licensee 8.8.1 → 8.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ca170a986f774378d1a843c2d1f965108e02ea4
-  data.tar.gz: fcf828df69ec47b230955311eedfa80e56ee7968
+  metadata.gz: 619ad8c9ec5567bab5810856457d95baeb3116be
+  data.tar.gz: d14fdefea813eb729cc4019d761c80b0c66825f2
 SHA512:
-  metadata.gz: 307ef2552412239f196daa3892091d9bf814d6bf402871e97fdc8c222557d94145dc24799b3f0d0223f83c058618d09e78477ee1574c419e9b621e4038337634
-  data.tar.gz: 808aae1ea2bb710fa968b741a3321a0716427100de2f5d439d1f675871ad38b32dcbf22a962cbe0d09da9890c91ed2630efbacc8487decfc2f00f49696d8bbf9
+  metadata.gz: ec4d52f35ceb0a363390cd8a6a9c0bd14d2a871e955ad99c528e7501f2935ef778c5739cbf3fe5fc62d8d2671713ef24f767494c495e14b0d3a2d817b0759e4c
+  data.tar.gz: 94e0d332a4d78d4a8344045d9db68ea7a3f871331a46c7c55bca084684505118da8e82715e1966be3bf4c3ba2ff8ef3620c0c5246fa9f62f45053aba1d6f7f82

data/lib/licensee/content_helper.rb

@@ -43,14 +43,26 @@ module Licensee
       @hash ||= DIGEST.hexdigest content_normalized
     end
 
-    # Content with copyright header and linebreaks removed
+    # Content with the title and version removed
+    # The first time should normally be the attribution line
+    # Used to dry up `content_normalized` but we need the case sensitive
+    # content with attribution first to detect attribuion in LicenseFile
+    def content_without_title_and_version
+      @content_without_title_and_version ||= begin
+        string = content.strip
+        string = strip_title(string) while string =~ title_regex
+        strip_version(string).strip
+      end
+    end
+
+    # Content without title, version, copyright, whitespace, or insturctions
     def content_normalized
       return unless content
       @content_normalized ||= begin
-        string = content.downcase.strip
-        string = strip_title(string) while string =~ title_regex
-        string = strip_version(string)
-        string = strip_copyright(string)
+        string = content_without_title_and_version.downcase
+        while string =~ Matchers::Copyright::REGEX
+          string = strip_copyright(string)
+        end
         string = strip_hrs(string)
         string, _partition, _instructions = string.partition(END_OF_TERMS_REGEX)
         strip_whitespace(string)
@@ -66,7 +78,7 @@ module Licensee
     end
 
     def title_regex
