license_finder 6.14.2 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34d77567442f9c47fcc7b150b7ffc32d2c7db0a76841ac3732f6e2af4887bc37
-  data.tar.gz: 1ae0dec6f2a8902bddfbfc3f0e466a7f26e9b19d304b40eef4d1a7a76a56cd5a
+  metadata.gz: a65abcec91ace2929ab66aa2e364002c4019e8cfd5ffdde361ce0ea4b20147f8
+  data.tar.gz: cfeaa1bf0a57a0480d8193fa10a75597b7421abcaa15d6995adc3a885797f547
 SHA512:
-  metadata.gz: 5a6e40dca9d5f3a91ab6cfba5e002ef14b3974fd6caeb6e3489d4bfc17b16897d0126e6c9f7edc35b28a0ec087bf9b68c3eb739ae583ccc6dcffb29b0d901ae5
-  data.tar.gz: 06d1bf8e227ce2db790f7ced5d53e507f384cdc7d582037bcb8be4574e7a483a550a34ba10c589c53b3513b24809900ba554da778de9b6cdb5437896c51a7b12
+  metadata.gz: c699e9127e4740d8795b5f494525c31251fa4dea297ebdd3c965b3d8bfc129d56d469135f2eb9614d244ed2828798008000116166fd55c1ac6ef5412e7d87313
+  data.tar.gz: e78c9b61fdf161c85c813a9892f02e470bc036f0061720a0fac73120394fb1f9e4161b6a935acb500ae55ac6c03d2ed6df6a320dda5cbc1443be6f62747c4f51

data/.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "20:00"
+    timezone: America/Los_Angeles
+  open-pull-requests-limit: 10

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3.3 
+  TargetRubyVersion: 2.4.0
   Exclude:
     - 'lib/license_finder/reports/**/*'
     - 'features/fixtures/**/*'
@@ -40,9 +40,17 @@ ModuleLength:
 # Security Cops
 YAMLLoad:
   Enabled: false
+Security/Open:
+  Enabled: false
 
 #Style Cops
-Style/MethodMissingSuper:
+Naming/VariableNumber:
+  Enabled: false
+Lint/MixedRegexpCaptureTypes:
+  Enabled: false
+Lint/MissingSuper:
+  Enabled: false
+Style/OptionalBooleanParameter:
   Enabled: false
 Style/MissingRespondToMissing:
   Enabled: false
@@ -56,6 +64,8 @@ Style/HashTransformValues:
   Enabled: true
 Layout/MultilineMethodCallIndentation:
     Enabled: false
