license_finder 7.1.0 → 7.2.0

data/ci/pipelines/release.yml.erb

@@ -8,8 +8,8 @@ resource_types:
   source:
     repository: cfcommunity/slack-notification-resource
     tag: latest
-    username: ((LicenseFinderDocker.username))
-    password: ((LicenseFinderDocker.password))
+    username: ((license-finder-docker-username))
+    password: ((license-finder-docker-password))
 <% end %>
 
 resources:
@@ -17,7 +17,7 @@ resources:
   type: git
   source:
     uri: git@github.com:pivotal/LicenseFinder.git
-    private_key: ((CfOslBot.private_key))
+    private_key: ((github-cf-osl-bot-private-key))
     branch: master
     ignore_paths: [VERSION, CHANGELOG.md]
 
@@ -27,24 +27,24 @@ resources:
     driver: gcs
     bucket: lf-semver-version
     key: version
-    json_key: ((GCPQueuedReportsBucketCredentials))
+    json_key: ((lf-bucket-credentials))
 
 - name: dockerhub-edge
   type: docker-image
   source:
     tag: edge
     repository: licensefinder/license_finder
-    email: ((LicenseFinderDockerEmail))
-    username: ((LicenseFinderDocker.username))
-    password: ((LicenseFinderDocker.password))
+    email: ((license-finder-docker-email))
+    username: ((license-finder-docker-username))
+    password: ((license-finder-docker-password))
 
 - name: dockerhub
   type: docker-image
   source:
     repository: licensefinder/license_finder
-    email: ((LicenseFinderDockerEmail))
-    username: ((LicenseFinderDocker.username))
-    password: ((LicenseFinderDocker.password))
+    email: ((license-finder-docker-email))
+    username: ((license-finder-docker-username))
+    password: ((license-finder-docker-password))
 
 - name: lf-release
   type: github-release
@@ -52,7 +52,7 @@ resources:
   source:
     owner: pivotal
     repository: LicenseFinder
-    access_token: ((GithubApiRootToken))
+    access_token: ((github-api-root-token))
 
 <% if setup_slack %>
 - name: slack-alert
@@ -66,10 +66,8 @@ jobs:
   public: true
   plan:
     - get: lf-git
-      tags: ["private-worker"]
       trigger: true
     - put: dockerhub-edge
-      tags: ["private-worker"]
       params:
         build: lf-git
 
@@ -78,16 +76,13 @@ jobs:
   public: true
   plan:
   - get: dockerhub-edge
-    tags: ["private-worker"]
     passed: [build-docker-image]
     trigger: true
   - get: LicenseFinder
-    tags: ["private-worker"]
     resource: lf-git
     passed: [build-docker-image]
     version: every
   - task: ruby-<%= ruby_version %>
-    tags: ["private-worker"]
     privileged: true
     image: dockerhub-edge
     file: LicenseFinder/ci/tasks/run-tests.yml
@@ -97,7 +92,6 @@ jobs:
 <% if setup_slack %>
   on_failure:
     put: slack-alert
-    tags: ["private-worker"]
     params:
       channel: '<%= slack_channel %>'
       icon_emoji: ':crying_cat_face:'
@@ -109,16 +103,13 @@ jobs:
   public: true
   plan:
   - get: dockerhub-edge
-    tags: ["private-worker"]
     passed: [build-docker-image]
     trigger: true
   - get: LicenseFinder
-    tags: ["private-worker"]
     resource: lf-git
     version: every
     passed: [build-docker-image]
   - task: run-rubocop
-    tags: ["private-worker"]
     privileged: true
     file: LicenseFinder/ci/tasks/rubocop.yml
     input_mapping: { LicenseFinder: LicenseFinder }
@@ -126,74 +117,59 @@ jobs:
 - name: bump-major
   plan:
     - get: semver-version
-      tags: ["private-worker"]
       params: {bump: major}
     - put: semver-version
-      tags: ["private-worker"]
       params: {file: semver-version/version}
 
 
 - name: bump-minor
   plan:
     - get: semver-version
-      tags: ["private-worker"]
       params: {bump: minor}
     - put: semver-version
