license_finder 2.1.0.rc3 → 2.1.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 554dcf10a176408392e1f259852f218803beff8f
-  data.tar.gz: 53c9a69a3779906d601903a6286d23237e156784
+  metadata.gz: 9cd300688bc79a2fdf74dc641f4794b361664cae
+  data.tar.gz: fbe19583d0baf7db5eb5da488b994d354ea8832a
 SHA512:
-  metadata.gz: 116aacdfab302a9ff712635bfc24068cea34a291d3b0c0308c8c2a6d4517eb95fd81d367a45157b7256829bcf851dd21fbfe697c1a554797e49677cf41e9f6d0
-  data.tar.gz: 169660177ad51b1a710c48f0264161eb6337d333655c50614bee3c27db2d4f58ad8bcb8d8bcc6f74b69be40fb910fa925753019670e5b2fd7f0dac20c8e6b607
+  metadata.gz: 8e82b7264e9be9d0e7f91ee9698ddfe2d297be5cee68e55bc7bc0358906fd31f58b371c99301375ba1e1cb3f8f76edd7322a0dd707990c23e1484719e465fc6c
+  data.tar.gz: 3ca7f365d490054f252ef823238ca42a7bdd1f5315ec2d678580cd5e10cc3df4c1c0d7081f2e86d3691558cc63e1465ca4f4af1cc6ffdd49958c1e261587c5b5

data/.gitignore

