license_finder 2.1.0.rc2 → 2.1.0.rc3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODI1N2UxNjA0NjVkOWE0MDQ3YTkzY2ZmMDBiNzcwMmNhYzllZDk3NQ==
-  data.tar.gz: !binary |-
-    M2ViZWI5ZGNhOWJhMDkxMTU2YTcyOWIyZDgwYTk3MzA1NzQ0NTJlYw==
+SHA1:
+  metadata.gz: 554dcf10a176408392e1f259852f218803beff8f
+  data.tar.gz: 53c9a69a3779906d601903a6286d23237e156784
 SHA512:
-  metadata.gz: !binary |-
-    ODFiNjY1NjdiYzA0MDA3MGMyZTc0NmExNTNjYjNlNDMxMTUwOWQxZTIxM2Mx
-    MWY0MmMzNzBkM2E3NjJhMjcxMjQwOGI3MDQ1OWI1MDFjZWFiZDM1MDUwMTYx
-    ZTRhMTNkNmM4ZDAxNDkzNGRlZjgyZWIyZWNiOTQ5MDYzMjg4MDE=
-  data.tar.gz: !binary |-
-    Nzg0M2E4OGM1NDUyMTJlODllNDgyNDQ3YjgzMmI3NzY1NzRmZGVlNDQ1MzYw
-    ODRiMDA2NmUzNzRkODVkNTU2Y2IxMWIwOTIxYzNmYjRhYmZhOWFhNTNiMzJk
-    OTk0ZTc5MmVkMTk0MzI1YWQ2YzYxOGI0OGUxNTNiMzZhMWY4OTI=
+  metadata.gz: 116aacdfab302a9ff712635bfc24068cea34a291d3b0c0308c8c2a6d4517eb95fd81d367a45157b7256829bcf851dd21fbfe697c1a554797e49677cf41e9f6d0
+  data.tar.gz: 169660177ad51b1a710c48f0264161eb6337d333655c50614bee3c27db2d4f58ad8bcb8d8bcc6f74b69be40fb910fa925753019670e5b2fd7f0dac20c8e6b607

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 2.1.0.rc3 / 2016-01-22
+
+* Features
+  * Godep dependencies can display the full commit SHA with `--go-full-version`
+
+
 === 2.1.0.rc2 / 2015-12-31
 
 * Features

data/lib/license_finder/cli/base.rb

@@ -28,6 +28,7 @@ module LicenseFinder
         extract_options(
           :project_path,
           :decisions_file,
+          :go_full_version,
           :gradle_command,
           :rebar_command,
           :rebar_deps_dir,

data/lib/license_finder/cli/main.rb

@@ -20,6 +20,7 @@ module LicenseFinder
       class_option :format, desc: "The desired output format.", default: 'text', enum: FORMATS.keys
       class_option :columns, type: :array, desc: "For CSV reports, which columns to print. Pick from: #{CsvReport::AVAILABLE_COLUMNS}", default: %w[name version licenses]
       class_option :save, desc: "Save report to a file. Default: 'license_report.csv' in project root.", lazy_default: "license_report"
+      class_option :go_full_version, desc: "Whether dependency version should include full version. Only meaningful if used with a Go project. Defaults to false."
       class_option :gradle_command, desc: "Command to use when fetching gradle packages. Only meaningful if used with a Java/gradle project. Defaults to 'gradlew' / 'gradlew.bat' if the wrapper is present, otherwise to 'gradle'."
       class_option :rebar_command, desc: "Command to use when fetching rebar packages. Only meaningful if used with a Erlang/rebar project. Defaults to 'rebar'."
       class_option :rebar_deps_dir, desc: "Path to rebar dependencies directory. Only meaningful if used with a Erlang/rebar project. Defaults to 'deps'."

data/lib/license_finder/configuration.rb

@@ -35,6 +35,10 @@ module LicenseFinder
       )
     end
 
+    def go_full_version
+      get(:go_full_version)
+    end
+
     def rebar_command
       get(:rebar_command) || 'rebar'
     end

data/lib/license_finder/core.rb

@@ -64,6 +64,7 @@ module LicenseFinder
         logger: logger,
         project_path: config.project_path,
         ignore_groups: decisions.ignored_groups,
+        go_full_version: config.go_full_version,
         gradle_command: config.gradle_command,
         rebar_command: config.rebar_command,
         rebar_deps_dir: config.rebar_deps_dir,

data/lib/license_finder/package_managers/go_dep.rb

@@ -2,9 +2,15 @@ require 'json'
 
 module LicenseFinder
   class GoDep < PackageManager
+
+    def initialize(options={})
+      super
+      @full_version = options[:go_full_version]
+    end
+
     def current_packages
       json = JSON.parse(package_path.read)
-      json['Deps'].map { |dep| GoPackage.from_dependency(dep, install_prefix) }
+      json['Deps'].map { |dep| GoPackage.from_dependency(dep, install_prefix, @full_version) }
     end
 
     def package_path

data/lib/license_finder/package_managers/go_package.rb

@@ -4,9 +4,9 @@ module LicenseFinder
       LicenseFinder::Package.new(name, 'unknown', {install_path: install_path(path)})
     end
 
-    def self.from_dependency(hash, prefix)
+    def self.from_dependency(hash, prefix,full_version)
       name = hash['ImportPath']
-      version = hash['Rev'][0..6]
+      version = full_version ? hash['Rev'] : hash['Rev'][0..6]
       LicenseFinder::Package.new(name, version, {install_path: install_path(prefix.join(name))})
     end
 

data/lib/license_finder/package_managers/go_workspace.rb

@@ -4,10 +4,15 @@ module LicenseFinder
   class GoWorkspace < PackageManager
     Submodule = Struct.new :path, :revision
 
+    def initialize(options={})
+      super
+      @full_version = options[:go_full_version]
+    end
+
     def current_packages
       submodules.map do |submodule|
         import_path = Pathname.new(submodule.path).relative_path_from(project_src)
-        GoPackage.from_dependency({'ImportPath' => import_path.to_s, 'Rev' => submodule.revision}, project_src)
+        GoPackage.from_dependency({'ImportPath' => import_path.to_s, 'Rev' => submodule.revision}, project_src, @full_version)
       end
     end
 

data/lib/license_finder/version.rb

@@ -1,3 +1,3 @@
 module LicenseFinder
-  VERSION = "2.1.0.rc2"
+  VERSION = "2.1.0.rc3"
 end

data/spec/lib/license_finder/core_spec.rb

@@ -27,6 +27,7 @@ module LicenseFinder
           logger: logger,
           project_path: configuration.project_path,
           ignore_groups: Set.new,
+          go_full_version: nil,
           gradle_command: configuration.gradle_command,
           rebar_command: configuration.rebar_command,
           rebar_deps_dir: configuration.rebar_deps_dir

data/spec/lib/license_finder/package_managers/go_dep_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 
 module LicenseFinder
   describe GoDep do
-    subject { GoDep.new(project_path: Pathname('/fake/path')) }
+    let(:options) { {} }
+    subject { GoDep.new(options.merge(project_path: Pathname('/fake/path'))) }
+
 
     it_behaves_like 'a PackageManager'
 
@@ -44,6 +46,15 @@ module LicenseFinder
           expect(packages[0].install_path).to eq('/fake/path/Godeps/_workspace/src/github.com/pivotal/foo')
           expect(packages[1].install_path).to eq('/fake/path/Godeps/_workspace/src/github.com/pivotal/bar')
         end
+
+        context 'when requesting the full version' do
+          let(:options) { { go_full_version:true } }
+          it 'list the dependencies with full version' do
+            expect(subject.current_packages.map(&:version)).to eq [
+              "61164e49940b423ba1f12ddbdf01632ac793e5e9",
+              "3245708abcdef234589450649872346783298736"]
+          end
+        end
       end
 
       context 'when dependencies are not vendored' do

data/spec/lib/license_finder/package_managers/go_workspace_spec.rb

@@ -2,8 +2,9 @@ require 'spec_helper'
 
 module LicenseFinder
   describe GoWorkspace do
+    let(:options) { {} }
     let(:logger) { double(:logger, active: nil) }
-    subject { GoWorkspace.new(project_path: Pathname('/Users/pivotal/workspace/loggregator'), logger: logger) }
+    subject { GoWorkspace.new(options.merge(project_path: Pathname('/Users/pivotal/workspace/loggregator'), logger: logger)) }
 
     describe '#current_packages' do
       let(:content) {
@@ -53,6 +54,13 @@ module LicenseFinder
             expect { subject.current_packages }.to raise_exception(/git submodule status failed/)
           end
         end
+
+        context 'when requesting the full version' do
+          let(:options) { { go_full_version:true } }
+          it 'list the dependencies with full version' do
+            expect(subject.current_packages.map(&:version)).to eq ["b8a35001b773c267e"]
+          end
+        end
       end
 
       describe '#package_path' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc2
+  version: 2.1.0.rc3
 platform: ruby
 authors:
 - Jacob Maine
@@ -20,179 +20,181 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: ! "    LicenseFinder works with your package managers to find\n    dependencies,
-  detect the licenses of the packages in them, compare\n    those licenses against
-  a user-defined whitelist, and give you an\n    actionable exception report.\n"
+description: |2
+      LicenseFinder works with your package managers to find
+      dependencies, detect the licenses of the packages in them, compare
+      those licenses against a user-defined whitelist, and give you an
+      actionable exception report.
 email:
 - commoncode@pivotalabs.com
 executables:
@@ -201,14 +203,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .force-build
-- .gitignore
-- .rspec
-- .travis.yml
-- .travis/install_bower.sh
-- .travis/install_godep.sh
-- .travis/install_gradle.sh
-- .travis/install_rebar.sh
+- ".force-build"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".travis/install_bower.sh"
+- ".travis/install_godep.sh"
+- ".travis/install_gradle.sh"
+- ".travis/install_rebar.sh"
 - CHANGELOG.rdoc
 - CONTRIBUTING.md
 - Gemfile
@@ -446,12 +448,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []