licensee 4.7.0 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de46f921456858704f9f2260d3d699d9ddc61501
-  data.tar.gz: 043ec663c844f2c845a33aab4df9bd9e70d277a3
+  metadata.gz: c12d9b4200c5da5e7b8d9de112cfac32f52d3def
+  data.tar.gz: 81a13ed9b414494093be1ebe79a52aa3008a7d99
 SHA512:
-  metadata.gz: 497beceba2f3b24cf06bafcf3042e9a202d3aaa8668431c09736cd3bc11267a937d90a522f5ade5ff67e45cdb585d07d1bcc5584034ff84284fc62146d681f94
-  data.tar.gz: 9e41896143cb6c2bc55f9ac5d6953f506f2d2b8223499bdbdf2f904f4feea9dbf7684a9cbe2a81deb85dc7264a8e006eea02c3cb91d4b6e2a38ff262ea4c8c98
+  metadata.gz: 9913ceaf83583b2fa47ffd0389af8e2aaa8219a3efd9243fa01d03a692c35cb4529b482f71ed347e034c549ee8e700aba93c0105c6e13dfa873ee6750cad003b
+  data.tar.gz: 3814c71d59f4df84abff4204213130732342b578e06212e0ee9dec632c83ac46f8e0542a1f6deb14513639f7556ddcf04191b676cfcb46471d53404fa8d99504

data/lib/licensee/license.rb

@@ -30,7 +30,13 @@ class Licensee
 
     # License metadata from YAML front matter
     def meta
-      @meta ||= YAML.load(parts[1]) if parts && parts[1]
+      @meta ||= if parts && parts[1]
+        if YAML.respond_to? :safe_yaml
+          YAML.safe_load(parts[1])
+        else
+          YAML.load(parts[1])
+        end
+      end
     end
 
     # Returns the human-readable license name

data/lib/licensee/project.rb

@@ -38,13 +38,15 @@ class Licensee
     #
     # filename - (string) the name of the file to score
     #
-    # Returns 1 if the file is definately a license file
-    # Return 0.5 if the file is likely a license file
-    # Returns 0 if the file is definately not a license file
+    # Returns 1.0  if the file is definately a license file
+    # Returns 0.75 if the file is probably a license file
+    # Returns 0.5  if the file is likely a license file
+    # Returns 0.0  if the file is definately not a license file
     def self.match_license_file(filename)
-      return 1   if self.license_file?(filename)
-      return 0.5 if self.maybe_license_file?(filename)
-      return 0
+      return 1.0  if filename =~ /\A(un)?licen[sc]e(\.[^.]+)?\z/i
+      return 0.75 if filename =~ /\Acopy(ing|right)(\.[^.]+)?\z/i
+      return 0.5  if filename =~ /licen[sc]e/i
+      return 0.0
     end
 
     private
@@ -60,8 +62,7 @@ class Licensee
     # Detects the license file, if any
     # Returns the blob hash as detected in the tree
     def license_hash
-      license_hash = tree.find { |blob| self.class.license_file?(blob[:name]) }
-      license_hash ||= tree.find { |blob| self.class.maybe_license_file?(blob[:name]) }
+      tree.sort_by { |blob| self.class.match_license_file(blob[:name]) }.last
     end
 
     def license_blob
@@ -71,26 +72,5 @@ class Licensee
     def license_path
       license_hash[:name] if license_hash
     end
-
-    # Regex to detect license files
-    #
-    # Examples it should match:
-    # - LICENSE.md
-    # - licence.txt
-    # - unlicense
-    # - copying
-    # - copyright
-    def self.license_file?(filename)
-      !!(filename =~ /\A(un)?licen[sc]e|copy(ing|right)(\.[^.]+)?\z/i)
-    end
-
-    # Regex to detect things that look like license files
-    #
-    # Examples it should match:
-    # - license-MIT.txt
-    # - MIT-LICENSE
-    def self.maybe_license_file?(filename)
-      !!(filename =~ /licen[sc]e/i)
-    end
   end
 end

data/lib/licensee/version.rb

@@ -1,3 +1,3 @@
 class Licensee