@@ -1,7 +1,9 @@
-pkg/*
-Gemfile.lock
-.rvmrc
-.idea/*
+.bundle
 .gradle/
-tmp/
+.idea/*
 .pairs
+.rvmrc
+Gemfile.lock
+pkg/*
+tmp/
+*~

data/.travis.yml

@@ -3,15 +3,11 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
-  - 2.3
+  - 2.3.0
   - jruby-19mode
   - jruby-1.7.23
   - jruby-9.0.4.0
 
-matrix:
-  allow_failures:
-    - rvm: 1.9.3
-
 env:
   - PATH=$PATH:$HOME/gradle/bin:$HOME/rebar:$HOME/go/bin GOPATH=$HOME/go
 
@@ -24,6 +20,7 @@ notifications:
     on_start: true
 
 before_install:
+  - gem update bundler
   - .travis/install_gradle.sh
   - .travis/install_rebar.sh
   - .travis/install_bower.sh

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 2.1.0.rc4 / 2016-01-27
+
+* Features
+  * Add support for including maven/gradle GroupIds with `--gradle-include-groups`
+
+
 === 2.1.0.rc3 / 2016-01-22
 
 * Features

data/features/features/report/java_groups_spec.rb

@@ -0,0 +1,11 @@
+require_relative '../../support/feature_helper'
+
+describe 'Composite project' do
+  let(:developer) { LicenseFinder::TestingDSL::User.new }
+
+  specify 'shows dependencies for all active projects' do
+    LicenseFinder::TestingDSL::BareGradleProject.create
+    developer.execute_command('license_finder report --gradle_include_groups')
+    expect(developer).to be_seeing('junit:junit, 4.11, "Common Public License Version 1.0"')
+  end
+end

data/features/fixtures/build.gradle

@@ -0,0 +1,26 @@
+apply plugin: 'java'
+
+sourceCompatibility = 1.5
+version = '1.0'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile group: 'junit', name: 'junit', version: '4.11'
+}
+
+buildscript {
+    repositories {
+        maven {
+            url 'https://plugins.gradle.org/m2/'
+        }
+    }
+
+    dependencies {
+        classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.12.1'
+    }
+}
+
+apply plugin: 'license'

data/features/support/testing_dsl.rb

@@ -145,6 +145,12 @@ module LicenseFinder
       end
     end
 
+    class BareGradleProject < Project
+      def add_dep
+        install_fixture('build.gradle')
+      end
+    end
+
     class GradleProject < Project
       def add_dep
         clone('single-module-gradle')

data/lib/license_finder/cli/base.rb

@@ -30,6 +30,7 @@ module LicenseFinder
           :decisions_file,
           :go_full_version,
           :gradle_command,
+          :gradle_include_groups,
           :rebar_command,
           :rebar_deps_dir,
           :save

data/lib/license_finder/cli/main.rb

@@ -21,6 +21,7 @@ module LicenseFinder
       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_include_groups, desc: "Whether dependency name should include group id. Only meaningful if used with a Java/gradle 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

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

data/lib/license_finder/core.rb

@@ -66,6 +66,7 @@ module LicenseFinder
         ignore_groups: decisions.ignored_groups,
         go_full_version: config.go_full_version,
         gradle_command: config.gradle_command,
+        gradle_include_groups: config.gradle_include_groups,
         rebar_command: config.rebar_command,
         rebar_deps_dir: config.rebar_deps_dir,
       )

data/lib/license_finder/package_managers/gradle.rb

@@ -6,6 +6,7 @@ module LicenseFinder
     def initialize(options={})
       super
       @command = options[:gradle_command] || 'gradle'
+      @include_groups = options[:gradle_include_groups]
     end
 
     def current_packages
@@ -18,7 +19,7 @@ module LicenseFinder
         options = {'GroupTags' => {'dependencies' => 'dependency'}}
         contents = XmlSimple.xml_in(xml_file, options).fetch('dependency', [])
         contents.map do |dep|
-          GradlePackage.new(dep, logger: logger)
+          GradlePackage.new(dep, logger: logger, include_groups: @include_groups)
         end
       end
 

data/lib/license_finder/package_managers/gradle_package.rb

@@ -2,11 +2,14 @@ module LicenseFinder
   class GradlePackage < Package
     def initialize(spec, options={})
       name = spec["name"]
-      if name.scan(":").size == 2
-        _, name, version = name.split(":")
+      if name.scan(":").size >= 1
+        group, name, version = name.split(":")
       else
         version = "unknown"
       end
+
+      name = options[:include_groups] ? "#{group}:#{name}" : name
+
       licenses = Array(spec["license"])
         .map { |l| l["name"] }
         .reject { |name| name == "No license found" }

data/lib/license_finder/version.rb

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

data/license_finder.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     "Mike Dalessio"
   ]
 
-  s.email       = ["commoncode@pivotalabs.com"]
+  s.email       = ["labs-commoncode@pivotal.io"]
   s.homepage    = "https://github.com/pivotal/LicenseFinder"
   s.summary     = "Audit the OSS licenses of your application's dependencies."
 
@@ -43,14 +43,14 @@ Gem::Specification.new do |s|
   s.add_dependency "httparty"
   s.add_dependency "xml-simple"
 
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec-its"
-  s.add_development_dependency "fakefs"
+  s.add_development_dependency "capybara", "~> 2.0.0"
+  s.add_development_dependency "cocoapods", "0.34.0" if LicenseFinder::Platform.darwin?
+  s.add_development_dependency "fakefs", "~> 0.6.7"
   s.add_development_dependency "pry"
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 3"
-  s.add_development_dependency "capybara", "~> 2.0.0"
+  s.add_development_dependency "rspec-its"
   s.add_development_dependency "webmock", "~> 1.13"
-  s.add_development_dependency "cocoapods", "0.34.0" if LicenseFinder::Platform.darwin?
 
   # temporary to preserve ruby 1.9.3 support.
   s.add_development_dependency "mime-types", "< 3.0"

data/spec/lib/license_finder/core_spec.rb

@@ -29,6 +29,7 @@ module LicenseFinder
           ignore_groups: Set.new,
           go_full_version: nil,
           gradle_command: configuration.gradle_command,
+          gradle_include_groups: nil,
           rebar_command: configuration.rebar_command,
           rebar_deps_dir: configuration.rebar_deps_dir
         }

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

@@ -40,6 +40,14 @@ module LicenseFinder
         end
       end
 
+      context 'when include_groups is set to true' do
+        subject { described_class.new({"name" => "a:b:c"}, include_groups: true) }
+
+        it 'includes the group id in the name' do
+          expect(subject.name).to eq("a:b")
+        end
+      end
+
       context "when there are no real licenses" do
         subject do
           described_class.new(

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

@@ -2,8 +2,10 @@ require 'spec_helper'
 
 module LicenseFinder
   describe Gradle do
-    subject { Gradle.new(project_path: Pathname('/fake/path')) }
-    
+    let(:options) { {} }
+
+    subject { Gradle.new(options.merge(project_path: Pathname('/fake/path'))) }
+
     let(:content) { [] }
 
     it_behaves_like 'a PackageManager'
@@ -42,6 +44,14 @@ module LicenseFinder
         it 'lists all dependencies' do
           expect(subject.current_packages.map(&:name)).to eq ['spring-aop', 'spring-core']
         end
+
+        context 'when gradle group ids option is enabled' do
+          let(:options) { { gradle_include_groups: true } }
+
+          it 'lists the dependencies with the group id' do
+            expect(subject.current_packages.map(&:name)).to eq ['org.springframework:spring-aop', 'org.springframework:spring-core']
+          end
+        end
       end
 
       context 'when multiple licenses exist' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc3
+  version: 2.1.0.rc4
 platform: ruby
 authors:
 - Jacob Maine
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,35 +79,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.7
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -121,7 +121,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -149,19 +149,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ description: |2
       those licenses against a user-defined whitelist, and give you an
       actionable exception report.
 email:
-- commoncode@pivotalabs.com
+- labs-commoncode@pivotal.io
 executables:
 - license_finder
 - license_finder_pip.py
@@ -243,8 +243,10 @@ files:
 - features/features/report/csv_spec.rb
 - features/features/report/diff_spec.rb
 - features/features/report/html_spec.rb
+- features/features/report/java_groups_spec.rb
 - features/features/report/subproject_spec.rb
 - features/fixtures/Podfile
+- features/fixtures/build.gradle
 - features/fixtures/file-based-libs-gradle/build.gradle
 - features/fixtures/file-based-libs-gradle/libs/data.json-0.2.3.jar
 - features/fixtures/gopath/src/github.com/pivotal/foo/Godeps/Godeps.json