spdx 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 920de1859895a723009a598101cf645d0a00ab45
-  data.tar.gz: 761ebacd877c0e03f7aa8f3ffceb3c1bd57da6b2
+  metadata.gz: 35c016f37e6cbd9cf4065a28b68c6508c939d69a
+  data.tar.gz: 19f52bc82a38452d9fc815056155241bcedf632f
 SHA512:
-  metadata.gz: 33fd79626a0a81193b09fc11c98c58c317d1a4d2e184143190728930b547a4dcb2fc7136ba4fa5c6afa88bb999ac667efae5184ee76c111efe8845e193662cc4
-  data.tar.gz: 5bd37029a8909bcc118f38a26cbf50fe2fcd4f09a7cf996b8b8e2a65c1d276d6775d075f49400bd2d67b0a52936da43187dcc1e9a63d5adc07710fa0c9a68204
+  metadata.gz: c55b595002ffeeb1b32c02f19b6cb3f1163694f23e5e0294a15e26e69bc86633ad2efa1888e8ae571f752011fb826d49a8de753383839b447ac666607aceaca3
+  data.tar.gz: a1a0083884dd5c5d2d118afdde82a0ee8d9a1199275f181c592bf913eaf84a081dcd4fe3b9bcdb1bf1b79df74fa1e82edd5733d434ed381d575cf549f2466503

data/README.md

@@ -28,7 +28,7 @@ Spdx.find('Apache 2') # => <SpdxLicenses::License:0x007fa3a2b462c8 @id="Apache-2
 
 ## Contributing
 
-1. Fork it ( https://github.com/andrew/spdx/fork )
+1. Fork it ( https://github.com/librariesio/spdx/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/spdx.rb

@@ -4,7 +4,7 @@ require "fuzzy_match"
 
 module Spdx
   def self.find(name)
-    SpdxLicenses[name] || closest(name)
+    SpdxLicenses[name] || find_by_special_case(name) || closest(name)
   end
 
   def self.closest(name)
@@ -34,6 +34,26 @@ module Spdx
     SpdxLicenses[match[0]] if match
   end
 
+  def self.find_by_special_case(name)
+    SpdxLicenses[special_cases[name.downcase]]
+  end
+
+  def self.special_cases
+    {
+      'perl_5' => 'Artistic-1.0-Perl',
+      'bsd3' => 'BSD-3-Clause',
+      'bsd' => 'BSD-3-Clause',
+      'new bsd license' => 'BSD-3-Clause',
+      'gplv3' => 'GPL-3.0',
+      'gpl-2' => 'GPL-2.0',
+      'gpl' => 'GPL-2.0+',
+      "gnu lesser general public license" => 'LGPL-2.1+',
+      'lgplv2 or later' => 'LGPL-2.1+',
+      'gplv2 or later' => 'GPL-2.0+',
+      'public domain' => 'Unlicense'
+    }
+  end
+
   def self.names
     SpdxLicenses.data.keys + SpdxLicenses.data.map{|k,v| v['name'] }
   end

data/lib/spdx/version.rb

@@ -1,3 +1,3 @@
 module Spdx
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spdx.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Andrew Nesbitt"]
   spec.email         = ["andrewnez@gmail.com"]
   spec.summary       = %q{A SPDX license checker}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/librariesio/spdx"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fuzzy_match", "~> 2.1"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.1.0"
 end

data/spec/spdx_spec.rb

@@ -30,5 +30,19 @@ describe Spdx do
       expect(Spdx.find('The MIT License').name).to eq("MIT License")
       expect(Spdx.find('UNLICENSE').name).to eq("The Unlicense")
     end
+
+    it "should return know licenses for special cases" do
+      expect(Spdx.find('perl_5').name).to eq("Artistic License 1.0 (Perl)")
+      expect(Spdx.find('BSD3').name).to eq('BSD 3-clause "New" or "Revised" License')
+      expect(Spdx.find('BSD').name).to eq('BSD 3-clause "New" or "Revised" License')
+      expect(Spdx.find('GPLv3').name).to eq('GNU General Public License v3.0 only')
+      expect(Spdx.find('LGPLv2 or later').name).to eq('GNU Lesser General Public License v2.1 or later')
+      expect(Spdx.find('GPLv2 or later').name).to eq('GNU General Public License v2.0 or later')
+      expect(Spdx.find('Public Domain').name).to eq('The Unlicense')
+      expect(Spdx.find('GPL-2').name).to eq('GNU General Public License v2.0 only')
+      expect(Spdx.find('GPL').name).to eq('GNU General Public License v2.0 or later')
+      expect(Spdx.find('GNU LESSER GENERAL PUBLIC LICENSE').name).to eq('GNU Lesser General Public License v2.1 or later')
+      expect(Spdx.find('New BSD License').name).to eq('BSD 3-clause "New" or "Revised" License')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spdx
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spdx-licenses
@@ -70,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 description: 
 email:
 - andrewnez@gmail.com
@@ -98,7 +98,7 @@ files:
 - spdx.gemspec
 - spec/spdx_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/librariesio/spdx
 licenses:
 - MIT
 metadata: {}