spdx 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f5e9db777ba544a7b8d7b860f1b4dfd888aff7a7
-  data.tar.gz: 5dc0536e865b5e7afb69555b4a7274634e8ff7c0
+SHA256:
+  metadata.gz: 5e3d2a512cc5d500d673afcbe56d3931b16eea1b1c2f838cd1cf0aa57cc2a2a7
+  data.tar.gz: 99e92b8ab7af4d29cb19b7224fef6d5a3f8d1a6c2f41ddba40cd9778011de5e4
 SHA512:
-  metadata.gz: 4c9f9f80031affe550184f7f107d7d712e11995eddf6b644b52558affa5a9b3e6778654176ee5b4c540967dbbf43536c854d8d0fd9251cb21726803d862539b9
-  data.tar.gz: ccc0a21928b7f598eb68a65bad34e8be0e52449ed65ef3fd9b8795d2876de549ae1e83c690909965cbf04c199451fe5d8adb6a83c820d85dcf2924b29633ac09
+  metadata.gz: b69f7078ad07df492666272deb8a761249ff2860f0449ae3ba673f628c158b2041df7626d0e1a068a885c25880b0d2a6304c20d6c7ab11d5c4c64d0e7cea1bd0
+  data.tar.gz: 35a5fcb97c23e08aa87a23a0a62ef83e07d27fb16200e8c61b21f78d4d49a06dfa8958248084051c3c35cc7d655aa4f78ff06cfdd616aa618ce6817f29a037b4

data/.travis.yml

@@ -1,5 +1,8 @@
 language: ruby
 rvm:
-  - 2.4.0
+  - 2.4.2
+  - 2.5.0
 cache: bundler
 sudo: false
+before_install:
+  - gem update --system

data/lib/spdx.rb

@@ -4,7 +4,19 @@ require "fuzzy_match"
 
 module Spdx
   def self.find(name)
-    lookup(name.strip) || find_by_special_case(name.strip) || closest(name.strip)
+    name.strip!
+    return nil if commercial?(name)
+    search(name)
+  end
+
+  def self.search(name)
+    lookup(name) ||
+    find_by_special_case(name) ||
+    closest(name)
+  end
+
+  def self.commercial?(name)
+    name.downcase == 'commercial'
   end
 
   def self.lookup(name)

data/lib/spdx/version.rb

@@ -1,3 +1,3 @@
 module Spdx
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/spdx.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "spdx-licenses", "~> 1.0"
   spec.add_dependency "fuzzy_match", "~> 2.1"
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 12"
-  spec.add_development_dependency "rspec", "~> 3.5.0"
+  spec.add_development_dependency "rspec", "~> 3.7"
 end

data/spec/spdx_spec.rb

@@ -15,6 +15,10 @@ describe Spdx do
       expect(Spdx.find('Apache License 2.0').name).to eq("Apache License 2.0")
     end
 
+    it "should return nil for commercial" do
+      expect(Spdx.find('Commercial')).to be_nil
+    end
+
     it "should return nil for garbage" do
       expect(Spdx.find('foo bar baz')).to be_nil
       expect(Spdx.find('Copyright Zendesk. All Rights Reserved.')).to be_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spdx
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spdx-licenses
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.7'
 description: 
 email:
 - andrewnez@gmail.com
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A SPDX license normalizer