license_finder 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b89e81bf9762d6270dbe27ac9b6fd761c72e632
-  data.tar.gz: 209a586dd42f207bb7036ad500b47ed96f77680c
+  metadata.gz: 97a98ebf99d7ffa7add150f9535d3470c19ca3b7
+  data.tar.gz: 556f7292ccfc2680808fe56e640b6f796ca6cf7d
 SHA512:
-  metadata.gz: f7c4a0d0c0822c4e98b1389c08f01e78f8615f7db41a8d666c12d4d5a448f0a34c57659e4af2864f142c3e856f03a7e00d90706a77961824163786a001ac52d4
-  data.tar.gz: 57311b8fef2641b63b76af1e867cb91789da2c197ead56c9a8bb1d6173acddba0e752ae3c112f2f3ebc845a36d03e4dd1010fc18a5a61d4184517e528185b7ff
+  metadata.gz: 0479b1b8712313d04e79f4e67fd8907ecb4bd8c56a9e4f0135894fdff6ce6973b4e6d153bc34341bc6442d7b9ebb07f542d66d3893122d8547b4bcf01fe014ef
+  data.tar.gz: feabe7ffe099290471374e30a5db5997446e7dc6a3bfeee9be2efa4c0cf71f5fb4195c3e9a45f8e0eaa32102ba910aaf4377399684f67160cc5c79e6b28be2f3

data/.travis.yml

@@ -1,3 +1,5 @@
+sudo: false
+
 rvm:
   - 1.9.3
   - 2.0

data/CHANGELOG.rdoc

@@ -1,3 +1,15 @@
+=== 2.1.1 / 2016-06-09
+
+Features:
+
+* GoWorkspace now detects some non-standard package names with only two path parts. (#226)
+
+Bugfixes:
+
+* NuGet now appropriately returns a Pathname from #package_path (previously was a String) (#227)
+* NuGet now correctly chooses a directory with vendored .nupkg packages
+
+
 === 2.1.0 / 2016-04-01
 
 * Features

data/README.md

@@ -20,17 +20,17 @@ report.
 * Python Eggs (via `pip`)
 * Node.js (via `npm`)
 * Bower
+* Nuget (without license discovery)
+* Godep
+* Go workspace (via a `.envrc` file)
+* Go submodules
+* Java (via `maven`)
+* Java (via `gradle`)
 
 ### Experimental project types
 
-* Java (via `maven`)
-* Java (via `gradle`)
 * Erlang (via `rebar`)
 * Objective-C (+ CocoaPods)
-* Nuget (without license discovery)
-* Godep
-* Go workspace (via a `.envrc` file)
-
 
 ## Installation
 

data/lib/license_finder/package_managers/go_workspace.rb

@@ -13,6 +13,8 @@ module LicenseFinder
     def current_packages
       go_list_packages = go_list
       git_modules.map do |submodule|
+        # We are filtering the non-standard packages because the word "net"
+        # seems to be common that can give false positive when filtering the git submodules
         import_path = go_list_packages.select { |gp|
           submodule.install_path =~ /#{repo_name(gp)}$/
         }.first
@@ -69,9 +71,11 @@ module LicenseFinder
         ENV['GOPATH'] = nil
         val = capture('go list -f \'{{join .Deps "\n"}}\' ./...')
         raise 'go list failed' unless val.last
-        # Select non-standard packages. Standard packages tend to be short
-        # and have less than two slashes
-        val.first.lines.map(&:strip).select { |l| l.split("/").length > 2 }
+        # Select non-standard packages. Non-standard packages typically
+        # have a period somewhere in the namespace (github.com, gopkg.in,
+        # etc.).
+        #
+        val.first.lines.map(&:strip).select { |l| l =~ /.+\..+\// }
       end
     end
 

data/lib/license_finder/package_managers/nuget.rb

@@ -4,7 +4,13 @@ require 'zip'
 module LicenseFinder
   class Nuget < PackageManager
     def package_path
-      project_path.join('.nuget')
+      path = project_path.join("**/*.nupkg")
+      nuget_dir = Dir[path].map{|pkg| File.dirname(pkg)}.uniq
+      if nuget_dir.length == 0
+        project_path.join(".nuget")
+      else
+        Pathname(nuget_dir.first)
+      end
     end
 
     def assemblies

data/lib/license_finder/version.rb

@@ -1,3 +1,3 @@
 module LicenseFinder
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/spec/lib/license_finder/package_managers/go_workspace_spec.rb

@@ -35,6 +35,7 @@ module LicenseFinder
       let(:go_list_output) {
         <<HERE
 encoding/json
+gopkg.in/yaml.v2
 github.com/onsi/ginkgo
 HERE
       }
@@ -54,8 +55,9 @@ HERE
       it 'returns the skip the standard libs and return lines of the output' do
         allow(subject).to receive(:capture).with('go list -f \'{{join .Deps "\n"}}\' ./...').and_return([go_list_output, true])
         packages = subject.send(:go_list)
-        expect(packages.count).to eq(1)
-        expect(packages.first).to eq('github.com/onsi/ginkgo')
+        expect(packages.count).to eq(2)
+        expect(packages).to include 'github.com/onsi/ginkgo'
+        expect(packages).to include 'gopkg.in/yaml.v2'
       end
 
       it 'sets gopath to the envrc path' do

data/spec/lib/license_finder/package_managers/nuget_spec.rb

@@ -3,6 +3,10 @@ require 'fakefs/spec_helpers'
 require 'zip'
 
 module LicenseFinder
+  def self.broken_fakefs?
+    RUBY_PLATFORM =~ /java/ || RUBY_VERSION =~ /^(1\.9|2\.0)/
+  end
+
   describe Nuget do
 
     it_behaves_like "a PackageManager"
@@ -36,6 +40,23 @@ module LicenseFinder
           expect(nuget.assemblies.map(&:name)).to include('.nuget')
         end
       end
+
+    end
+
+    describe "#package_path" do
+      include FakeFS::SpecHelpers
+
+      context 'when .nupkg files exist, but are not in .nuget directory' do
+        before do
+          FileUtils.mkdir_p 'app/vendor'
+          FileUtils.touch 'app/vendor/package.nupkg'
+        end
+
+        it "returns vendored director" do
+          nuget = Nuget.new project_path: Pathname.new("app")
+          expect(nuget.package_path).to eq Pathname('/app/vendor')
+        end
+      end
     end
 
     describe "#current_packages" do
@@ -91,18 +112,18 @@ module LicenseFinder
       end
 
       # cannot run on JRuby due to https://github.com/fakefs/fakefs/issues/303
-      context 'when there is a .nupkg file', :skip => RUBY_PLATFORM =~ /java/ do
+      context 'when there is a .nupkg file', :skip => LicenseFinder.broken_fakefs? do
         before do
-          obscure_dependency_nuspec = <<-HERE
-          <?xml version="1.0"?>
-          <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-          <metadata>
-            <id>ObscureDependency</id>
-            <version>1.3.15</version>
-            <licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
-          </metadata>
-          </package>
-          HERE
+          obscure_dependency_nuspec = <<-EOXML
+            <?xml version="1.0"?>
+            <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+              <metadata>
+                <id>ObscureDependency</id>
+                <version>1.3.15</version>
+                <licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
+              </metadata>
+            </package>
+          EOXML
           File.write("app/packages/ObscureDependency.nuspec", obscure_dependency_nuspec)
           Dir.chdir 'app/packages' do
             Zip::File.open('ObscureDependency.1.3.15.nupkg', Zip::File::CREATE) do |zipfile|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Jacob Maine
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler