spdx 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99e4ba8213d4d1b3d06d4bd8566faa8dbed061fe
-  data.tar.gz: b29a2930b8053f967481dd19dfd9b71a8c9160f9
+  metadata.gz: 9ee8c6428b27ec96a45846d4bcd98a9fd1d769ba
+  data.tar.gz: 6e8ba7832367a63e560b144c9043adb3981b93f2
 SHA512:
-  metadata.gz: fcd7873257448fb37055bafb9fad07704d1ae4b8403ce81cdd0c1d5cfe20302e43ec4152d1584a2e10f403dd879b6521545b62e38e7ad9745941b68888df0737
-  data.tar.gz: 7ce407f2569b0b44af0f8b3facac57a8b11e6602b21b25646983af0c49b079c737d4422e10607ea09a1bca433f7ac45e3abf7b2ca9e48a629decb4965b45dabf
+  metadata.gz: 10ff3a6783d7bb21042f8ac931e6657a5c30b312d5dea4552bd5131468b769d657ccec580fe1bec642f8bccc673e6299238411089ecacd1702a6527389267ce3
+  data.tar.gz: de633ce981bc1c1acb783f83247bd6f796f917b5dc149cf2738312fc9296a9e38cdb35bd40d2ec01e2f705fdb61392c9b793b5d4eae160f140b7b4881973f3c1

data/lib/spdx.rb

@@ -45,11 +45,33 @@ module Spdx
       'bsd' => 'BSD-3-Clause',
       'new bsd license' => 'BSD-3-Clause',
       'gplv3' => 'GPL-3.0',
+      'gplv2' => 'GPL-2.0',
+      'gpl3' => 'GPL-3.0',
+      'gpl2' => 'GPL-2.0',
+      'gpl 3' => 'GPL-3.0',
+      'gpl 2' => 'GPL-2.0',
+      'gpl v3' => 'GPL-3.0',
+      'gpl v2' => 'GPL-2.0',
+      'gpl 3.0' => 'GPL-3.0',
+      'gpl 2.0' => 'GPL-2.0',
+      'gpl-3' => 'GPL-3.0',
       'gpl-2' => 'GPL-2.0',
+      'gpl30' => 'GPL-3.0',
+      'gpl20' => 'GPL-2.0',
+      'gpl v3+' => 'GPL-3.0+',
+      'gpl v2+' => 'GPL-2.0+',
       'gpl' => 'GPL-2.0+',
+      'gpl (≥ 3)' => 'GPL-3.0+',
+      'gpl-2 | gpl-3 [expanded from: gpl (≥ 2)]' => 'GPL-2.0+',
+      'gpl-2 | gpl-3 [expanded from: gpl (≥ 2.0)]' => 'GPL-2.0+',
+      'gpl-2 | gpl-3 [expanded from: gpl]' => 'GPL-2.0+',
+      'gpl-2 | gpl-3' => 'GPL-2.0+',
       "gnu lesser general public license" => 'LGPL-2.1+',
       'lgplv2 or later' => 'LGPL-2.1+',
       'gplv2 or later' => 'GPL-2.0+',
+      'gpl2 w/ cpe' => 'GPL-2.0-with-classpath-exception',
+      'new bsd license (gpl-compatible)' => 'BSD-3-Clause',
+      'the gpl v3' => 'GPL-3.0',
       'public domain' => 'Unlicense'
     }
   end

data/lib/spdx/version.rb

@@ -1,3 +1,3 @@
 module Spdx
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/spdx_spec.rb

@@ -32,6 +32,27 @@ describe Spdx do
     end
 
     it "should return know licenses for special cases" do
+      expect(Spdx.find('GPL3').name).to eq('GNU General Public License v3.0 only')
+      expect(Spdx.find('GPL v3').name).to eq('GNU General Public License v3.0 only')
+      expect(Spdx.find('GPL3').name).to eq('GNU General Public License v3.0 only')
+      expect(Spdx.find('GPL 3.0').name).to eq('GNU General Public License v3.0 only')
+      expect(Spdx.find('GPL-3').name).to eq('GNU General Public License v3.0 only')
+      expect(Spdx.find('GPL-2 | GPL-3 [expanded from: GPL (≥ 2)]').name).to eq('GNU General Public License v2.0 or later')
+      expect(Spdx.find('GPL-2 | GPL-3 [expanded from: GPL]').name).to eq('GNU General Public License v2.0 or later')
+      expect(Spdx.find('GPL (≥ 3)').name).to eq('GNU General Public License v3.0 or later')
+      expect(Spdx.find('gpl30').name).to eq('GNU General Public License v3.0 only')
+      expect(Spdx.find("GPL v2+").name).to eq('GNU General Public License v2.0 or later')
+      expect(Spdx.find("GPL 2").name).to eq('GNU General Public License v2.0 only')
+      expect(Spdx.find("GPL v2").name).to eq('GNU General Public License v2.0 only')
+      expect(Spdx.find("GPL2").name).to eq('GNU General Public License v2.0 only')
+      expect(Spdx.find("GPL-2 | GPL-3").name).to eq('GNU General Public License v2.0 or later')
+      expect(Spdx.find("GPL-2 | GPL-3 [expanded from: GPL (≥ 2.0)]").name).to eq('GNU General Public License v2.0 or later')
+      expect(Spdx.find("GPL2 w/ CPE").name).to eq('GNU General Public License v2.0 w/Classpath exception')
+      expect(Spdx.find("GPL 2.0").name).to eq('GNU General Public License v2.0 only')
+      expect(Spdx.find("New BSD License (GPL-compatible)").name).to eq('BSD 3-clause "New" or "Revised" License')
+      expect(Spdx.find("The GPL V3").name).to eq('GNU General Public License v3.0 only')
+
+
       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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spdx
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Andrew Nesbitt