-      tags: ["private-worker"]
       params: {file: semver-version/version}
 
 - name: bump-patch
   plan:
     - get: semver-version
-      tags: ["private-worker"]
       params: {bump: patch}
     - put: semver-version
-      tags: ["private-worker"]
       params: {file: semver-version/version}
 
 - name: release
   disable_manual_trigger: true
   plan:
   - get: lf-git
-    tags: ["private-worker"]
     passed: [<%= "#{ruby_versions.map{ |version| "ruby-#{version}" unless version == "jruby-9.3.1.0" }.compact.join(', ') }, rubocop" %>]
   - get: semver-version
-    tags: ["private-worker"]
     trigger: true
   - get: dockerhub
-    tags: ["private-worker"]
     params:
       save: true
   - get: lf-release
-    tags: ["private-worker"]
   - task: update-changelog
-    tags: ["private-worker"]
     image: dockerhub
     params:
-      GIT_USERNAME: ((GithubApiUser))
-      GIT_EMAIL: ((GithubApiEmail))
+      GIT_USERNAME: ((github-api-user))
+      GIT_EMAIL: ((github-api-email))
     file: lf-git/ci/tasks/update-changelog.yml
   - put: dockerhub
-    tags: ["private-worker"]
     params:
       build: lf-git-changed
       tag: version/version.txt
       tag_as_latest: true
   - put: lf-git
-    tags: ["private-worker"]
     params:
       repository: lf-git-changed
   - task: build-and-push-gem
-    tags: ["private-worker"]
     image: dockerhub
     params:
-      GIT_USERNAME: ((GithubApiUser))
-      GIT_EMAIL: ((GithubApiEmail))
-      GIT_PRIVATE_KEY: ((CfOslBot.private_key))
-      GEM_API_KEY: ((LicenseFinderGemApiKey))
+      GIT_USERNAME: ((github-api-user))
+      GIT_EMAIL: ((github-api-email))
+      GIT_PRIVATE_KEY: ((github-cf-osl-bot-private-key))
+      GEM_API_KEY: ((license-finder-gem-api-key))
     file: lf-git/ci/tasks/build-and-push-gem.yml
   - put: lf-release
-    tags: ["private-worker"]
     params:
       name: version/tag.txt
       tag: version/tag.txt

data/ci/scripts/run-tests.sh

@@ -6,14 +6,30 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PROJECT_ROOT="$( dirname "$( dirname $DIR )" )"
 
 pushd "$PROJECT_ROOT"
-
-  rvm install --default $RUBY_VERSION_UNDER_TEST
+  DISABLE_BINARY=""
+  if [[ $RUBY_VERSION_UNDER_TEST == "2.6.10" ]]; then
+    DISABLE_BINARY="--disable-binary"
+  fi
+
+  # This is needed for 2.7 but also works for 2.6. For 2.6, you can also downgrade the openssl version to 1.1.1l-1ubuntu1.4 in the dockerfile with allowing downgrades for apt install -y libssl-dev=1.1.1l-1ubuntu1.4
+  if [[ $RUBY_VERSION_UNDER_TEST == "2.6.10" || $RUBY_VERSION_UNDER_TEST == "2.7.8" ]]; then
+    OPEN_SSL_FLAG="--with-openssl-dir=/usr/share/rvm/usr/"
+    rvm pkg install openssl
+  fi
+
+  rvm install --default $RUBY_VERSION_UNDER_TEST $DISABLE_BINARY $OPEN_SSL_FLAG
   ruby --version
 
   export GOPATH=$HOME/go
-  export RUBYOPT='-E utf-8'
+  if [[ $RUBY_VERSION_UNDER_TEST == "2.6.10" || $RUBY_VERSION_UNDER_TEST == "2.7.8" ]]; then
+    export RUBYOPT='-E utf-8 -W0'
+    gem install "rubygems-update:<3.5.0" --no-document
+    gem update --system --conservative
+  else
+    export RUBYOPT='-E utf-8'
+    gem update --system
+  fi
 
-  gem update --system
   gem install bundler
   bundle install
   bundle pristine

data/ci/tasks/rubocop.yml

@@ -4,9 +4,9 @@ image_resource:
   type: registry-image
   source:
     repository: ruby
-    tag: 3.1.1
-    username: ((LicenseFinderDocker.username))
-    password: ((LicenseFinderDocker.password))
+    tag: 3.2.3
+    username: ((license-finder-docker-username))
+    password: ((license-finder-docker-password))
 
 inputs:
 - name: LicenseFinder

data/ci/tasks/update-changelog.yml

@@ -4,8 +4,8 @@ image_resource:
   source:
     repository: brenix/alpine-bash-git-ssh
     tag: latest
-    username: ((LicenseFinderDocker.username))
-    password: ((LicenseFinderDocker.password))
+    username: ((license-finder-docker-username))
+    password: ((license-finder-docker-password))
 platform: linux
 inputs:
 - name: lf-git

data/lib/license_finder/core.rb

@@ -61,9 +61,9 @@ module LicenseFinder
       clear_logs
       package_managers = @scanner.active_package_managers
       package_managers.each do |manager|
-        logger.debug manager.class, 'Running prepare on project'
+        logger.debug manager.class, "Running prepare on project '#{config.project_path}'"
         manager.prepare
-        logger.debug manager.class, 'Finished prepare on project', color: :green
+        logger.debug manager.class, "Finished prepare on project '#{config.project_path}'", color: :green
       end
     end
 

data/lib/license_finder/license/definitions.rb

@@ -7,12 +7,17 @@ module LicenseFinder
 
       def all
         [
+          agpl3,
           apache1_1,
           apache2,
+          artistic,
           bsd,
           cc01,
           cddl1,
+          cddl1_1,
+          cpl1,
           eclipse1,
+          eclipse2,
           gplv2,
           gplv3,
           isc,
@@ -26,6 +31,7 @@ module LicenseFinder
           python,
           ruby,
           simplifiedbsd,
+          unlicense,
           wtfpl,
           zerobsd,
           zlib
@@ -42,14 +48,39 @@ module LicenseFinder
 
       private
 
+      def agpl3
+        License.new(
+          short_name: 'AGPL3',
+          spdx_id: 'AGPL-3.0-only',
+          pretty_name: 'GNU Affero GPL',
+          other_names: [
+            'AGPL 3',
+            'AGPL-3.0',
+            'AGPL 3.0',
+            'GNU Affero General Public License v3.0',
+            'GNU Affero General Public License, Version 3'
+          ],
+          url: 'http://www.gnu.org/licenses/agpl-3.0.html'
+        )
+      end
+
       def apache1_1
         License.new(
           short_name: 'Apache1_1',
-          pretty_name: 'Apache 1.1',
           spdx_id: 'Apache-1.1',
+          pretty_name: 'Apache 1.1',
           other_names: [
+            'Apache',
             'Apache-1.1',
-            'The Apache Software License, Version 1.1'
+            'APACHE 1.1',
+            'Apache License 1.1',
+            'Apache License Version 1.1',
+            'Apache Public License 1.1',
+            'Apache Software License, Version 1.1',
+            'Apache Software License - Version 1.1',
+            'Apache License, Version 1.1',
+            'ASL 1.1',
+            'ASF 1.1'
           ],
           url: 'http://www.apache.org/licenses/LICENSE-1.1.txt'
         )
@@ -58,10 +89,9 @@ module LicenseFinder
       def apache2
         License.new(
           short_name: 'Apache2',
-          pretty_name: 'Apache 2.0',
           spdx_id: 'Apache-2.0',
+          pretty_name: 'Apache 2.0',
           other_names: [
-            'Apache-2.0',
             'Apache Software License',
             'Apache License 2.0',
             'Apache License Version 2.0',
@@ -78,12 +108,22 @@ module LicenseFinder
         )
       end
 
+      def artistic
+        License.new(
+          short_name: 'Artistic',
+          spdx_id: 'Artistic-1.0',
+          pretty_name: 'Artistic 1.0',
+          other_names: ['Artistic License'],
+          url: 'https://www.perlfoundation.org/artistic-license-20.html'
+        )
+      end
+
       def bsd
         License.new(
           short_name: 'BSD',
           spdx_id: 'BSD-4-Clause',
-          other_names: ['BSD4', 'bsd-old', '4-clause BSD', 'BSD-4-Clause', 'BSD 4-Clause', 'BSD License'],
-          url: 'http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29'
+          other_names: ['BSD4', 'bsd-old', '4-clause BSD', 'BSD 4-Clause', 'BSD License'],
+          url: 'https://directory.fsf.org/wiki/License:BSD-4-Clause'
         )
       end
 
@@ -93,6 +133,10 @@ module LicenseFinder
           spdx_id: 'CC0-1.0',
           pretty_name: 'CC0 1.0 Universal',
           other_names: ['CC0 1.0'],
+          matcher: AnyMatcher.new(
+            Matcher.from_template(Template.named('CC01')),
+            Matcher.from_template(Template.named('CC01_alt'))
+          ),
           url: 'http://creativecommons.org/publicdomain/zero/1.0'
         )
       end
@@ -111,25 +155,75 @@ module LicenseFinder
         )
       end
 
+      def cddl1_1
+        License.new(
+          short_name: 'CDDL1_1',
+          spdx_id: 'CDDL-1.1',
+          pretty_name: 'Common Development and Distribution License 1.1',
+          other_names: [
+            'CDDL-1.1',
+            'Common Development and Distribution License (CDDL) v1.1',
+            'COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1'
+          ],
+          url: 'https://spdx.org/licenses/CDDL-1.1.html'
+        )
+      end
+
+      def cpl1
+        License.new(
+          short_name: 'CPL1',
+          spdx_id: 'CPL-1.0',
+          pretty_name: 'Common Public License Version 1.0',
+          other_names: [
+            'CPL-1',
+            'CPL 1',
+            'CPL-1.0',
+            'CPL 1.0',
+            'Common Public License 1.0',
+            'Common Public License v1.0',
+            'Common Public License, v1.0'
+          ],
+          url: 'https://opensource.org/licenses/cpl1.0.txt'
+        )
+      end
+
       def eclipse1
         License.new(
           short_name: 'EPL1',
           spdx_id: 'EPL-1.0',
           pretty_name: 'Eclipse Public License 1.0',
           other_names: [
-            'EPL-1.0',
             'EPL 1.0',
+            'Eclipse 1.0',
+            'Eclipse Public License 1.0',
             'Eclipse Public License - v 1.0'
           ],
           url: 'https://www.eclipse.org/legal/epl-v10.html'
         )
       end
 
+      def eclipse2
+        License.new(
+          short_name: 'EPL2',
+          spdx_id: 'EPL-2.0',
+          pretty_name: 'Eclipse 2.0',
+          other_names: [
+            'EPL-2.0',
+            'EPL 2.0',
+            'Eclipse 2.0',
+            'Eclipse Public License 2.0',
+            'Eclipse Public License - v 2.0'
+          ],
+          url: 'https://www.eclipse.org/legal/epl-v20.html'
+        )
+      end
+
       def gplv2
         License.new(
           short_name: 'GPLv2',
           spdx_id: 'GPL-2.0-only',
-          other_names: ['GPL V2', 'gpl-v2', 'GNU GENERAL PUBLIC LICENSE Version 2'],
+          # pretty_name: 'GPL 2.0',
+          other_names: ['GPL V2', 'gpl-v2', 'GNU GENERAL PUBLIC LICENSE Version 2', 'GPL 2.0'],
           url: 'http://www.gnu.org/licenses/gpl-2.0.txt'
         )
       end
@@ -138,7 +232,8 @@ module LicenseFinder
         License.new(
           short_name: 'GPLv3',
           spdx_id: 'GPL-3.0-only',
-          other_names: ['GPL V3', 'gpl-v3', 'GNU GENERAL PUBLIC LICENSE Version 3'],
+          # pretty_name: 'GPL 3.0',
+          other_names: ['GPL V3', 'gpl-v3', 'GNU GENERAL PUBLIC LICENSE Version 3', 'GPL 3.0'],
           url: 'http://www.gnu.org/licenses/gpl-3.0.txt'
         )
       end
@@ -147,6 +242,7 @@ module LicenseFinder
         License.new(
           short_name: 'ISC',
           spdx_id: 'ISC',
+          other_names: ['ISC License'],
           url: 'http://en.wikipedia.org/wiki/ISC_license'
         )
       end
@@ -155,7 +251,8 @@ module LicenseFinder
         License.new(
           short_name: 'LGPL',
           spdx_id: 'LGPL-3.0-only',
-          other_names: ['LGPL-3', 'LGPLv3', 'LGPL-3.0'],
+          # pretty_name: 'LGPL 3.0',
+          other_names: ['LGPL-3', 'LGPLv3', 'LGPL-3.0', 'LGPL 3.0'],
           url: 'http://www.gnu.org/licenses/lgpl.txt'
         )
       end
@@ -166,12 +263,11 @@ module LicenseFinder
           spdx_id: 'LGPL-2.1-only',
           pretty_name: 'GNU Lesser General Public License version 2.1',
           other_names: [
-            'LGPL-2.1-only',
             'LGPL 2.1',
             'LGPL v2.1',
             'GNU Lesser General Public License 2.1'
           ],
-          url: 'https://opensource.org/licenses/LGPL-2.1'
+          url: 'https://www.gnu.org/licenses/lgpl-2.1.txt'
         )
       end
 
