licensee 9.9.3 → 9.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d245d544a683bfaff9448e8654a409cea3b6ddc808ba7f7b966c84e031255ea
-  data.tar.gz: 801c8048260b692571828fce99aa754afeb99063849e3e330e7fbb0b1b7117db
+  metadata.gz: b85ef478c3f4eee0b055871998df44b7ac925d4cf558b12257e4ece69dffb605
+  data.tar.gz: 605cc902e7c2ff5dce082c200a12f0758577757dc1c23f3b601aa1a033bce055
 SHA512:
-  metadata.gz: 918b6abcf12b00722fb85c64112f2e11334a4b43d6f3b7d3335156a6bb21b0077432030f6c132aa0950af0b4860102a9a1c2d8548a5de5e1529852ae13e29ed1
-  data.tar.gz: 919b0c1a4390a2dd964e7f4d245194ef47e108e1336fc4f04b9795a97f17475ebc64dce12ff1bbd97bb805f5d1fc95774ece1878af17a89f4d57cf974582944b
+  metadata.gz: e570922e52f88998432deea4760a3414aa583406cfdb77e156e474c076e82c6314edb2934caeb515d9c24217e6a06ab70909bef3898ff69fc03dd6c55ae99aa5
+  data.tar.gz: 970c89d645d161d59380c02934485bff1108fa0d31289975da3f8f87103949e18b1b12eb584291477170a530e833465339887d99a042b605f705a27ab3082512

data/lib/licensee/matchers/dice.rb

@@ -43,7 +43,7 @@ module Licensee
 
       def matches
         @matches ||= matches_by_similarity.select do |_, similarity|
-          similarity >= Licensee.confidence_threshold
+          similarity >= minimum_confidence
         end
       end
 
@@ -51,6 +51,12 @@ module Licensee
       def confidence
         @confidence ||= match ? file.similarity(match) : 0
       end
+
+      private
+
+      def minimum_confidence
+        Licensee.confidence_threshold
+      end
     end
   end
 end

data/lib/licensee/projects/github_project.rb

@@ -28,19 +28,34 @@ module Licensee
       private
 
       def files
-        @files ||= contents.map { |data| { name: data[:name], dir: '/' } }
-      rescue Octokit::NotFound
-        raise RepoNotFound,
-              "Could not load GitHub repo #{repo}, it may be private or deleted"
+        return @files if defined? @files_from_tree
+        @files = dir_files
+        return @files unless @files.empty?
+        msg = "Could not load GitHub repo #{repo}, it may be private or deleted"
+        raise RepoNotFound, msg
       end
 
       def load_file(file)
-        Octokit.contents(@repo, path:   file[:name],
-                                accept: 'application/vnd.github.v3.raw')
+        client.contents(@repo, path:   file[:path],
+                               accept: 'application/vnd.github.v3.raw').to_s
+      end
+
+      def dir_files(path = nil)
+        path = path.gsub('./', '') if path
+        files = client.contents(@repo, path: path)
+        files = files.select { |data| data[:type] == 'file' }
+        files.each { |data| data[:dir] = File.dirname(data[:path]) }
+        files.map(&:to_h)
+      rescue Octokit::NotFound
+        []
+      end
+
+      def client
+        @client ||= Octokit::Client.new access_token: access_token
       end
 
-      def contents
-        Octokit.contents(@repo).select { |data| data[:type] == 'file' }
+      def access_token
+        ENV['OCTOKIT_ACCESS_TOKEN']
       end
     end
   end

data/lib/licensee/version.rb

@@ -1,3 +1,3 @@
 module Licensee
-  VERSION = '9.9.3'.freeze
+  VERSION = '9.9.4'.freeze
 end

data/spec/licensee/project_spec.rb

@@ -27,7 +27,7 @@
         FileUtils.rm_rf File.expand_path '.git', path
       end
     elsif described_class == Licensee::Projects::GitHubProject
-      let(:path) do
+      before do
         stub_request(
           :get, "#{api_base}/#{stubbed_org}/#{fixture}/contents/"
         ).to_return(
@@ -43,9 +43,8 @@
             .with(headers: { 'accept' => 'application/vnd.github.v3.raw' })
             .to_return(status: 200, body: File.read(file))
         end
-
-        "https://github.com/#{stubbed_org}/#{fixture}"
       end
+      let(:path) { "https://github.com/#{stubbed_org}/#{fixture}" }
     end
 
     if described_class == Licensee::Projects::GitProject
@@ -178,6 +177,25 @@
         end
       end
 
+      if described_class == Licensee::Projects::GitHubProject
+        before do
+          stub_request(
+            :get, "#{api_base}/#{stubbed_org}/#{fixture}/contents/"
+          ).to_return(
+            status:  200,
+            body:    fixture_root_contents_from_api(fixture),
+            headers: { 'Content-Type' => 'application/json' }
+          )
+
+          file = fixture_path "#{fixture}/project.gemspec"
+          relative_path = File.basename(file)
+          parts = [api_base, stubbed_org, fixture, 'contents', relative_path]
+          stub_request(:get, parts.join('/'))
+            .with(headers: { 'accept' => 'application/vnd.github.v3.raw' })
+            .to_return(status: 200, body: File.read(file))
+        end
+      end
+
       after do
         FileUtils.rm("#{fixture_path(fixture)}/project.gemspec")
       end

data/spec/spec_helper.rb

@@ -43,7 +43,8 @@ def fixture_root_contents_from_api(fixture)
   fixture_root_files(fixture).map do |file|
     {
       name: File.basename(file),
-      type: 'file'
+      type: 'file',
+      path: File.basename(file)
     }
   end.to_json
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensee
 version: !ruby/object:Gem::Version
-  version: 9.9.3
+  version: 9.9.4
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv