From 89edce7e8d5495c085bebff480bccc8f187fa17a Mon Sep 17 00:00:00 2001 From: mo khan Date: Mon, 10 Feb 2020 18:13:27 -0700 Subject: Remove/loosen dependencies --- Gemfile.lock | 8 ++------ lib/spandx.rb | 1 - lib/spandx/gateways/nuget.rb | 7 +++---- spandx.gemspec | 4 ++-- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b8c4162..e4160ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,11 +4,10 @@ PATH spandx (0.4.1) addressable (~> 2.7) bundler (>= 1.16, < 3.0.0) - concurrent-ruby-ext (~> 1.1) net-hippie (~> 0.3) nokogiri (~> 1.10) text (~> 1.3) - thor (~> 0.1) + thor GEM remote: https://rubygems.org/ @@ -22,9 +21,6 @@ GEM bundler-audit (0.6.1) bundler (>= 1.2.0, < 3) thor (~> 0.18) - concurrent-ruby (1.1.5) - concurrent-ruby-ext (1.1.5) - concurrent-ruby (= 1.1.5) crack (0.4.3) safe_yaml (~> 1.0.0) diff-lcs (1.3) @@ -32,7 +28,7 @@ GEM jaro_winkler (1.5.4) mini_portile2 (2.4.0) net-hippie (0.3.2) - nokogiri (1.10.7) + nokogiri (1.10.8) mini_portile2 (~> 2.4.0) parallel (1.19.1) parser (2.7.0.2) diff --git a/lib/spandx.rb b/lib/spandx.rb index d99c570..65651b8 100644 --- a/lib/spandx.rb +++ b/lib/spandx.rb @@ -2,7 +2,6 @@ require 'addressable/uri' require 'bundler' -require 'concurrent' require 'forwardable' require 'json' require 'net/hippie' diff --git a/lib/spandx/gateways/nuget.rb b/lib/spandx/gateways/nuget.rb index 05d9932..b33296f 100644 --- a/lib/spandx/gateways/nuget.rb +++ b/lib/spandx/gateways/nuget.rb @@ -16,13 +16,13 @@ module Spandx end def update!(index, limit: nil) - counter = Concurrent::AtomicFixnum.new(0) + counter = 0 each do |spec| upsert_into!(index, spec) if limit - counter.increment - break if counter.value > limit + counter += 1 + break if counter > limit end end end @@ -107,7 +107,6 @@ module Spandx if (license = spec['licenseExpression']) index.write(key, license) end - puts [license, key].inspect end end end diff --git a/spandx.gemspec b/spandx.gemspec index b47ac4f..8086b32 100644 --- a/spandx.gemspec +++ b/spandx.gemspec @@ -32,11 +32,11 @@ Gem::Specification.new do |spec| spec.add_dependency 'addressable', '~> 2.7' spec.add_dependency 'bundler', '>= 1.16', '< 3.0.0' - spec.add_dependency 'concurrent-ruby-ext', '~> 1.1' spec.add_dependency 'net-hippie', '~> 0.3' spec.add_dependency 'nokogiri', '~> 1.10' spec.add_dependency 'text', '~> 1.3' - spec.add_dependency 'thor', '~> 0.1' + spec.add_dependency 'thor' + spec.add_development_dependency 'bundler-audit', '~> 0.6' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec', '~> 3.0' -- cgit v1.2.3