licensee 5.0.0b6 → 5.0.0b7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0124d7811751a1221aa8ba861192a36432f23fe
-  data.tar.gz: b01c35d07fc8db789ec3bd4af74ae8834a88c702
+  metadata.gz: 63059879d191ca3bf975e0637e991fa9b9ed0421
+  data.tar.gz: 00d43ef2f8dffdc51771150afec931baa3ce2e68
 SHA512:
-  metadata.gz: 50f59b2e3ea125d6016a071aeeb585f7555e0920ee2ab3a7ee3118af086d9cf8ace3d9db578cdeea36e9dfde40139f49ef26a804146e0d4488823f1193ca6891
-  data.tar.gz: 7ce11976be77d28769c878bdbc382506f4ad17d3785ba4c3d54df7359a6651d5e779cdd96e79d83d78a4302cd4403a53d2da1581099cade778fd8507986036f0
+  metadata.gz: d090f96f08bde997282923240d05886983ad4e4681da26a3549ebbcf06ff364174231b439b1a68d47c1ab2a9754170a1966de56d4cb7266f23d81d12a52f8822
+  data.tar.gz: 2e6ffcbda4dd0a3f5f97c79a660648d8e5a045029c85288bb0a7994f77914f3fd33d11de70a2ecb84e4d508575dd408748676619f611b4404809ab05e822c01c

data/lib/licensee/license.rb

@@ -39,6 +39,10 @@ class Licensee
 
     HIDDEN_LICENSES = %w[other no-license]
 
+    # Licenses that technically contain the license name or nickname
+    # But we are so short that GitMatcher may not catch if rewrapped
+    BODY_INCLUDES_WHITELIST = %w[mit]
+
     include Licensee::ContentHelper
 
     def initialize(key)
@@ -129,10 +133,12 @@ class Licensee
     end
 
     def body_includes_name?
+      return false if BODY_INCLUDES_WHITELIST.include?(key)
       @body_includes_name ||= body_normalized.include?(name_without_version.downcase)
     end
 
     def body_includes_nickname?
+      return false if BODY_INCLUDES_WHITELIST.include?(key)
       @body_includes_nickname ||= !!(nickname && body_normalized.include?(nickname.downcase))
     end
 

data/lib/licensee/version.rb

@@ -1,3 +1,3 @@
 class Licensee
-  VERSION = "5.0.0b6"
+  VERSION = "5.0.0b7"
 end

data/test/fixtures/mit-without-title-rewrapped/mit.txt

@@ -0,0 +1,19 @@
+Copyright (c) 2015 Ben Balter
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/test/test_licensee_copyright_matcher.rb

@@ -51,4 +51,11 @@ class TestLicenseeCopyrightMatcher < Minitest::Test
     file = Licensee::ProjectFile.new(blob, "LICENSE")
     assert_equal "no-license", Licensee::CopyrightMatcher.match(file).key
   end
+
+  should "match comma, separated dates" do
+    text = "Copyright (c) 2003, 2004 Ben Balter"
+    blob = FakeBlob.new(text)
+    file = Licensee::ProjectFile.new(blob, "LICENSE")
+    assert_equal "no-license", Licensee::CopyrightMatcher.match(file).key
+  end
  end

data/test/test_licensee_project.rb

@@ -68,10 +68,17 @@ class TestLicenseeProject < Minitest::Test
     end
   end
 
-  should "detect the MIT license even with the title removed" do
-    verify_license_file fixture_path("mit-without-title/mit.txt")
+  describe "mit license with title removed" do
+    should "detect the MIT license" do
+      verify_license_file fixture_path("mit-without-title/mit.txt")
+    end
+
+    should "should detect the MIT license when rewrapped" do
+      verify_license_file fixture_path("mit-without-title-rewrapped/mit.txt")
+    end
   end
 
+
   describe "packages" do
 
     def setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensee
 version: !ruby/object:Gem::Version
-  version: 5.0.0b6
+  version: 5.0.0b7
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -152,6 +152,7 @@ files:
 - test/fixtures/licenses.git/objects/pack/pack-4a7088171ae3ca900f010a4be6f1c2c96490c338.pack
 - test/fixtures/licenses.git/packed-refs
 - test/fixtures/licenses.git/refs/heads/master
+- test/fixtures/mit-without-title-rewrapped/mit.txt
 - test/fixtures/mit-without-title/mit.txt
 - test/fixtures/named-license-file-prefix.git/HEAD
 - test/fixtures/named-license-file-prefix.git/config