licensee 4.3.1 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0532a309a8c4d19ca16a7504da94953bddb0948d
-  data.tar.gz: 72d573ef81545cb890cf479db81c3424774277ed
+  metadata.gz: a01e0662cd476d9f2a5e8764fb2c0147166da2cb
+  data.tar.gz: bdf3c4a1438ae6001693c58ed8be7ed04b6ecd53
 SHA512:
-  metadata.gz: c7621458e6955c279bd6b458bb25b8b6c947a165a91869e8beae400a0b1ddca92f18b57be6628df07df343fe5908a3d5c16445f7124995e5c3592a5f58a2a483
-  data.tar.gz: b31f1841f66454f2229ec02245bd5437f188a3c0b5ed18646fcfb68b2c30e7f57f267190422e84a1545000de725d6e7fa2f499747bcadcbc03ab864d8cb245a0
+  metadata.gz: 71a8f8837bd03de8ce8f5da7a05d2b781d2c0a51a0df2bbd2b598a372e7fed77309097a81f7ba1a291315161f4b8ed360c9be924e9d86eed48648b7762e64389
+  data.tar.gz: 0aa65b6e811f06047422f1676f79f458674b78e74065de526ed82c8d77e99f29afccf9588813494757cf885fd489c166b5224cce60ab23be0dd80c1a600bbcde

data/bin/licensee

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 
 require_relative "../lib/licensee"
-license = Licensee::Project.new(Dir.pwd).license_file
+project = Licensee::Project.new(Dir.pwd)
+license = project.license_file
 
 if license
+  puts "License file: #{project.send(:license_blob)[:name]}"
   puts "License: #{license.match ? license.match.meta['title'] : 'no license'}"
   puts "Confidence: #{license.confidence}%"
   puts "Method: #{license.matcher.class}"

data/lib/licensee/project.rb

@@ -26,26 +26,34 @@ class Licensee
       @revision = revision
     end
 
-    # Detects the license file, if any
-    # Returns a Licensee::LicenseFile instance
+    # Returns an instance of Licensee::LicenseFile if there's a license file detected
     def license_file
-      return @license_file if defined? @license_file
+      @license_file ||= LicenseFile.new(@repository.lookup(license_blob[:oid])) if license_blob
+    end
 
-      commit = @revision ? @repository.lookup(@revision) : @repository.last_commit
-      tree = commit.tree.select { |blob| blob[:type] == :blob }
+    # Returns the matching Licensee::License instance if a license can be detected
+    def license
+      @license ||= license_file.match if license_file
+    end
 
-      # Prefer an exact match to one of our known file names
-      license_blob = tree.find { |blob| LICENSE_FILENAMES.include? blob[:name].downcase }
+    private
 
-      # Fall back to the first file in the project root that has the word license in it
-      license_blob = tree.find { |blob| blob[:name] =~ /license/i } unless license_blob
+    def commit
+      @revision ? @repository.lookup(@revision) : @repository.last_commit
+    end
 
-      @license_file = LicenseFile.new(@repository.lookup(license_blob[:oid])) if license_blob
+    def tree
+      commit.tree.select { |blob| blob[:type] == :blob }
     end
 
-    # Returns the matching Licensee::License instance if a license can be detected
-    def license
-      @license ||= license_file.match if license_file
+    # Detects the license file, if any
+    # Returns the blob hash as detected in the tree
+    def license_blob
+      # Prefer an exact match to one of our known file names
+      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 || tree.find { |blob| blob[:name] =~ /licen(s|c)e/i }
     end
   end
 end

data/lib/licensee/version.rb

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

data/test/fixtures/licence.git/HEAD

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

data/test/fixtures/licence.git/config

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

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

@@ -0,0 +1 @@
+660c086dc25f9f3b96e7afd9dee8a11b4e614543

data/test/test_licensee_project.rb

@@ -14,6 +14,22 @@ class TestLicenseeProject < Minitest::Test
     assert_equal "mit", @project.license.key
   end
 
+  should "know the last commit" do
+    commit = @project.send(:commit)
+    assert_equal Rugged::Commit, commit.class
+    assert_equal "b02cbad9d254c41d16d56ed9d6d2cf07c1d837fd", commit.oid
+  end
+
+  should "retrieve the tree" do
+    tree = @project.send(:tree)
+    assert_equal 1, tree.count
+    assert_equal "bcb552d06d9cf1cd4c048a6d3bf716849c2216cc", tree.first[:oid]
+  end
+
+  should "return the license blob" do
+    assert_equal "LICENSE", @project.send(:license_blob)[:name]
+  end
+
   should "detect an atypically cased license file" do
     project = Licensee::Project.new fixture_path("case-sensitive.git")
     assert_equal Licensee::LicenseFile, project.license_file.class
@@ -33,4 +49,9 @@ class TestLicenseeProject < Minitest::Test
     project = Licensee::Project.new fixture_path("license-folder.git")
     assert_equal nil, project.license
   end
+
+  should "detect licence files" do
+    project = Licensee::Project.new fixture_path("licence.git")
+    assert_equal "mit", project.license.key
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensee
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.2
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -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/licence.git/HEAD
+- test/fixtures/licence.git/config
+- test/fixtures/licence.git/objects/66/0c086dc25f9f3b96e7afd9dee8a11b4e614543
+- test/fixtures/licence.git/objects/68/804815597f79aa323de3257a8fd7b76449943c
+- test/fixtures/licence.git/objects/dd/59aed84c5aa4dff7ceda11a1c045f831194067
+- test/fixtures/licence.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+- test/fixtures/licence.git/refs/heads/master
 - test/fixtures/license-folder.git/HEAD
 - test/fixtures/license-folder.git/config
 - test/fixtures/license-folder.git/objects/32/6d0761f0c54d54327ea9e127e02d9bae14d2c8