spandx 0.13.5 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01abc42f6e315aee9f35bf60cdad7a4801ee95ae4a186ef3ee001f2617c9891e
-  data.tar.gz: 78248675cdddbcb197f347239c85016862254a113b17894e4d6ffe7ecd33cddd
+  metadata.gz: 7e01f7023f4a164fb867c7d457769d1c9dd2eb2b480cee88c5d4d682c2d6dc4e
+  data.tar.gz: f202f85c254d11041b79e1305d12641eb66ea66cec9afea25a38e9724a5636d6
 SHA512:
-  metadata.gz: d6d4462c74dc412f9016ff576f55e67bdc9a6b341059d3b372b505f6e7ee730a92da53a4b5d0ab836df298b2cb527d0890c599fdc48f92a848b3d93c6c7d67ab
-  data.tar.gz: fdc618b97c619aa7d8a99b799dc5b1569d8396e9cfbbee5ee91cf7b994335e7fcbd9a5abac03b87a21615b23eef7913d5b59aabf277cacaa3eeac8497d795f38
+  metadata.gz: 926df592dfc76466a7e26bcdfd9fc581957b2c748c9272e30a22180a61f4d6498ebb14e04e8acbbccc813f4aae929ecb8ba82ee54064d642990e5874b05bb0b1
+  data.tar.gz: 5dede807761bf9d4fa91f6a0ea9df1bec9531d0a397fedea5c687b7c12860216e41df47c09fc7e94c8951e7dc0f88c99fc74395913002890b199409b700830f0

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-Version 0.13.5
+Version 0.14.0
 
 # Changelog
 
@@ -8,6 +8,11 @@ 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.14.0] - 2020-11-14
+### Added
+- Parse `/lib/apk/db/installed` file.
+
 ## [0.13.5] - 2020-05-26
 ### Fixed
 - Process PyPI package urls with single digit versions.
@@ -198,7 +203,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.13.5...HEAD
+[Unreleased]: https://github.com/spandx/spandx/compare/v0.14.0...HEAD
+[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
 [0.13.4]: https://github.com/spandx/spandx/compare/v0.13.3...v0.13.4
 [0.13.3]: https://github.com/spandx/spandx/compare/v0.13.2...v0.13.3

data/lib/spandx/core/dependency.rb

@@ -13,6 +13,7 @@ module Spandx
         Spandx::Php::Parsers::Composer => :composer,
         Spandx::Python::Parsers::PipfileLock => :pypi,
         Spandx::Ruby::Parsers::GemfileLock => :rubygems,
+        Spandx::Os::Parsers::Apk => :apk,
       }.freeze
       attr_reader :path, :name, :version, :licenses, :meta
 

data/lib/spandx/core/http.rb

@@ -36,12 +36,12 @@ module Spandx
       end
 
       def self.default_driver
-        @default_driver ||= Net::Hippie::Client.new.tap do |client|
-          client.logger = Spandx.logger
-          client.open_timeout = 1
-          client.read_timeout = 5
-          client.follow_redirects = 3
-        end
+        @default_driver ||= Net::Hippie::Client.new(
+          follow_redirects: 3,
+          logger: Spandx.logger,
+          open_timeout: 1,
+          read_timeout: 5
+        )
       end
 
       private

data/lib/spandx/core/license_plugin.rb

@@ -33,7 +33,7 @@ module Spandx
       end
 
       def known?(package_manager)
-        %i[nuget maven rubygems npm yarn pypi composer].include?(package_manager)
+        %i[nuget maven rubygems npm yarn pypi composer apk].include?(package_manager)
       end
 
       def gateway_for(dependency)

data/lib/spandx/os/parsers/apk.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Spandx
+  module Os
+    module Parsers
+      class Apk < ::Spandx::Core::Parser
+        def match?(path)
+          path.basename.fnmatch?('installed')
+        end
+
+        def parse(lockfile)
+          path = lockfile.to_s
+
+          [].tap do |items|
+            lockfile.open(mode: 'r') do |io|
+              each_package(io) do |data|
+                items.push(map_from(data, path))
+              end
+            end
+          end
+        end
+
+        private
+
+        def each_package(io)
+          package = {}
+
+          until io.eof?
+            line = io.readline.chomp
+            if line.empty?
+              yield package
+
+              package = {}
+            else
+              line.split(':').tap { |(key, value)| package[key] = value }
+            end
+          end
+        end
+
+        def map_from(data, path)
+          ::Spandx::Core::Dependency.new(
+            path: path,
+            name: data['P'],
+            version: data['V'],
+            meta: data.merge('license' => [data['L']])
+          )
+        end
+      end
+    end
+  end
+end

data/lib/spandx/version.rb

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

data/spandx.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'addressable', '~> 2.7'
   spec.add_dependency 'bundler', '>= 1.16', '< 3.0.0'
-  spec.add_dependency 'net-hippie', '~> 0.3'
+  spec.add_dependency 'net-hippie', '~> 1.0'
   spec.add_dependency 'nokogiri', '~> 1.10'
   spec.add_dependency 'oj', '~> 3.10'
   spec.add_dependency 'parslet', '~> 2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spandx
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.14.0
 platform: ruby
 authors:
 - Can Eldem
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -404,6 +404,7 @@ files:
 - lib/spandx/js/parsers/yarn.rb
 - lib/spandx/js/yarn_lock.rb
 - lib/spandx/js/yarn_pkg.rb
+- lib/spandx/os/parsers/apk.rb
 - lib/spandx/php/packagist_gateway.rb
 - lib/spandx/php/parsers/composer.rb
 - lib/spandx/python/index.rb
@@ -441,7 +442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A ruby interface to the SPDX catalogue.