licensee 9.2.0 → 9.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78870e247e0c6151853578986d20c1c751367d5d
-  data.tar.gz: 44bb59c524289c3797c408ddd727fca8e808893d
+  metadata.gz: de59dd055155b4db053cd767df32f14eb5b2dc0d
+  data.tar.gz: e3897cc9d4d9d5b73909e0779ddd48a027cedf3a
 SHA512:
-  metadata.gz: beda36d600d5771bf870f627547800aa561641f2755c2f9a6662b7e7b14dfdb743075ecfd45145bfe6050c8f3aedcf9c3b65f70b10d5f0edab22b1c4a10bf7cb
-  data.tar.gz: d66f22ef8340ccfb6c9ca11fdbd1c5e403ba26c5f8a21776cd5f88dfa2fc8bf71322b5fc0895412091cd78ccbf39fba099953a5bec51c62e129c99c95c308cf7
+  metadata.gz: dd3d44919402f44ec02a3a25cf44a14fe7d905229cda772e0ad9c6425457a7f480ff6bdc981e0324d5fcc8f0ea84827d427d271041624dbccf5b02d76b5c1f79
+  data.tar.gz: b653f0f4024450b822e42a4a8bce66ac7c1102ab5629512137cf1eb99ff58b0f27ead76b4ff0a6e09f600855353cae24d1f092070a5b2f7c39e62635bdd785a8

data/lib/licensee/content_helper.rb