@@ -190,7 +286,7 @@ module LicenseFinder
         License.new(
           short_name: 'MIT',
           spdx_id: 'MIT',
-          other_names: ['Expat', 'MIT license', 'MIT License', 'The MIT License (MIT)'],
+          other_names: ['Expat', 'MIT license', 'MIT License (MIT)'],
           url: 'http://opensource.org/licenses/mit-license',
           matcher: matcher
         )
@@ -213,6 +309,7 @@ module LicenseFinder
           pretty_name: 'Mozilla Public License 1.1',
           other_names: [
             'MPL-1.1',
+            'Mozilla 1.1',
             'Mozilla Public License, Version 1.1',
             'Mozilla Public License version 1.1'
           ],
@@ -222,7 +319,7 @@ module LicenseFinder
       end
 
       def mpl2
-        header_regexp = /Mozilla Public Licen[sc]e, version 2\.0/
+        header_regexp = /Mozilla Public Licen[sc]e.*version 2\.0/
 
         matcher = AnyMatcher.new(
           Matcher.from_template(Template.named('MPL2')),
@@ -235,6 +332,7 @@ module LicenseFinder
           pretty_name: 'Mozilla Public License 2.0',
           other_names: [
             'MPL-2.0',
+            'Mozilla 2.0',
             'Mozilla Public License, Version 2.0',
             'Mozilla Public License version 2.0'
           ],
@@ -266,13 +364,12 @@ module LicenseFinder
             'BSD-3',
             '3-clause BSD',
             '3-Clause BSD License',
-            'BSD-3-Clause',
             'BSD 3-Clause',
             'BSD 3-Clause License',
-            'The 3-Clause BSD License',
             'BSD 3-clause New License',
             'New BSD License',
             'BSD New license',
+            'BSD License 3',
             'BSD Licence 3'
           ],
           url: 'http://opensource.org/licenses/BSD-3-Clause',
@@ -299,8 +396,11 @@ module LicenseFinder
           pretty_name: 'Python Software Foundation License',
           other_names: [
             'PSF',
+            'PSF 2.0',
             'PSFL',
-            'PSF License'
+            'Python 2.0',
+            'PSF License',
+            'PSF License 2.0'
           ],
           url: 'http://hg.python.org/cpython/raw-file/89ce323357db/LICENSE'
         )
@@ -331,14 +431,22 @@ module LicenseFinder
           other_names: [
             'FreeBSD',
             '2-clause BSD',
-            'BSD-2-Clause',
             'BSD 2-Clause',
-            'The BSD 2-Clause License'
+            'BSD 2-Clause License'
           ],
           url: 'http://opensource.org/licenses/bsd-license'
         )
       end
 
+      def unlicense
+        License.new(
+          short_name: 'Unlicense',
+          spdx_id: 'Unlicense',
+          pretty_name: 'The Unlicense',
+          url: 'https://unlicense.org/'
+        )
+      end
+
       def wtfpl
         License.new(
           short_name: 'WTFPL',