license_finder 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32d2839f00871d5e2e7a3a9e878cff1db69cc16d
-  data.tar.gz: 7efb10b41b8f02f96d76cc8c930e633c968577d6
+  metadata.gz: 7666cca63edcbd5d26d92de0d0079eb6baba6f04
+  data.tar.gz: bd234f6e53146db0c10bb5aedec7bf2ab9666af0
 SHA512:
-  metadata.gz: 7788b979fe82a6d433413e3fdfc1c8c0cac611c52f5e6314e6b73a9a4ee5b5e75111ebc6f1fa0b6be9de484b503166c1cc3de63e22772c2751353269a4572dd3
-  data.tar.gz: c09196ab1c745506c23bd7e1e17ed6753ec8e7016195eeb55a458cf5df16cb9fde391f0efe25461ce380948717ebfc830c493524e956cc554c70d4e75a42e381
+  metadata.gz: 6632cd374b76addc79e2c094aaf2210ec8185319633ca15594eb5217cc29eb954b66e5a21ea081c28a171a6df3aea48f12d58f8a2759f4ac5c87e987121f332e
+  data.tar.gz: ff1d7062e96965b57f17260398faa2baa0fd4caffccec01b0d483ece2690e963c75779b3b6561b7b216ca9d4be42a51f1f830b2cfef57e6ebd7a091bd58c2895

data/features/features/cli/cli_spec.rb

@@ -53,4 +53,11 @@ describe 'License Finder command line executable' do
     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
+
+  specify 'displays a warning if no package managers are active/installed', :focus do
+    developer.create_empty_project
+    developer.execute_command('license_finder')
+    expect(developer).to be_seeing('No active and installed package managers found for project.')
+    expect(developer).to be_receiving_exit_code(0)
+  end
 end

data/features/features/package_managers/glide_spec.rb

@@ -3,12 +3,24 @@ require_relative '../../support/feature_helper'
 describe 'Glide Dependencies' do
   let(:go_developer) { LicenseFinder::TestingDSL::User.new }
 
-  specify 'are shown in reports for a project' do
-    project = LicenseFinder::TestingDSL::GlideProject.create
-    ENV['GOPATH'] = "#{project.project_dir}/gopath_glide"
+  context 'when project is in src directory' do
+    specify 'are shown in reports for a project' do
+      project = LicenseFinder::TestingDSL::GlideProject.create
+      ENV['GOPATH'] = "#{project.project_dir}/gopath_glide"
 
-    go_developer.run_license_finder('gopath_glide')
-    expect(go_developer).to be_seeing_line 'github.com/Masterminds/semver, 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd, MIT'
-    expect(go_developer).to be_seeing_line 'github.com/Masterminds/cookoo, 78aa11ce75e257c51be7ea945edb84cf19c4a6de, MIT'
+      go_developer.run_license_finder('gopath_glide')
+      expect(go_developer).to be_seeing_line 'github.com/Masterminds/semver, 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd, MIT'
+      expect(go_developer).to be_seeing_line 'github.com/Masterminds/cookoo, 78aa11ce75e257c51be7ea945edb84cf19c4a6de, MIT'
+    end
+  end
+
+  context 'when projecy is not in src directory' do
+    specify 'are shown in reports for a project' do
+      LicenseFinder::TestingDSL::GlideProjectWithoutSrc.create
+
+      go_developer.run_license_finder('gopath_glide_without_src')
+      expect(go_developer).to be_seeing_line 'github.com/Masterminds/semver, 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd, MIT'
+      expect(go_developer).to be_seeing_line 'github.com/Masterminds/cookoo, 78aa11ce75e257c51be7ea945edb84cf19c4a6de, MIT'
+    end
   end
 end

data/features/fixtures/gopath_glide_without_src/glide.lock

@@ -0,0 +1,9 @@
+hash: 4765849129e9fbb9f7ebc620df51f27b6999f1a06bba4ecf92193ffffcf1d684
+updated: 2017-09-27T22:42:02.817609367Z
+imports:
+- name: github.com/Masterminds/cookoo
+  version: 78aa11ce75e257c51be7ea945edb84cf19c4a6de
+  repo: https://github.com/Masterminds/cookoo.git
+- name: github.com/Masterminds/semver
+  version: 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd
+testImports: []

data/features/fixtures/gopath_glide_without_src/glide.yaml

@@ -0,0 +1,6 @@
+package: github.com/Masterminds/glide
+import:
+  - package: github.com/Masterminds/semver
+  - package: github.com/Masterminds/cookoo
+    version: ^1.2.0
+    repo: https://github.com/Masterminds/cookoo.git

data/features/support/testing_dsl.rb

@@ -215,6 +215,28 @@ module LicenseFinder
       end
     end
 
+    class GlideProjectWithoutSrc < Project
+      def add_dep
+        clone('gopath_glide_without_src')
+      end
+
+      def install
+        src_path = File.join(project_dir, 'gopath_glide_without_src', 'src')
+        FileUtils.mkdir_p(src_path)
+
+        orig_gopath = ENV['GOPATH']
+        ENV['GOPATH'] = "#{project_dir}/gopath_glide_without_src"
+        shell_out('glide install')
+        ENV['GOPATH'] = orig_gopath
+
+        FileUtils.rmdir(src_path)
+      end
+
+      def shell_out(command)
+        ProjectDir.new(Paths.root.join('tmp', 'projects', 'my_app', 'gopath_glide_without_src')).shell_out(command)
+      end
+    end
+
     class GvtProject < Project
       def add_dep
         clone('gopath_gvt')

data/lib/license_finder/cli/main.rb

@@ -47,16 +47,23 @@ module LicenseFinder
                       desc: 'Prepares the project first for license_finder',
                       default: false,
                       required: false
+
+        method_option :recursive, aliases: '-r', type: :boolean, default: false,
+                                  desc: 'Recursively runs License Finder on all sub-projects'
+
+        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'"
+
+        method_option :quiet, aliases: '-q', type: :boolean, desc: 'Silences progress report', required: false
       end
 
       desc 'action_items', 'List unapproved dependencies (the default action for `license_finder`)'
-      method_option :quiet, aliases: '-q', type: :boolean, desc: 'Silences progress report', required: false
       shared_options
       def action_items
-        run_prepare_phase if prepare?
-        any_packages = license_finder.any_packages?
-        unapproved = license_finder.unapproved
-        blacklisted = license_finder.blacklisted
+        finder = LicenseAggregator.new(license_finder_config, aggregate_paths)
+        any_packages = finder.any_packages?
+        unapproved = finder.unapproved
+        blacklisted = finder.blacklisted
 
         # Ensure to start output on a new line even with dot progress indicators.
         say "\n"
@@ -88,11 +95,7 @@ module LicenseFinder
 
       desc 'report', "Print a report of the project's dependencies to stdout"
       shared_options
-      method_option :recursive, aliases: '-r', type: :boolean, default: false,
-                                desc: 'Recursively runs License Finder on all sub-projects'
 
-      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[:mode] = Logger::MODE_QUIET
         aggregate_paths = options[:aggregate_paths]
@@ -132,6 +135,13 @@ module LicenseFinder
 
       private
 
+      def aggregate_paths
+        aggregate_paths = options[:aggregate_paths]
+        aggregate_paths = ProjectFinder.new(license_finder.config.project_path).find_projects if options[:recursive]
+        return aggregate_paths unless aggregate_paths.nil? || aggregate_paths.empty?
+        [license_finder_config[:project_path]] unless license_finder_config[:project_path].nil?
+      end
+
       def save_report(content, file_name)
         File.open(file_name, 'w') do |f|
           f.write(content)

data/lib/license_finder/core.rb

@@ -43,6 +43,10 @@ module LicenseFinder
       decisions.project_name || config.project_path.basename.to_s
     end
 
+    def project_path
+      config.project_path
+    end
+
     def decisions
       @decisions ||= Decisions.fetch_saved(config.decisions_file_path)
     end

data/lib/license_finder/license_aggregator.rb

@@ -7,19 +7,42 @@ module LicenseFinder
 
     def dependencies
       aggregate_packages
-        .group_by { |package| [package.name, package.version] }
-        .map do |_, packages|
-          MergedPackage.new(packages[0].dependency, packages.flat_map(&:aggregate_paths))
-        end
+    end
+
+    def any_packages?
+      finders.map(&:any_packages?).reduce(:|)
+    end
+
+    def unapproved
+      aggregate_packages.reject(&:approved?)
+    end
+
+    def blacklisted
+      aggregate_packages.select(&:blacklisted?)
     end
 
     private
 
+    def finders
+      return @finders unless @finders.nil?
+      @finders = if @aggregate_paths.nil?
+                   [LicenseFinder::Core.new(@license_finder_config)]
+                 else
+                   @aggregate_paths.map do |path|
+                     LicenseFinder::Core.new(@license_finder_config.merge(project_path: path))
+                   end
+                 end
+    end
+
     def aggregate_packages
-      @aggregate_paths.flat_map do |project_path|
-        finder = LicenseFinder::Core.new(@license_finder_config.merge(project_path: project_path))
+      return @packages unless @packages.nil?
+      all_packages = finders.flat_map do |finder|
         finder.prepare_projects if @license_finder_config[:prepare]
-        finder.acknowledged.map { |dep| MergedPackage.new(dep, [project_path]) }
+        finder.acknowledged.map { |dep| MergedPackage.new(dep, [finder.project_path]) }
+      end
+      @packages = all_packages.group_by { |package| [package.name, package.version] }
+                              .map do |_, packages|
+        MergedPackage.new(packages[0].dependency, packages.flat_map(&:aggregate_paths))
       end
     end
   end

data/lib/license_finder/package_manager.rb

@@ -42,6 +42,10 @@ module LicenseFinder
           end
         end
 
+        if active_pm_classes.empty?
+          logger.info 'License Finder', 'No active and installed package managers found for project.', color: :red
+        end
+
         active_pm_classes -= active_pm_classes.map(&:takes_priority_over)
         active_pm_classes.map { |pm_class| pm_class.new(options) }
       end

data/lib/license_finder/package_managers/bundler.rb

@@ -21,6 +21,10 @@ module LicenseFinder
       'bundle'
     end
 
+    def self.prepare_command
+      'bundle install'
+    end
+
     private
 
     attr_reader :ignored_groups

data/lib/license_finder/package_managers/glide.rb

@@ -5,11 +5,20 @@ module LicenseFinder
     end
 
     def current_packages
-      YAML.load_file(detected_package_path).fetch('imports').map do |package_hash|
+      detected_path = detected_package_path
+
+      YAML.load_file(detected_path).fetch('imports').map do |package_hash|
         import_path = package_hash.fetch('name')
+        license_path =
+          if detected_path == possible_package_paths.first
+            project_path.join('src', 'vendor', import_path)
+          else
+            project_path.join('vendor', import_path)
+          end
+
         GoPackage.from_dependency({
                                     'ImportPath' => import_path,
-                                    'InstallPath' => project_path.join('src', 'vendor', import_path),
+                                    'InstallPath' => license_path,
                                     'Rev' => package_hash.fetch('version')
                                   }, nil, true)
       end

data/lib/license_finder/package_managers/merged_package.rb

@@ -1,10 +1,11 @@
 module LicenseFinder
-  class MergedPackage
+  class MergedPackage < Package
     attr_reader :dependency
 
-    def initialize(dependency, aggregate_paths)
-      @dependency = dependency
+    def initialize(package, aggregate_paths)
+      @dependency = package
       @aggregate_paths = aggregate_paths.map { |p| Pathname(p) }
+      super(package.name, package.version)
     end
 
     def name
@@ -39,6 +40,22 @@ module LicenseFinder
       dependency.description
     end
 
+    def approved_manually?
+      dependency.approved_manually?
+    end
+
+    def approved?
+      dependency.approved?
+    end
+
+    def whitelisted?
+      dependency.whitelisted?
+    end
+
+    def blacklisted?
+      dependency.blacklisted?
+    end
+
     def groups
       dependency.groups
     end
@@ -56,7 +73,15 @@ module LicenseFinder
     end
 
     def eql?(other)
-      dependency.eql?(other.dependency)
+      if other.instance_of? MergedPackage
+        other.dependency.eql?(dependency)
+      else
+        dependency.eql?(other)
+      end
+    end
+
+    def ==(other)
+      dependency.eql?(other.dependency) && aggregate_paths.eql?(other.aggregate_paths)
     end
 
     def hash

data/lib/license_finder/version.rb

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

data/license_finder.gemspec

@@ -42,8 +42,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'httparty'
   s.add_dependency 'rubyzip'
   s.add_dependency 'thor'
-  s.add_dependency 'xml-simple'
   s.add_dependency 'toml', '0.1.2'
+  s.add_dependency 'xml-simple'
+
   # to preserve ruby 1.9.3 support
   s.add_dependency 'with_env', (RUBY_VERSION <= '1.9.3' ? '1.0.0' : '> 1.0')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Jacob Maine
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,33 +79,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xml-simple
+  name: toml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: toml
+  name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: with_env
   requirement: !ruby/object:Gem::Requirement
@@ -366,6 +366,8 @@ files:
 - 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_glide_without_src/glide.lock
+- features/fixtures/gopath_glide_without_src/glide.yaml
 - features/fixtures/gopath_govendor/src/vendor/vendor.json
 - features/fixtures/gopath_gvt/src/vendor/manifest
 - features/fixtures/gradle-wrapper/build.gradle