licensee 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a80220390156080250dcaea26db57f17625d8f02
-  data.tar.gz: 0fcafa03b8ad6a1b30c28b191f12a6224d193bc2
+  metadata.gz: 0532a309a8c4d19ca16a7504da94953bddb0948d
+  data.tar.gz: 72d573ef81545cb890cf479db81c3424774277ed
 SHA512:
-  metadata.gz: e069fd762d497e70504e3cf3dba03d0daaf3e3aa993ab26178b008901950598112d34c0da4ee638aab3ede891ab13de31c3d0089f4bd5a61d28da790a0397a02
-  data.tar.gz: 6ba024fc0f83f26e4773bc0fc28ffbe9c38d92638b5580000d570fe1230aae1c8f7148209161aafb54d2e9d8124321bec434d67419e27e18ebfdff74994f851b
+  metadata.gz: c7621458e6955c279bd6b458bb25b8b6c947a165a91869e8beae400a0b1ddca92f18b57be6628df07df343fe5908a3d5c16445f7124995e5c3592a5f58a2a483
+  data.tar.gz: b31f1841f66454f2229ec02245bd5437f188a3c0b5ed18646fcfb68b2c30e7f57f267190422e84a1545000de725d6e7fa2f499747bcadcbc03ab864d8cb245a0

data/README.md

@@ -12,13 +12,13 @@
 
 ## The solution
 
-Licensee automates the process of reading `LICENSE` files and compares their contents to known licenses using a several strategies (which we call "Matchers":
+Licensee automates the process of reading `LICENSE` files and compares their contents to known licenses using a several strategies (which we call "Matchers"):
 
 First, we look to see if the license is an exact match. Licenses like GPL don't have a copyright notice that needs to be changed in the license itself, so if we strip away whitespace, we might get lucky, and direct string comparison is cheap.
 
 Next, we look to Git's internal change calculation method, which is fast, but is done on a line-by-line basis, so if the license is wrapped differently, or has extra words inserted, it's not going to match the license.
 
-Finally, if we still can't match the license, we use a fancy math thing called the [Levenshtein distance algorithm](https://en.wikipedia.org/wiki/Levenshtein_distance), which while slow, is really good at calculating the similarity between two a known license and an unknown license. By calculating the percent changed from the known license, you can tell, e.g., that a given license is 98% similar to the MIT license, that 2% likely representing the copyright line being properly adapted to the project.
+Finally, if we still can't match the license, we use a fancy math thing called the [Levenshtein distance algorithm](https://en.wikipedia.org/wiki/Levenshtein_distance), which while slow, is really good at calculating the similarity between a known license and an unknown license. By calculating the percent changed from the known license, you can tell, e.g., that a given license is 98% similar to the MIT license, that 2% likely representing the copyright line being properly adapted to the project.
 
 Licensee will even diff the distributed license with the original, so you can see exactly what, if anything's been changed.
 

data/lib/licensee/project.rb

@@ -32,12 +32,13 @@ class Licensee
       return @license_file if defined? @license_file
 
       commit = @revision ? @repository.lookup(@revision) : @repository.last_commit
+      tree = commit.tree.select { |blob| blob[:type] == :blob }
 
       # Prefer an exact match to one of our known file names
-      license_blob = commit.tree.find { |blob| LICENSE_FILENAMES.include? blob[:name].downcase }
+      license_blob = tree.find { |blob| LICENSE_FILENAMES.include? blob[:name].downcase }
 
       # Fall back to the first file in the project root that has the word license in it
-      license_blob = commit.tree.find { |blob| blob[:name] =~ /license/i } unless license_blob
+      license_blob = tree.find { |blob| blob[:name] =~ /license/i } unless license_blob
 
       @license_file = LicenseFile.new(@repository.lookup(license_blob[:oid])) if license_blob
     end

data/lib/licensee/version.rb

@@ -1,3 +1,3 @@
 class Licensee
-  VERSION = "4.3.0"
+  VERSION = "4.3.1"
 end

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

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

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

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

data/test/fixtures/license-folder.git/objects/32/6d0761f0c54d54327ea9e127e02d9bae14d2c8

@@ -0,0 +1,2 @@
+x
��Q
+� D��)�

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

@@ -0,0 +1 @@
+326d0761f0c54d54327ea9e127e02d9bae14d2c8

data/test/test_licensee_project.rb

@@ -28,4 +28,9 @@ class TestLicenseeProject < Minitest::Test
     project = Licensee::Project.new fixture_path("named-license-file-suffix.git")
     assert_equal "mit", project.license.key
   end
+
+  should "not error out on repos with folders names license" do
+    project = Licensee::Project.new fixture_path("license-folder.git")
+    assert_equal nil, project.license
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: licensee
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Ben Balter
@@ -122,6 +122,13 @@ files:
 - test/fixtures/case-sensitive.git/objects/2c/b878e0851c5cf53d7455d9018baa6755a38bd7
 - test/fixtures/case-sensitive.git/objects/fb/ddf40ba5f30225af7cd9841afe374ca5800cb9
 - test/fixtures/case-sensitive.git/refs/heads/master
+- test/fixtures/license-folder.git/HEAD
+- test/fixtures/license-folder.git/config
+- test/fixtures/license-folder.git/objects/32/6d0761f0c54d54327ea9e127e02d9bae14d2c8
+- test/fixtures/license-folder.git/objects/93/109217bbe2937fc3a8d8933fddd80ed6292481
+- test/fixtures/license-folder.git/objects/c6/6e45436e4f3fda934dc7268bccbc59c37a67b4
+- test/fixtures/license-folder.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+- test/fixtures/license-folder.git/refs/heads/master
 - test/fixtures/licenses.git/HEAD
 - test/fixtures/licenses.git/config
 - test/fixtures/licenses.git/objects/info/packs