license_finder 6.1.2 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92797cb41f38da098d755a7f537e96ec16925e7610f10d6736ce44e174cff922
-  data.tar.gz: 301342706e551b6cfd12a57a9ab20034dd3661761e783d6a89cbf743c93b1e49
+  metadata.gz: 9346290d1b6444834799d917362604ab2b8c8cf02c798fa0125d48e2e96b185e
+  data.tar.gz: 46d7563db0baaf8506c295a14f2872ea72a0f3ba9a96577a7265b74c38026899
 SHA512:
-  metadata.gz: 4dcfdede6d98dca29349242131114ca30085d9a1257443b7c7ff79b1c9a56c73c2d855fe35a2fed98a05c746823e7195906fed150aea2941f894d883140cdb8a
-  data.tar.gz: e73144436a4e5a6a05137c13ed6702296660f473c15696b17f7a4973cb7797bb98d9545879a4ece0893ef7b130f94dcda1c00381496bf734f0326338ec2781a7
+  metadata.gz: c18721d86285f2cc2ad05ab0e72f615ceefe001607427bedc1ab19cd83f7bbc7ca1a9fa6d5b8925e96438cec68f0be7dfdb243c6f7e43680bea33fa1b4046120
+  data.tar.gz: 64775a9d8d417fbe9b2a10fcb094e0040268c18a69997b4c2367e8869090b0213e153f7dae3d9fb2641f90bc29694db7e2dfadd357e8e5adb80835ebec7e9bad

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# [6.2.0] / 2020-04-07
+
+### Fixed
+* Break dependency of specs on released license_finder gem - [ef69fa00](https://github.com/pivotal/LicenseFinder/commit/ef69fa00deb7a8f8ebd74312afa9f130be2d9fda) - Matijs van Zuijlen
+* Replace toml parser with tomlrb - [8b9b34b4](https://github.com/pivotal/LicenseFinder/commit/8b9b34b48d5bdadc679c0d072117b092d080fb81) - Matijs van Zuijlen
+
+### Changed
+* Run glide install in folder containing glide.lock - [cec3ff47](https://github.com/pivotal/LicenseFinder/commit/cec3ff4759f1c06df2cd0c39ac8004fcd156a6e6) - Jeff Jun
+* specify path for bundle install [#168042947] - [431355dc](https://github.com/pivotal/LicenseFinder/commit/431355dc1d0172c65444d2f4bcb5b4416fc52af7) 
+
 # [6.1.2] / 2020-03-16
 
 # [6.1.0] / 2020-02-21
@@ -813,3 +823,4 @@ Bugfixes:
 [6.0.0]: https://github.com/pivotal/LicenseFinder/compare/v5.11.1...v6.0.0
 [6.1.0]: https://github.com/pivotal/LicenseFinder/compare/v6.0.0...v6.1.0
 [6.1.2]: https://github.com/pivotal/LicenseFinder/compare/v6.1.0...v6.1.2
+[6.2.0]: https://github.com/pivotal/LicenseFinder/compare/v6.1.2...v6.2.0

data/VERSION

@@ -1 +1 @@
-6.1.2
+6.2.0

data/ci/pipelines/release.yml.erb

@@ -19,22 +19,13 @@ resources:
     branch: master
     ignore_paths: [VERSION, CHANGELOG.md]
 
-- name: lf-git-version
-  type: git
-  source:
-    uri: git@github.com:pivotal/LicenseFinder.git
-    private_key: ((CfOslBot.private_key))
-    branch: master
-
 - name: semver-version
   type: semver
   source:
-    driver: git
-    uri: git@github.com:pivotal/LicenseFinder.git
-    branch: master
-    file: VERSION
-    private_key: ((CfOslBot.private_key))
-    commit_message: "Updates version to: %version%"
+    driver: gcs
+    bucket: lf-semver-version
+    key: VERSION
+    json_key: ((GCPQueuedReportsBucketCredentials))
 
 - name: dockerhub-edge
   type: docker-image
@@ -154,8 +145,6 @@ jobs:
   - get: lf-git
     tags: ["private-worker"]
     passed: [<%= "#{ruby_versions.map{ |version| "ruby-#{version}"}.join(', ')}, rubocop" %>]
-  - get: lf-git-version
-    tags: ["private-worker"]
   - get: semver-version
     tags: ["private-worker"]
     trigger: true
@@ -171,14 +160,14 @@ jobs:
     params:
       GIT_USERNAME: ((GithubApiUser))
       GIT_EMAIL: ((GithubApiEmail))
-    file: lf-git-version/ci/tasks/update-changelog.yml
+    file: lf-git/ci/tasks/update-changelog.yml
   - put: dockerhub
     tags: ["private-worker"]
     params:
-      build: lf-git-version
+      build: lf-git
       tag: version/version.txt
       tag_as_latest: true
-  - put: lf-git-version
+  - put: lf-git
     tags: ["private-worker"]
     params:
       repository: lf-git-changed
@@ -190,7 +179,7 @@ jobs:
       GIT_EMAIL: ((GithubApiEmail))
       GIT_PRIVATE_KEY: ((CfOslBot.private_key))
       GEM_API_KEY: ((LicenseFinderGemApiKey))
-    file: lf-git-version/ci/tasks/build-and-push-gem.yml
+    file: lf-git/ci/tasks/build-and-push-gem.yml
   - put: lf-release
     tags: ["private-worker"]
     params:

data/ci/scripts/pushscript.sh

@@ -3,8 +3,8 @@
 echo -e "---\n:rubygems_api_key: $GEM_API_KEY" > ~/.gem/credentials
 chmod 0600 ~/.gem/credentials
 
-cd lf-git-version
 build_version="$(cat semver-version/version)"
+cd lf-git
 built_gem="pkg/license_finder-$build_version.gem"
 
 git config --global user.email $GIT_EMAIL

data/ci/scripts/updateChangelog.sh

@@ -2,9 +2,11 @@
 
 set -e
 
-git clone lf-git-version lf-git-changed
+git clone lf-git lf-git-changed
 
 CHANGELOG_FILE="CHANGELOG.md"
+VERSION_FILE="VERSION"
+
 COMMIT_URL="https://github.com/pivotal/LicenseFinder/commit/"
 
 TAGS=( "Added" "ADDED" "Fixed" "FIXED" "Changed" "CHANGED" "Deprecated" "DEPRECATED" "Removed" "REMOVED" "Security" "SECURITY" )
@@ -50,10 +52,15 @@ echo -e "$LOG\n$(cat $CHANGELOG_FILE)" > $CHANGELOG_FILE
 # Append version hyperlink to the end of the file
 echo -e "[$VERSION]: https://github.com/pivotal/LicenseFinder/compare/$OLD...$VERSION_TAG" >> $CHANGELOG_FILE
 
+# Update version file in git
+echo $VERSION > $VERSION_FILE
+
 git config --global user.email $GIT_EMAIL
 git config --global user.name $GIT_USERNAME
 
 git add $CHANGELOG_FILE
+git add $VERSION_FILE
+
 git commit -m "Update changelog for version: $VERSION"
 
 echo "New version: $VERSION"

data/ci/tasks/build-and-push-gem.yml

@@ -1,10 +1,10 @@
 ---
 platform: linux
 inputs:
-- name: lf-git-version
+- name: lf-git
 - name: semver-version
 run:
   path: bash
   args:
   - "-lc"
-  - lf-git-version/ci/scripts/pushscript.sh
+  - lf-git/ci/scripts/pushscript.sh

data/ci/tasks/update-changelog.yml

@@ -6,11 +6,11 @@ image_resource:
     tag: latest
 platform: linux
 inputs:
-- name: lf-git-version
+- name: lf-git
 - name: lf-release
 - name: semver-version
 outputs:
 - name: lf-git-changed
 - name: version
 run:
-  path: lf-git-version/ci/scripts/updateChangelog.sh
+  path: lf-git/ci/scripts/updateChangelog.sh

data/lib/license_finder/package_managers/bundler.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler'
+require 'securerandom'
 
 module LicenseFinder
   class Bundler < PackageManager
@@ -26,7 +27,10 @@ module LicenseFinder
     def prepare_command
       ignored_groups_argument = !ignored_groups.empty? ? "--without #{ignored_groups.to_a.join(' ')}" : ''
 
-      "bundle install #{ignored_groups_argument}".strip
+      gem_path = SecureRandom.uuid
+      logger.info self.class, "Running bundle install for #{Dir.pwd} with path #{gem_path}", color: :blue
+
+      "bundle install #{ignored_groups_argument} --path #{gem_path}".strip
     end
 
     def possible_package_paths

data/lib/license_finder/package_managers/dep.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'toml'
+require 'tomlrb'
 
 module LicenseFinder
   class Dep < PackageManager
@@ -9,7 +9,7 @@ module LicenseFinder
     end
 
     def current_packages
-      toml = TOML.load_file(detected_package_path)
+      toml = Tomlrb.load_file(detected_package_path)
       projects = toml['projects']
 
       return [] if projects.nil?

data/lib/license_finder/package_managers/glide.rb

@@ -3,7 +3,7 @@
 module LicenseFinder
   class Glide < PackageManager
     def possible_package_paths
-      [project_path.join('src', 'glide.lock'), project_path.join('glide.lock')]
+      [project_path.join('glide.lock')]
     end
 
     def current_packages
@@ -11,12 +11,7 @@ module LicenseFinder
 
       YAML.load_file(detected_path).fetch('imports').map do |package_hash|
         import_path = package_hash.fetch('name')
-        license_path =
-          if detected_path == possible_package_paths.first
-            project_path.join('src', 'vendor', import_path)
-          else
-            project_path.join('vendor', import_path)
-          end
+        license_path = project_path.join('vendor', import_path)
 
         GoPackage.from_dependency({
                                     'ImportPath' => import_path,

data/lib/license_finder/package_managers/go_workspace.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+
 module LicenseFinder
   class GoWorkspacePackageManagerError < ::StandardError
   end
@@ -51,9 +52,10 @@ module LicenseFinder
       return false if @strict_matching
 
       godep = LicenseFinder::GoDep.new(project_path: Pathname(project_path))
+      dep = LicenseFinder::Dep.new(project_path: Pathname(project_path))
       # go workspace is only active if GoDep wasn't. There are some projects
       # that will use the .envrc and have a Godep folder as well.
-      !!(!godep.active? && envrc_path && ENVRC_REGEXP.match(IO.read(envrc_path)))
+      !!(!godep.active? && !dep.active? && envrc_path && ENVRC_REGEXP.match(IO.read(envrc_path)))
     end
 
     private
@@ -81,6 +83,8 @@ module LicenseFinder
         orig_gopath = ENV['GOPATH']
         ENV['GOPATH'] = nil
         val, stderr, status = Cmd.run('go list -f "{{join .Deps \"\n\"}}" ./...')
+        ENV['GOPATH'] = project_path.to_s
+        val, stderr, status = Cmd.run('go list -f "{{join .Deps \"\n\"}}" ./...') unless status.success?
         ENV['GOPATH'] = orig_gopath
         raise GoWorkspacePackageManagerError, "go list failed:\n#{stderr}" unless status.success?
 

data/license_finder.gemspec

@@ -46,24 +46,24 @@ Gem::Specification.new do |s|
   s.add_dependency 'bundler'
   s.add_dependency 'rubyzip', '>=1', '<3'
   s.add_dependency 'thor', '~> 1.0.1'
-  s.add_dependency 'toml', '0.2.0'
+  s.add_dependency 'tomlrb', '~> 1.3.0'
   s.add_dependency 'with_env', '1.1.0'
   s.add_dependency 'xml-simple', '~> 1.1.5'
 
   s.add_development_dependency 'addressable', '2.7.0'
   s.add_development_dependency 'capybara', '~> 3.15.0'
   s.add_development_dependency 'cocoapods', '>= 1.0.0' if RUBY_PLATFORM =~ /darwin/
-  s.add_development_dependency 'fakefs', '~> 1.0.0'
+  s.add_development_dependency 'fakefs', '~> 1.2.0'
   s.add_development_dependency 'mime-types', '3.3.1'
-  s.add_development_dependency 'pry', '~> 0.12.2'
+  s.add_development_dependency 'pry', '~> 0.13.0'
   s.add_development_dependency 'rake', '~> 13.0.1'
   s.add_development_dependency 'rspec', '~> 3'
   s.add_development_dependency 'rspec-its', '~> 1.3.0'
-  s.add_development_dependency 'rubocop', '~> 0.79.0'
+  s.add_development_dependency 'rubocop', '~> 0.81.0'
   s.add_development_dependency 'rubocop-performance', '~> 1.5.0'
   s.add_development_dependency 'webmock', '~> 3.5'
 
-  s.add_development_dependency 'rack', '~> 2.0.7', '> 1.6'
+  s.add_development_dependency 'rack', '~> 2.2.2'
   s.add_development_dependency 'rack-test', '~> 1.1.0', '> 0.7'
 
   s.files         = `git ls-files`.split("\n").reject { |f| f.start_with?('spec', 'features') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.2.0
 platform: ruby
 authors:
 - Ryan Collins
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,19 +78,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: toml
+  name: tomlrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: with_env
   requirement: !ruby/object:Gem::Requirement
@@ -153,14 +153,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -181,14 +181,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -237,14 +237,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -279,20 +279,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement