license_finder 5.4.1 → 5.5.0

data/ci/scripts/run-rubocop.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 cd LicenseFinder
-gem install rubocop --version 0.51
+gem install rubocop --version 0.59.2
 
 
 echo "Running Rubocop ..."

data/ci/scripts/run-tests.sh

@@ -5,8 +5,6 @@ set -o pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PROJECT_ROOT="$( dirname "$( dirname $DIR )" )"
 
-RUBY_VERSION_UNDER_TEST=$1
-
 pushd "$PROJECT_ROOT"
 
   rvm install --default $RUBY_VERSION_UNDER_TEST
@@ -19,18 +17,6 @@ pushd "$PROJECT_ROOT"
   gem install bundler
   bundle install
 
-  # jruby-9 specific: requires  >= rack 2.x
-  if [ "$RUBY_VERSION_UNDER_TEST" == "jruby-9.0.4.0" ]
-  then
-    bundle update rack
-    apt-get -y install software-properties-common
-    add-apt-repository -y ppa:webupd8team/java
-    apt-get update
-    echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | sudo debconf-set-selections
-    apt-get -y install oracle-java8-set-default
-  fi
-
-
   bundle exec rake install
   bundle exec rake spec
   bundle exec rake features

data/ci/tasks/run-tests.yml

@@ -0,0 +1,10 @@
+platform: linux
+
+inputs:
+- name: LicenseFinder
+
+run:
+  path: ./LicenseFinder/ci/scripts/run-tests.sh
+
+params:
+  RUBY_VERSION_UNDER_TEST:

data/dlf

@@ -1,9 +1,9 @@
 #!/bin/bash
 if `which docker > /dev/null`; then
 	if [ $# -eq 0 ]; then
-  		docker run -v $PWD:/scan -it licensefinder/license_finder /bin/bash -lc "cd /scan && /bin/bash -l"
+  		docker run -v $PWD:/scan -it licensefinder/license_finder
 	else
-  		docker run -v $PWD:/scan -it licensefinder/license_finder /bin/bash -lc "cd /scan && bundle install && `echo $@`"
+  		docker run -v $PWD:/scan -it licensefinder/license_finder /bin/bash -lc "cd /scan && `echo $@`"
 	fi
 else
   echo "You do not have docker installed. Please install it:"

data/lib/license_finder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'yaml'
 

data/lib/license_finder/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
   end

data/lib/license_finder/cli/approvals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class Approvals < Base

data/lib/license_finder/cli/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 
 module LicenseFinder

data/lib/license_finder/cli/blacklist.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class Blacklist < Base

data/lib/license_finder/cli/dependencies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class Dependencies < Base

data/lib/license_finder/cli/ignored_dependencies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class IgnoredDependencies < Base

data/lib/license_finder/cli/ignored_groups.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class IgnoredGroups < Base

data/lib/license_finder/cli/licenses.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class Licenses < Base

data/lib/license_finder/cli/main.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'license_finder/report'
 require 'license_finder/version'
 require 'license_finder/diff'
@@ -172,6 +174,7 @@ module LicenseFinder
         aggregate_paths = ProjectFinder.new(project_path, config.strict_matching).find_projects if config.recursive
         say(aggregate_paths || project_path) if config.strict_matching
         return aggregate_paths unless aggregate_paths.nil? || aggregate_paths.empty?
+
         [config.project_path] unless config.project_path.nil?
       end
 

data/lib/license_finder/cli/makes_decisions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     module MakesDecisions

data/lib/license_finder/cli/patched_thor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     module Rootcommand

data/lib/license_finder/cli/project_name.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class ProjectName < Base

data/lib/license_finder/cli/whitelist.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class Whitelist < Base

data/lib/license_finder/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'platform'
 
 module LicenseFinder
@@ -16,6 +18,7 @@ module LicenseFinder
 
     def valid_project_path?
       return project_path.exist? if get(:project_path)
+
       true
     end
 

data/lib/license_finder/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 require 'license_finder/logger'
@@ -73,7 +75,7 @@ module LicenseFinder
     def decision_applier
       # lazy, do not move to `initialize`
       # Needs to be lazy loaded to prvent multiple decision appliers being created each time
-      @applier ||= DecisionApplier.new(decisions: decisions, packages: current_packages)
+      @decision_applier ||= DecisionApplier.new(decisions: decisions, packages: current_packages)
     end
 
     def current_packages

data/lib/license_finder/decision_applier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   class DecisionApplier
     def initialize(options)

data/lib/license_finder/decisions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   class Decisions
     ######

data/lib/license_finder/decisions_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   class DecisionsFactory
     @decisions = {}

data/lib/license_finder/diff.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   class Diff
     class << self
-      def compare(f1, f2)
-        p1 = Set.new(build_packages(f1))
-        p2 = Set.new(build_packages(f2))
+      def compare(file1, file2)
+        p1 = Set.new(build_packages(file1))
+        p2 = Set.new(build_packages(file2))
 
         added = p2.difference(p1).to_a
         removed = p1.difference(p2).to_a

data/lib/license_finder/license.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'license_finder/license/text'
 require 'license_finder/license/template'
 

data/lib/license_finder/license/any_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   class License
     class AnyMatcher

data/lib/license_finder/license/definitions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   class License
     module Definitions

data/lib/license_finder/license/header_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   class License
     HeaderMatcher = Struct.new(:base_matcher) do

data/lib/license_finder/license/matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   class License
     Matcher = Struct.new(:regexp) do

data/lib/license_finder/license/none_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   class License
     class NoneMatcher

data/lib/license_finder/license/template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   class License
     class Template

data/lib/license_finder/license/text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   class License
     module Text

data/lib/license_finder/license_aggregator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   class LicenseAggregator
     def initialize(config, aggregate_paths)
@@ -28,6 +30,7 @@ module LicenseFinder
 
     def finders
       return @finders unless @finders.nil?
+
       @finders = if @aggregate_paths.nil?
                    [LicenseFinder::Core.new(@config)]
                  else
@@ -42,6 +45,7 @@ module LicenseFinder
 
     def aggregate_packages
       return @packages unless @packages.nil?
+
       all_packages = finders.flat_map do |finder|
         finder.prepare_projects if @config.prepare
         finder.acknowledged.map { |dep| MergedPackage.new(dep, [finder.project_path]) }

data/lib/license_finder/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 
 module LicenseFinder
@@ -39,16 +41,18 @@ module LicenseFinder
       end
     end
 
-    def mode=(v)
-      @mode = v
+    def mode=(verbose)
+      @mode = verbose
 
       return if quiet?
+
       level = @mode.equal?(MODE_DEBUG) ? ::Logger::DEBUG : ::Logger::INFO
       system_logger.level = level
     end
 
     def log(msg, method)
       return if quiet?
+
       system_logger.send(method, msg)
     end
 

data/lib/license_finder/package.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'license_finder/package_utils/licensing'
 require 'license_finder/package_utils/license_files'
 
@@ -102,6 +104,7 @@ module LicenseFinder
     def <=>(other)
       eq_name = name <=> other.name
       return eq_name unless eq_name.zero?
+
       version <=> other.version
     end
 

data/lib/license_finder/package_delta.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   class PackageDelta
     STATUSES = %i[added removed unchanged].freeze
@@ -53,7 +55,7 @@ module LicenseFinder
     private
 
     def pick_package
-      @current_package ? @current_package : @previous_package
+      @current_package || @previous_package
     end
   end
 end

data/lib/license_finder/package_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   # Super-class for the different package managers
   # (Bundler, NPM, Pip, etc.)
@@ -66,7 +68,7 @@ module LicenseFinder
 
     def active?
       path = detected_package_path
-      path && path.exist?
+      path&.exist?
     end
 
     def detected_package_path
@@ -90,6 +92,7 @@ module LicenseFinder
         packages = current_packages
       rescue StandardError => e
         raise e unless @prepare_no_fail
+
         packages = []
       end
 
@@ -130,6 +133,7 @@ require 'license_finder/package_managers/go_dep'
 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/bundler'
 require 'license_finder/package_managers/npm'
 require 'license_finder/package_managers/yarn'

data/lib/license_finder/package_managers/bower.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module LicenseFinder

data/lib/license_finder/package_managers/bundler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 
 module LicenseFinder
@@ -47,6 +49,7 @@ module LicenseFinder
 
     def gem_details
       return @gem_details if @gem_details
+
       # clear gem paths before runninng specs_for
       Gem.clear_paths
       @gem_details = definition.specs_for(included_groups)

data/lib/license_finder/package_managers/cargo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module LicenseFinder
@@ -27,6 +29,7 @@ module LicenseFinder
 
       stdout, stderr, status = Dir.chdir(project_path) { Cmd.run(command) }
       raise "Command '#{command}' failed to execute: #{stderr}" unless status.success?
+
       JSON(stdout)
         .fetch('packages', [])
     end

data/lib/license_finder/package_managers/carthage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module LicenseFinder

data/lib/license_finder/package_managers/cocoa_pods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module LicenseFinder