-  VERSION = "4.7.0"
+  VERSION = "4.7.1"
 end

data/test/fixtures/licenses.git/objects/51/a11d50f29a14774ded8f7b90ba9938dce78a92

@@ -0,0 +1,3 @@
+x
��K
+�0��)t�d;�RJnbKrȏ�,z��=Bwom�2U�o�
/\Уob���L�Q�-:��B6:z��C�
+Y[ʉ;�	

data/test/fixtures/licenses.git/refs/heads/master

@@ -0,0 +1 @@
+51a11d50f29a14774ded8f7b90ba9938dce78a92

data/test/test_licensee_project.rb

@@ -79,42 +79,29 @@ class TestLicenseeProject < Minitest::Test
     end
   end
 
-  context "license filename matching" do
-    # Standard license names
-    ["license",
-      "LICENSE",
-      "LICENCE",
-      "license.md",
-      "unlicense",
-      "unlicence",
-      "copying",
-      "copyRIGHT",
-      "license.txt"
-    ].each do |license|
-      should "match #{license}" do
-        assert Licensee::Project.license_file?(license)
+  context "license filename scoring" do
+
+    EXPECTATIONS = {
+      "license"            => 1.0,
+      "LICENCE"            => 1.0,
+      "license.md"         => 1.0,
+      "LICENSE.md"         => 1.0,
+      "license.txt"        => 1.0,
+      "unLICENSE"          => 1.0,
+      "unlicence"          => 1.0,
+      "COPYING"            => 0.75,
+      "copyRIGHT"          => 0.75,
+      "COPYRIGHT.txt"      => 0.75,
+      "LICENSE-MIT"        => 0.5,
+      "MIT-LICENSE.txt"    => 0.5,
+      "mit-license-foo.md" => 0.5,
+      "README.txt"         => 0.0
+    }
+
+    EXPECTATIONS.each do |filename, expected|
+      should "score a license named `#{filename}` as `#{expected}`" do
+        assert_equal expected, Licensee::Project.match_license_file(filename)
       end
     end
-
-    should "not match MIT-LICENSE" do
-      refute Licensee::Project.license_file?("MIT-LICENSE")
-    end
-
-    # Abnormal license names
-    [
-      "LICENSE-MIT",
-      "MIT-LICENSE.txt",
-      "mit-license-foo.md"
-    ].each do |license|
-      should "match #{license}" do
-        assert Licensee::Project.maybe_license_file?(license)
-      end
-    end
-
-    should "return the proper license files scores" do
-      assert_equal 1,   Licensee::Project.match_license_file("LICENSE.md")
-      assert_equal 0.5, Licensee::Project.match_license_file("MIT-LICENSE")
-      assert_equal 0,   Licensee::Project.match_license_file("README.txt")
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: licensee
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.7.1
 platform: ruby
 authors:
 - Ben Balter
@@ -140,10 +140,14 @@ files:
 - test/fixtures/license-folder.git/refs/heads/master
 - test/fixtures/licenses.git/HEAD
 - test/fixtures/licenses.git/config
+- test/fixtures/licenses.git/objects/51/a11d50f29a14774ded8f7b90ba9938dce78a92
+- test/fixtures/licenses.git/objects/5e/df454e6517673d5e64a33cf284308b9c6b1075
+- test/fixtures/licenses.git/objects/e1/b4dc13f4bf683ce8f2943e051c3e91e778d043
 - test/fixtures/licenses.git/objects/info/packs
 - test/fixtures/licenses.git/objects/pack/pack-4a7088171ae3ca900f010a4be6f1c2c96490c338.idx
 - test/fixtures/licenses.git/objects/pack/pack-4a7088171ae3ca900f010a4be6f1c2c96490c338.pack
 - test/fixtures/licenses.git/packed-refs
+- test/fixtures/licenses.git/refs/heads/master
 - test/fixtures/named-license-file-prefix.git/HEAD
 - test/fixtures/named-license-file-prefix.git/config
 - test/fixtures/named-license-file-prefix.git/objects/64/3983d3f82ecc2a7d8e4227946220ebffd477d2