licensee 9.9.0.beta.3 → 9.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7068f99fb864749b613e41ea2aebbe89ab89dc84e64dc31f91ac2be663d47cae
-  data.tar.gz: 981300886595234a0a0b37b9d47b450570fd4e09de5e8964036781cc74d9a496
+  metadata.gz: 0e68d77bd40c2b0782aaa0a9e7e2920bbb1fc618f9b9c2de2d327e0402133718
+  data.tar.gz: 3c9f04a3200fdb7a54861698f2dd341c057c7c3cf39326679e70c4927a1cdbcd
 SHA512:
-  metadata.gz: 44f974f4265ab5169ac2a8f567ba79db34c537b34ed80f8a62265b391a778dbbc6be3fb819acbbab69ae998ab112af46fc4ea4323dffb580fac9bc107e7167c8
-  data.tar.gz: f556bc5d62310d775677ced65c3340d961efb0f3ead7035369b213aac0a998864339def2a0025f304f00b984c7b5a2b89fa2234d7f4ae116faa035564156a5b7
+  metadata.gz: 4a59d88fea1c24eb704762f0482656e100e8d57b76d52d1cf2265db7193e81996ae8a1719fbadbab9e5f0f3d2ba9aa80304769ca47c40776b4c6caee9383ebb3
+  data.tar.gz: 88e89806f40aab22b987d2bae53add71b0ee7a0ba2ba92daed4574c900d3f00629cf066991f38a64efdebabbb06e95450a346382bf82b9741b1ccd93c61b0cad

data/lib/licensee/content_helper.rb

@@ -82,6 +82,7 @@ module Licensee
         string, _partition, _instructions = string.partition(END_OF_TERMS_REGEX)
         string = strip_markup(string)
         string = normalize_quotes(string)
+        string = normalize_https(string)
         strip_whitespace(string)
       end
 
@@ -178,5 +179,9 @@ module Licensee
     def normalize_quotes(string)
       string.gsub(/\s'([\w -]*?\w)'/, ' "\1"')
     end
+
+    def normalize_https(string)
+      string.gsub(/http:/, 'https:')
+    end
   end
 end

data/lib/licensee/license.rb

@@ -117,6 +117,12 @@ module Licensee
       @meta ||= LicenseMeta.from_yaml(yaml)
     end
 
+    def spdx_id
+      return meta.spdx_id if meta.spdx_id
+      return 'NOASSERTION' if key == 'other'
+      return 'NONE' if key == 'no-license'
+    end
+
     # Returns the human-readable license name
     def name
       title ? title : key.capitalize

data/lib/licensee/matchers/copyright.rb

@@ -5,7 +5,7 @@ module Licensee
 
       # rubocop:disable Metrics/LineLength
       COPYRIGHT_SYMBOLS = Regexp.union([/copyright/i, /\(c\)/i, "\u00A9", "\xC2\xA9"])
-      REGEX = /\A\s*#{COPYRIGHT_SYMBOLS}.*$/i
+      REGEX = /\A(\s*#{COPYRIGHT_SYMBOLS}.*$)+/i
       # rubocop:enable Metrics/LineLength
 
       def match

data/lib/licensee/project_files/license_file.rb

@@ -54,6 +54,7 @@ module Licensee
 
       def attribution
         @attribution ||= begin
+          return unless copyright? || license.content =~ /\[fullname\]/
           matches = Matchers::Copyright::REGEX
                     .match(content_without_title_and_version)
           matches[0] if matches

data/lib/licensee/project_files/project_file.rb

@@ -67,7 +67,7 @@ module Licensee
       alias path filename
 
       def matched_license
-        license.key if license
+        license.spdx_id if license
       end
 
       # Is this file a COPYRIGHT file with only a copyright statement?

data/lib/licensee/version.rb

@@ -1,3 +1,3 @@
 module Licensee
-  VERSION = '9.9.0.beta.3'.freeze
+  VERSION = '9.9.0'.freeze
 end

data/spec/fixtures/detect.json

@@ -94,7 +94,7 @@
         "name": "exact",
         "confidence": 100
       },
-      "matched_license": "mit"
+      "matched_license": "MIT"
     },
     {
       "filename": "licensee.gemspec",
@@ -105,7 +105,7 @@
         "name": "gemspec",
         "confidence": 90
       },
