license_finder 5.6.2 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 207c10de05ccd3be7e79a413b670029c2d2ee07f8e15bb8f86a51de1fe057bde
-  data.tar.gz: a465c01f2cd694a43179285ffbcbf9f5e61fea86e955775f8af1dd9808517bd9
+  metadata.gz: e496efa9426b10270897d6a7b1748f35eb93368c39834b25e1453e3cf5215c97
+  data.tar.gz: 51cae7c9a62e9d8ff00ab31180b6ead86fedd0b5429517a578271159ea0d99fd
 SHA512:
-  metadata.gz: 35ba648956584307bae58fb6d068935011d5e69de3b684d7665248b70687da9012a7b556659356f3e2fb24470a24e69d835a7dc93a68a679edbe48fcf10065fc
-  data.tar.gz: 28af64e2785ea33efc10f8b90df2f2c72087d6a70d737979ac0c6077dff981b17e7a648e81bf5ed7e4bfa2121b0af02c7444c763d588e86fc255ab71fa90ac0a
+  metadata.gz: e3267cde35f16a8ebd7fd9bdad404b47d447850fc0a9171c9153f9532b4c6425b0725890ce8dc506c3d35449a4550f64da4e21152df570a26a67e26427d90844
+  data.tar.gz: 38dfb72920070d6fd39a215447b33d7e2773de92b99c116dee3428195b5fb6b91a8f8aef2263f9d9b470c6c8224539af7692bd934394a3dc79230ce409178845

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# [5.7.0] / 2019-03-01
+
+### Added
+* Ruby 2.6.1 support - [8d60ed1](https://github.com/pivotal-legacy/LicenseFinder/commit/8d60ed13f99b830cc1352900f90e2b298105f518) 
+
+### Changed
+* Conan version is locked to 1.11.2 to avoid breaking changes - [72b766a](https://github.com/pivotal-legacy/LicenseFinder/commit/72b766a948be5b0f8eade75e716796f50ea9ebf3) 
+
 # [5.6.2] / 2019-01-28
 
 # [5.6.1] / 2019-01-25
@@ -688,3 +696,4 @@ Bugfixes:
 [5.6.0]: https://github.com/pivotal-legacy/LicenseFinder/compare/v5.5.2...v5.6.0
 [5.6.1]: https://github.com/pivotal-legacy/LicenseFinder/compare/v5.6.0...v5.6.1
 [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

data/CONTRIBUTING.md

@@ -118,19 +118,3 @@ JAVA_OPTS='-client -XX:+TieredCompilation -XX:TieredStopAtLevel=1' JRUBY_OPTS='-
 ### Gradle
 
 You'll need a gradle version >= 1.8.
-
-### CocoaPods
-LicenseFinder supports CocoaPods 0.39 and below. If you are using a later version of CocoaPods, you will need to downgrade CocoaPods/Specs repository in order to use LicenseFinder. [This article](http://blog.cocoapods.org/Sharding/) describes the breaking change between CocoaPods 0.39 and 1.0. You will need to use an older, archived CocoaPods/Specs repo. 
-
-If you see the following error, try switching to the archived repo. 
-
-```bash
-[!] The `master` repo requires CocoaPods 1.0.0 -  (currently using 0.34.0)
- ```
-
-Example of how to switch to the archived repo: 
-
-```bash 
-mv ~/.cocoapods/repos/master ~/.cocoapods/repos/master.bak
-git clone https://github.com/CocoaPods/Old-Specs.git ~/.cocoapods/repos/master
-```

data/Dockerfile

@@ -1,12 +1,12 @@
 FROM ubuntu:xenial
 
 # Versioning
-ENV PIP_INSTALL_VERSION 10.0.1
-ENV GO_LANG_VERSION 1.11.4
-ENV MAVEN_VERSION 3.5.3
+ENV PIP_INSTALL_VERSION 19.0.2
+ENV GO_LANG_VERSION 1.11.5
+ENV MAVEN_VERSION 3.6.0
 ENV SBT_VERSION 1.1.1
-ENV GRADLE_VERSION 4.10
-ENV RUBY_VERSION 2.5.1
+ENV GRADLE_VERSION 4.10.3
+ENV RUBY_VERSION 2.6.1
 ENV MIX_VERSION 1.0
 
 # programs needed for building
@@ -125,7 +125,7 @@ RUN bash -lc "gem update --system && gem install bundler"
 # install conan
 RUN apt-get install -y python-dev && \
 	pip install --ignore-installed six --ignore-installed colorama --ignore-installed requests --ignore-installed chardet --ignore-installed urllib3 --upgrade setuptools && \
-	pip install conan
+    pip install -Iv conan==1.11.2
 
 # install Cargo
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y

data/README.md

@@ -3,11 +3,12 @@
 [![Code Climate](https://codeclimate.com/github/pivotal-legacy/LicenseFinder.png)](https://codeclimate.com/github/pivotal-legacy/LicenseFinder)
 
 Build status
-* Ruby 2.3.3 [![Ruby 2.3.3 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.3.3/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
-* Ruby 2.4.4 [![Ruby 2.4.4 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.4.4/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
-* Ruby 2.5.1 [![Ruby 2.5.1 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.5.1/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
+* Ruby 2.3.8 [![Ruby 2.3.8 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.3.8/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
+* Ruby 2.4.5 [![Ruby 2.4.5 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.4.5/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
+* Ruby 2.5.3 [![Ruby 2.5.3 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.5.3/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
+* Ruby 2.6.1 [![Ruby 2.6.1 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.6.1/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
 * JRuby 9.1.17.0 [![JRuby 9.1.17.0 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-jruby-9.1.17.0/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
-* JRuby 9.2.0.0 [![JRuby 9.2.0.0 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-jruby-9.2.0.0/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
+* JRuby 9.2.6.0 [![JRuby 9.2.6.0 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-jruby-9.2.6.0/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
 
 
 LicenseFinder works with your package managers to find dependencies,
@@ -29,15 +30,15 @@ report.
 | Project Type | Package Manager | Tested on Version |
 | ------------ | --------------- | -------:|
 | Ruby Gems    | bundler         | 1.16.6  |
-| Python Eggs  | pip             | 10.0.1   |
+| Python Eggs  | pip             | 19.0.2  |
 | Node.js      | npm             | 6.4.1   |
 | Bower        | bower           | 1.8.4   |
 | Nuget (without license discovery) | nuget | 4.7.1.5393 |
 | Godep        | Godep           | 80      |
-| Go workspace (via a `.envrc` file) | Go lang |    1.11 |
-| Go submodules | Go lang | 1.11 |
-| Java         | maven           | 3.5.3   |
-| Java         | gradle          | 4.2     |
+| Go workspace (via a `.envrc` file) | Go lang | 1.11.5 |
+| Go submodules | Go lang | 1.11.5 |
+| Java         | maven           | 3.6.0   |
+| Java         | gradle          | 4.10.3  |
 
 ### Experimental project types
 

data/Rakefile

@@ -63,7 +63,7 @@ task :update_pipeline, [:slack_url, :slack_channel] do |_, args|
     puts 'Warning: You should provide slack channel and url to receive slack notifications on build failures'
   end
 
-  ruby_versions = %w[2.5.1 2.4.4 2.3.3 jruby-9.1.17.0 jruby-9.2.0.0]
+  ruby_versions = %w[2.6.1 2.5.3 2.4.5 2.3.8 jruby-9.1.17.0 jruby-9.2.6.0]
 
   params = []
   params << "ruby_versions=#{ruby_versions.join(',')}"

data/VERSION

@@ -0,0 +1 @@
+5.7.0

data/ci/pipelines/pull-request.yml.erb

@@ -5,7 +5,7 @@ resource_types:
 - name: pull-request
   type: docker-image
   source:
-    repository: jtarchie/pr
+    repository: teliaoss/github-pr-resource
 
 <% if setup_slack %>
 - name: slack-notification
@@ -16,11 +16,12 @@ resource_types:
 <% end %>
 
 resources:
-- name: pull-request
+- name: github-pull-request
   type: pull-request
+  check_every: 24h
+  webhook_token: ((GithubPullRequestWebhookToken))
   source:
-    repo: pivotal-legacy/LicenseFinder
-    base: master
+    repository: pivotal-legacy/LicenseFinder
     access_token: ((GithubApiPullRequestToken))
 
 - name: dockerhub-pr
@@ -43,17 +44,29 @@ jobs:
 - name: build-docker-image
   public: true
   plan:
-    - get: pull-request
+    - get: github-pull-request
       version: every
       trigger: true
     - put: dockerhub-pr
       params:
-        build: pull-request
+        build: github-pull-request
+  on_success:
+    put: github-pull-request
+    params:
+      path: github-pull-request
+      status: success
+      context: build-docker-image
+  on_failure:
+    put: github-pull-request
+    params:
+      path: github-pull-request
+      status: failure
+      context: build-docker-image
 <% ruby_versions.each do |ruby_version| %>
 - name: PR-ruby-<%= ruby_version %>-linux
   public: true
   plan:
-  - get: pull-request
+  - get: github-pull-request
     passed: [build-docker-image]
     version: every
   - get: dockerhub-pr
@@ -62,20 +75,20 @@ jobs:
   - task: ruby-<%= ruby_version %>
     privileged: true
     image: dockerhub-pr
-    file: pull-request/ci/tasks/run-tests.yml
+    file: github-pull-request/ci/tasks/run-tests.yml
     params:
       RUBY_VERSION_UNDER_TEST: <%= ruby_version %>
-    input_mapping: { LicenseFinder: pull-request }
+    input_mapping: { LicenseFinder: github-pull-request }
     on_success:
-      put: pull-request
+      put: github-pull-request
       params:
-        path: pull-request
+        path: github-pull-request
         status: success
         context: ruby-<%= ruby_version %>
     on_failure:
-      put: pull-request
+      put: github-pull-request
       params:
-        path: pull-request
+        path: github-pull-request
         status: failure
         context: ruby-<%= ruby_version %>
 <% if setup_slack %>
@@ -91,22 +104,22 @@ jobs:
 - name: PR-rubocop
   public: true
   plan:
-  - get: pull-request
+  - get: github-pull-request
     trigger: true
     version: every
   - task: run-rubocop
     privileged: true
-    file: pull-request/ci/tasks/rubocop.yml
-    input_mapping: { LicenseFinder: pull-request }
+    file: github-pull-request/ci/tasks/rubocop.yml
+    input_mapping: { LicenseFinder: github-pull-request }
     on_success:
-      put: pull-request
+      put: github-pull-request
       params:
-        path: pull-request
+        path: github-pull-request
         status: success
         context: run-rubocop
     on_failure:
-      put: pull-request
+      put: github-pull-request
       params:
-        path: pull-request
+        path: github-pull-request
         status: failure
         context: run-rubocop

data/ci/pipelines/release.yml.erb

@@ -17,6 +17,7 @@ resources:
     uri: git@github.com:pivotal-legacy/LicenseFinder.git
     private_key: ((CfOslBot.private_key))
     branch: master
+    ignore_paths: [VERSION]
 
 - name: git-master-dockerfile
   type: git
@@ -26,6 +27,16 @@ resources:
     branch: master
     paths: [Dockerfile]
 
+- name: semver-version
+  type: semver
+  source:
+    driver: git
+    uri: git@github.com:pivotal-legacy/LicenseFinder.git
+    branch: master
+    file: VERSION
+    private_key: ((CfOslBot.private_key))
+    commit_message: "Updates version to: %version%"
+
 - name: dockerhub-edge
   type: docker-image
   source:
@@ -58,96 +69,6 @@ resources:
 <% end %>
 
 jobs:
-
-- name: patch-version
-  plan:
-  - get: lf-git
-    passed: [<%= ruby_versions.map{ |version| "ruby-#{version}"}.join(', ') %>]
-  - get: dockerhub
-    params:
-      save: true
-  - task: bump-version
-    image: dockerhub
-    params:
-      GIT_USERNAME: ((GithubApiUser))
-      GIT_EMAIL: ((GithubApiEmail))
-    file: lf-git/ci/tasks/bump-patch-version.yml
-  - put: lf-git
-    params:
-      repository: lf-git-changed
-
-- name: release
-  plan:
-  - get: lf-git
-    trigger: true
-    passed: [ patch-version ]
-  - get: dockerhub
-    params:
-      save: true
-  - get: lf-release
-  - task: update-changelog
-    image: dockerhub
-    params:
-      GIT_USERNAME: ((GithubApiUser))
-      GIT_EMAIL: ((GithubApiEmail))
-    file: lf-git/ci/tasks/update-changelog.yml
-  - put: dockerhub
-    params:
-      build: lf-git
-      tag: version/version.txt
-      tag_as_latest: true
-  - put: lf-git
-    params:
-      repository: lf-git-changed
-  - task: build-and-push-gem
-    image: dockerhub
-    params:
-      GIT_USERNAME: ((GithubApiUser))
-      GIT_EMAIL: ((GithubApiEmail))
-      GIT_PRIVATE_KEY: ((CfOslBot.private_key))
-      GEM_API_KEY: ((LicenseFinderGemApiKey))
-    file: lf-git/ci/tasks/build-and-push-gem.yml
-  - put: lf-release
-    params:
-      name: version/tag.txt
-      tag: version/tag.txt
-      body: version/changelog.txt
-
-- name: manual-release
-  plan:
-  - get: lf-git
-    passed: [<%= ruby_versions.map{ |version| "ruby-#{version}"}.join(', ') %>]
-  - get: dockerhub
-    params:
-      save: true
-  - get: lf-release
-  - task: update-changelog
-    image: dockerhub
-    params:
-      GIT_USERNAME: ((GithubApiUser))
-      GIT_EMAIL: ((GithubApiEmail))
-    file: lf-git/ci/tasks/update-changelog.yml
-  - put: dockerhub
-    params:
-      build: lf-git
-      tag_file: version/version.txt
-      tag_as_latest: true
-  - task: build-and-push-gem
-    image: dockerhub
-    params:
-      GIT_USERNAME: ((GithubApiUser))
-      GIT_EMAIL: ((GithubApiEmail))
-      GIT_PRIVATE_KEY: ((CfOslBot.private_key))
-      GEM_API_KEY: ((LicenseFinderGemApiKey))
-    file: lf-git/ci/tasks/build-and-push-gem.yml
-  - put: lf-git
-    params:
-      repository: lf-git-changed
-  - put: lf-release
-    params:
-      name: version/tag.txt
-      tag: version/tag.txt
-      body: version/changelog.txt
 - name: build-docker-image
   public: true
   plan:
@@ -156,6 +77,7 @@ jobs:
     - put: dockerhub-edge
       params:
         build: git-master-dockerfile
+
 <% ruby_versions.each do |ruby_version| %>
 - name: ruby-<%= ruby_version %>
   public: true
@@ -197,3 +119,62 @@ jobs:
     privileged: true
     file: LicenseFinder/ci/tasks/rubocop.yml
     input_mapping: { LicenseFinder: LicenseFinder }
+
+- name: bump-major
+  plan:
+    - get: lf-git
+      passed: [<%= ruby_versions.map{ |version| "ruby-#{version}"}.join(', ') %>]
+    - put: semver-version
+      params: {bump: major}
+
+- name: bump-minor
+  plan:
+    - get: lf-git
+      passed: [<%= ruby_versions.map{ |version| "ruby-#{version}"}.join(', ') %>]
+    - put: semver-version
+      params: {bump: minor}
+
+- name: bump-patch
+  plan:
+    - get: lf-git
+      passed: [<%= ruby_versions.map{ |version| "ruby-#{version}"}.join(', ') %>]
+    - put: semver-version
+      params: {bump: patch}
+
+- name: release
+  plan:
+  - get: lf-git
+  - get: semver-version
+    trigger: true
+    passed: [bump-major, bump-minor, bump-patch]
+  - get: dockerhub
+    params:
+      save: true
+  - get: lf-release
+  - task: update-changelog
+    image: dockerhub
+    params:
+      GIT_USERNAME: ((GithubApiUser))
+      GIT_EMAIL: ((GithubApiEmail))
+    file: lf-git/ci/tasks/update-changelog.yml
+  - put: dockerhub
+    params:
+      build: lf-git
+      tag: version/version.txt
+      tag_as_latest: true
+  - put: lf-git
+    params:
+      repository: lf-git-changed
+  - task: build-and-push-gem
+    image: dockerhub
+    params:
+      GIT_USERNAME: ((GithubApiUser))
+      GIT_EMAIL: ((GithubApiEmail))
+      GIT_PRIVATE_KEY: ((CfOslBot.private_key))
+      GEM_API_KEY: ((LicenseFinderGemApiKey))
+    file: lf-git/ci/tasks/build-and-push-gem.yml
+  - put: lf-release
+    params:
+      name: version/tag.txt
+      tag: version/tag.txt
+      body: version/changelog.txt

data/ci/scripts/pushscript.sh

@@ -4,7 +4,7 @@ echo -e "---\n:rubygems_api_key: $GEM_API_KEY" > ~/.gem/credentials
 chmod 0600 ~/.gem/credentials
 
 cd lf-git
-build_version=$(ruby -r ./lib/license_finder/version.rb -e "puts LicenseFinder::VERSION")
+build_version="$(cat semver-version/version)"
 built_gem="pkg/license_finder-$build_version.gem"
 
 git config --global user.email $GIT_EMAIL

data/ci/scripts/run-rubocop.sh

@@ -1,8 +1,11 @@
 #!/bin/bash -e
 
 cd LicenseFinder
-gem install rubocop --version 0.59.2
 
+bundle install --without runtime default
+
+version=`cat Gemfile.lock | grep '    rubocop' | awk -F'[\(*\)]' '{print $2}'`
+gem install rubocop --version $version
 
 echo "Running Rubocop ..."
 /usr/local/bundle/bin/rubocop

data/ci/scripts/updateChangelog.sh

@@ -11,7 +11,7 @@ TAGS=( "Added" "ADDED" "Fixed" "FIXED" "Changed" "CHANGED" "Deprecated" "DEPRECA
 CONTRIBUTORS=( "Shane Lattanzio" "Li Tai" "Vikram Yadav" "Mark Fiorvanti" "Serafima Ostrovskaya" "Yoon Jean Kim"  "Tony Wong" "Parv Mital" )
 
 OLD="v$(cat ./lf-release/version)"
-VERSION="$(ruby -r ./lf-git-changed/lib/license_finder/version.rb -e "puts LicenseFinder::VERSION")"
+VERSION="$(cat semver-version/version)"
 VERSION_TAG="v$VERSION"
 
 # Add version title information
@@ -60,7 +60,7 @@ echo "New version: $VERSION"
 echo "Current version: $OLD"
 
 if [ "$VERSION" == "$OLD" ]; then
-    echo "Error: Version in version.rb is identical to latest release on github"
+    echo "Error: Version in VERSION file is identical to latest release on github"
     exit 1
 fi
 

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

@@ -2,6 +2,7 @@
 platform: linux
 inputs:
 - name: lf-git
+- name: semver-version
 run:
   path: bash
   args:

data/ci/tasks/update-changelog.yml

@@ -2,14 +2,15 @@
 image_resource:
   type: docker-image
   source:
-    repository: licensefinder/license_finder
+    repository: brenix/alpine-bash-git-ssh
     tag: latest
 platform: linux
 inputs:
 - name: lf-git
 - name: lf-release
+- name: semver-version
 outputs:
-- name: version
 - name: lf-git-changed
+- name: version
 run:
-  path: lf-git/ci/scripts/updateChangelog.sh
+  path: lf-git/ci/scripts/updateChangelog.sh

data/lib/license_finder/license/definitions.rb

@@ -35,7 +35,7 @@ module LicenseFinder
 
       def apache2
         License.new(
-          short_name:  'Apache2',
+          short_name: 'Apache2',
           pretty_name: 'Apache 2.0',
           other_names: [
             'Apache-2.0',
@@ -48,55 +48,55 @@ module LicenseFinder
             'Apache License',
             'Apache License, Version 2.0'
           ],
-          url:         'http://www.apache.org/licenses/LICENSE-2.0.txt'
+          url: 'http://www.apache.org/licenses/LICENSE-2.0.txt'
         )
       end
 
       def bsd
         License.new(
-          short_name:  'BSD',
+          short_name: 'BSD',
           other_names: ['BSD4', 'bsd-old', '4-clause BSD', 'BSD-4-Clause', 'BSD License'],
-          url:         'http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29'
+          url: 'http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29'
         )
       end
 
       def cc01
         License.new(
-          short_name:  'CC01',
+          short_name: 'CC01',
           pretty_name: 'CC0 1.0 Universal',
           other_names: ['CC0 1.0'],
-          url:         'http://creativecommons.org/publicdomain/zero/1.0'
+          url: 'http://creativecommons.org/publicdomain/zero/1.0'
         )
       end
 
       def gplv2
         License.new(
-          short_name:  'GPLv2',
+          short_name: 'GPLv2',
           other_names: ['GPL V2', 'gpl-v2', 'GNU GENERAL PUBLIC LICENSE Version 2'],
-          url:         'http://www.gnu.org/licenses/gpl-2.0.txt'
+          url: 'http://www.gnu.org/licenses/gpl-2.0.txt'
         )
       end
 
       def gplv3
         License.new(
-          short_name:  'GPLv3',
+          short_name: 'GPLv3',
           other_names: ['GPL V3', 'gpl-v3', 'GNU GENERAL PUBLIC LICENSE Version 3'],
-          url:         'http://www.gnu.org/licenses/gpl-3.0.txt'
+          url: 'http://www.gnu.org/licenses/gpl-3.0.txt'
         )
       end
 
       def isc
         License.new(
           short_name: 'ISC',
-          url:        'http://en.wikipedia.org/wiki/ISC_license'
+          url: 'http://en.wikipedia.org/wiki/ISC_license'
         )
       end
 
       def lgpl
         License.new(
-          short_name:  'LGPL',
+          short_name: 'LGPL',
           other_names: ['LGPL-3', 'LGPLv3', 'LGPL-3.0'],
-          url:         'http://www.gnu.org/licenses/lgpl.txt'
+          url: 'http://www.gnu.org/licenses/lgpl.txt'
         )
       end
 
@@ -113,10 +113,10 @@ module LicenseFinder
         )
 
         License.new(
-          short_name:  'MIT',
+          short_name: 'MIT',
           other_names: ['Expat', 'MIT license', 'MIT License'],
-          url:         'http://opensource.org/licenses/mit-license',
-          matcher:     matcher
+          url: 'http://opensource.org/licenses/mit-license',
+          matcher: matcher
         )
       end
 
@@ -129,14 +129,14 @@ module LicenseFinder
         )
 
         License.new(
-          short_name:  'MPL2',
+          short_name: 'MPL2',
           pretty_name: 'Mozilla Public License 2.0',
           other_names: [
             'MPL-2.0',
             'Mozilla Public License, Version 2.0'
           ],
-          url:         'https://www.mozilla.org/media/MPL/2.0/index.815ca599c9df.txt',
-          matcher:     matcher
+          url: 'https://www.mozilla.org/media/MPL/2.0/index.815ca599c9df.txt',
+          matcher: matcher
         )
       end
 
@@ -153,20 +153,20 @@ module LicenseFinder
         )
 
         License.new(
-          short_name:  'NewBSD',
+          short_name: 'NewBSD',
           pretty_name: 'New BSD',
           other_names: ['Modified BSD', 'BSD3', 'BSD-3', '3-clause BSD', 'BSD-3-Clause'],
-          url:         'http://opensource.org/licenses/BSD-3-Clause',
-          matcher:     matcher
+          url: 'http://opensource.org/licenses/BSD-3-Clause',
+          matcher: matcher
         )
       end
 
       def python
         License.new(
-          short_name:  'Python',
+          short_name: 'Python',
           pretty_name: 'Python Software Foundation License',
           other_names: ['PSF'],
-          url:         'http://hg.python.org/cpython/raw-file/89ce323357db/LICENSE'
+          url: 'http://hg.python.org/cpython/raw-file/89ce323357db/LICENSE'
         )
       end
 
@@ -179,19 +179,19 @@ module LicenseFinder
         )
 
         License.new(
-          short_name:  'Ruby',
+          short_name: 'Ruby',
           pretty_name: 'ruby',
-          url:         url,
-          matcher:     matcher
+          url: url,
+          matcher: matcher
         )
       end
 
       def simplifiedbsd
         License.new(
-          short_name:  'SimplifiedBSD',
+          short_name: 'SimplifiedBSD',
           pretty_name: 'Simplified BSD',
           other_names: ['FreeBSD', '2-clause BSD', 'BSD-2-Clause', 'BSD 2-Clause'],
-          url:         'http://opensource.org/licenses/bsd-license'
+          url: 'http://opensource.org/licenses/bsd-license'
         )
       end
     end

data/lib/license_finder/license/text.rb

@@ -3,9 +3,9 @@
 module LicenseFinder
   class License
     module Text
-      SPACES = /\s+/
-      QUOTES = /['`"]{1,2}/
-      PLACEHOLDERS = /<[^<>]+>/
+      SPACES = /\s+/.freeze
+      QUOTES = /['`"]{1,2}/.freeze
+      PLACEHOLDERS = /<[^<>]+>/.freeze
 
       def self.normalize_punctuation(text)
         text.gsub(SPACES, ' ')

data/lib/license_finder/package_managers/cocoa_pods.rb

@@ -46,7 +46,10 @@ module LicenseFinder
                       'Pods/Target Support Files/Pods/Pods-acknowledgements.plist',
                       'Pods/Target Support Files/Pods-*/Pods-*-acknowledgements.plist']
 
-      Dir[*search_paths.map { |path| File.join(project_path, path) }].first
+      result = Dir[*search_paths.map { |path| File.join(project_path, path) }].first
+      raise "Found a Podfile but no Pods directory in #{project_path}. Try running pod install before running license_finder." if result.nil?
+
+      result
     end
 
     def read_plist(pathname)

data/lib/license_finder/package_managers/go_workspace.rb

@@ -7,7 +7,7 @@ module LicenseFinder
 
   class GoWorkspace < PackageManager
     Submodule = Struct.new :install_path, :revision
-    ENVRC_REGEXP = /GOPATH|GO15VENDOREXPERIMENT/
+    ENVRC_REGEXP = /GOPATH|GO15VENDOREXPERIMENT/.freeze
 
     def initialize(options = {})
       super

data/lib/license_finder/package_managers/mix.rb

@@ -14,11 +14,25 @@ module LicenseFinder
           name,
           version,
           install_path: @deps_path.join(name),
-          logger: logger
+          logger: logger,
+          spec_licenses: licenses(name)
         )
       end
     end
 
+    # Adapted from licenser: https://github.com/unnawut/licensir/blob/71f96f8734adc73c0651050bd9f0e20ff52c61a8/lib/licensir/scanner.ex#L61
+    def licenses(name)
+      config_path = @deps_path.join(name).join('hex_metadata.config')
+      # rubocop:disable Metrics/LineLength
+      args = "\\\"#{config_path}\\\" |> :file.consult() |> case do {:ok, metadata} -> metadata; {:error, _} -> [] end |> List.keyfind(\\\"licenses\\\", 0) |> case do {_, licenses} -> licenses; _ -> [] end |> Enum.join(\\\"\\t\\\") |> IO.puts()"
+      # rubocop:enable Metrics/LineLength
+      command = "#{@command} run --no-start --no-compile -e \"#{args}\""
+      stdout, stderr, status = Dir.chdir(project_path) { Cmd.run(command) }
+      raise "Command '#{command}' failed to execute: #{stderr}" unless status.success?
+
+      stdout.strip.split("\t")
+    end
+
     def self.package_management_command
       'mix'
     end

data/lib/license_finder/packages/pip_package.rb

@@ -4,7 +4,7 @@ require 'set'
 
 module LicenseFinder
   class PipPackage < Package
-    LICENSE_FORMAT = /^License.*::\s*(.*)$/
+    LICENSE_FORMAT = /^License.*::\s*(.*)$/.freeze
     INVALID_LICENSES = ['', 'UNKNOWN'].to_set
 
     def self.license_names_from_spec(spec)

data/lib/license_finder/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module LicenseFinder
-  VERSION = '5.6.2'
+  root    = File.expand_path('../..', __dir__)
+  VERSION = File.read("#{root}/VERSION").strip
 end

data/license_finder.gemspec

@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
-
-require 'license_finder/platform'
-require 'license_finder/version'
+version = File.read(File.expand_path('VERSION', __dir__)).strip
 
 Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.3.3'
   s.name        = 'license_finder'
-  s.version     = LicenseFinder::VERSION
+  s.version     = version
 
   s.authors = [
     'Ryan Collins',
@@ -55,15 +51,15 @@ Gem::Specification.new do |s|
   s.add_dependency 'xml-simple'
 
   s.add_development_dependency 'addressable', '2.5.2'
-  s.add_development_dependency 'capybara', '~> 2.0.0'
-  s.add_development_dependency 'cocoapods', '0.34.0' if LicenseFinder::Platform.darwin?
-  s.add_development_dependency 'fakefs', '~> 0.11.3'
+  s.add_development_dependency 'capybara', '~> 3.14.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 'pry'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3'
   s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'rubocop', '~> 0.59.2'
+  s.add_development_dependency 'rubocop', '~> 0.65.0'
   s.add_development_dependency 'webmock', '~> 1.13'
 
   # to preserve ruby < 2.2.2 support.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 5.6.2
+  version: 5.7.0
 platform: ruby
 authors:
 - Ryan Collins
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,28 +133,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.14.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.19.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.19.2
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -231,14 +231,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.65.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.65.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -306,12 +306,12 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- VERSION
 - appveyor.yml
 - bin/license_finder
 - bin/license_finder_pip.py
 - ci/pipelines/pull-request.yml.erb
 - ci/pipelines/release.yml.erb
-- ci/scripts/bump-patch-version.sh
 - ci/scripts/containerize-tests.sh
 - ci/scripts/pushscript.sh
 - ci/scripts/run-rubocop.sh
@@ -321,7 +321,6 @@ files:
 - ci/tasks/build-and-push-gem.yml
 - ci/tasks/build-windows.yml
 - ci/tasks/build.yml
-- ci/tasks/bump-patch-version.yml
 - ci/tasks/rubocop.yml
 - ci/tasks/run-tests.yml
 - ci/tasks/update-changelog.yml

data/ci/scripts/bump-patch-version.sh

@@ -1,26 +0,0 @@
-#!/bin/bash --login
-
-set -e
-
-git clone lf-git lf-git-changed
-
-VERSION_FILE="./lf-git-changed/lib/license_finder/version.rb"
-
-VERSION="$(ruby -r "$VERSION_FILE" -e "puts LicenseFinder::VERSION")"
-
-OLD_PATCH=$(cut -d'.' -f3 <<<"$VERSION")
-
-NEW_PATCH=$(echo $((++OLD_PATCH)))
-
-NEW_VERSION="$(cut -d'.' -f1,2 <<<"$VERSION").$NEW_PATCH"
-
-sed -i.bak "s/$VERSION/$NEW_VERSION/g" "$VERSION_FILE"
-
-cd lf-git-changed
-git config --global user.email $GIT_EMAIL
-git config --global user.name $GIT_USERNAME
-
-git add "lib/license_finder/version.rb"
-git commit -m "Update patch version to: $NEW_VERSION"
-
-exit 0

data/ci/tasks/bump-patch-version.yml

@@ -1,13 +0,0 @@
----
-image_resource:
-  type: docker-image
-  source:
-    repository: licensefinder/license_finder
-    tag: latest
-platform: linux
-inputs:
-- name: lf-git
-outputs:
-- name: lf-git-changed
-run:
-  path: lf-git/ci/scripts/bump-patch-version.sh