license_finder 3.1.1 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 956d6a13cb2fb6bdcaa433ec77957db763a41d6b
-  data.tar.gz: 1f9a2da6f824d793b9dffb6a1e5903de465d8d13
+  metadata.gz: 32d2839f00871d5e2e7a3a9e878cff1db69cc16d
+  data.tar.gz: 7efb10b41b8f02f96d76cc8c930e633c968577d6
 SHA512:
-  metadata.gz: d2fb7013ff3482c23d1fba6c30aef68df057e1c61665f50907ed0f8e1151a0785430c4a233424d8c5d890f426e57234df435dec7c5e7ea70712eb21941271c17
-  data.tar.gz: 9805ab07f8d85a4b1d34d4a4e26b44c645e4477eef615b870692c9099233ecb072b9acc895917960ad2763c447825a059d7ee04e144a062e2231499b4006cc2a
+  metadata.gz: 7788b979fe82a6d433413e3fdfc1c8c0cac611c52f5e6314e6b73a9a4ee5b5e75111ebc6f1fa0b6be9de484b503166c1cc3de63e22772c2751353269a4572dd3
+  data.tar.gz: c09196ab1c745506c23bd7e1e17ed6753ec8e7016195eeb55a458cf5df16cb9fde391f0efe25461ce380948717ebfc830c493524e956cc554c70d4e75a42e381

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# [4.0.0] / 2017-11-10
+
+### Changed
+
+* CLI output has been altered to be clear about active states and installed states.
+* option `--subprojects`have been renamed to `--aggregate_paths` in order to be clear about its functionality
+
+### Fixed
+
+* Fixed issue where dangling symbolic link would cause License Finder to crash and not continue. Instead, License Finder will now warn about the issue and continue.
+
 # [3.1.0] / 2017-11-10
 
 ### Added
@@ -487,6 +498,7 @@ Bugfixes:
 
 
 [Unreleased]: https://github.com/pivotal/LicenseFinder/compare/v3.0.4...HEAD
+[4.0.0]: https://github.com/pivotal/LicenseFinder/compare/v3.1.0...v4.0.0
 [3.1.0]: https://github.com/pivotal/LicenseFinder/compare/v3.0.4...v3.1.0
 [3.0.4]: https://github.com/pivotal/LicenseFinder/compare/v3.0.2...v3.0.4
 [3.0.2]: https://github.com/pivotal/LicenseFinder/compare/v3.0.1...v3.0.2

data/features/features/cli/cli_spec.rb

@@ -1,5 +1,4 @@
 require_relative '../../support/feature_helper'
-
 describe 'License Finder command line executable' do
   # As a developer
   # I want a command-line interface
@@ -47,4 +46,11 @@ describe 'License Finder command line executable' do
     expect(developer).to be_seeing("Project path '#{File.absolute_path(path)}' does not exist!")
     expect(developer).to be_receiving_exit_code(1)
   end
+
+  specify 'displays an error if symlink to potential license file is dangling' do
+    project = LicenseFinder::TestingDSL::BrokenSymLinkDepProject.create
+    ENV['GOPATH'] = "#{project.project_dir}/gopath_dep"
+    developer.run_license_finder('gopath_dep/src/foo-dep')
+    expect(developer).to be_seeing_something_like %r{ERROR: .*my_app/gopath_dep/src/foo-dep/vendor/a/b/LICENSE does not exists}
+  end
 end

data/features/features/report/diff_spec.rb

@@ -61,12 +61,12 @@ describe 'Diff report' do
       project2 = developer.create_ruby_app('project_2')
       project2.depend_on(developer.create_gem('foo', version: '1.0.0', license: 'MIT'))
       developer
-        .execute_command("license_finder report --columns name version licenses subproject_paths --subprojects=#{project1.project_dir} #{project2.project_dir} --save=report-1.csv --format=csv")
+        .execute_command("license_finder report --columns name version licenses aggregate_paths --aggregate_paths=#{project1.project_dir} #{project2.project_dir} --save=report-1.csv --format=csv")
 
       # Second multi-project report
       project2.depend_on(developer.create_gem('baz', version: '3.0.0', license: 'BSD'))
       developer