-      /\A(the )?#{Regexp.union(license_names)}.*$/i
+      /\A\(?(the )?(#{Regexp.union(license_names).source}).*$/i
     end
 
     def strip_title(string)
@@ -78,7 +90,7 @@ module Licensee
     end
 
     def strip_copyright(string)
-      string.gsub(/\A#{Matchers::Copyright::REGEX}$/i, '').strip
+      string.gsub(Matchers::Copyright::REGEX, '').strip
     end
 
     # Strip HRs from MPL

data/lib/licensee/matchers/copyright_matcher.rb

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

data/lib/licensee/project_files/license_file.rb

@@ -40,8 +40,11 @@ module Licensee
       end
 
       def attribution
-        matches = /^#{Matchers::Copyright::REGEX}$/i.match(content)
-        matches[0].strip if matches
+        @attribution ||= begin
+          matches = Matchers::Copyright::REGEX
+                    .match(content_without_title_and_version)
+          matches[0] if matches
+        end
       end
 
       # Is this file likely to result in a creative commons false positive?

data/lib/licensee/version.rb

@@ -1,3 +1,3 @@
 module Licensee
-  VERSION = '8.8.1'.freeze
+  VERSION = '8.8.2'.freeze
 end

data/spec/fixtures/gemspec/{project.gemspec → project._gemspec}

@@ -1,3 +1,4 @@
+# Using a `.gemspec` extension here breaks the `gem release` command
 Gem::Specification.new do |gem|
   gem.name = "licensee-fixture-project"
   gem.license = 'mit'

data/spec/licensee/content_helper_spec.rb

@@ -2,7 +2,14 @@ class ContentHelperTestHelper
   include Licensee::ContentHelper
   attr_accessor :content
 
-  DEFAULT_CONTENT = <<-EOS.freeze
+  def initialize(content = nil)
+    @content = content
+  end
+end
+
+RSpec.describe Licensee::ContentHelper do
+  let(:content) do
+    <<-EOS.freeze
 The MIT License
 
 Copyright 2016 Ben Balter
@@ -10,15 +17,9 @@ Copyright 2016 Ben Balter
 The made
 up  license.
 -----------
-  EOS
-
-  def initialize(content = nil)
-    @content = content || DEFAULT_CONTENT
+EOS
   end
-end
-
-RSpec.describe Licensee::ContentHelper do
-  subject { ContentHelperTestHelper.new }
+  subject { ContentHelperTestHelper.new(content) }
   let(:mit) { Licensee::License.find('mit') }
 
   it 'creates the wordset' do
@@ -74,13 +75,17 @@ RSpec.describe Licensee::ContentHelper do
 
     Licensee::License.all(hidden: true).each do |license|
       context license.name do
+        let(:stripped_content) { subject.content_without_title_and_version }
+
         it 'strips the title' do
           regex = /\A#{license.name_without_version}/i
           expect(license.content_normalized).to_not match(regex)
+          expect(stripped_content).to_not match(regex)
         end
 
         it 'strips the version' do
           expect(license.content_normalized).to_not match(/\Aversion/i)
+          expect(stripped_content).to_not match(/\Aversion/i)
         end
 
         it 'strips the copyright' do
@@ -102,5 +107,23 @@ RSpec.describe Licensee::ContentHelper do
     it 'normalize the content' do
       expect(normalized_content).to eql 'the made up license.'
     end
+
+    context 'a title in parenthesis' do
+      let(:content) { "(The MIT License)\n\nfoo" }
+
+      it 'strips the title' do
+        expect(normalized_content).to_not match('MIT')
+        expect(normalized_content).to eql('foo')
+      end
+    end
+
+    context 'multiple copyrights' do
+      let(:content) { "Copyright 2016 Ben Balter\nCopyright 2017 Bob\nFoo" }
+
+      it 'strips multiple copyrights' do
+        expect(normalized_content).to_not match('Ben')
+        expect(normalized_content).to eql('foo')
+      end
+    end
   end
 end

data/spec/licensee/project_files/license_file_spec.rb

@@ -9,6 +9,14 @@ RSpec.describe Licensee::Project::LicenseFile do
     expect(subject.attribution).to eql('Copyright (c) 2016 Ben Balter')
   end
 
+  context "when there's a random copyright-like line" do
+    let(:content) { "Foo\nCopyright 2016 Ben Balter\nBar" }
+
+    it "doesn't match" do
+      expect(subject.attribution).to be_nil
+    end
+  end
+
   context 'with an non-UTF-8-encoded license' do
     let(:content) { "\x91License\x93".force_encoding('windows-1251') }
 

data/spec/licensee/project_spec.rb

@@ -75,6 +75,22 @@
 
     context 'package manager detection' do
       let(:fixture) { 'gemspec' }
+
+      # Using a `.gemspec` extension in the fixture breaks `gem release`
+      before do
+        FileUtils.cp("#{path}/project._gemspec", "#{path}/project.gemspec")
+        if described_class == Licensee::GitProject
+          Dir.chdir path do
+            `git add project.gemspec`
+            `git commit -m 'add real gemspec'`
+          end
+        end
+      end
+
+      after do
+        FileUtils.rm("#{path}/project.gemspec")
+      end
+
       subject { described_class.new(path, detect_packages: true) }
 
       it 'returns the package file' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensee
 version: !ruby/object:Gem::Version
-  version: 8.8.1
+  version: 8.8.2
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -130,8 +130,7 @@ files:
 - spec/fixtures/case-sensitive/LiCeNsE.TxT
 - spec/fixtures/cc-by-nc-sa/LICENSE
 - spec/fixtures/cc-by-nd/LICENSE
-- spec/fixtures/gemspec/lib/licensee-fixture-project/version.rb
-- spec/fixtures/gemspec/project.gemspec
+- spec/fixtures/gemspec/project._gemspec
 - spec/fixtures/gpl3-without-instructions/LICENSE
 - spec/fixtures/lgpl/COPYING.lesser
 - spec/fixtures/lgpl/LICENSE