spandx 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 288989db458fbe8da46cf782ab6d0410dbcfe5f167a4fa258b2fb0bdd819b2c3
-  data.tar.gz: 3df236283d2d8149bb9c6c9633969540147cd31cc6dfdabb4c26b56d3a6d5b92
+  metadata.gz: e89b8200563a7e8d6499790a3cec3673744cb46be6f3eb4a279cb28c311bc9cd
+  data.tar.gz: 2f33ec62f37e65a69e77872cef146c988f41bf7b9832ddd97cb7454ae2dd0281
 SHA512:
-  metadata.gz: 7c6bb83298a7298814f484236df79234aac9710cf990eb728db53465e1ec82943085a9057bc7d29e8f49ce74e76a6229606f1392bb13835db13ebbbfa18f173d
-  data.tar.gz: a95189cec4d7b0d5f4a6e8007bb79b805fe5072bf5a502c995140cfa5b495fb774e9e36fc2c6dbc17190ce8641fc9eb4ca1485e8dd033c70fce7960382a5d346
+  metadata.gz: dd107af13cc5a9acf8e5f915f01f1be6e687e3322ed3a2bdb499ab03ffed7b287b0424aa1682cd97212fe9206e51ff6a4e4f2773a1ce5d2f434c23a410c8472d
+  data.tar.gz: f984aed0d5db9ff517fffb491f9be9794419795186fbc9b9e9287529ecd286e0876f7f97588bc31b264c10d02049e56d125bea565e3579cc4c8ce7ff1eae3858

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-Version 0.13.1
+Version 0.13.2
 
 # Changelog
 
@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.13.2] - 2020-05-17
+### Fixed
+- Detect licenses when provided as an array.
+- Skip empty lockfiles.
+
 ## [0.13.1] - 2020-05-16
 ### Fixed
 - Add `ext/**/*.c` and `ext/**/*.h` to list of files.

data/ext/spandx/spandx.c

@@ -20,7 +20,7 @@ static VALUE parse(VALUE self, VALUE line)
 
   const VALUE items = rb_ary_new2(3);
   const char *s, *n;
-  const int len = RSTRING_LEN(line);
+  const long len = RSTRING_LEN(line);
   enum { open, closed } state = closed;
 
   for (int i = 0; i < len && *p; i++) {

data/lib/spandx/core/git.rb

@@ -42,7 +42,5 @@ module Spandx
         end
       end
     end
-
-    Database = Git
   end
 end

data/lib/spandx/core/guess.rb

@@ -10,7 +10,14 @@ module Spandx
       end
 
       def license_for(raw)
-        raw.is_a?(Hash) ? from_hash(raw) : from_string(raw)
+        case raw
+        when Hash
+          from_hash(raw)
+        when Array
+          from_array(raw)
+        else
+          from_string(raw)
+        end
       end
 
       private
@@ -21,6 +28,10 @@ module Spandx
           unknown(hash[:name] || hash[:url])
       end
 
+      def from_array(array)
+        from_string(array.join(' AND '))
+      end
+
       def from_string(raw)
         return if raw.nil?
 

data/lib/spandx/core/parser.rb

@@ -21,6 +21,8 @@ module Spandx
         include Registerable
 
         def for(path)
+          return UNKNOWN if !File.exist?(path) || File.size(path).zero?
+
           find { |x| x.matches?(File.basename(path)) } || UNKNOWN
         end
       end

data/lib/spandx/python/pypi.rb

@@ -96,7 +96,5 @@ module Spandx
         Nokogiri::HTML(http.get(url).body)
       end
     end
-
-    PyPI = Pypi
   end
 end

data/lib/spandx/version.rb

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

metadata

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