@@ -9,8 +9,12 @@ module Licensee
     ALT_TITLE_REGEX = {
       'bsd-2-clause'       => /bsd 2-clause( \"simplified\")? license/i,
       'bsd-3-clause'       => /bsd 3-clause( \"new\" or \"revised\")? license/i,
-      'bsd-3-clause-clear' => /bsd 3-clause( clear)? license/i
+      'bsd-3-clause-clear' => /(clear bsd|bsd 3-clause( clear)?) license/i
     }.freeze
+    ALL_RIGHTS_RESERVED_REGEX = /\Aall rights reserved\.?$/i
+    WHITESPACE_REGEX = /\s+/
+    MARKDOWN_HEADING_REGEX = /\A\s*#+/
+    VERSION_REGEX = /\Aversion.*$/i
 
     # A set of each word in the license, without duplicates
     def wordset
@@ -75,6 +79,7 @@ module Licensee
         while string =~ Matchers::Copyright::REGEX
           string = strip_copyright(string)
         end
+        string = strip_all_rights_reserved(string)
         string, _partition, _instructions = string.partition(END_OF_TERMS_REGEX)
         strip_whitespace(string)
       end
@@ -121,29 +126,37 @@ module Licensee
     end
 
     def strip_title(string)
-      string.sub(title_regex, '').strip
+      strip(string, title_regex)
     end
 
     def strip_version(string)
-      string.sub(/\Aversion.*$/i, '').strip
+      strip(string, VERSION_REGEX)
     end
 
     def strip_copyright(string)
-      string.gsub(Matchers::Copyright::REGEX, '').strip
+      strip(string, Matchers::Copyright::REGEX)
     end
 
     # Strip HRs from MPL
     def strip_hrs(string)
-      string.gsub HR_REGEX, ' '
+      strip(string, HR_REGEX)
     end
 
     # Strip leading #s from the document
     def strip_markdown_headings(string)
-      string.sub(/\A\s*#+/, '').strip
+      strip(string, MARKDOWN_HEADING_REGEX)
     end
 
     def strip_whitespace(string)
-      string.gsub(/\s+/, ' ').squeeze(' ').strip
+      strip(string, WHITESPACE_REGEX)
+    end
+
+    def strip_all_rights_reserved(string)
+      strip(string, ALL_RIGHTS_RESERVED_REGEX)
+    end
+
+    def strip(string, regex)
+      string.gsub(regex, ' ').squeeze(' ').strip
     end
   end
 end

data/lib/licensee/license.rb

@@ -59,7 +59,7 @@ module Licensee
 
     attr_reader :key
 
-    # Preserved for backwards compatability
+    # Preserved for backwards compatibility
     YAML_DEFAULTS = Licensee::LicenseMeta.members
 
     # Pseudo-license are license placeholders with no content
@@ -113,6 +113,7 @@ module Licensee
     def creative_commons?
       key.start_with?('cc-')
     end
+    alias cc? creative_commons?
 
     # The license body (e.g., contents - frontmatter)
     def content

data/lib/licensee/project_files/license_file.rb

@@ -19,22 +19,27 @@ module Licensee
       # Regex to match OFL.
       OFL_REGEX = /ofl/i
 
+      # BSD + PATENTS patent file
+      PATENTS_REGEX = /patents/i
+
       # Hash of Regex => score with which to score potential license files
       FILENAME_REGEXES = {
-        /\A#{LICENSE_REGEX}\z/                       => 1.0,  # LICENSE
-        /\A#{LICENSE_REGEX}#{PREFERRED_EXT_REGEX}\z/ => 0.9,  # LICENSE.md
-        /\A#{COPYING_REGEX}\z/                       => 0.8,  # COPYING
-        /\A#{COPYING_REGEX}#{PREFERRED_EXT_REGEX}\z/ => 0.7,  # COPYING.md
-        /\A#{LICENSE_REGEX}#{ANY_EXT_REGEX}\z/       => 0.6,  # LICENSE.textile
-        /\A#{COPYING_REGEX}#{ANY_EXT_REGEX}\z/       => 0.5,  # COPYING.textile
-        /#{LICENSE_REGEX}-/                          => 0.4,  # LICENSE-MIT
-        /#{COPYING_REGEX}-/                          => 0.35, # COPYING-MIT
-        /-#{LICENSE_REGEX}/                          => 0.3,  # MIT-LICENSE-MIT
-        /-#{COPYING_REGEX}/                          => 0.25, # MIT-COPYING
-        /\A#{OFL_REGEX}#{PREFERRED_EXT_REGEX}/       => 0.2,  # OFL.md
-        /\A#{OFL_REGEX}#{ANY_EXT_REGEX}/             => 0.1,  # OFL.textile
-        /\A#{OFL_REGEX}\z/                           => 0.05, # OFL
-        //                                           => 0.0   # Catch all
+        /\A#{LICENSE_REGEX}\z/                       => 1.00,  # LICENSE
+        /\A#{LICENSE_REGEX}#{PREFERRED_EXT_REGEX}\z/ => 0.95,  # LICENSE.md
+        /\A#{COPYING_REGEX}\z/                       => 0.90,  # COPYING
+        /\A#{COPYING_REGEX}#{PREFERRED_EXT_REGEX}\z/ => 0.85,  # COPYING.md
+        /\A#{LICENSE_REGEX}#{ANY_EXT_REGEX}\z/       => 0.80,  # LICENSE.textile
+        /\A#{COPYING_REGEX}#{ANY_EXT_REGEX}\z/       => 0.75,  # COPYING.textile
+        /#{LICENSE_REGEX}-/                          => 0.70,  # LICENSE-MIT
+        /#{COPYING_REGEX}-/                          => 0.65,  # COPYING-MIT
+        /-#{LICENSE_REGEX}/                          => 0.60,  # MIT-LICENSE-MIT
+        /-#{COPYING_REGEX}/                          => 0.55,  # MIT-COPYING
+        /\A#{OFL_REGEX}#{PREFERRED_EXT_REGEX}/       => 0.50,  # OFL.md
+        /\A#{OFL_REGEX}#{ANY_EXT_REGEX}/             => 0.45,  # OFL.textile
+        /\A#{OFL_REGEX}\z/                           => 0.40,  # OFL
+        /\A#{PATENTS_REGEX}\z/                       => 0.35,  # PATENTS
+        /\A#{PATENTS_REGEX}#{ANY_EXT_REGEX}\z/       => 0.30,  # PATENTS.txt
+        //                                           => 0.00   # Catch all
       }.freeze
 
       # CC-NC and CC-ND are not open source licenses and should not be

data/lib/licensee/version.rb

@@ -1,3 +1,3 @@
 module Licensee
-  VERSION = '9.2.0'.freeze
+  VERSION = '9.2.1'.freeze
 end

data/spec/fixtures/bsd-plus-patents/PATENTS

@@ -0,0 +1,33 @@
+Additional Grant of Patent Rights Version 2
+
+"Software" means the React software distributed by Facebook, Inc.
+
+Facebook, Inc. ("Facebook") hereby grants to each recipient of the Software
+("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
+(subject to the termination provision below) license under any Necessary
+Claims, to make, have made, use, sell, offer to sell, import, and otherwise
+transfer the Software. For avoidance of doubt, no license is granted under
+Facebook's rights in any patent claims that are infringed by (i) modifications
+to the Software made by you or any third party or (ii) the Software in
+combination with any software or other technology.
+
+The license granted hereunder will terminate, automatically and without notice,
+if you (or any of your subsidiaries, corporate affiliates or agents) initiate
+directly or indirectly, or take a direct financial interest in, any Patent
+Assertion: (i) against Facebook or any of its subsidiaries or corporate
+affiliates, (ii) against any party if such Patent Assertion arises in whole or
+in part from any software, technology, product or service of Facebook or any of
+its subsidiaries or corporate affiliates, or (iii) against any party relating
+to the Software. Notwithstanding the foregoing, if Facebook or any of its
+subsidiaries or corporate affiliates files a lawsuit alleging patent
+infringement against you in the first instance, and you respond by filing a
+patent infringement counterclaim in that lawsuit against that party that is
+unrelated to the Software, the license granted hereunder will not terminate
+under section (i) of this paragraph due to such counterclaim.
+
+A "Necessary Claim" is a claim of a patent owned by Facebook that is
+necessarily infringed by the Software standing alone.
+
+A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
+or contributory infringement or inducement to infringe any patent, including a
+cross-claim or counterclaim.

data/spec/fixtures/bsd-plus-patents/license.txt

@@ -0,0 +1,27 @@
+Copyright (c) 2013-present, Facebook, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither the name Facebook nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific
+   prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/spec/integration_spec.rb

@@ -139,6 +139,15 @@ RSpec.describe 'integration test' do
             expect(subject.license).to eql(license)
           end
         end
+
+        context 'BSD + PATENTS' do
+          let(:license) { Licensee::License.find('other') }
+          let(:fixture) { 'bsd-plus-patents' }
+
+          it 'returns other' do
+            expect(subject.license).to eql(license)
+          end
+        end
       end
 
       context 'with the license file stubbed' do

data/spec/licensee/content_helper_spec.rb

@@ -16,6 +16,8 @@ RSpec.describe Licensee::ContentHelper do
 	Copyright 2016 Ben Balter
 	*************************
 
+  All rights reserved.
+
   The made
   * * * *
   up  license.
@@ -110,6 +112,10 @@ EOS
       expect(normalized_content).to_not match('#')
     end
 
+    it 'strips all rights reserved' do
+      expect(normalized_content).to_not match(/all rights reserved/i)
+    end
+
     Licensee::License.all(hidden: true).each do |license|
       context license.name do
         let(:stripped_content) { subject.content_without_title_and_version }
@@ -126,6 +132,11 @@ EOS
           expect(stripped_content).to_not match(/\Aversion/i)
         end
 
+        it 'strips all rights reserved' do
+          regex = /all rights reserved/i
+          expect(license.content_normalized).to_not match(regex)
+        end
+
         it 'strips the copyright' do
           expect(license.content_normalized).to_not match(/\Acopyright/i)
         end

data/spec/licensee/project_files/license_file_spec.rb

@@ -37,31 +37,31 @@ RSpec.describe Licensee::ProjectFiles::LicenseFile do
 
   context 'filename scoring' do
     {
-      'license'            => 1.0,
-      'LICENCE'            => 1.0,
-      'unLICENSE'          => 1.0,
-      'unlicence'          => 1.0,
-      'license.md'         => 0.9,
-      'LICENSE.md'         => 0.9,
-      'license.txt'        => 0.9,
-      'COPYING'            => 0.8,
-      'copyRIGHT'          => 0.8,
-      'COPYRIGHT.txt'      => 0.7,
-      'copying.txt'        => 0.7,
-      'LICENSE.php'        => 0.6,
-      'LICENCE.docs'       => 0.6,
-      'copying.image'      => 0.5,
-      'COPYRIGHT.go'       => 0.5,
-      'LICENSE-MIT'        => 0.4,
-      'MIT-LICENSE.txt'    => 0.3,
-      'mit-license-foo.md' => 0.4,
-      'COPYING-GPL'        => 0.35,
-      'COPYRIGHT-BSD'      => 0.35,
-      'OFL.md'             => 0.2,
-      'ofl.textile'        => 0.1,
-      'ofl'                => 0.05,
-      'not-the-ofl'        => 0.0,
-      'README.txt'         => 0.0
+      'license'            => 1.00,
+      'LICENCE'            => 1.00,
+      'unLICENSE'          => 1.00,
+      'unlicence'          => 1.00,
+      'license.md'         => 0.95,
+      'LICENSE.md'         => 0.95,
+      'license.txt'        => 0.95,
+      'COPYING'            => 0.90,
+      'copyRIGHT'          => 0.90,
+      'COPYRIGHT.txt'      => 0.85,
+      'copying.txt'        => 0.85,
+      'LICENSE.php'        => 0.80,
+      'LICENCE.docs'       => 0.80,
+      'copying.image'      => 0.75,
+      'COPYRIGHT.go'       => 0.75,
+      'LICENSE-MIT'        => 0.70,
+      'MIT-LICENSE.txt'    => 0.60,
+      'mit-license-foo.md' => 0.70,
+      'COPYING-GPL'        => 0.65,
+      'COPYRIGHT-BSD'      => 0.65,
+      'OFL.md'             => 0.50,
+      'ofl.textile'        => 0.45,
+      'ofl'                => 0.40,
+      'not-the-ofl'        => 0.00,
+      'README.txt'         => 0.00
     }.each do |filename, expected|
       context "a file named #{filename}" do
         let(:score) { described_class.name_score(filename) }

data/spec/licensee/project_spec.rb

@@ -11,6 +11,7 @@
       before do
         Dir.chdir path do
           `git init`
+          `git config --local commit.gpgsign false`
           `git add .`
           `git commit -m 'initial commit'`
         end

data/spec/spec_helper.rb

@@ -54,11 +54,9 @@ end
 def git_init(path)
   Dir.chdir path do
     `git init`
-    gpgsign = `git config --local commit.gpgsign`
     `git config --local commit.gpgsign false`
     `git add .`
     `git commit -m 'initial commit'`
-    `git config --local commit.gpgsign #{gpgsign}`
   end
 end
 

data/vendor/choosealicense.com/_data/meta.yml

@@ -7,7 +7,7 @@
 
 - name: spdx-id
   description: Short identifier specified by http://spdx.org/licenses/
-  required: required
+  required: true
 
 - name: source
   description: The URL to the license source text

data/vendor/choosealicense.com/_licenses/postgresql.txt

@@ -0,0 +1,48 @@
+---
+title: PostgreSQL License
+spdx-id: PostgreSQL
+source: https://opensource.org/licenses/PostgreSQL
+
+description: A very short, BSD-style license, used specifically for PostgreSQL.  
+
+how: To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution.
+
+using:
+  - pgBadger: https://github.com/dalibo/pgbadger/blob/master/LICENSE
+  - pgAdmin: https://github.com/postgres/pgadmin4/blob/master/LICENSE
+  - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE.txt
+
+permissions:
+  - commercial-use
+  - modifications
+  - distribution
+  - private-use
+
+conditions:
+  - include-copyright
+
+limitations:
+  - liability
+  - warranty
+
+---
+
+PostgreSQL Licence
+
+Copyright (c) [year], [fullname]
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose, without fee, and without a written agreement is
+hereby granted, provided that the above copyright notice and this paragraph
+and the following two paragraphs appear in all copies.
+
+IN NO EVENT SHALL [fullname] BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING
+OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF [fullname]
+HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+[fullname] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
+AND [fullname] HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
+ENHANCEMENTS, OR MODIFICATIONS.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensee
 version: !ruby/object:Gem::Version
-  version: 9.2.0
+  version: 9.2.1
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -133,6 +133,8 @@ files:
 - lib/licensee/rule.rb
 - lib/licensee/version.rb
 - spec/bin_spec.rb
+- spec/fixtures/bsd-plus-patents/PATENTS
+- spec/fixtures/bsd-plus-patents/license.txt
 - spec/fixtures/case-sensitive/LiCeNsE.TxT
 - spec/fixtures/cc-by-nc-sa/LICENSE
 - spec/fixtures/cc-by-nd/LICENSE
@@ -209,6 +211,7 @@ files:
 - vendor/choosealicense.com/_licenses/ncsa.txt
 - vendor/choosealicense.com/_licenses/ofl-1.1.txt
 - vendor/choosealicense.com/_licenses/osl-3.0.txt
+- vendor/choosealicense.com/_licenses/postgresql.txt
 - vendor/choosealicense.com/_licenses/unlicense.txt
 - vendor/choosealicense.com/_licenses/wtfpl.txt
 - vendor/choosealicense.com/_licenses/zlib.txt