-      "matched_license": "mit"
+      "matched_license": "MIT"
     }
   ]
 }

data/spec/licensee/content_helper_spec.rb

@@ -103,6 +103,12 @@ LICENSE
       expect(license.content_normalized).to_not include('* *')
     end
 
+    it 'normalizes http: to https:' do
+      license = Licensee::License.find('mpl-2.0')
+      expect(license.content).to include('http:')
+      expect(license.content_normalized).to_not include('http:')
+    end
+
     it 'wraps' do
       lines = mit.content_normalized(wrap: 40).split("\n")
       expect(lines.first.length).to be <= 40

data/spec/licensee/license_spec.rb

@@ -11,6 +11,7 @@ RSpec.describe Licensee::License do
   let(:cc_by) { described_class.find('cc-by-4.0') }
   let(:unlicense) { described_class.find('unlicense') }
   let(:other) { described_class.find('other') }
+  let(:no_license) { described_class.find('no-license') }
   let(:gpl) { described_class.find('gpl-3.0') }
   let(:lgpl) { described_class.find('lgpl-3.0') }
   let(:content_hash) { '46cdc03462b9af57968df67b450cc4372ac41f53' }
@@ -168,6 +169,11 @@ RSpec.describe Licensee::License do
     expect(gpl.spdx_id).to eql('GPL-3.0')
   end
 
+  it 'exposes special SPDX ID for pseudo licenses' do
+    expect(other.spdx_id).to eql('NOASSERTION')
+    expect(no_license.spdx_id).to eql('NONE')
+  end
+
   context '#other?' do
     it 'knows MIT is not other' do
       expect(gpl).to_not be_other

data/spec/licensee/matchers/copyright_matcher_spec.rb

@@ -26,7 +26,8 @@ RSpec.describe Licensee::Matchers::Copyright do
     'Comma-separated date'  => 'Copyright (c) 2003, 2004 Ben Balter',
     'Hyphen-separated date' => 'Copyright (c) 2003-2004 Ben Balter',
     'ASCII-8BIT encoded'    => "Copyright \xC2\xA92015 Ben Balter`",
-    'No year'               => 'Copyright Ben Balter'
+    'No year'               => 'Copyright Ben Balter',
+    'Multiline'             => "Copyright Ben Balter\nCopyright Another Entity"
       .force_encoding('ASCII-8BIT')
   }.each do |description, notice|
     context "with a #{description} notice" do

data/spec/licensee/project_files/license_file_spec.rb

@@ -1,5 +1,6 @@
 RSpec.describe Licensee::ProjectFiles::LicenseFile do
   let(:filename) { 'LICENSE.txt' }
+  let(:gpl) { Licensee::License.find('gpl-3.0') }
   let(:mit) { Licensee::License.find('mit') }
   let(:content) { sub_copyright_info(mit) }
   let(:content_hash) { '46cdc03462b9af57968df67b450cc4372ac41f53' }
@@ -26,6 +27,23 @@ RSpec.describe Licensee::ProjectFiles::LicenseFile do
     end
   end
 
+  context 'with a non-templated license' do
+    let(:content) { sub_copyright_info(gpl) }
+
+    it "doesn't match" do
+      expect(subject.attribution).to be_nil
+    end
+  end
+
+  context 'with a copyright file' do
+    let(:filename) { 'COPYRIGHT' }
+    let(:content) { 'Copyright (C) 2015 Ben Balter' }
+
+    it "doesn't match" do
+      expect(subject.attribution).to eql(content)
+    end
+  end
+
   it 'creates the wordset' do
     expect(subject.wordset.count).to eql(91)
     expect(subject.wordset.first).to eql('permission')
@@ -215,7 +233,6 @@ Creative Commons Attribution-NonCommercial 4.0
   end
 
   context 'GPL' do
-    let(:gpl) { Licensee::License.find('gpl-3.0') }
     let(:content) { sub_copyright_info(gpl) }
 
     it 'knows its GPL' do

data/spec/licensee/project_files/project_file_spec.rb

@@ -56,7 +56,7 @@ RSpec.describe Licensee::ProjectFiles::ProjectFile do
           name:       :exact,
           confidence: 100
         },
-        matched_license:    'mit'
+        matched_license:    'MIT'
       }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensee
 version: !ruby/object:Gem::Version
-  version: 9.9.0.beta.3
+  version: 9.9.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -339,9 +339,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6