-        .execute_command("license_finder report --columns name version licenses subproject_paths --subprojects=#{project1.project_dir} #{project2.project_dir} --save=report-2.csv --format=csv")
+        .execute_command("license_finder report --columns name version licenses aggregate_paths --aggregate_paths=#{project1.project_dir} #{project2.project_dir} --save=report-2.csv --format=csv")
 
       # Diff the reports
       developer.execute_command('license_finder diff report-1.csv report-2.csv --save=diff.csv --format=csv')
@@ -88,14 +88,14 @@ describe 'Diff report' do
         project2 = developer.create_ruby_app('project_2')
         project2.depend_on(developer.create_gem('foo', version: '1.0.0', license: 'MIT'))
         developer
-          .execute_command("license_finder report --columns name version licenses subproject_paths --subprojects=#{project1.project_dir} #{project2.project_dir} --save=report-1.csv --format=csv")
+          .execute_command("license_finder report --columns name version licenses aggregate_paths --aggregate_paths=#{project1.project_dir} #{project2.project_dir} --save=report-1.csv --format=csv")
 
         # Second multi-project report
         project2.depend_on(developer.create_gem('baz', version: '3.0.0', license: 'BSD'))
         project1.depend_on(developer.create_gem('bar', version: '3.0.0', license: 'GPLv2'))
 
         developer
-          .execute_command("license_finder report --columns name version licenses subproject_paths --subprojects=#{project1.project_dir} #{project2.project_dir} --save=report-2.csv --format=csv")
+          .execute_command("license_finder report --columns name version licenses aggregate_paths --aggregate_paths=#{project1.project_dir} #{project2.project_dir} --save=report-2.csv --format=csv")
 
         # Diff the reports
         developer.execute_command('license_finder diff report-1.csv report-2.csv --save=diff.csv --format=csv')
@@ -117,14 +117,14 @@ describe 'Diff report' do
         project2 = developer.create_ruby_app('project_2')
         project2.depend_on(developer.create_gem('foo', version: '1.0.0', license: 'MIT'))
         developer
-          .execute_command("license_finder report --columns name version licenses subproject_paths --subprojects=#{project1.project_dir} #{project2.project_dir} --save=report-1.csv --format=csv")
+          .execute_command("license_finder report --columns name version licenses aggregate_paths --aggregate_paths=#{project1.project_dir} #{project2.project_dir} --save=report-1.csv --format=csv")
 
         # Second multi-project report
         project2.depend_on(developer.create_gem('baz', version: '3.0.0', license: 'BSD'))
         project1.depend_on(developer.create_gem('bar', version: '3.0.0', license: 'MIT'))
 
         developer
-          .execute_command("license_finder report --columns name version licenses subproject_paths --subprojects=#{project1.project_dir} #{project2.project_dir} --save=report-2.csv --format=csv")
+          .execute_command("license_finder report --columns name version licenses aggregate_paths --aggregate_paths=#{project1.project_dir} #{project2.project_dir} --save=report-2.csv --format=csv")
 
         # Diff the reports
         developer
@@ -149,14 +149,14 @@ describe 'Diff report' do
         project2 = developer.create_ruby_app('project_2')
         project2.depend_on(developer.create_gem('foo', version: '1.0.0', license: 'MIT'))
         developer
-          .execute_command("license_finder report --columns name version licenses subproject_paths --subprojects=#{project1.project_dir} #{project2.project_dir} --save=report-1.csv --format=csv")
+          .execute_command("license_finder report --columns name version licenses aggregate_paths --aggregate_paths=#{project1.project_dir} #{project2.project_dir} --save=report-1.csv --format=csv")
 
         # Second multi-project report
         project2.depend_on(developer.create_gem('baz', version: '3.0.0', license: 'BSD'))
         project1.depend_on(developer.create_gem('foo', version: '2.0.0', license: 'BSD'))
 
         developer
-          .execute_command("license_finder report --columns name version licenses subproject_paths --subprojects=#{project1.project_dir} #{project2.project_dir} --save=report-2.csv --format=csv")
+          .execute_command("license_finder report --columns name version licenses aggregate_paths --aggregate_paths=#{project1.project_dir} #{project2.project_dir} --save=report-2.csv --format=csv")
 
         # Diff the reports
         developer
@@ -178,13 +178,13 @@ describe 'Diff report' do
 
         project2 = developer.create_ruby_app('project_2')
         project2.depend_on(developer.create_gem('foo', version: '2.0.0', license: 'BSD'))
-        developer.execute_command("license_finder report --subprojects=#{project1.project_dir} #{project2.project_dir} --save=report-1.csv --format=csv")
+        developer.execute_command("license_finder report --aggregate_paths=#{project1.project_dir} #{project2.project_dir} --save=report-1.csv --format=csv")
 
         # Second multi-project report
         project2.depend_on(developer.create_gem('baz', version: '3.0.0', license: 'BSD'))
         project1.depend_on(developer.create_gem('foo', version: '2.0.0', license: 'BSD'))
 
-        developer.execute_command("license_finder report --subprojects=#{project1.project_dir} #{project2.project_dir} --save=report-2.csv --format=csv")
+        developer.execute_command("license_finder report --aggregate_paths=#{project1.project_dir} #{project2.project_dir} --save=report-2.csv --format=csv")
 
         # Diff the reports
         developer.execute_command('license_finder diff report-1.csv report-2.csv --save=diff.csv --format=csv')

data/features/features/report/subproject_spec.rb

@@ -1,6 +1,6 @@
 require_relative '../../support/feature_helper'
 
-describe 'Subproject report' do
+describe 'Aggregate Paths Projects report' do
   # As a non-technical product owner
   # I want a single csv report that includes multiple sub-projects
   # So that I can easily review my composite application's dependencies and licenses
@@ -14,11 +14,11 @@ describe 'Subproject report' do
     project1.depend_on(foo10)
 
     developer.create_empty_project
-    developer.execute_command("license_finder report --columns name homepage subproject_paths --subprojects #{project1.project_dir} --format=csv")
+    developer.execute_command("license_finder report --columns name homepage aggregate_paths --aggregate_paths #{project1.project_dir} --format=csv")
     expect(developer).to be_seeing_once("foo,http://example.homepage.com,#{project1.project_dir}")
   end
 
-  specify 'shows dependencies for multiple subprojects' do
+  specify 'shows dependencies for multiple projects' do
     project1 = developer.create_ruby_app('project_1')
     project1.depend_on(developer.create_gem('foo', version: '1.0.0', license: 'MIT'))
 
@@ -26,7 +26,7 @@ describe 'Subproject report' do
     project2.depend_on(developer.create_gem('bar', version: '2.0.0', license: 'GPLv2'))
 
     developer.create_empty_project
-    developer.execute_command("license_finder report --columns name version licenses subproject_paths --subprojects #{project1.project_dir} #{project2.project_dir} --format=csv")
+    developer.execute_command("license_finder report --columns name version licenses aggregate_paths --aggregate_paths #{project1.project_dir} #{project2.project_dir} --format=csv")
     expect(developer).to be_seeing("foo,1.0.0,MIT,#{project1.project_dir}")
     expect(developer).to be_seeing("bar,2.0.0,GPLv2,#{project2.project_dir}")
   end
@@ -41,7 +41,7 @@ describe 'Subproject report' do
     project2.depend_on(foo)
 
     developer.create_empty_project
-    developer.execute_command("license_finder report --columns name version licenses subproject_paths --subprojects #{project1.project_dir} #{project2.project_dir} --format=csv")
+    developer.execute_command("license_finder report --columns name version licenses aggregate_paths --aggregate_paths #{project1.project_dir} #{project2.project_dir} --format=csv")
     expect(developer).to be_seeing_once("foo,1.0.0,MIT,\"#{project1.project_dir},#{project2.project_dir}\"")
   end
 
@@ -56,7 +56,7 @@ describe 'Subproject report' do
     project2.depend_on(foo11)
 
     developer.create_empty_project
-    developer.execute_command("license_finder report --columns name version licenses subproject_paths --subprojects #{project1.project_dir} #{project2.project_dir} --format=csv")
+    developer.execute_command("license_finder report --columns name version licenses aggregate_paths --aggregate_paths #{project1.project_dir} #{project2.project_dir} --format=csv")
     expect(developer).to be_seeing_once("foo,1.0.0,MIT,#{project1.project_dir}")
     expect(developer).to be_seeing_once("foo,1.1.0,MIT,#{project2.project_dir}")
   end

data/features/fixtures/gopath_dep/src/foo-dep/Gopkg.lock

@@ -1,5 +1,10 @@
 # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
 
+[[projects]]
+  branch = "master"
+  name = "a/b"
+  packages = ["."]
+  revision = "2269160ae1757f96bbb8c6475e6fa36c805e7234"
 
 [solve-meta]
   analyzer-name = "dep"

data/features/fixtures/gopath_dep/src/foo-dep/vendor/a/b/LICENSE

@@ -0,0 +1 @@
+features/fixtures/gopath_dep/src/foo-dep/vendor/a/b/LICENSE

data/features/support/testing_dsl.rb

@@ -249,6 +249,18 @@ module LicenseFinder
       end
     end
 
+    class BrokenSymLinkDepProject < Project
+      def add_dep
+        clone('gopath_dep')
+      end
+
+      def install; end
+
+      def shell_out(command)
+        ProjectDir.new(Paths.root.join('tmp', 'projects', 'my_app', 'gopath_dep', 'src', 'foo-dep')).shell_out(command)
+      end
+    end
+
     class GovendorProject < Project
       def add_dep
         clone('gopath_govendor')
@@ -463,7 +475,7 @@ module LicenseFinder
       end
 
       def install_fixture(fixture_name)
-        if Platform.windows?
+        if RUBY_PLATFORM =~ /mswin|cygwin|mingw/
           FileUtils.cp(Paths.fixtures.join(fixture_name), join(fixture_name))
         else
           join(fixture_name).make_symlink Paths.fixtures.join(fixture_name)

data/lib/license_finder/cli/base.rb

@@ -48,7 +48,17 @@ module LicenseFinder
       end
 
       def logger_config
-        @logger_config ||= extract_options(:quiet, :debug)
+        quiet = LicenseFinder::Logger::MODE_QUIET
+        debug = LicenseFinder::Logger::MODE_DEBUG
+        info = LicenseFinder::Logger::MODE_INFO
+        mode = extract_options(quiet, debug)
+        if mode[quiet]
+          { mode: quiet }
+        elsif mode[debug]
+          { mode: debug }
+        else
+          { mode: info }
+        end
       end
 
       def say_each(coll)

data/lib/license_finder/cli/main.rb

@@ -4,6 +4,7 @@ require 'license_finder/diff'
 require 'license_finder/package_delta'
 require 'license_finder/license_aggregator'
 require 'license_finder/project_finder'
+require 'license_finder/logger'
 
 module LicenseFinder
   module CLI
@@ -90,15 +91,15 @@ module LicenseFinder
       method_option :recursive, aliases: '-r', type: :boolean, default: false,
                                 desc: 'Recursively runs License Finder on all sub-projects'
 
-      method_option :subprojects, aliases: '-s', type: :array,
-                                  desc: "Generate a single report for multiple sub-projects. Ex: --subprojects='path/to/project1', 'path/to/project2'"
+      method_option :aggregate_paths, aliases: '-a', type: :array,
+                                      desc: "Generate a single report for multiple projects. Ex: --aggregate_paths='path/to/project1' 'path/to/project2'"
       def report
-        logger_config[:quiet] = true
-        subproject_paths = options[:subprojects]
-        subproject_paths = ProjectFinder.new(license_finder.config.project_path).find_projects if options[:recursive]
+        logger_config[:mode] = Logger::MODE_QUIET
+        aggregate_paths = options[:aggregate_paths]
+        aggregate_paths = ProjectFinder.new(license_finder.config.project_path).find_projects if options[:recursive]
 
-        if subproject_paths && !subproject_paths.empty?
-          finder = LicenseAggregator.new(license_finder_config, subproject_paths)
+        if aggregate_paths && !aggregate_paths.empty?
+          finder = LicenseAggregator.new(license_finder_config, aggregate_paths)
           report = MergedReport.new(finder.dependencies, options)
         else
           run_prepare_phase if prepare?

data/lib/license_finder/core.rb

@@ -14,7 +14,7 @@ module LicenseFinder
     attr_reader :config
 
     def self.default_logger
-      Logger::Default.new
+      Logger.new
     end
 
     # Default +options+:
@@ -50,9 +50,9 @@ module LicenseFinder
     def prepare_projects
       package_managers = PackageManager.active_package_managers options
       package_managers.each do |manager|
-        logger.log manager.class, 'Running prepare on project'
+        logger.debug manager.class, 'Running prepare on project'
         manager.prepare
-        logger.log manager.class, 'Finished prepare on project', color: :green
+        logger.debug manager.class, 'Finished prepare on project', color: :green
       end
     end
 
@@ -64,6 +64,7 @@ module LicenseFinder
     # packages.
     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)
     end
 

data/lib/license_finder/license_aggregator.rb

@@ -1,22 +1,22 @@
 module LicenseFinder
   class LicenseAggregator
-    def initialize(license_finder_config, subprojects)
+    def initialize(license_finder_config, aggregate_paths)
       @license_finder_config = license_finder_config
-      @subprojects = subprojects
+      @aggregate_paths = aggregate_paths
     end
 
     def dependencies
       aggregate_packages
         .group_by { |package| [package.name, package.version] }
         .map do |_, packages|
-          MergedPackage.new(packages[0].dependency, packages.flat_map(&:subproject_paths))
+          MergedPackage.new(packages[0].dependency, packages.flat_map(&:aggregate_paths))
         end
     end
 
     private
 
     def aggregate_packages
-      @subprojects.flat_map do |project_path|
+      @aggregate_paths.flat_map do |project_path|
         finder = LicenseFinder::Core.new(@license_finder_config.merge(project_path: project_path))
         finder.prepare_projects if @license_finder_config[:prepare]
         finder.acknowledged.map { |dep| MergedPackage.new(dep, [project_path]) }

data/lib/license_finder/logger.rb

@@ -1,17 +1,34 @@
+require 'logger'
+
 module LicenseFinder
-  module Logger
-    def self.new(options = {})
-      klass = if options[:quiet]
-                Quiet
-              elsif options[:debug]
-                Verbose
-              else
-                Progress
-              end
-      klass.new
+  class Logger
+    MODE_QUIET = :quiet
+    MODE_INFO = :info
+    MODE_DEBUG = :debug
+
+    attr_reader :mode
+
+    def initialize(options = {})
+      @system_logger = ::Logger.new(STDOUT)
+      @system_logger.formatter = proc do |_, _, _, msg|
+        "#{msg}\n"
+      end
+
+      self.mode = options[:mode] || MODE_INFO
+    end
+
+    [MODE_INFO, MODE_DEBUG].each do |level|
+      define_method level do |prefix, string, options = {}|
+        msg = format('%s: %s', prefix, colorize(string, options[:color]))
+        log(msg, level)
+      end
     end
 
-    def self.colorize(string, color)
+    private
+
+    attr_reader :system_logger
+
+    def colorize(string, color)
       case color
       when :red
         "\e[31m#{string}\e[0m"
@@ -22,28 +39,25 @@ module LicenseFinder
       end
     end
 
-    class Base
-      def log(_prefix, _string, _options = {})
-        raise NotImplementedError, '#log must be implemented'
-      end
-    end
+    def mode=(v)
+      @mode = v
 
-    class Quiet < Base
-      def log(prefix, string, options = {}); end
+      return if quiet?
+      level = @mode.equal?(MODE_DEBUG) ? ::Logger::DEBUG : ::Logger::INFO
+      system_logger.level = level
     end
 
-    class Progress < Base
-      def log(_prefix, _string, _options = {})
-        print('.') && $stdout.flush
-      end
+    def log(msg, method)
+      return if quiet?
+      system_logger.send(method, msg)
     end
 
-    class Verbose < Base
-      def log(prefix, string, options = {})
-        printf("%s: %s\n", prefix, Logger.colorize(string, options[:color]))
-      end
+    def debug?
+      @mode.equal?(MODE_DEBUG)
     end
 
-    Default = Quiet
+    def quiet?
+      @mode.equal?(MODE_QUIET)
+    end
   end
 end

data/lib/license_finder/package.rb

@@ -142,7 +142,7 @@ module LicenseFinder
     end
 
     def license_files
-      LicenseFiles.find(install_path)
+      LicenseFiles.find(install_path, logger: logger)
     end
 
     def package_manager
@@ -156,10 +156,10 @@ module LicenseFinder
     def log_activation(activation)
       preamble = format('package %s:', activation.package.name)
       if activation.sources.empty?
-        logger.log activation.package.class, format('%s no licenses found', preamble)
+        logger.debug activation.package.class, format('%s no licenses found', preamble)
       else
         activation.sources.each do |source|
-          logger.log activation.package.class, format("%s found license '%s' %s", preamble, activation.license.name, source)
+          logger.debug activation.package.class, format("%s found license '%s' %s", preamble, activation.license.name, source)
         end
       end
     end

data/lib/license_finder/package_delta.rb

@@ -16,8 +16,8 @@ module LicenseFinder
       pick_package.version
     end
 
-    def subproject_paths
-      pick_package.subproject_paths
+    def aggregate_paths
+      pick_package.aggregate_paths
     end
 
     attr_reader :status

data/lib/license_finder/package_manager.rb

@@ -22,12 +22,26 @@ module LicenseFinder
          Yarn, Bower, Maven, Gradle, CocoaPods, Rebar, Nuget, Carthage, Mix, Conan]
       end
 
-      def active_packages(options)
-        active_package_managers(options).flat_map(&:current_packages_with_relations)
+      def active_packages(options = { project_path: Pathname.new('') })
+        package_managers = active_package_managers(options)
+        installed_package_managers = package_managers.select { |pm| pm.class.installed?(options[:logger]) }
+        installed_package_managers.flat_map(&:current_packages_with_relations)
       end
 
       def active_package_managers(options = { project_path: Pathname.new('') })
-        active_pm_classes = package_managers.select { |pm_class| pm_class.new(options).active? }
+        logger = options[:logger]
+
+        active_pm_classes = []
+        package_managers.each do |pm_class|
+          active = pm_class.new(options).active?
+          if active
+            logger.info pm_class, 'is active', color: :green
+            active_pm_classes << pm_class
+          else
+            logger.debug pm_class, 'is not active', color: :red
+          end
+        end
+
         active_pm_classes -= active_pm_classes.map(&:takes_priority_over)
         active_pm_classes.map { |pm_class| pm_class.new(options) }
       end
@@ -38,13 +52,13 @@ module LicenseFinder
 
       def installed?(logger = Core.default_logger)
         if package_management_command.nil?
-          logger.log self, 'no command defined' # TODO: comment me out
+          logger.debug self, 'no command defined' # TODO: comment me out
           true
         elsif command_exists?(package_management_command)
-          logger.log self, 'is installed', color: :green
+          logger.debug self, 'is installed', color: :green
           true
         else
-          logger.log self, 'is not installed', color: :red
+          logger.info self, 'is not installed', color: :red
           false
         end
       end
@@ -67,15 +81,7 @@ module LicenseFinder
 
     def active?
       path = detected_package_path
-      self.class.installed?(logger) &&
-        !path.nil? &&
-        path.exist?.tap do |is_active|
-          if is_active
-            logger.log self.class, 'is active', color: :green
-          else
-            logger.log self.class, 'is not active'
-          end
-        end
+      path && path.exist?
     end
 
     def detected_package_path
@@ -87,7 +93,7 @@ module LicenseFinder
         _stdout, _stderr, status = Cmd.run(self.class.prepare_command)
         raise "Prepare command '#{self.class.prepare_command}' failed" unless status.success?
       else
-        logger.log self.class, 'no prepare step provided', color: :red
+        logger.debug self.class, 'no prepare step provided', color: :red
       end
     end
 
@@ -103,11 +109,12 @@ module LicenseFinder
     end
 
     def self.command_exists?(command)
-      if LicenseFinder::Platform.windows?
-        _stdout, _stderr, status = Cmd.run("where #{command} 2>NUL")
-      else
-        _stdout, _stderr, status = Cmd.run("which #{command} 2>/dev/null")
-      end
+      _stdout, _stderr, status =
+        if LicenseFinder::Platform.windows?
+          Cmd.run("where #{command}")
+        else
+          Cmd.run("which #{command}")
+        end
 
       status.success?
     end

data/lib/license_finder/package_managers/bundler.rb

@@ -9,7 +9,7 @@ module LicenseFinder
     end
 
     def current_packages
-      logger.log self.class, "including groups #{included_groups.inspect}"
+      logger.debug self.class, "including groups #{included_groups.inspect}"
       details.map do |gem_detail, bundle_detail|
         BundlerPackage.new(gem_detail, bundle_detail, logger: logger).tap do |package|
           log_package_dependencies package
@@ -60,11 +60,11 @@ module LicenseFinder
     def log_package_dependencies(package)
       dependencies = package.children
       if dependencies.empty?
-        logger.log self.class, format("package '%s' has no dependencies", package.name)
+        logger.debug self.class, format("package '%s' has no dependencies", package.name)
       else
-        logger.log self.class, format("package '%s' has dependencies:", package.name)
+        logger.debug self.class, format("package '%s' has dependencies:", package.name)
         dependencies.each do |dep|
-          logger.log self.class, format('- %s', dep)
+          logger.debug self.class, format('- %s', dep)
         end
       end
     end

data/lib/license_finder/package_managers/go_workspace.rb

@@ -38,19 +38,10 @@ module LicenseFinder
     end
 
     def active?
-      return false unless self.class.installed?(logger)
-
       godep = LicenseFinder::GoDep.new(project_path: Pathname(project_path))
       # go workspace is only active if GoDep wasn't. There are some projects
       # that will use the .envrc and have a Godep folder as well.
-      active = !!(!godep.active? && envrc_path && ENVRC_REGEXP.match(IO.read(envrc_path)))
-      active.tap do |is_active|
-        if is_active
-          logger.log self.class, 'is active', color: :green
-        else
-          logger.log self.class, 'is not active'
-        end
-      end
+      !!(!godep.active? && envrc_path && ENVRC_REGEXP.match(IO.read(envrc_path)))
     end
 
     private

data/lib/license_finder/package_managers/merged_package.rb

@@ -2,9 +2,9 @@ module LicenseFinder
   class MergedPackage
     attr_reader :dependency
 
-    def initialize(dependency, subproject_paths)
+    def initialize(dependency, aggregate_paths)
       @dependency = dependency
-      @subproject_paths = subproject_paths.map { |p| Pathname(p) }
+      @aggregate_paths = aggregate_paths.map { |p| Pathname(p) }
     end
 
     def name
@@ -47,8 +47,8 @@ module LicenseFinder
       dependency.package_manager
     end
 
-    def subproject_paths
-      @subproject_paths.map { |p| p.expand_path.to_s }
+    def aggregate_paths
+      @aggregate_paths.map { |p| p.expand_path.to_s }
     end
 
     def <=>(other)

data/lib/license_finder/packages/license_files.rb

@@ -5,17 +5,17 @@ module LicenseFinder
     CANDIDATE_FILE_NAMES = %w[LICENSE License Licence COPYING README Readme ReadMe].freeze
     CANDIDATE_PATH_WILDCARD = "*{#{CANDIDATE_FILE_NAMES.join(',')}}*".freeze
 
-    def self.find(install_path)
-      new(install_path).find
+    def self.find(install_path, options = {})
+      new(install_path).find(options)
     end
 
     def initialize(install_path)
       @install_path = install_path ? Pathname(install_path) : nil
     end
 
-    def find
+    def find(options = {})
       paths_of_candidate_files
-        .map { |path| PossibleLicenseFile.new(path) }
+        .map { |path| PossibleLicenseFile.new(path, options) }
         .reject { |file| file.license.nil? }
     end
 

data/lib/license_finder/packages/possible_license_file.rb

@@ -1,7 +1,8 @@
 module LicenseFinder
   class PossibleLicenseFile
-    def initialize(path)
+    def initialize(path, options = {})
       @path = Pathname(path)
+      @logger = options[:logger]
     end
 
     def path
@@ -13,7 +14,12 @@ module LicenseFinder
     end
 
     def text
-      @text ||= (@path.respond_to?(:binread) ? @path.binread : @path.read)
+      if @path.exist?
+        @text ||= (@path.respond_to?(:binread) ? @path.binread : @path.read)
+      else
+        @logger.info('ERROR', "#{@path} does not exists", color: :red)
+        ''
+      end
     end
   end
 end

data/lib/license_finder/reports/diff_report.rb

@@ -15,7 +15,7 @@ module LicenseFinder
     end
 
     def format_project_paths(dep)
-      dep.subproject_paths.join(self.class::COMMA_SEP)
+      dep.aggregate_paths.join(self.class::COMMA_SEP)
     end
 
     private

data/lib/license_finder/reports/merged_report.rb

@@ -1,14 +1,14 @@
 module LicenseFinder
   class MergedReport < CsvReport
-    AVAILABLE_COLUMNS = AVAILABLE_COLUMNS + ['subproject_paths']
+    AVAILABLE_COLUMNS = AVAILABLE_COLUMNS + ['aggregate_paths']
 
     def initialize(dependencies, options = {})
-      options[:columns] ||= %w[name version licenses subproject_paths]
+      options[:columns] ||= %w[name version licenses aggregate_paths]
       super(dependencies, options)
     end
 
-    def format_subproject_paths(merged_dep)
-      merged_dep.subproject_paths.join(self.class::COMMA_SEP)
+    def format_aggregate_paths(merged_dep)
+      merged_dep.aggregate_paths.join(self.class::COMMA_SEP)
     end
   end
 end

data/lib/license_finder/version.rb

@@ -1,3 +1,3 @@
 module LicenseFinder
-  VERSION = '3.1.1'.freeze
+  VERSION = '4.0.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.1
 platform: ruby
 authors:
 - Jacob Maine
@@ -363,6 +363,7 @@ files:
 - features/fixtures/gopath_dep/src/foo-dep/Gopkg.toml
 - features/fixtures/gopath_dep/src/foo-dep/bar/bar.go
 - features/fixtures/gopath_dep/src/foo-dep/foo.go
+- features/fixtures/gopath_dep/src/foo-dep/vendor/a/b/LICENSE
 - features/fixtures/gopath_glide/src/glide.lock
 - features/fixtures/gopath_glide/src/glide.yaml
 - features/fixtures/gopath_govendor/src/vendor/vendor.json