+Lint/EmptyFile:
+  Enabled: false
 DoubleNegation:
   Enabled: false
 Documentation:

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [7.0.1] / 2022-03-18
+
+# [7.0.0] / 2022-03-04
+
+### Added
+* Ruby 3.x Support - [02497dfb](https://github.com/pivotal/LicenseFinder/commit/02497dfb60d458e51a43ef26568389b5fcf302af)
+* Provide Flutter project scanning support - [e739f281](https://github.com/pivotal/LicenseFinder/commit/e739f2180c88504152c0e19477489177012f5631) - etiennecadicidean
+* Add a new option to use spdx identifier in reports - [a71763bb](https://github.com/pivotal/LicenseFinder/commit/a71763bb132ed39e57f8071e72cb2450733bf8db) - etiennecadicidean
+* Allow to specify cocoadpods acknowledgment through ENV - [67bd3fb5](https://github.com/pivotal/LicenseFinder/commit/67bd3fb5569afa54abc16035fd7804bc2d65b7c0) - etiennecadicidean
+
+### Changed
+* Updated code to support newest Thor gem - [b118772c](https://github.com/pivotal/LicenseFinder/commit/b118772c3f634dacc56795eebb7c3ba4c89ef639)
+* Raise an error if the yarn licenses list command fails - [8f9ab6bd](https://github.com/pivotal/LicenseFinder/commit/8f9ab6bd681866aee888410672f3babab7aab383) - ajesler
+
+### Deprecated
+* Remove support for Ruby 2.3 - [02497dfb](https://github.com/pivotal/LicenseFinder/commit/02497dfb60d458e51a43ef26568389b5fcf302af)
+
+# [6.15.0] / 2021-12-17
+
+### Added
+* Add Yarn2 support - [7f08790c](https://github.com/pivotal/LicenseFinder/commit/7f08790ce1d7cd12ccd0aa9de114ca3366ab408c)
+
+###Changed
+* Upgrade conan and use https://center.conan.io instead of conan.bintray.com - [eea1292b](https://github.com/pivotal/LicenseFinder/commit/eea1292bf2613f603a8a0ae42747857acf77e361)
+
+### Fixed
+* Fix docker Conan and swift - [66031df9](https://github.com/pivotal/LicenseFinder/commit/66031df912c2e1e21aa794a4b897fc61c9ec6b02) 
+
 # [6.14.2] / 2021-10-27
 
 ### Added
@@ -8,17 +36,17 @@
 First two commit were supposed to show up in v6.14.0, but GPG bug prevented a correct build. Therefore, a follow up patch build was made to include the GPG fix.
 
 ### Changed
-* Upgrade Docker image to use Ubuntu Bionic [#178471230] [1c12588c](https://github.com/pivotal/LicenseFinder/commit/1c12588cceecb8b7350d090c85b519b24bcc6682)
+* Upgrade Docker image to use Ubuntu Bionic [#178471230] - [1c12588c](https://github.com/pivotal/LicenseFinder/commit/1c12588cceecb8b7350d090c85b519b24bcc6682)
 * Update the default timezone to GMT [#178471230] - [9fcab84](https://github.com/pivotal/LicenseFinder/commit/9fcab84605cda81e7f276d3c567d14409e371333)
 * Use local copy of Swift puglic GPG keys [#178674224] - [4db4b3e](https://github.com/pivotal/LicenseFinder/commit/4db4b3e5980ca52019549d74da574a2342a7846e)
 
 ### Added 
-* Added --npm_options option to customize npm behavior. [b8457a62](https://github.com/pivotal/LicenseFinder/commit/b8457a62e7b531294934364d1e5f72cd78a7686a) - Alexander-Malott 
+* Added --npm_options option to customize npm behavior - [b8457a62](https://github.com/pivotal/LicenseFinder/commit/b8457a62e7b531294934364d1e5f72cd78a7686a) - Alexander-Malott 
 
 ### Security
-* Fix issue where commands could be injected running on Cocoapods projects. [b0a61a2d](https://github.com/pivotal/LicenseFinder/commit/b0a61a2d833921c714cc39cdda8ba80af3f33d04)
+* Fix issue where commands could be injected running on Cocoapods projects - [b0a61a2d](https://github.com/pivotal/LicenseFinder/commit/b0a61a2d833921c714cc39cdda8ba80af3f33d04)
 
-  Thanks to Joern SchneeweiszStaff Security Engineer, Security Research | GitLab for raising the issue
+  Thanks to Joern Schneeweisz Staff Security Engineer, Security Research | GitLab for raising the issue
 
 
 # [6.13.0] / 2021-04-27
@@ -979,3 +1007,6 @@ Bugfixes:
 [6.13.0]: https://github.com/pivotal/LicenseFinder/compare/v6.12.2...v6.13.0
 [6.14.1]: https://github.com/pivotal/LicenseFinder/compare/v6.13.0...v6.14.1
 [6.14.2]: https://github.com/pivotal/LicenseFinder/compare/v6.14.1...v6.14.2
+[6.15.0]: https://github.com/pivotal/LicenseFinder/compare/v6.14.2...v6.15.0
+[7.0.0]: https://github.com/pivotal/LicenseFinder/compare/v6.15.0...v7.0.0
+[7.0.1]: https://github.com/pivotal/LicenseFinder/compare/v7.0.0...v7.0.1

data/Dockerfile

@@ -9,7 +9,7 @@ ENV GO_LANG_VERSION 1.14.3
 ENV MAVEN_VERSION 3.6.0
 ENV SBT_VERSION 1.3.3
 ENV GRADLE_VERSION 5.6.4
-ENV RUBY_VERSION 2.7.1
+ENV RUBY_VERSION 3.1.1
 ENV MIX_VERSION 1.0
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
@@ -137,7 +137,9 @@ RUN apt-get install -y python-dev && \
 	    --ignore-installed requests --ignore-installed chardet \
 	    --ignore-installed urllib3 \
 	    --upgrade setuptools && \
-    pip install --no-cache-dir -Iv conan==1.11.2
+    pip install --no-cache-dir -Iv conan==1.43.0 && \
+    conan config install https://github.com/conan-io/conanclientcert.git
+
 
 # install NuGet (w. mono)
 # https://docs.microsoft.com/en-us/nuget/install-nuget-client-tools#macoslinux
@@ -204,6 +206,25 @@ RUN apt-get -q install -y \
     pkg-config \
     && rm -r /var/lib/apt/lists/*
 
+#install flutter
+ENV FLUTTER_HOME=/root/flutter
+RUN curl -o flutter_linux_2.8.1-stable.tar.xz https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_2.8.1-stable.tar.xz \
+    && tar xf flutter_linux_2.8.1-stable.tar.xz \
+    && mv flutter ${FLUTTER_HOME} \
+    && rm flutter_linux_2.8.1-stable.tar.xz
+        
+ENV PATH=$PATH:${FLUTTER_HOME}/bin:${FLUTTER_HOME}/bin/cache/dart-sdk/bin
+RUN flutter doctor -v \
+    && flutter update-packages \
+    && flutter precache
+# Accepting all licences
+RUN yes | flutter doctor --android-licenses -v
+# Creating Flutter sample projects to put binaries in cache fore each template type
+RUN flutter create --template=app ${TEMP}/app_sample \
+    && flutter create --template=package ${TEMP}/package_sample \
+    && flutter create --template=plugin ${TEMP}/plugin_sample
+
+
 # pub   4096R/ED3D1561 2019-03-22 [SC] [expires: 2023-03-23]
 #       Key fingerprint = A62A E125 BBBF BB96 A6E0  42EC 925C C1CC ED3D 1561
 # uid                  Swift 5.x Release Signing Key <swift-infrastructure@swift.org
@@ -211,7 +232,7 @@ ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
 ARG SWIFT_PLATFORM=ubuntu18.04
 ARG SWIFT_BRANCH=swift-5.3.3-release
 ARG SWIFT_VERSION=swift-5.3.3-RELEASE
-ARG SWIFT_WEBROOT=https://swift.org/builds/
+ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
@@ -221,7 +242,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 
 COPY swift-all-keys.asc .
 RUN set -e; \
-    SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)/" \
+    SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)" \
     && SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz" \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl here so we cache better up above
@@ -240,7 +261,7 @@ RUN set -e; \
 
 # install license_finder
 COPY . /LicenseFinder
-RUN bash -lc "cd /LicenseFinder && bundle config set no-cache 'true' && bundle install -j4 && rake install"
+RUN bash -lc "cd /LicenseFinder && bundle config set no-cache 'true' && bundle install -j4 && bundle pristine && rake install"
 
 WORKDIR /
 

data/README.md

@@ -3,12 +3,11 @@
 [![Code Climate](https://codeclimate.com/github/pivotal/LicenseFinder.png)](https://codeclimate.com/github/pivotal/LicenseFinder)
 
 Build status
-* 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.9 [![Ruby 2.4.9 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.4.9/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
 * Ruby 2.5.7 [![Ruby 2.5.7 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.5.7/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
-* Ruby 2.6.5 [![Ruby 2.6.5 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.6.5/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
-* Ruby 2.7.1 [![Ruby 2.7.1 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.7.1/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
-* JRuby 9.2.9.0 [![JRuby 9.2.9.0 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-jruby-9.2.9.0/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
+* Ruby 2.6.9 [![Ruby 2.6.9 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.6.9/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
+* Ruby 2.7.5 [![Ruby 2.7.5 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.7.5/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
+* Ruby 3.1.1 [![Ruby 3.1.1 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-3.1.1/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
 
 
 LicenseFinder works with your package managers to find dependencies,
@@ -21,44 +20,44 @@ and give you an actionable exception report.
 * docker: [licensefinder/license_finder](https://hub.docker.com/r/licensefinder/license_finder/)
   * the docker image contains all the package managers needed to run `license_finder`
 * support:
+  * The primary form of communication for support is through github issues. The google groups are not actively
+    monitored
   * license-finder@googlegroups.com
   * https://groups.google.com/forum/#!forum/license-finder
-* backlog: https://www.pivotaltracker.com/n/projects/234851
 
 ### Supported project types
 
 | Project Type | Package Manager | Tested on Version |
-| ------------ | --------------- | -------:|
-| Ruby Gems    | bundler         | 1.16.6  |
-| Python 2.7 Eggs  | pip2             | 19.0.2  |
-| Python 3.5 Eggs  | pip3             | 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.5 |
-| Go modules   | Go lang         | 1.11.5  |
-| Java         | maven           | 3.6.0   |
-| Java         | gradle          | 4.10.3  |
+| ------------ |-----------------|------------------:|
+| Ruby Gems    | bundler         | 2.3.7 |
+| Python 2.7 Eggs  | pip2            | 19.0.2 |
+| Python 3.5 Eggs  | pip3            | 20.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 | Go lang         | 1.11.5 |
+| Go modules   | Go lang         | 1.14.3 |
+| Java         | maven           | 3.6.0 |
+| Java         | gradle          | 5.6.4 |
 
 ### Experimental project types
 
 * Erlang (via `rebar` and `Erlang.mk`)
-* Objective-C, Swift (via Carthage, CocoaPods \[0.39 and below. See [CocoaPods Specs Repo Sharding](http://blog.cocoapods.org/Sharding/)\]) and Swift Package Manager)
-* Objective-C (+ CocoaPods 0.39 and below. See [CocoaPods Specs Repo Sharding](http://blog.cocoapods.org/Sharding/))
+* Objective-C, Swift (via Carthage, CocoaPods \[0.39 and below. See [CocoaPods Specs Repo Sharding](http://blog.cocoapods.org/Sharding/)\]) and Swift Package Manager(SPM)
 * Elixir (via `mix`)
 * Golang (via `gvt`, `glide`,`dep`, `trash` and `govendor`)
 * JavaScript (via `yarn`)
 * C++/C (via `conan`)
 * Scala (via `sbt`)
 * Rust (via `cargo`)
-* Go Modules (via `go mod`)
 * PHP (via `composer`)
-* Python (via Conda [Conda 4.8.3, Python 3.7, Bash; requires an `environment.yml` or `environment.yaml`])
+* Python (via `Conda`, `pipenv`)
+* Flutter (via `flutter pub`)
 
 ## Installation
 
-License Finder requires Ruby 2.3.3 or greater to run. If you have an older
+License Finder requires Ruby 2.4.0 or greater to run. If you have an older
 version of Ruby installed, you can update via Homebrew:
 
 ```sh
@@ -158,7 +157,7 @@ reference it will mount your current directory at the path `/scan` and run any c
 passed to it from that directory.
 
 Note that the docker image will run the gem which is installed within it.
-So the docker image tagged `4.0.2` will run *License Finder Version 4.0.2*
+So the docker image tagged `7.0.0` will run *License Finder Version 7.0.0*
 
 See the [contributing guide](https://github.com/pivotal/LicenseFinder/blob/master/CONTRIBUTING.md) for information on development. 
 
@@ -169,12 +168,13 @@ languages, as long as that language has a package definition in the project dire
 
 * `Gemfile` (for `bundler`)
 * `requirements.txt` (for `pip`)
+* `Pipfile.lock` (for `pipenv`)
 * `package.json` (for `npm`)
 * `pom.xml` (for `maven`)
-* `build.gradle` (for `gradle`)
+* `build.gradle` or `build.gradle.kts` (for `gradle`)
 * `settings.gradle` that specifies `rootProject.buildFileName` (for `gradle`)
 * `bower.json` (for `bower`)
-* `Podfile` (for `pod`)
+* `Podfile` (for `pod`) (set `ACKNOWLEDGEMENTS_PATH` variable if you want to target a particular `Pods-acknowledgements-<TARGET>.plist`. Can be useful in multi-target pods projects.)
 * `Cartfile` (for `carthage`)
 * `workspace-state.json` under build directory (provided as enviroment variable `SPM_DERIVED_DATA` for Xcode, or default `.build` for non-Xcode projects), (for `spm`)
 * `rebar.config` (for `rebar`)
@@ -186,6 +186,8 @@ languages, as long as that language has a package definition in the project dire
 * `glide.lock` file (for `glide`)
 * `vendor/vendor.json` file (for `govendor`)
 * `Gopkg.lock` file (for `dep`)
+* `Godeps/Godeps.json` (for `godep`)
+* `*.envrc` file (for `go`) 
 * `go.mod` file (for `go mod`)
 * `vendor.conf` file (for `trash`)
 * `yarn.lock` file (for `yarn`)
@@ -193,7 +195,8 @@ languages, as long as that language has a package definition in the project dire
 * `build.sbt` file (for `sbt`)
 * `Cargo.lock` file (for `cargo`)
 * `composer.lock` file (for `composer`)
-
+* `environment,yml` file (for `conda`)
+* `pubspec.yaml & .pub cache locaton through ENV variable` (for `flutter`)
 
 ### Continuous Integration
 
@@ -499,7 +502,7 @@ licenseConfigurations := Set("compile", "provided")
 
 ## Requirements
 
-`license_finder` requires ruby >= 1.9.3, or jruby.
+`license_finder` requires ruby >= 2.4.0. We will be dropping 2.4.x support soon.
 
 
 ## Upgrading

data/Rakefile

@@ -40,7 +40,7 @@ task :check_dependencies do
   LicenseFinder::Scanner::PACKAGE_MANAGERS.each do |package_manager|
     satisfied = false unless package_manager.new(project_path: Pathname.new('')).installed?(LicenseFinder::Logger.new(LicenseFinder::Logger::MODE_INFO))
   end
-  STDOUT.flush
+  $stdout.flush
   exit 1 unless satisfied
 end
 
@@ -54,7 +54,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.7.1 2.6.5 2.5.7 2.4.9 2.3.8 jruby-9.2.14.0]
+  ruby_versions = %w[3.1.1 2.7.5 2.6.9 2.5.7 2.4.9]
 
   params = []
   params << "ruby_versions=#{ruby_versions.join(',')}"

data/VERSION

@@ -1 +1 @@
-6.14.2
+7.0.1

data/ci/pipelines/release.yml.erb

@@ -156,7 +156,7 @@ jobs:
   plan:
   - get: lf-git
     tags: ["private-worker"]
-    passed: [<%= "#{ruby_versions.map{ |version| "ruby-#{version}" unless version == "jruby-9.2.14.0" }.compact.join(', ') }, rubocop" %>]
+    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

data/ci/scripts/pushscript.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
-
-echo -e "---\n:rubygems_api_key: $GEM_API_KEY" > ~/.gem/credentials
-chmod 0600 ~/.gem/credentials
+echo -e "---\n:rubygems_api_key: $GEM_API_KEY" > ~/.local/share/gem/credentials
+chmod 0600 ~/.local/share/gem/credentials
 
 build_version="$(cat semver-version/version)"
 cd lf-git

data/ci/scripts/run-tests.sh

@@ -16,9 +16,10 @@ pushd "$PROJECT_ROOT"
   gem update --system
   gem install bundler
   bundle install
+  bundle pristine
 
-  bundle exec rake install
-  bundle exec rake spec
+  rake install
+  rake spec
 
-  bundle exec rake features
+  rake features
 popd

data/ci/tasks/rubocop.yml

@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ruby
-    tag: 2.7.1
+    tag: 3.1.1
     username: ((LicenseFinderDocker.username))
     password: ((LicenseFinderDocker.password))
 

data/dlf

@@ -1,10 +1,14 @@
 #!/bin/bash
 if `which docker > /dev/null`; then
-	if [ $# -eq 0 ]; then
-  		docker run -v $PWD:/scan -it licensefinder/license_finder
-	else
-  		docker run -v $PWD:/scan -it licensefinder/license_finder /bin/bash -lc "cd /scan && `echo $@`"
-	fi
+  if [ $# -eq 0 ]; then
+    docker run -v $PWD:/scan -it licensefinder/license_finder
+  else
+    escaped_params=""
+    for p in "$@"; do
+      escaped_params="$escaped_params \"$p\""
+    done
+    docker run -v $PWD:/scan -it licensefinder/license_finder /bin/bash -lc "cd /scan && $escaped_params"
+  fi
 else
   echo "You do not have docker installed. Please install it:"
   echo "    https://docs.docker.com/engine/installation/"

data/lib/license_finder/cli/approvals.rb

@@ -13,7 +13,7 @@ module LicenseFinder
         assert_some names
         modifying { names.each { |name| decisions.approve(name, txn) } }
 
-        say "The #{names.join(', ')} dependency has been approved!", :green
+        printer.say "The #{names.join(', ')} dependency has been approved!", :green
       end
 
       auditable
@@ -21,7 +21,7 @@ module LicenseFinder
       def remove(dep)
         modifying { decisions.unapprove(dep, txn) }
 
-        say "The dependency #{dep} no longer has a manual approval"
+        printer.say "The dependency #{dep} no longer has a manual approval"
       end
     end
   end

data/lib/license_finder/cli/base.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'thor'
-
 module LicenseFinder
   module CLI
     class Base < Thor
@@ -24,12 +23,16 @@ module LicenseFinder
         def config
           @config ||= Configuration.with_optional_saved_config(license_finder_config)
         end
+
+        def printer
+          @printer || Printer.new
+        end
       end
 
       private
 
       def fail(message)
-        say(message) && exit(1)
+        printer.say(message) && exit(1)
       end
 
       def license_finder_config
@@ -61,7 +64,8 @@ module LicenseFinder
           :recursive,
           :sbt_include_groups,
           :conda_bash_setup_script,
-          :composer_check_require_only
+          :composer_check_require_only,
+          :use_spdx_id
         ).merge(
           logger: logger_mode
         )
@@ -84,10 +88,10 @@ module LicenseFinder
       def say_each(coll)
         if coll.any?
           coll.each do |item|
-            say(block_given? ? yield(item) : item)
+            printer.say(block_given? ? yield(item) : item)
           end
         else
-          say '(none)'
+          printer.say '(none)'
         end
       end
 

data/lib/license_finder/cli/dependencies.rb

@@ -20,9 +20,9 @@ module LicenseFinder
           decisions.approve(name, txn) if options[:approve]
         end
         if options[:approve]
-          say "The #{name} dependency has been added and approved!", :green
+          printer.say "The #{name} dependency has been added and approved!", :green
         else
-          say "The #{name} dependency has been added!", :green
+          printer.say "The #{name} dependency has been added!", :green
         end
       end
 
@@ -31,12 +31,12 @@ module LicenseFinder
       def remove(name)
         modifying { decisions.remove_package(name, txn) }
 
-        say "The #{name} dependency has been removed.", :green
+        printer.say "The #{name} dependency has been removed.", :green
       end
 
       desc 'list', 'List manually added dependencies'
       def list
-        say 'Manually Added Dependencies:', :blue
+        printer.say 'Manually Added Dependencies:', :blue
         say_each(decisions.packages, &:name)
       end
     end

data/lib/license_finder/cli/ignored_dependencies.rb

@@ -8,7 +8,7 @@ module LicenseFinder
 
       desc 'list', 'List all the ignored dependencies'
       def list
-        say 'Ignored Dependencies:', :blue
+        printer.say 'Ignored Dependencies:', :blue
         say_each(decisions.ignored)
       end
 
@@ -17,7 +17,7 @@ module LicenseFinder
       def add(dep)
         modifying { decisions.ignore(dep, txn) }
 
-        say "Added #{dep} to the ignored dependencies"
+        printer.say "Added #{dep} to the ignored dependencies"
       end
 
       auditable
@@ -25,7 +25,7 @@ module LicenseFinder
       def remove(dep)
         modifying { decisions.heed(dep, txn) }
 
-        say "Removed #{dep} from the ignored dependencies"
+        printer.say "Removed #{dep} from the ignored dependencies"
       end
     end
   end

data/lib/license_finder/cli/ignored_groups.rb

@@ -8,7 +8,7 @@ module LicenseFinder
 
       desc 'list', 'List all the ignored groups'
       def list
-        say 'Ignored Groups:', :blue
+        printer.say 'Ignored Groups:', :blue
         say_each(decisions.ignored_groups)
       end
 
@@ -17,7 +17,7 @@ module LicenseFinder
       def add(group)
         modifying { decisions.ignore_group(group, txn) }
 
-        say "Added #{group} to the ignored groups"
+        printer.say "Added #{group} to the ignored groups"
       end
 
       auditable
@@ -25,7 +25,7 @@ module LicenseFinder
       def remove(group)
         modifying { decisions.heed_group(group, txn) }
 
-        say "Removed #{group} from the ignored groups"
+        printer.say "Removed #{group} from the ignored groups"
       end
     end
   end

data/lib/license_finder/cli/inherited_decisions.rb

@@ -8,7 +8,7 @@ module LicenseFinder
 
       desc 'list', 'List all the inherited decision files'
       def list
-        say 'Inherited Decision Files:', :blue
+        printer.say 'Inherited Decision Files:', :blue
         say_each(decisions.inherited_decisions)
       end
 
@@ -17,7 +17,7 @@ module LicenseFinder
       def add(*decision_files)
         assert_some decision_files
         modifying { decision_files.each { |filepath| decisions.inherit_from(filepath) } }
-        say "Added #{decision_files.join(', ')} to the inherited decisions"
+        printer.say "Added #{decision_files.join(', ')} to the inherited decisions"
       end
 
       auditable
@@ -26,7 +26,7 @@ module LicenseFinder
         url, auth_type, token_or_env = params
         auth_info = { 'url' => url, 'authorization' => "#{auth_type} #{token_or_env}" }
         modifying { decisions.add_decision [:inherit_from, auth_info] }
-        say "Added #{url} to the inherited decisions"
+        printer.say "Added #{url} to the inherited decisions"
       end
 
       auditable
@@ -34,7 +34,7 @@ module LicenseFinder
       def remove(*decision_files)
         assert_some decision_files
         modifying { decision_files.each { |filepath| decisions.remove_inheritance(filepath) } }
-        say "Removed #{decision_files.join(', ')} from the inherited decisions"
+        printer.say "Removed #{decision_files.join(', ')} from the inherited decisions"
       end
 
       auditable
@@ -43,7 +43,7 @@ module LicenseFinder
         url, auth_type, token_or_env = params
         auth_info = { 'url' => url, 'authorization' => "#{auth_type} #{token_or_env}" }
         modifying { decisions.remove_inheritance(auth_info) }
-        say "Removed #{url} from the inherited decisions"
+        printer.say "Removed #{url} from the inherited decisions"
       end
     end
   end

data/lib/license_finder/cli/licenses.rb

@@ -11,7 +11,7 @@ module LicenseFinder
       def add(name, license)
         modifying { decisions.license(name, license, txn) }
 
-        say "The #{name} dependency has been marked as using #{license} license!", :green
+        printer.say "The #{name} dependency has been marked as using #{license} license!", :green
       end
 
       auditable
@@ -19,7 +19,7 @@ module LicenseFinder
       def remove(dep, lic)
         modifying { decisions.unlicense(dep, lic, txn) }
 
-        say "The dependency #{dep} no longer has a manual license"
+        printer.say "The dependency #{dep} no longer has a manual license"
       end
     end
   end