licensee 4.7.1 → 4.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c12d9b4200c5da5e7b8d9de112cfac32f52d3def
-  data.tar.gz: 81a13ed9b414494093be1ebe79a52aa3008a7d99
+  metadata.gz: 8ba75185c14cbfaa45edb5dc8fdb46744c10bcf0
+  data.tar.gz: f4cf2d3c717c6e4f198d35e76eb3aa72451dd57d
 SHA512:
-  metadata.gz: 9913ceaf83583b2fa47ffd0389af8e2aaa8219a3efd9243fa01d03a692c35cb4529b482f71ed347e034c549ee8e700aba93c0105c6e13dfa873ee6750cad003b
-  data.tar.gz: 3814c71d59f4df84abff4204213130732342b578e06212e0ee9dec632c83ac46f8e0542a1f6deb14513639f7556ddcf04191b676cfcb46471d53404fa8d99504
+  metadata.gz: 82231c76c1ab2d6d77640420f3f850154b835703246a62ac71779f7609b348e2244f6be33b1321dd74944104cc3e01ce5add1e31735f318c3e4389a03b4bc9b8
+  data.tar.gz: 03d1e3e669f55a1cf3e882a1859e130715a52e7368aaf3506b03917c79483943c850113830103212785400c9ee52d78a65dd8dfcf6f99a000cb4baa517e6cabe

data/lib/licensee/license.rb

@@ -31,7 +31,7 @@ class Licensee
     # License metadata from YAML front matter
     def meta
       @meta ||= if parts && parts[1]
-        if YAML.respond_to? :safe_yaml
+        if YAML.respond_to? :safe_load
           YAML.safe_load(parts[1])
         else
           YAML.load(parts[1])

data/lib/licensee/project.rb

@@ -62,7 +62,9 @@ class Licensee
     # Detects the license file, if any
     # Returns the blob hash as detected in the tree
     def license_hash
-      tree.sort_by { |blob| self.class.match_license_file(blob[:name]) }.last
+      hashes = tree.map { |blob| [self.class.match_license_file(blob[:name]), blob] }
+      hash = hashes.select { |hash| hash[0] > 0 }.sort_by { |hash| hash[0] }.last
+      hash[1] if hash
     end
 
     def license_blob

data/lib/licensee/version.rb

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

data/test/fixtures/no-license.git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

data/test/fixtures/no-license.git/config

@@ -0,0 +1,6 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
+	ignorecase = true
+	precomposeunicode = true

data/test/fixtures/no-license.git/refs/heads/master

@@ -0,0 +1 @@
+e1d9b2a3d41c2ea74a520e66da2b5c63b2f6202f

data/test/test_licensee_project.rb

@@ -76,6 +76,10 @@ class TestLicenseeProject < Minitest::Test
         assert_equal "mit", project.license.key
       end
 
+      should "detect an unlicensed project" do
+        project = make_project "no-license.git", as_git
+        assert_equal nil, project.license
+      end
     end
   end
 

data/test/test_licensee_vendor.rb

@@ -1,31 +1,28 @@
 require 'helper'
 
 class TestLicenseeVendor < Minitest::Test
-  should "detect each vendored license" do
-    licenses = Dir["#{Licensee::Licenses.base}/*"].shuffle
-    licenses.each do |license|
+  Dir["#{Licensee::Licenses.base}/*"].shuffle.each do |license|
+
+    should "detect the #{license} license" do
       verify_license_file(license)
     end
-  end
 
-  should "detect each vendored license when modified" do
-    licenses = Dir["#{Licensee::Licenses.base}/*"].shuffle
-    licenses.each do |license|
-      verify_license_file(license, true) unless license =~ /no-license\.txt$/
+    context "when modified" do
+      should "detect the #{license} license" do
+        verify_license_file(license, true) unless license =~ /no-license\.txt$/
+      end
     end
-  end
 
-  should "detect each vendored license with different line lengths" do
-    licenses = Dir["#{Licensee::Licenses.base}/*"].shuffle
-    licenses.each do |license|
-      verify_license_file(license, false, 50)
-    end
-  end
+    context "different line lengths" do
+      should "detect the #{license} license" do
+        verify_license_file(license, false, 50)
+      end
 
-  should "detect each vendored license with different line lengths when modified" do
-    licenses = Dir["#{Licensee::Licenses.base}/*"].shuffle
-    licenses.each do |license|
-      verify_license_file(license, true, 50) unless license =~ /no-license\.txt$/
+      context "when modified" do
+        should "detect the #{license} license" do
+          verify_license_file(license, true, 50) unless license =~ /no-license\.txt$/
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: licensee
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.7.2
 platform: ruby
 authors:
 - Ben Balter
@@ -162,6 +162,12 @@ files:
 - test/fixtures/named-license-file-suffix.git/objects/c9/b229e500e529fdbd4f50746ba207e91d0677b6
 - test/fixtures/named-license-file-suffix.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
 - test/fixtures/named-license-file-suffix.git/refs/heads/master
+- test/fixtures/no-license.git/HEAD
+- test/fixtures/no-license.git/config
+- test/fixtures/no-license.git/objects/82/0c999cf27a6f71431646c404274c578f7a2869
+- test/fixtures/no-license.git/objects/e1/d9b2a3d41c2ea74a520e66da2b5c63b2f6202f
+- test/fixtures/no-license.git/objects/ff/1592f44259635df9feda5e02853964b26f9e4d
+- test/fixtures/no-license.git/refs/heads/master
 - test/functions.rb
 - test/helper.rb
 - test/test_licensee.rb