licensee 5.0.0b1 → 5.0.0b2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49baf7865bddf84e8237149cba6f21768e661c39
-  data.tar.gz: 95dbc39d96bed4d0952df9e85eb56ae37f387c1f
+  metadata.gz: 9275866e83088fd301ad334a09190133d210c398
+  data.tar.gz: d679bb4b0813cbd065b49abd05fe5256f2a551af
 SHA512:
-  metadata.gz: 60a4c027e6d388d732ad3588606c380d90595be0955f55e9415a727370c78c8faff40c781843bc04989fb3a591821f91579079f54c2197f02778e9cac6cb73a3
-  data.tar.gz: 510467b863f02cdb658986dd5626460d0383c5602d22c3f170094d7d38bf80e56727691a4c8fc30dc7b4c79003a610383a90dfa4864fc87b1f3a4f83eb404012
+  metadata.gz: 5ff54bc4e9472afd1230c41119ce5c450a1a63e43b49c7312e610bee3b0aaadb2b3aa2e426339d8238f7b02a4d14f43dc392d414c7432d4a665dbc260332aee4
+  data.tar.gz: ca076a720d1e9962df28e24641ce7f7337fee22ac838da9f5b66cda1fa440d1e8224b9e3804530e5a0dafd8ed399dc69143c251bf664c7751408b005c9a4d591

data/lib/licensee.rb

@@ -30,8 +30,8 @@ class Licensee
     attr_writer :confidence_threshold, :package_manager_files
 
     # Returns an array of Licensee::License instances
-    def licenses
-      @licenses ||= Licensee::License.all
+    def licenses(options={})
+      Licensee::License.all(options)
     end
 
     # Returns the license for a given git repo

data/lib/licensee/license.rb

@@ -3,19 +3,22 @@ class Licensee
   class License
 
     class << self
-      def all
+      def all(options={})
         @all ||= keys.map { |key| self.new(key) }
+        options[:hidden] ? @all : @all.reject { |l| l.hidden? }
       end
 
       def keys
         @keys ||= license_files.map { |l| File.basename(l, ".txt").downcase }
       end
 
-      def find(key)
+      def find(key, options={})
+        options = {:hidden => true}.merge(options)
         key = key.downcase
-        all.find { |l| l.key == key }
+        all(options).find { |license| license.key == key }
       end
       alias_method :[], :find
+      alias_method :find_by_key, :find
 
       def license_dir
         File.expand_path "../../vendor/choosealicense.com/_licenses", File.dirname(__FILE__)
@@ -111,6 +114,10 @@ class Licensee
       URI.join(Licensee::DOMAIN, "/licenses/#{key}/").to_s
     end
 
+    def ==(other)
+      key == other.key
+    end
+
     private
 
     def parts

data/lib/licensee/matchers/exact_matcher.rb

@@ -1,7 +1,7 @@
 class Licensee
   class ExactMatcher < Matcher
     def match
-      Licensee.licenses.find { |l| l.body_normalized == file.content_normalized }
+      Licensee.licenses(:hidden => true).find { |l| l.body_normalized == file.content_normalized }
     end
 
     def confidence

data/lib/licensee/matchers/git_matcher.rb

@@ -12,7 +12,7 @@ class Licensee
     private
 
     def matches
-      @matches ||= Licensee.licenses.map { |l| [l, file.similarity(l)] }.select { |l,sim| sim > 0 }
+      @matches ||= Licensee.licenses(:hidden => true).map { |l| [l, file.similarity(l)] }.select { |l,sim| sim > 0 }
     end
 
     # Pulled out for easier testing

data/lib/licensee/matchers/levenshtein_matcher.rb

@@ -12,7 +12,7 @@ class Licensee
     # Difference in lengths cannot exceed the file's length * the confidence threshold / 100
     def potential_licenses
       @potential_licenses ||= begin
-        Licensee.licenses.select { |license| length_delta(license) <= max_delta }.sort_by { |l| length_delta(l) }
+        Licensee.licenses(:hidden => true).select { |license| length_delta(license) <= max_delta }.sort_by { |l| length_delta(l) }
       end
     end
 

data/lib/licensee/matchers/package_matcher.rb

@@ -2,7 +2,7 @@ class Licensee
   class PackageMatcher < Matcher
 
     def match
-      Licensee.licenses.find { |l| l.key == license_property } if file.package?
+      Licensee.licenses(:hidden => true).find { |l| l.key == license_property } if file.package?
     end
 
     def confidence

data/lib/licensee/project.rb

@@ -36,7 +36,8 @@ class Licensee
     end
 
     def matched_file
-      license_file || package_file
+      return license_file if license_file && license_file.match
+      return package_file if package_file && package_file.match
     end
 
     private

data/lib/licensee/version.rb

@@ -1,3 +1,3 @@
 class Licensee
-  VERSION = "5.0.0b1"
+  VERSION = "5.0.0b2"
 end

data/test/test_licensee.rb

@@ -3,7 +3,8 @@ require 'helper'
 class TestLicensee < Minitest::Test
   should "know the licenses" do
     assert_equal Array, Licensee.licenses.class
-    assert_equal 19, Licensee.licenses.size
+    assert_equal 15, Licensee.licenses.size
+    assert_equal 19, Licensee.licenses(:hidden => true).size
     assert_equal Licensee::License, Licensee.licenses.first.class
   end
 

data/test/test_licensee_license.rb

@@ -34,6 +34,11 @@ class TestLicenseeLicense < Minitest::Test
     assert_equal "mit", @license.key
   end
 
+  should "know license equality" do
+    assert @license == Licensee::License.new("MIT")
+    refute @license == Licensee::License.new("ISC")
+  end
+
   should "know if the license is featured" do
     assert @license.featured?
     assert_equal TrueClass, @license.featured?.class
@@ -58,7 +63,6 @@ class TestLicenseeLicense < Minitest::Test
     refute @license.hidden?
     assert Licensee::License.new("ofl-1.1").hidden?
     assert Licensee::License.new("no-license").hidden?
-
   end
 
   should "parse the license parts" do
@@ -97,7 +101,8 @@ class TestLicenseeLicense < Minitest::Test
 
     should "load the licenses" do
       assert_equal Array, Licensee::License.all.class
-      assert_equal 19, Licensee::License.all.size
+      assert_equal 15, Licensee::License.all.size
+      assert_equal 19, Licensee::License.all(:hidden => true).size
       assert_equal Licensee::License, Licensee::License.all.first.class
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensee
 version: !ruby/object:Gem::Version
-  version: 5.0.0b1
+  version: 5.0.0b2
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged