spandx 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee3b447710888b33bf24ecf467ce1bf41e3cf6f2c91d2c3c381f256d0fa1ea6f
-  data.tar.gz: cd802eabfd2f0e383ae198217992ce465c28ac7d53587264ca1a2f4746e9e9ce
+  metadata.gz: 120ae97e54f2a138b7d1053d9e71c8b702174cf70fbac0fc861b8971f4aec0bd
+  data.tar.gz: c89d3ffe76d00d0a6fb18e91b5cdd3ef1487a826047213dd264be3d59796d188
 SHA512:
-  metadata.gz: ed0fec87962da7ad1576131d6a463324deeaa9ea2b9a6b289dc9c639d1eb9dda98e2bd7aa02df2f9d40526fc4793cedafe3311c9c5fb6c6aedba5594b68fcc1f
-  data.tar.gz: f6bdc294db3b95093c8e3872bb5113879c0a12f9d45ec718557281ff9397f925d0b0a443ba41fad0c5a48e86c77babf95b855b7315d795ec8e869bf8c1dbd6c4
+  metadata.gz: ab85f497f8ce4fe46a03b31d25ffa07816975dcbcb91a1438cf09bcd38f857ed652a1003569e2a8cbb091c5fb5b5b88a52043f4a61eec71337eff58107c75737
+  data.tar.gz: e73a923228358065c7d67bdfa8aaea328657269758f2c2d664621b5e6dd6da449b1d585655ae351e0edd99dbd155ef2efa24f0e37c95cd24c75f85da517503af

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-Version 0.15.0
+Version 0.15.1
 
 # Changelog
 
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.15.1] - 2020-11-18
+### Fixed
+- Rebuild index after pulling latest cache.
+
 ## [0.15.0] - 2020-11-18
 ### Added
 - Parse `/var/lib/dpkg/status` file.
@@ -207,7 +211,8 @@ 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/spandx/spandx/compare/v0.15.0...HEAD
+[Unreleased]: https://github.com/spandx/spandx/compare/v0.15.1...HEAD
+[0.15.1]: https://github.com/spandx/spandx/compare/v0.15.0...v0.15.1
 [0.15.0]: https://github.com/spandx/spandx/compare/v0.14.0...v0.15.0
 [0.14.0]: https://github.com/spandx/spandx/compare/v0.13.5...v0.14.0
 [0.13.5]: https://github.com/spandx/spandx/compare/v0.13.4...v0.13.5

data/ext/spandx/spandx.c

@@ -52,4 +52,6 @@ void Init_spandx(void)
   rb_mCore = rb_define_module_under(rb_mSpandx, "Core");
   rb_mCsvParser = rb_define_module_under(rb_mCore, "CsvParser");
   rb_define_module_function(rb_mCsvParser, "parse", parse, 1);
+
+  rb_gc_register_mark_object(rb_mCsvParser);
 }

data/lib/spandx/cli/commands/pull.rb

@@ -8,12 +8,41 @@ module Spandx
           @options = options
         end
 
-        def execute(output: $stdout)
+        def execute(output: $stderr)
+          sync(output)
+          build(output, ::Spandx::Core::Dependency::PACKAGE_MANAGERS.values.uniq)
+          output.puts 'OK'
+        end
+
+        private
+
+        def sync(output)
           Spandx.git.each_value do |db|
-            output.puts "Updating #{db.url}..."
-            db.update!
+            with_spinner("Updating #{db.url}...", output: output) do
+              db.update!
+            end
           end
-          output.puts 'OK'
+        end
+
+        def build(output, sources)
+          index_path = Spandx.git[:cache].root.join('.index')
+
+          with_spinner('Rebuilding index...', output: output) do
+            sources.each do |source|
+              Spandx::Core::Cache
+                .new(source, root: index_path)
+                .rebuild_index
+            end
+          end
+        end
+
+        def with_spinner(message, output:)
+          spinner = TTY::Spinner.new("[:spinner] #{message}", output: output)
+          spinner.auto_spin
+          yield
+          spinner.success('(done)')
+        ensure
+          spinner.stop
         end
       end
     end

data/lib/spandx/cli/printers/table.rb

@@ -6,8 +6,9 @@ module Spandx
       class Table < Printer
         HEADINGS = ['Name', 'Version', 'Licenses', 'Location'].freeze
 
-        def initialize
-          @spinner = TTY::Spinner.new(output: $stderr)
+        def initialize(output: $stderr)
+          @spinner = TTY::Spinner.new('[:spinner] Scanning...', output: output, clear: true, format: :dots)
+          @spinner.auto_spin
         end
 
         def match?(format)
@@ -16,7 +17,6 @@ module Spandx
 
         def print_header(_io)
           @dependencies = SortedSet.new
-          @spinner.auto_spin
         end
 
         def print_line(dependency, _io)
@@ -25,6 +25,7 @@ module Spandx
 
         def print_footer(io)
           @spinner.stop
+          @spinner.reset
           io.puts(to_table(@dependencies.map(&:to_a)))
         end
 

data/lib/spandx/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spandx
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Can Eldem
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable