spdx 1.2.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16ede262711d02ee917738a2bf2d9e2f9e78013a
-  data.tar.gz: 7a5bccbe64a7ef0b8de666cea839b8ca1d5c1a4e
+  metadata.gz: ab1a08a469d835c79da210f3089871c2a90a4582
+  data.tar.gz: ce5e6e21b416a8dfb3d3cd2cefab5f9b3e65166f
 SHA512:
-  metadata.gz: ad45cb5086164f9c6de8a7c62efe7eafdc24040c94dc6141af6327b06b9449c64dd07d273d0f00794a6d944b1e247277ba0e319f3a97f0387975063926be67aa
-  data.tar.gz: 1dff5bb00871d340bb681bdd16df45d0fe86b0012b264df5bfd110a3ddbbf043d254eef43265c9c36359c7105bfce88c0642601ca2655191d1ac66f699f12ad9
+  metadata.gz: b8599cb7916bf96d6259556effabdd3172e85c048963e8a67099a092701f3a6f757d591aaabd3c67db580e1a967a3cc28adc9486898807da830bfcbc2ebdc04c
+  data.tar.gz: 8adf47e9e068838ab72463e006d44dfe0039c41ca43e5081ee8a2b7e55a0a5de0a024cde2c05396fe3351c7480f3255bda014a2922c99880e4599f119489a47a

data/CODE_OF_CONDUCT.md

@@ -1,24 +1,41 @@
-# Contributor Code of Conduct
+# Contributor Covenant Code of Conduct
 
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
+## Our Pledge
 
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
 Project maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, wiki edits, issues, and other contributions
@@ -26,25 +43,32 @@ that are not aligned to this Code of Conduct, or to ban temporarily or
 permanently any contributor for other behaviors that they deem inappropriate,
 threatening, offensive, or harmful.
 
-By adopting this Code of Conduct, project maintainers commit themselves to
-fairly and consistently applying these principles to every aspect of managing
-this project. Project maintainers who do not follow or enforce the Code of
-Conduct may be permanently removed from the project team.
+## Scope
 
 This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at andrewnez@gmail.com. All
+reported by contacting the project team at andrew@libraries.io. All
 complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. Maintainers are
-obligated to maintain confidentiality with regard to the reporter of an
-incident.
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
 
+## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
 
 [homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
+[version]: http://contributor-covenant.org/version/1/4/

data/README.md

@@ -1,6 +1,6 @@
 # [Spdx](http://libraries.io/rubygems/spdx)
 
-A SPDX license checker
+A SPDX license normalizer
 
 This gem allows you to find standard SPDX licenses from similar, but not exact names using [FuzzyMatch](https://github.com/seamusabshere/fuzzy_match) to find the closest match.
 

data/lib/spdx.rb

@@ -43,69 +43,49 @@ module Spdx
   end
 
   def self.find_by_special_case(name)
+    gpl = gpl_match(name)
+    return gpl if gpl
     lookup(special_cases[name.downcase.strip])
   end
 
+  def self.gpl_match(name)
+    match = name.match(/^(l|a)?gpl-?\s?_?v?(1|2|3)\.?(\d)?(\+)?$/i)
+    return unless match
+    lookup "#{match[1]}GPL-#{match[2]}.#{match[3] || 0}#{match[4]}"
+  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',
-      'gplv2' => 'GPL-2.0',
-      'gpl3' => 'GPL-3.0',
-      'gpl2' => 'GPL-2.0',
-      'gpl 3' => 'GPL-3.0',
-      'gpl_1' => 'GPL-1.0',
-      'gpl_2' => '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+',
-      'gplv2+' => 'GPL-2.0+',
       'gpl' => '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 [expanded from: gpl (≥ 2)]' => 'GPL-2.0+',
+      'gpl-2 | gpl-3' => 'GPL-2.0+',
+      'gplv2 or later' => 'GPL-2.0+',
+      'the gpl v3' => 'GPL-3.0',
       'gpl (≥ 3)' => 'GPL-3.0+',
       'mpl2.0' => 'mpl-2.0',
       'mpl1' => 'mpl-1.0',
       'mpl1.0' => 'mpl-1.0',
       'mpl1.1' => 'mpl-1.1',
       'mpl2' => 'mpl-2.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',
       'cc0' => 'CC0-1.0',
-      'lgpl v3' => 'LGPL-3.0',
       'artistic_2' => 'Artistic-2.0',
       'artistic_1' => 'Artistic-1.0',
-      'lgpl 2.1' => 'LGPL-2.1',
-      'lgpl' => 'LGPL-3.0',
-      'lgplv2.1+' => 'LGPL-2.1+',
-      'lgplv3' => 'LGPL-3.0',
-      'gplv3+' => 'GPL-3.0+',
       'alv2' => 'Apache-2.0',
       'asl 2.0' => 'Apache-2.0',
       'mpl 2.0' => 'MPL-2.0',
-      'agplv3' => 'AGPL-3.0',
       'publicdomain' => 'Unlicense',
       'unlicensed' => 'Unlicense',
-      'lgpl-3' => 'LGPL-3.0',
       'psfl' => 'Python-2.0',
       'psf' => 'Python-2.0',
       'asl2' => 'Apache-2.0',
@@ -116,20 +96,9 @@ module Spdx
       'ZPL 1.1' => 'ZPL-1.1',
       'ZPL 2.0' => 'ZPL-2.0',
       'ZPL 2.1' => 'ZPL-2.1',
-      'lgplv2' => 'LGPL-2.0',
-      'lgplv2+' => 'LGPL-2.0+',
-      'lgplv2.1' => 'LGPL-2.1',
       'lgpl_2_1' => 'LGPL-2.1',
       'lgpl_v2_1' => 'LGPL-2.1',
-      'lgpl v2.1+' => 'LGPL-2.1+',
-      'lgplv3+' => 'LGPL-3.0+',
-      'lgpl 3.0' => 'LGPL-3.0',
-      'lgpl 3' => 'LGPL-3.0',
-      'lgpl3' => 'LGPL-3.0',
       'lgpl version 3' => 'LGPL-3.0',
-      'agpl3' => 'AGPL-3.0',
-      'agpl-3' => 'AGPL-3.0',
-      'agpl3+' => 'AGPL-3.0+',
       'cc by-sa 4.0' => 'CC-BY-SA-4.0',
       'cc by-nc-sa 3.0' => 'CC-BY-NC-SA-3.0',
       'cc by-sa 3.0' => 'CC-BY-SA-3.0',

data/lib/spdx/version.rb

@@ -1,3 +1,3 @@
 module Spdx
-  VERSION = "1.2.8"
+  VERSION = "1.3.0"
 end

data/spdx.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Spdx::VERSION
   spec.authors       = ["Andrew Nesbitt"]
   spec.email         = ["andrewnez@gmail.com"]
-  spec.summary       = %q{A SPDX license checker}
+  spec.summary       = %q{A SPDX license normalizer}
   spec.homepage      = "https://github.com/librariesio/spdx"
   spec.license       = "MIT"
 
@@ -20,6 +20,6 @@ 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 "rake", "~> 10.4"
+  spec.add_development_dependency "rake", "~> 11.1"
   spec.add_development_dependency "rspec", "~> 3.4.0"
 end

data/spec/spdx_spec.rb

@@ -69,6 +69,21 @@ describe Spdx do
       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')
       expect(Spdx.find('(MIT OR X11) ').name).to eq('MIT License')
+      expect(Spdx.find('mit-license').name).to eq('MIT License')
+      expect(Spdx.find('lgpl-3').name).to eq('GNU Lesser General Public License v3.0 only')
+      expect(Spdx.find('agpl-3').name).to eq('GNU Affero General Public License v3.0')
+      expect(Spdx.find('cc by-sa 4.0').name).to eq('Creative Commons Attribution Share Alike 4.0')
+      expect(Spdx.find('cc by-nc-sa 3.0').name).to eq('Creative Commons Attribution Non Commercial Share Alike 3.0')
+      expect(Spdx.find('cc by-sa 3.0').name).to eq('Creative Commons Attribution Share Alike 3.0')
+      expect(Spdx.find('gpl_1').name).to eq('GNU General Public License v1.0 only')
+      expect(Spdx.find('gpl_2').name).to eq('GNU General Public License v2.0 only')
+      expect(Spdx.find('gpl_3').name).to eq('GNU General Public License v3.0 only')
+      expect(Spdx.find('artistic_2').name).to eq('Artistic License 2.0')
+      expect(Spdx.find('artistic_1').name).to eq('Artistic License 1.0')
+      expect(Spdx.find('apache_2_0').name).to eq('Apache License 2.0')
+      expect(Spdx.find('apache_v2').name).to eq('Apache License 2.0')
+      expect(Spdx.find('lgpl_2_1').name).to eq('GNU Lesser General Public License v2.1 only')
+      expect(Spdx.find('lgpl_v2_1').name).to eq('GNU Lesser General Public License v2.1 only')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spdx
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-14 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spdx-licenses
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A SPDX license checker
+summary: A SPDX license normalizer
 test_files:
 - spec/spdx_spec.rb
 - spec/spec_helper.rb