license_finder 5.7.1 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de5cc2258287ef1f4b53140591af0c55eae77d4d313eb83ef5b112b0bacc1986
-  data.tar.gz: f6a66c58034982c32688959453d84f68973bfcaf0dfb4474a964f76eeff985c7
+  metadata.gz: c3ddaa44514959c64554705bd86e147b70ca1067e3a0949549b18a0431204999
+  data.tar.gz: '07853ae9c40dee27d37946ed1ae1f0a9300e440184926037a18169cab0a8d696'
 SHA512:
-  metadata.gz: 86f369b65cd07a12cd3125ef20e8792397235a515f72998710ee4dcda1de215ca4e2941e6b4c385ecf580065489c9104b612c00fa29d24be37eccca699005fe3
-  data.tar.gz: 470ef0bb693e522188c909a6d3cd56d61d0bd48f00e6292c82c06a6e7b2bf3a24dfe8834f089204a63df426eb1e1c7f549ed0d6953e8406826a6ed401b162c78
+  metadata.gz: 9d213c171689b5839d5ea00beced104e6e4a33346e658390005d2a6c786d5a06c3da578e2fa0edcea290b457260e90305d0129be25530efa19858fc594f38671
+  data.tar.gz: 7f56df207a2d49adff14d8855e6ac2bf218f6934115afafd47f2066d45fe88041082052d5cf07a73dde596589a432074099d6d0336d19f4b16268f705194f4df

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# [5.8.0] / 2019-05-22
+
+### Added
+* Trash Package Manager - [3a3d854](https://github.com/pivotal-legacy/LicenseFinder/commit/3a3d8541c4ea64607df6b120111aff324f93778d) 
+
+### Fixed
+* Prefer to use `origin` over `path` for govendor - [31c6041](https://github.com/pivotal-legacy/LicenseFinder/commit/31c6041926a27b61c35c05c6433a87d0af78c1e5) 
+
 # [5.7.1] / 2019-03-08
 
 # [5.7.0] / 2019-03-01
@@ -700,3 +708,4 @@ Bugfixes:
 [5.6.2]: https://github.com/pivotal-legacy/LicenseFinder/compare/v5.6.1...v5.6.2
 [5.7.0]: https://github.com/pivotal-legacy/LicenseFinder/compare/v5.6.2...v5.7.0
 [5.7.1]: https://github.com/pivotal-legacy/LicenseFinder/compare/v5.7.0...v5.7.1
+[5.8.0]: https://github.com/pivotal-legacy/LicenseFinder/compare/v5.7.1...v5.8.0

data/Dockerfile

@@ -8,6 +8,7 @@ ENV SBT_VERSION 1.1.1
 ENV GRADLE_VERSION 4.10.3
 ENV RUBY_VERSION 2.6.1
 ENV MIX_VERSION 1.0
+ENV JDK_VERISON 8u211
 
 # programs needed for building
 RUN apt-get update && apt-get install -y \
@@ -34,18 +35,13 @@ RUN npm install -g bower && \
 
 #install java 8
 #http://askubuntu.com/questions/521145/how-to-install-oracle-java-on-ubuntu-14-04
-RUN cd /tmp && \
-    wget --quiet --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" https://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.tar.gz -O jdk-8.tgz && \
-    tar xf /tmp/jdk-8.tgz && \
-    mkdir -p /usr/lib/jvm && \
-    mv jdk1.8.0_201 /usr/lib/jvm/oracle_jdk8 && \
-    rm /tmp/jdk-8.tgz
-
-ENV J2SDKDIR=/usr/lib/jvm/oracle_jdk8
-ENV J2REDIR=/usr/lib/jvm/oracle_jdk8/jre
-ENV PATH=$PATH:/usr/lib/jvm/oracle_jdk8/bin:/usr/lib/jvm/oracle_jdk8/db/bin:/usr/lib/jvm/oracle_jdk8/jre/bin
-ENV JAVA_HOME=/usr/lib/jvm/oracle_jdk8
-ENV DERBY_HOME=/usr/lib/jvm/oracle_jdk8/db
+RUN apt-get install -y openjdk-8-jdk
+RUN JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+
+ENV J2SDKDIR=/usr/lib/jvm/java-8-openjdk-amd64
+ENV J2REDIR=/usr/lib/jvm/java-8-openjdk-amd64/jre
+ENV PATH=$PATH:/usr/lib/jvm/java-8-openjdk-amd64/bin:/usr/lib/jvm/java-8-openjdk-amd64/jre/bin
+ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 
 RUN java -version
 
@@ -96,7 +92,8 @@ RUN mkdir /gopath && \
   go get github.com/FiloSottile/gvt && \
   go get github.com/Masterminds/glide && \
   go get github.com/kardianos/govendor && \
-  go get github.com/golang/dep/cmd/dep
+  go get github.com/golang/dep/cmd/dep && \
+  go get -u github.com/rancher/trash
 
 # Fix the locale
 RUN apt-get install -y locales
@@ -106,7 +103,7 @@ ENV LANGUAGE=en_US:en
 ENV LC_ALL=en_US.UTF-8
 
 #install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
+RUN gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
     curl -sSL https://rvm.io/mpapis.asc | gpg --import && \
     curl -sSL https://get.rvm.io | sudo bash -s stable --ruby=$RUBY_VERSION
 ENV PATH=/usr/local/rvm/bin:$PATH

data/README.md

@@ -36,7 +36,7 @@ report.
 | Nuget (without license discovery) | nuget | 4.7.1.5393 |
 | Godep        | Godep           | 80      |
 | Go workspace (via a `.envrc` file) | Go lang | 1.11.5 |
-| Go submodules | Go lang | 1.11.5 |
+| Go modules   | Go lang         | 1.11.5  |
 | Java         | maven           | 3.6.0   |
 | Java         | gradle          | 4.10.3  |
 
@@ -46,7 +46,7 @@ report.
 * Objective-C, Swift (via Carthage or CocoaPods \[0.39 and below. See [CocoaPods Specs Repo Sharding](http://blog.cocoapods.org/Sharding/)\])
 * Objective-C (+ CocoaPods 0.39 and below. See [CocoaPods Specs Repo Sharding](http://blog.cocoapods.org/Sharding/))
 * Elixir (via `mix`)
-* Golang (via `gvt`, `glide`,`dep`, and `govendor`)
+* Golang (via `gvt`, `glide`,`dep`, `trash` and `govendor`)
 * JavaScript (via `yarn`)
 * C++/C (via `conan`)
 * Scala (via `sbt`)
@@ -181,6 +181,7 @@ languages, as long as that language has a package definition in the project dire
 * `vendor/vendor.json` file (for `govendor`)
 * `Gopkg.lock` file (for `dep`)
 * `go.sum` file (for `go mod`)
+* `vendor.conf` file (for `trash`)
 * `yarn.lock` file (for `yarn`)
 * `conanfile.txt` file (for `conan`)
 * `build.sbt` file (for `sbt`)

data/VERSION

@@ -1 +1 @@
-5.7.1
+5.8.0

data/ci/pipelines/release.yml.erb

@@ -32,7 +32,7 @@ resources:
     uri: git@github.com:pivotal-legacy/LicenseFinder.git
     private_key: ((CfOslBot.private_key))
     branch: master
-    paths: [Dockerfile]
+    paths: [Dockerfile, Gemfile, license_finder.gemspec]
 
 - name: semver-version
   type: semver

data/ci/scripts/run-rubocop.sh

@@ -4,8 +4,11 @@ cd LicenseFinder
 
 bundle install --without runtime default
 
-version=`cat Gemfile.lock | grep '    rubocop' | awk -F'[\(*\)]' '{print $2}'`
-gem install rubocop --version $version
+rubocop_version=`cat Gemfile.lock | grep '    rubocop' | awk -F'[\(*\)]' '{print $2;exit}'`
+rubocop_performance_version=`cat Gemfile.lock | grep '    rubocop-performance' | awk -F'[\(*\)]' '{print $2;exit}'`
+
+gem install rubocop --version $rubocop_version
+gem install rubocop-performance --version $rubocop_performance_version
 
 echo "Running Rubocop ..."
-/usr/local/bundle/bin/rubocop
+/usr/local/bundle/bin/rubocop --require rubocop-performance

data/ci/scripts/run-tests.sh

@@ -19,6 +19,6 @@ pushd "$PROJECT_ROOT"
 
   bundle exec rake install
   bundle exec rake spec
-  bundle exec rake features
 
+  bundle exec rake features
 popd

data/lib/license_finder/package_manager.rb

@@ -143,6 +143,7 @@ require 'license_finder/package_managers/gvt'
 require 'license_finder/package_managers/glide'
 require 'license_finder/package_managers/govendor'
 require 'license_finder/package_managers/go_modules'
+require 'license_finder/package_managers/trash'
 require 'license_finder/package_managers/bundler'
 require 'license_finder/package_managers/npm'
 require 'license_finder/package_managers/yarn'

data/lib/license_finder/package_managers/bundler.rb

@@ -37,6 +37,9 @@ module LicenseFinder
 
     def definition
       # DI
+      ENV['BUNDLE_PATH'] = project_path.to_s
+      ENV['BUNDLE_GEMFILE'] = "#{project_path}/Gemfile"
+
       @definition ||= ::Bundler::Definition.build(detected_package_path, lockfile_path, nil)
     end
 
@@ -52,6 +55,10 @@ module LicenseFinder
 
       # clear gem paths before runninng specs_for
       Gem.clear_paths
+      if File.exist?(bundler_config_path)
+        ::Bundler.reset!
+        ::Bundler.configure
+      end
       @gem_details = definition.specs_for(included_groups)
     end
 
@@ -67,6 +74,10 @@ module LicenseFinder
       project_path.join('Gemfile.lock')
     end
 
+    def bundler_config_path
+      project_path.join('.bundle')
+    end
+
     def log_package_dependencies(package)
       dependencies = package.children
       if dependencies.empty?

data/lib/license_finder/package_managers/go_modules.rb

@@ -12,7 +12,7 @@ module LicenseFinder
       end
 
       def prepare_command
-        'GO111MODULE=on go mod vendor'
+        'GO111MODULE=on go mod tidy && GO111MODULE=on go mod vendor'
       end
     end
 
@@ -30,7 +30,6 @@ module LicenseFinder
       packages.reject do |package|
         Pathname(package.install_path).cleanpath == Pathname(project_path).cleanpath
       end
-      # binding.pry
     end
 
     private

data/lib/license_finder/package_managers/govendor.rb

@@ -43,7 +43,7 @@ module LicenseFinder
       packages_with_no_sha = []
 
       packages.each do |package|
-        package_path = package['path']
+        package_path = package['origin'] || package['path']
         package_revision = package['revision']
 
         if !package_is_versioned?(package)

data/lib/license_finder/package_managers/trash.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module LicenseFinder
+  class Trash < PackageManager
+    class << self
+      def package_management_command
+        'trash'
+      end
+
+      def prepare_command
+        'trash'
+      end
+
+      def takes_priority_over
+        Go15VendorExperiment
+      end
+    end
+
+    def possible_package_paths
+      [project_path.join('vendor.conf')]
+    end
+
+    def current_packages
+      dependencies_path = project_path.join('trash.lock')
+
+      YAML.load_file(dependencies_path).fetch('import').map do |package_hash|
+        import_path = package_hash.fetch('package')
+        license_path = project_path.join('vendor', import_path)
+
+        GoPackage.from_dependency({
+                                    'ImportPath' => import_path,
+                                    'InstallPath' => license_path,
+                                    'Rev' => package_hash.fetch('version')
+                                  }, nil, true)
+      end
+    end
+  end
+end

data/lib/license_finder/scanner.rb

@@ -2,7 +2,7 @@
 
 module LicenseFinder
   class Scanner
-    PACKAGE_MANAGERS = [GoModules, GoDep, GoWorkspace, Go15VendorExperiment, Glide, Gvt, Govendor, Dep, Bundler, NPM, Pip,
+    PACKAGE_MANAGERS = [GoModules, GoDep, GoWorkspace, Go15VendorExperiment, Glide, Gvt, Govendor, Trash, Dep, Bundler, NPM, Pip,
                         Yarn, Bower, Maven, Gradle, CocoaPods, Rebar, Nuget, Carthage, Mix, Conan, Sbt, Cargo, Dotnet].freeze
 
     def initialize(config = { project_path: Pathname.new('') })

data/license_finder.gemspec

@@ -50,17 +50,18 @@ Gem::Specification.new do |s|
   s.add_dependency 'with_env', '1.1.0'
   s.add_dependency 'xml-simple'
 
-  s.add_development_dependency 'addressable', '2.5.2'
-  s.add_development_dependency 'capybara', '~> 3.14.0'
+  s.add_development_dependency 'addressable', '2.6.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', '~> 0.19.2'
-  s.add_development_dependency 'mime-types', '3.1'
+  s.add_development_dependency 'fakefs', '~> 0.20.0'
+  s.add_development_dependency 'mime-types', '3.2.2'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3'
   s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'rubocop', '~> 0.65.0'
-  s.add_development_dependency 'webmock', '~> 1.13'
+  s.add_development_dependency 'rubocop', '~> 0.70.0'
+  s.add_development_dependency 'rubocop-performance', '~> 1.3.0'
+  s.add_development_dependency 'webmock', '~> 3.5'
 
   # to preserve ruby < 2.2.2 support.
   s.add_development_dependency 'rack', (RUBY_VERSION < '2.2.2' ? '1.6.0' : '> 1.6')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 5.7.1
+  version: 5.8.0
 platform: ruby
 authors:
 - Ryan Collins
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,56 +119,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.14.0
+        version: 3.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.14.0
+        version: 3.15.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -231,28 +231,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 0.70.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 0.70.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -394,6 +408,7 @@ files:
 - lib/license_finder/package_managers/pip.rb
 - lib/license_finder/package_managers/rebar.rb
 - lib/license_finder/package_managers/sbt.rb
+- lib/license_finder/package_managers/trash.rb
 - lib/license_finder/package_managers/yarn.rb
 - lib/license_finder/package_utils/activation.rb
 - lib/license_finder/package_utils/conan_info_parser.rb