license_finder 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a685f3cfcc2a335e59d21f4848d508a24c9a082
-  data.tar.gz: 53bedb396aac4876dcbda03be2c781b7444c0f45
+  metadata.gz: a3b754e74ea1f89d22e72c1f145618bafbda14aa
+  data.tar.gz: f6a5e9c7f1717e5901a746fc6dcac108e565a78c
 SHA512:
-  metadata.gz: 536c44c9945a108f77d3beb5425dcf5b0888e3e6aa8a28c6750387afc90987ed5b64efe855d491f875902a47a275b47d2483e113b3fd3a5552670dd470d7e813
-  data.tar.gz: e3775a625b547ca7843bff43eb26215049b416dbd6371c410e3006000ab71fe250467d249ec2b8d251cb20145ed93954e28de8d7f148a7cef648412f1e1ea04c
+  metadata.gz: 0eb69ee77b1c8734e3d4b1baef6c1dacca50bf267273926c548f5982e69f1080c50b0cb327fe3c655fa5b4cb9ca1de91fb14b06f64acf63d9e70aa1a42ee035f
+  data.tar.gz: 8a67ab3a162f55da1802a3b551a8a6398f0d2946cc977473052a991331ab3b9f727ee9411c9feec4b8955d09e101df5422eedbd855606886950b53ef1bc9a453

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+=== 2.0.4 / 2015-04-16
+
+* Features
+
+  * Allow project path to be set in a command line option (Thanks, @robertclancy!)
+
+
 === 2.0.3 / 2015-03-18
 
 * Bugfixes

data/features/features/configure/set_project_path_spec.rb

@@ -0,0 +1,17 @@
+require 'feature_helper'
+
+describe "Project path" do
+  # As a developer
+  # I want to set a project path
+  # So that I can run license finder in a different Bundle environment to the project.
+
+  let(:developer) { LicenseFinder::TestingDSL::User.new }
+
+  specify "can be overridden on the command line" do
+    project = developer.create_ruby_app
+    gem = developer.create_gem 'mitlicensed_dep', license: 'MIT', version: '1.2.3'
+    project.depend_on gem
+    developer.execute_command_outside_project("license_finder --quiet --project_path #{project.project_dir}")
+    expect(developer).to be_seeing 'mitlicensed_dep, 1.2.3, MIT'
+  end
+end

data/features/support/testing_dsl.rb

@@ -19,7 +19,11 @@ module LicenseFinder::TestingDSL
     end
 
     def execute_command(command)
-      @output, @exit_code = Paths.project.shell_out(command, true)
+      execute_command_in_path(command, Paths.project)
+    end
+
+    def execute_command_outside_project(command)
+      execute_command_in_path(command, Paths.root)
     end
 
     def seeing?(content)
@@ -42,6 +46,12 @@ module LicenseFinder::TestingDSL
       execute_command 'license_finder report --format html'
       HtmlReport.from_string(@output)
     end
+
+    private
+
+    def execute_command_in_path(command, path)
+      @output, @exit_code = path.shell_out(command, true)
+    end
   end
 
   require 'forwardable'
@@ -67,8 +77,6 @@ module LicenseFinder::TestingDSL
     def install
     end
 
-    private
-
     def project_dir
       Paths.project
     end
@@ -262,7 +270,7 @@ module LicenseFinder::TestingDSL
 
     def root
       # where license_finder is installed
-      Pathname.new(__FILE__).dirname.join("..", "..").realpath
+      ProjectDir.new(Pathname.new(__FILE__).dirname.join("..", "..").realpath)
     end
 
     def fixtures

data/lib/license_finder/cli/base.rb

@@ -3,6 +3,7 @@ require 'thor'
 module LicenseFinder
   module CLI
     class Base < Thor
+      class_option :project_path, desc: "Path to the project. Defaults to current working directory."
       class_option :decisions_file, desc: "Where decisions are saved. Defaults to doc/dependency_decisions.yml."
 
       no_commands do
@@ -18,9 +19,8 @@ module LicenseFinder
       end
 
       def license_finder_config
-        result = extract_options(:decisions_file, :gradle_command, :rebar_command, :rebar_deps_dir)
+        result = extract_options(:project_path, :decisions_file, :gradle_command, :rebar_command, :rebar_deps_dir)
         result[:logger] = logger_config
-        result[:project_path] = Pathname.pwd
         result
       end
 

data/lib/license_finder/core.rb

@@ -15,19 +15,18 @@ module LicenseFinder
       Logger::Default.new
     end
 
-    # +options+ look like:
+    # Default +options+:
     # {
-    #   logger: { quiet: true, debug: false },
-    #   project_path: "./some/project/path/"
-    #   decisions_file: "./some/path.yml",
-    #   gradle_command: "gradlew",
-    #   rebar_command: "rebar2",
-    #   rebar_deps_dir: "./some/rebar/path",
+    #   project_path: Pathname.pwd
+    #   logger: {},   # can include quiet: true or debug: true
+    #   decisions_file: "doc/dependency_decisions.yml",
+    #   gradle_command: "gradle",
+    #   rebar_command: "rebar",
+    #   rebar_deps_dir: "deps",
     # }
-    # +gradle_command+ and +decisions_file+ are optional, see Configuration
-    def initialize(options)
-      @logger = Logger.new(options.fetch(:logger))
-      @project_path = Pathname(options.fetch(:project_path))
+    def initialize(options = {})
+      @logger = Logger.new(options.fetch(:logger, {}))
+      @project_path = Pathname(options.fetch(:project_path, Pathname.pwd))
       @config = Configuration.with_optional_saved_config(options, project_path)
       @decisions = Decisions.saved!(config.decisions_file)
     end

data/lib/license_finder/license/definitions.rb

@@ -157,7 +157,7 @@ module LicenseFinder
         License.new(
           short_name:  "SimplifiedBSD",
           pretty_name: "Simplified BSD",
-          other_names: ["FreeBSD", "2-clause BSD", "BSD-2-Clause"],
+          other_names: ["FreeBSD", "2-clause BSD", "BSD-2-Clause", "BSD 2-Clause"],
           url:         "http://opensource.org/licenses/bsd-license"
         )
       end

data/lib/license_finder/package_managers/npm.rb

@@ -24,9 +24,13 @@ module LicenseFinder
       if success
         json = JSON(output)
       else
-        json = JSON(output) rescue nil
+        json = begin
+                 JSON(output)
+               rescue JSON::ParserError
+                 nil
+               end
         if json
-          $stderr.puts "Command #{command} returned error but parsing succeeded." unless ENV['test_run']
+          $stderr.puts "Command #{command} returned error but parsing succeeded."
         else
           raise "Command #{command} failed to execute: #{output}"
         end

data/lib/license_finder/reports/erb_report.rb

@@ -4,8 +4,7 @@ module LicenseFinder
   class ErbReport < Report
     TEMPLATE_PATH = ROOT_PATH.join('reports', 'templates')
 
-    def to_s
-      filename = TEMPLATE_PATH.join("#{template_name}.erb")
+    def to_s(filename = TEMPLATE_PATH.join("#{template_name}.erb"))
       template = ERB.new(filename.read, nil, '-')
       template.result(binding)
     end

data/lib/license_finder/version.rb

@@ -1,3 +1,3 @@
 module LicenseFinder
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

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

@@ -91,7 +91,7 @@ module LicenseFinder
 
       it "does not fail when command fails but produces output" do
         allow(npm).to receive(:capture).with(/npm/).and_return('{"foo":"bar"}', false).once
-        npm.current_packages
+        silence_stderr { npm.current_packages }
       end
     end
   end

data/spec/spec_helper.rb

@@ -7,8 +7,6 @@ require 'rspec'
 require 'webmock/rspec'
 require 'rspec/its'
 
-ENV['test_run'] = true.to_s
-
 Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].each do |file|
   require file
 end
@@ -20,7 +18,8 @@ end
 RSpec.configure do |config|
   config.after(:suite) do
     ["./doc"].each do |tmp_dir|
-      Pathname(tmp_dir).rmtree
+      tmp_dir = Pathname(tmp_dir)
+      tmp_dir.rmtree if tmp_dir.directory?
     end
   end
 

data/spec/support/stdout_helpers.rb

@@ -1,4 +1,17 @@
 module StdoutHelpers
+  def capture_stderr
+    orig_stderr = $stderr
+    $stderr = StringIO.new
+
+    yield
+
+    $stderr.string
+  ensure
+    $stderr = orig_stderr
+  end
+
+  alias silence_stderr capture_stderr
+
   def capture_stdout
     orig_stdout = $stdout
     $stdout = StringIO.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Jacob Maine
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -199,6 +199,7 @@ files:
 - features/features/configure/ignore_dependencies_spec.rb
 - features/features/configure/ignore_groups_spec.rb
 - features/features/configure/name_project_spec.rb
+- features/features/configure/set_project_path_spec.rb
 - features/features/configure/whitelist_licenses_spec.rb
 - features/features/package_managers/bower_spec.rb
 - features/features/package_managers/cocoapods_spec.rb
@@ -370,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Audit the OSS licenses of your application's dependencies.