spandx 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d43310f8751344a680d231818e7f9563df42c15062ba7230b00bbed9758eed86
-  data.tar.gz: 87138f6b4d45fc73bcb48fa3dc22262e79a8d0423cb4d15ddd2c0310a168e400
+  metadata.gz: 03ab3629ac636e8be88e27061cbce6941672dfd0a99bce30a9a638a095ebddab
+  data.tar.gz: 3e0d7eb62b59887c2770ac9dfbef7b0037fcf3031e73f2f380a8ed1ba93d2cca
 SHA512:
-  metadata.gz: f61f68f17cc299026704e76a0bef59d7437b6de68a85996e094b353c8e5edfa7290dd1351170f4da2e3078e3f5303ba8cdd5d550cad3349e4e83a99a9c69126a
-  data.tar.gz: 6cd23ff18208621c628f4c3811e95aaf6b73e466f46e008ee2219d663f74f64662bd767259d97a70bf8765b0ad0cea39c1798160c12c66d676a4176ab264cc0d
+  metadata.gz: c6962a430329a9d3ed3f274485a55a396cea66b9bcd8f664caf803d74c5768508aa9eee499a7ae99ab06bd840a6bedb67b85812cab193c1e5f6f725458c05fbd
+  data.tar.gz: a42dd5adeeb36e374a1f4a2582a881d5d4e28f2959d0044e653162edd0835895ade882261379bc5d47d3a7955b536c7f0ddc53b4a489ce8e68e6b6a3ad0c9731

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-Version 0.12.2
+Version 0.12.3
 
 # Changelog
 
@@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [0.12.3] - 2020-04-19
+### Fixed
+- Ignore nuget entries with missing `items`.
+- Remove require `etc`.
+
 ## [0.12.2] - 2020-04-18
 ### Fixed
 - Insert entries with unknown license into cache instead of one large dead letter file that is too big to commit to git.
@@ -138,7 +144,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Provide ruby API to the latest SPDX catalogue.
 
-[Unreleased]: https://github.com/mokhan/spandx/compare/v0.12.1...HEAD
+[Unreleased]: https://github.com/mokhan/spandx/compare/v0.12.3...HEAD
+[0.12.3]: https://github.com/mokhan/spandx/compare/v0.12.2...v0.12.3
+[0.12.2]: https://github.com/mokhan/spandx/compare/v0.12.1...v0.12.2
 [0.12.1]: https://github.com/mokhan/spandx/compare/v0.12.0...v0.12.1
 [0.12.0]: https://github.com/mokhan/spandx/compare/v0.11.0...v0.12.0
 [0.11.0]: https://github.com/mokhan/spandx/compare/v0.10.1...v0.11.0

data/lib/spandx/cli/main.rb

@@ -35,11 +35,13 @@ module Spandx
       desc 'build', 'Build a package index'
       method_option :help, aliases: '-h', type: :boolean, desc: 'Display usage information'
       method_option :directory, aliases: '-d', type: :string, desc: 'Directory to build index in', default: '.index'
+      method_option :logfile, aliases: '-l', type: :string, desc: 'Path to a logfile', default: '/dev/null'
       method_option :index, aliases: '-i', type: :string, desc: 'The specific index to build', default: :all
       def build(*)
         if options[:help]
           invoke :help, ['build']
         else
+          Spandx.logger = Logger.new(options[:logfile])
           Commands::Build.new(options).execute
         end
       end

data/lib/spandx/core/circuit.rb

@@ -3,10 +3,12 @@
 module Spandx
   module Core
     class Circuit
-      attr_reader :state
+      attr_reader :name, :state, :logger
 
-      def initialize(state: :closed)
+      def initialize(name, state: :closed, logger: Spandx.logger)
+        @name = name
         @state = state
+        @logger = logger
       end
 
       def attempt
@@ -16,6 +18,8 @@ module Spandx
         result = yield
         close!
         result
+      ensure
+        logger.debug("#{name} #{state}")
       end
 
       def open!

data/lib/spandx/core/http.rb

@@ -8,7 +8,7 @@ module Spandx
       def initialize(driver: Http.default_driver, retries: 3)
         @driver = driver
         @retries = retries
-        @circuits = Hash.new { |hash, key| hash[key] = Circuit.new }
+        @circuits = Hash.new { |hash, key| hash[key] = Circuit.new(key) }
       end
 
       def get(uri, default: nil, escape: true)

data/lib/spandx/core/thread_pool.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Spandx
+  module Core
+    class ThreadPool
+      def initialize(size: Etc.nprocessors)
+        @size = size
+        @jobs = Queue.new
+        @pool = size.times { start_worker_thread }
+      end
+
+      def schedule(*args, &block)
+        @jobs << [block, args]
+      end
+
+      def shutdown
+        @size.times do
+          schedule { throw :exit }
+        end
+
+        @pool.map(&:join)
+      end
+
+      private
+
+      def start_worker_thread
+        Thread.new do
+          catch(:exit) do
+            loop do
+              job, args = @jobs.deq
+              job.call(*args)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spandx/dotnet/nuget_gateway.rb

@@ -78,7 +78,7 @@ module Spandx
       end
 
       def items_from(page)
-        page['items'].sort_by { |x| x['commitTimeStamp'] }
+        page.fetch('items', []).sort_by { |x| x['commitTimeStamp'] }
       end
 
       def page_number_from(url)

data/lib/spandx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spandx
-  VERSION = '0.12.2'
+  VERSION = '0.12.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spandx
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - mo khan
@@ -317,6 +317,7 @@ files:
 - lib/spandx/core/report.rb
 - lib/spandx/core/score.rb
 - lib/spandx/core/table.rb
+- lib/spandx/core/thread_pool.rb
 - lib/spandx/dotnet/index.rb
 - lib/spandx/dotnet/nuget_gateway.rb
 - lib/spandx/dotnet/package_reference.rb