license_finder 2.1.0.rc5 → 2.1.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f2e99eaffffaa4d029d0d4d3971a71d3bb2105a
-  data.tar.gz: 5dfcf808d965a35a662a0d18d49b6386aecfd6d2
+  metadata.gz: bbf949d7115f817832bcf5c25f76c57c8f43ca4f
+  data.tar.gz: 1edbbb2de90eaa0d57791b3f560ec28efdc7fcb2
 SHA512:
-  metadata.gz: 3832445531340ec5402915b366caa853e874a9193103b2519bda9cce2f27151d314d18b56daf74af7d1aadee446cb60269e71438758f15067d9000a109a944e2
-  data.tar.gz: 1d062154252007749613893853b18ab205e83e03e4e28334424d2af99f61e34aad5baeb0844a1509f90781ce2f8ba2306d186b715b708dd3d6c226be2e464fa4
+  metadata.gz: 0c97e33455a8a162d0c44182fbfebccbabe11b4e76eab9c5871b594f016158041f52688b2165a48773d82a4c49b0910f00ede7255d3be6eef1a219a9a058e58b
+  data.tar.gz: dd33c7312b0d2c1ef4f8cfcfafac5ddbbc7dc719388cfd4a153634a5594eec6e1c8fc30e194be25189c52ae9836aa87c8807fc0181ef35ae53b5f357c4feafad

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+=== 2.1.0.rc6 / 2016-03-11
+
+* Features
+  * detect GO15VENDOREXPERIMENT as evidence of a go workspace project
+
+* Bugfixes
+  * deep npm dependency trees no longer result in some packages having no metadata (#211)
+
+
 === 2.1.0.rc5 / 2016-02-19
 
 * Features

data/lib/license_finder/package_managers/go_workspace.rb

@@ -3,6 +3,7 @@ require 'json'
 module LicenseFinder
   class GoWorkspace < PackageManager
     Submodule = Struct.new :install_path, :revision
+    ENVRC_REGEXP = /GOPATH|GO15VENDOREXPERIMENT/
 
     def initialize(options={})
       super
@@ -32,7 +33,7 @@ module LicenseFinder
     def active?
       go_dep = LicenseFinder::GoDep.new({project_path: Pathname(project_path), logger: logger})
       return if go_dep.package_path.exist?
-      active = !!envrc_path && IO.read(envrc_path).include?('GOPATH')
+      active = !! (envrc_path && ENVRC_REGEXP.match(IO.read(envrc_path)))
       active.tap { |is_active| logger.active self.class, is_active }
     end
 

data/lib/license_finder/package_managers/npm.rb

@@ -10,7 +10,12 @@ module LicenseFinder
         group_name = dep[:group]
         walk_dependency_tree(dep[:name]) do |dependency|
           package_id = dependency["name"]
-          packages[package_id] ||= NpmPackage.new(dependency, logger: logger)
+          if packages[package_id] && packages[package_id].version.nil? && dependency["version"]
+            old_package = packages[package_id]
+            packages[package_id] = NpmPackage.new(dependency, logger: logger, groups: old_package.groups)
+          else
+            packages[package_id] ||= NpmPackage.new(dependency, logger: logger)
+          end
           packages[package_id].groups << group_name unless packages[package_id].groups.include?(group_name)
         end
       end

data/lib/license_finder/version.rb

@@ -1,3 +1,3 @@
 module LicenseFinder
-  VERSION = "2.1.0.rc5"
+  VERSION = "2.1.0.rc6"
 end

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

@@ -198,7 +198,13 @@ HERE
         expect(subject.active?).to eq(true)
       end
 
-      it 'returns false when .envrc does not contain GOPATH' do
+      it 'returns true when .envrc contains GO15VENDOREXPERIMENT' do
+        allow(FileTest).to receive(:exist?).with(envrc).and_return(true)
+        allow(IO).to receive(:read).with(Pathname(envrc)).and_return('export GO15VENDOREXPERIMENT=1')
+        expect(subject.active?).to eq(true)
+      end
+
+      it 'returns false when .envrc does not contain GOPATH or GO15VENDOREXPERIMENT' do
         allow(FileTest).to receive(:exist?).with(envrc).and_return(true)
         allow(IO).to receive(:read).with(Pathname(envrc)).and_return('this is not an envrc file')
         expect(subject.active?).to eq(false)

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

@@ -132,6 +132,26 @@ module LicenseFinder
         allow(npm).to receive(:capture).with(/npm/).and_return('{"foo":"bar"}', false).once
         silence_stderr { npm.current_packages }
       end
+
+      context "npm recursive dependency edge case - GH#211" do
+        let(:package_json) do
+          FakeFS.without do
+            File.read fixture_path "npm-recursive-dependencies/package.json"
+          end
+        end
+        let(:dependency_json) do
+          FakeFS.without do
+            File.read fixture_path "npm-recursive-dependencies/npm-list.json"
+          end
+        end
+
+        describe ".current_packages" do
+          it "correctly navigates the dependencies tree and pulls out valid information" do
+            expect(npm.current_packages.find { |p| p.name == "pui-react-alerts" }.version).to eq("3.0.0-alpha.2")
+            expect(npm.current_packages.find { |p| p.name == "pui-react-media" }.version).to eq("3.0.0-alpha.2")
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc5
+  version: 2.1.0.rc6
 platform: ruby
 authors:
 - Jacob Maine
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler