license_finder 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a41cc6c0c1e879809e6c5a1f9aed3f92bb636a6
-  data.tar.gz: aa62ba988067f0fcdb068e1192325012e6526cbe
+  metadata.gz: 3b65d1f533fe92270a5d6924fb5bb496c39f5bbb
+  data.tar.gz: 61b8c1a0c33212a69497fa1f95ba3c3825794dd6
 SHA512:
-  metadata.gz: b95bc8fa644441df9dbbed5d48d230b5f620e50c4546180e3c5e68f4cad1f4483e5283da7817fae7ddad073256a6495937d8866f7d599dfe1e9f76e91567d428
-  data.tar.gz: 66d40b6e5526f49eece69d11d77a562bd1315cab23c3c96ca5f6ba8e030850799faabe6e7ec03b92895a475f21bc21913e6a5c5c31b0578b1a52d0692f764aa4
+  metadata.gz: 3e3315d6de234859334ea3d7426bf6aec588c1b381ab081839d7a0e59e325c9ad1375229b36c0c4ff9b95062c727accf11d7b9019ced480cd4b4ac6c13a3dd1b
+  data.tar.gz: c5a56556655e5852ae8156f02838262d4d3f4064f0dc53c652385073779551b404b8cde0199bece774a2c7c1f667309b1feb3c02cf798191beccc2920b2bb9bd

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
   - 1.9.2

data/CHANGELOG.rdoc

@@ -1,4 +1,18 @@
-=== 0.9.3 / 2012-10-01
+=== 0.9.4 / 2014-01-05
+
+* Features
+
+  * Add detailed csv report
+  * Add markdown report
+  * Add support for "licenses" => ["license"] (npn)
+  * Add basic bower support
+  * Allow adding/removing multiple licenses from whitelist
+
+* Bugfixes
+
+  * Use all dependencies by default for npm as bundler does
+
+=== 0.9.3 / 2013-10-01
 
 * Features
 

data/features/cli.feature

@@ -18,7 +18,7 @@ Feature: License Finder command line executable
     Given I have an app with license finder that depends on a MIT licensed gem
     When I whitelist MIT and 'other' and New BSD and Apache 2.0 licenses
     Then it should exit with status code 0
-    And I should see all gems approved for use
+    And I should see all dependencies approved for use
 
   Scenario: Keep manually set license dependencies
     Given I have a project that depends on mime-types with a manual license type

data/features/step_definitions/cli_steps.rb

@@ -44,8 +44,8 @@ Then(/^should list my MIT gem in the output$/) do
   @output.should include 'mit_gem'
 end
 
-Then(/^I should see all gems approved for use$/) do
-  @output.should include 'All gems are approved for use'
+Then(/^I should see all dependencies approved for use$/) do
+  @output.should include 'All dependencies are approved for use'
 end
 
 Then(/^the mime\-types license remains set with my manual license type$/) do

data/features/step_definitions/non_bundler_steps.rb

@@ -10,7 +10,7 @@ end
 
 When(/^I add my JS dependency with an approval flag$/) do
   @output = @user.execute_command 'license_finder dependencies add --approve MIT my_js_dep 1.2.3'
-  @output.should == "The my_js_dep dependency has been added and approved!\n"
+  @output.should match /The my_js_dep dependency has been added and approved/
 end
 
 When(/^I remove my JS dependency$/) do

data/lib/license_finder.rb

@@ -9,6 +9,7 @@ module LicenseFinder
 
   autoload :Bundle,               'license_finder/bundle'
   autoload :PackageSaver,         'license_finder/package_saver'
+  autoload :Bower,                'license_finder/bower'
   autoload :CLI,                  'license_finder/cli'
   autoload :Configuration,        'license_finder/configuration'
   autoload :DependencyManager,    'license_finder/dependency_manager'
@@ -29,8 +30,10 @@ module LicenseFinder
 
   autoload :DependencyReport, 'license_finder/reports/dependency_report'
   autoload :HtmlReport,       'license_finder/reports/html_report'
+  autoload :MarkdownReport,   'license_finder/reports/markdown_report'
   autoload :Reporter,         'license_finder/reports/reporter'
   autoload :TextReport,       'license_finder/reports/text_report'
+  autoload :DetailedTextReport,   'license_finder/reports/detailed_text_report'
 
   def self.config
     @config ||= Configuration.ensure_default

data/lib/license_finder/bower.rb

@@ -0,0 +1,57 @@
+require 'json'
+require 'license_finder/package'
+
+module LicenseFinder
+  class Bower
+
+    def self.current_packages
+      return @packages if @packages
+
+      output = `bower list --json`
+
+      json = JSON(output)
+
+      @packages = json.fetch("dependencies",[]).map do |package|
+        package = package[1]
+        pkg_meta = package.fetch("pkgMeta", Hash.new)
+
+        Package.new(OpenStruct.new(
+          :name => pkg_meta.fetch("name", nil),
+          :version => pkg_meta.fetch("version", nil),
+          :full_gem_path => package.fetch("canonicalDir", nil),
+          :license => self.harvest_license(pkg_meta),
+          :summary => pkg_meta.fetch("description", nil),
+          :description => pkg_meta.fetch("readme", nil)
+        ))
+      end
+    end
+
+    def self.has_package_file?
+      File.exists?(package_path)
+    end
+
+    private
+
+    def self.package_path
+      Pathname.new('bower.json').expand_path
+    end
+
+    def self.harvest_license(package)
+      license = package.fetch("licenses", []).first
+
+      if license.is_a? Hash
+        license = license.fetch("type", nil)
+      end
+
+      if license.nil?
+        license = package.fetch("license", nil)
+
+        if license.is_a? Hash
+          license = license.fetch("type", nil)
+        end
+      end
+
+      license
+    end
+  end
+end

data/lib/license_finder/cli.rb

@@ -74,26 +74,30 @@ module LicenseFinder
         end
       end
 
-      desc "add LICENSE", "Add a license to the whitelist"
-      def add(license)
+      desc "add LICENSE", "Add one ore more licenses to the whitelist"
+      def add(*licenses)
         die_on_error {
-          LicenseFinder.config.whitelist.push(license)
+          licenses.each do |license|
+            LicenseFinder.config.whitelist.push(license)
+          end
           LicenseFinder.config.save
 
           Reporter.write_reports
         }
-        say "Added #{license} to the license whitelist"
+        say "Added #{licenses.join(", ")} to the license whitelist"
       end
 
-      desc "remove LICENSE", "Remove a license from the whitelist"
-      def remove(license)
+      desc "remove LICENSE", "Remove one ore more licenses from the whitelist"
+      def remove(*licenses)
         die_on_error {
-          LicenseFinder.config.whitelist.delete(license)
+          licenses.each do |license|
+            LicenseFinder.config.whitelist.delete(license)
+          end
           LicenseFinder.config.save
 
           Reporter.write_reports
         }
-        say "Removed #{license} from the license whitelist"
+        say "Removed #{licenses.join(", ")} from the license whitelist"
       end
     end
 
@@ -158,13 +162,13 @@ module LicenseFinder
       end
       default_task :rescan
 
-      desc "approve DEPENDENCY_NAME", "Approve a dependency by name."
-      def approve(name)
+      desc "approve DEPENDENCY_NAME", "Approve one ore more dependencies by name."
+      def approve(*names)
         die_on_error {
-          DependencyManager.approve!(name)
+          names.each { |name| DependencyManager.approve!(name) }
         }
 
-        say "The #{name} dependency has been approved!", :green
+        say "The #{names.join(", ")} dependency has been approved!", :green
       end
 
       desc "license LICENSE DEPENDENCY_NAME", "Update a dependency's license."
@@ -187,7 +191,7 @@ module LicenseFinder
         unapproved = Dependency.unapproved
 
         if unapproved.empty?
-          say "All gems are approved for use", :green
+          say "All dependencies are approved for use", :green
         else
           say "Dependencies that need approval:", :red
           say TextReport.new(unapproved)

data/lib/license_finder/configuration.rb

@@ -61,6 +61,10 @@ module LicenseFinder
       File.join(dependencies_dir, "dependencies.csv")
     end
 
+    def dependencies_detailed_text
+      File.join(dependencies_dir, "dependencies_detailed.csv")
+    end
+
     def dependencies_legacy_text
       File.join(dependencies_dir, "dependencies.txt")
     end
@@ -69,6 +73,10 @@ module LicenseFinder
       File.join(dependencies_dir, "dependencies.html")
     end
 
+    def dependencies_markdown
+      File.join(dependencies_dir, "dependencies.md")
+    end
+
     def whitelisted?(license_name)
       license = License.find_by_name(license_name) || license_name
       whitelisted_licenses.include? license

data/lib/license_finder/dependency_manager.rb

@@ -18,6 +18,10 @@ module LicenseFinder
           current_dependencies += PackageSaver.save_packages(NPM.current_modules())
         end
 
+        if Bower.has_package_file?
+          current_dependencies += PackageSaver.save_packages(Bower.current_packages())
+        end
+
         Dependency.bundler.obsolete(current_dependencies).each(&:destroy)
       }
     end

data/lib/license_finder/license/apache2.rb

@@ -1,5 +1,5 @@
 class LicenseFinder::License::Apache2 < LicenseFinder::License::Base
-  self.alternative_names = ["Apache 2.0", "Apache2", "Apache-2.0", "Apache Software License", "Apache License 2.0"]
+  self.alternative_names = ["Apache 2.0", "Apache2", "Apache-2.0", "Apache Software License", "Apache License 2.0", "Apache License Version 2.0"]
   self.license_url       = "http://www.apache.org/licenses/LICENSE-2.0.txt"
 
   def self.pretty_name

data/lib/license_finder/npm.rb

@@ -4,16 +4,19 @@ require 'license_finder/package'
 module LicenseFinder
   class NPM
 
+    DEPENDENCY_GROUPS = ["dependencies", "devDependencies", "bundleDependencies", "bundledDependencies"]
+
     def self.current_modules
       return @modules if @modules
 
-      output = `npm list --json --long`
+      command = "npm list --json --long"
+      output, success = capture(command)
+      raise "Command #{command} failed to execute: #{output}" unless success
 
       json = JSON(output)
+      dependencies = DEPENDENCY_GROUPS.map { |g| (json[g] || {}).values }.flatten(1)
 
-      @modules = json.fetch("dependencies",[]).map do |node_module|
-        node_module = node_module[1]
-
+      @modules = dependencies.map do |node_module|
         Package.new(OpenStruct.new(
           :name => node_module.fetch("name", nil),
           :version => node_module.fetch("version", nil),
@@ -31,6 +34,10 @@ module LicenseFinder
 
     private
 
+    def self.capture(command)
+      [`#{command}`, $?.success?]
+    end
+
     def self.package_path
       Pathname.new('package.json').expand_path
     end
@@ -38,7 +45,7 @@ module LicenseFinder
     def self.harvest_license(node_module)
       license = node_module.fetch("licenses", []).first
 
-      if license
+      if license.is_a? Hash
         license = license.fetch("type", nil)
       end
 
@@ -53,4 +60,4 @@ module LicenseFinder
       license
     end
   end
-end
+end

data/lib/license_finder/reports/detailed_text_report.rb

@@ -0,0 +1,20 @@
+# encoding: UTF-8
+require 'csv'
+
+module LicenseFinder
+  class DetailedTextReport < DependencyReport
+    def to_s
+      CSV.generate(col_sep: ",") do |csv|
+        sorted_dependencies.each do |s|
+          csv << [
+            s.name,
+            s.version,
+            s.license.name,
+            s.summary ? s.summary.strip : "",
+            s.description ? s.description.strip : ""
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/license_finder/reports/markdown_report.rb

@@ -0,0 +1,23 @@
+# encoding: UTF-8
+
+module LicenseFinder
+  class MarkdownReport < DependencyReport
+    private
+    def unapproved_dependencies
+      dependencies.reject(&:approved?)
+    end
+
+    def grouped_dependencies
+      find_name = lambda do |dep|
+        license = License.find_by_name(dep.license.name)
+        if license
+          license.pretty_name
+        else
+          dep.license.name
+        end
+      end
+
+      dependencies.group_by(&find_name).sort_by { |_, group| group.size }.reverse
+    end
+  end
+end

data/lib/license_finder/reports/reporter.rb

@@ -6,7 +6,9 @@ module LicenseFinder
       dependencies = Dependency.all
 
       write_file LicenseFinder.config.dependencies_text, TextReport.new(dependencies).to_s
+      write_file LicenseFinder.config.dependencies_detailed_text, DetailedTextReport.new(dependencies).to_s
       write_file LicenseFinder.config.dependencies_html, HtmlReport.new(dependencies).to_s
+      write_file LicenseFinder.config.dependencies_markdown, MarkdownReport.new(dependencies).to_s
 
       if File.exists?(LicenseFinder.config.dependencies_legacy_text)
         File.delete(LicenseFinder.config.dependencies_legacy_text)

data/lib/templates/markdown_report.erb

@@ -0,0 +1,43 @@
+# <%= LicenseFinder.config.project_name %>
+
+As of <%= Time.now.strftime("%B %e, %Y %l:%M%P") %>. <%= dependencies.size %> total, _<%= unapproved_dependencies.size %> unapproved_
+
+## Summary
+<% grouped_dependencies.each do |license_name, group| -%>
+  * <%= group.size %> <%= license_name %>
+<% end %>
+
+<% if unapproved_dependencies.any? -%>
+<%= unapproved_dependencies.size %> unapproved dependencies
+
+<% unapproved_dependencies.each do |dependency| -%>
+* <a href='#<%= dependency.name %>'><%= dependency.name %></a> (<%= dependency.license.name %>)
+<% end %>
+<% end -%>
+
+## Items
+
+<% sorted_dependencies.each do |dependency|
+version_groups = "v#{dependency.version}"
+if dependency.bundler_groups.any?
+  version_groups += "(#{dependency.bundler_groups.map(&:name).join(", ")})"
+end -%>
+
+<% if dependency.homepage && !dependency.homepage.empty? -%>
+<a name="<%= dependency.name %>"></a>
+### [<%= dependency.name %>](<%= dependency.homepage %>) <%= version_groups -%>
+<% else -%>
+### <%= dependency.name %> <%= version_groups -%>
+<% end -%>
+<%
+license_text = (dependency.license.url && !dependency.license.url.empty?) ? "<a href='#{dependency.license.url}'>#{dependency.license.name}</a>" : dependency.license.name
+%>
+
+| Summary | License | Approved? |
+|---------|-------------|---------|
+|<%= dependency.summary %>|<%= license_text %>| <%= dependency.approved? ? 'Yes' : '_*No*_' %> |
+
+<% if dependency.description %>
+<% dependency.description.lines.each{|l| %>> <%= l -%><% } %>
+<% end %>
+<% end -%>

data/license_finder.gemspec

@@ -1,8 +1,9 @@
 require './lib/license_finder/platform'
 
 Gem::Specification.new do |s|
+  s.required_ruby_version = '>= 1.9.2'
   s.name        = "license_finder"
-  s.version     = "0.9.3"
+  s.version     = "0.9.4"
   s.authors     = ["Jacob Maine", "Matthew Kane Parker", "Ian Lesperance", "David Edwards", "Paul Meskers", "Brent Wheeldon", "Trevor John", "David Tengdin", "William Ramsey"]
   s.email       = ["licensefinder@pivotalabs.com"]
   s.homepage    = "https://github.com/pivotal/LicenseFinder"
@@ -22,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "sequel"
   s.add_dependency "thor"
   s.add_dependency "rake"
-  s.add_dependency "httparty"
+  s.add_dependency "httparty", "0.11.0"
   s.add_dependency LicenseFinder::Platform.sqlite_gem
 
   %w(rspec xpath cucumber pry).each do |gem|

data/readme.md

@@ -100,16 +100,16 @@ To list licenses currently on the whitelist:
 $ license_finder whitelist list
 ```
 
-To add a license to the whitelist:
+To add a licenses to the whitelist:
 
 ```sh
-$ license_finder whitelist add MIT
+$ license_finder whitelist add MIT [BSD [...]]
 ```
 
-To remove a license from the whitelist:
+To remove a licenses from the whitelist:
 
 ```sh
-$ license_finder whitelist remove MIT
+$ license_finder whitelist remove MIT [BSD [...]]
 ```
 
 ### Managing ignored Bundler groups
@@ -215,7 +215,7 @@ This will move your dependencies.* files to the /doc directory and update the co
 
 ## Compatibility
 
-license_finder is compatible with ruby 1.9, and ruby 2.0. There is also experimental support for jruby.
+license_finder is compatible with ruby >= 1.9, and jruby.
 
 
 ## A note to gem authors / maintainers

data/release/manual_instructions.md

@@ -15,9 +15,9 @@ any existing Gemfile.lock in the directory.
 
 
 ```sh
-$ rvm use jruby-1.7.4
+$ rvm use jruby
 $ rake build
-$ rvm use ruby-2.0.0
+$ rvm use ruby
 $ rake build
 ```
 

data/release/publish.sh

@@ -14,12 +14,12 @@ function perform {
   $1
 }
 
-printf "\nBuilding jruby... (1.7.4)"
-perform "rvm use jruby-1.7.4"
+printf "\nBuilding jruby..."
+perform "rvm use jruby"
 perform "rake build"
 
-printf "\nBuilding ruby... (2.0.0)"
-perform "rvm use ruby-2.0.0"
+printf "\nBuilding ruby..."
+perform "rvm use ruby"
 perform "rake build"
 
 printf "\nPublishing to rubygems..."

data/spec/lib/license_finder/bower_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+module LicenseFinder
+  describe Bower do
+    describe '.current_packages' do
+      it 'lists all the current packages' do
+        json = <<-resp
+{
+  "dependencies": {
+    "dependency-library": {
+      "canonicalDir": "/path/to/thing",
+      "pkgMeta": {
+        "name": "dependency-library",
+        "description": "description",
+        "version": "1.3.3.7",
+        "main": "normalize.css"
+      }
+    },
+    "another-dependency": {
+      "canonicalDir": "/path/to/thing2",
+      "pkgMeta": {
+        "name": "another-dependency",
+        "description": "description2",
+        "version": "4.2",
+        "main": "denormalize.css"
+      }
+    }
+  }
+}
+        resp
+        allow(Bower).to receive(:`).with(/bower/).and_return(json)
+
+        current_packages = Bower.current_packages
+
+        expect(current_packages.size).to eq(2)
+        expect(current_packages.first).to be_a(Package)
+      end
+
+      it 'memoizes the current_packages' do
+        allow(Bower).to receive(:`).with(/bower/).and_return('{}').once
+
+        Bower.current_packages
+        Bower.current_packages
+      end
+    end
+
+    describe '.harvest_license' do
+      let(:package1) { {"license" => "MIT"} }
+      let(:package2) { {"licenses" => [{"type" => "BSD", "url" => "github.github/github"}]} }
+      let(:package3) { {"license" => {"type" => "PSF", "url" => "github.github/github"}} }
+      let(:package4) { {"licenses" => ["MIT"]} }
+
+      it 'finds the license for both license structures' do
+        Bower.harvest_license(package1).should eq("MIT")
+        Bower.harvest_license(package2).should eq("BSD")
+        Bower.harvest_license(package3).should eq("PSF")
+        Bower.harvest_license(package4).should eq("MIT")
+      end
+    end
+
+    describe '.has_package_file?' do
+      let(:package) { Pathname.new('bower.json').expand_path }
+
+      context 'with a bower.json file' do
+        before :each do
+          allow(File).to receive(:exists?).with(package).and_return(true)
+        end
+
+        it 'returns true' do
+          expect(Bower.has_package_file?).to eq(true)
+        end
+      end
+
+      context 'without a bower.json file' do
+        before :each do
+          allow(File).to receive(:exists?).with(package).and_return(false)
+        end
+
+        it 'returns false' do
+          expect(Bower.has_package_file?).to eq(false)
+        end
+      end
+    end
+  end
+end

data/spec/lib/license_finder/cli_spec.rb

@@ -63,6 +63,17 @@ module LicenseFinder
             subject.add("test")
           end
         end
+
+        it "adds multiple licenses to the whitelist" do
+          config.whitelist.should_receive(:push).with("test")
+          config.whitelist.should_receive(:push).with("rest")
+          config.should_receive(:save)
+          Reporter.should_receive(:write_reports)
+
+          silence_stdout do
+            subject.add("test", "rest")
+          end
+        end
       end
 
       describe "remove" do
@@ -72,9 +83,21 @@ module LicenseFinder
           Reporter.should_receive(:write_reports)
 
           silence_stdout do
+
             subject.remove("test")
           end
         end
+
+        it "removes multiple licenses from the whitelist" do
+          config.should_receive(:save)
+          config.whitelist.should_receive(:delete).with("test")
+          config.whitelist.should_receive(:delete).with("rest")
+          Reporter.should_receive(:write_reports)
+
+          silence_stdout do
+            subject.remove("test", "rest")
+          end
+        end
       end
     end
 
@@ -174,6 +197,15 @@ module LicenseFinder
             subject.approve 'foo'
           end
         end
+
+        it "approves multiple gem" do
+          DependencyManager.should_receive(:approve!).with("foo")
+          DependencyManager.should_receive(:approve!).with("bar")
+
+          silence_stdout do
+            subject.approve 'foo', 'bar'
+          end
+        end
       end
 
       describe "#action_items" do

data/spec/lib/license_finder/detailed_text_report_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+module LicenseFinder
+  describe DetailedTextReport do
+    describe '#to_s' do
+      let(:dep1) do
+        dependency = Dependency.new(
+          'name' => 'gem_a',
+          'version' => '1.0',
+          'summary' => 'Summary',
+          'description' => 'Description'
+        )
+        dependency.license = LicenseFinder::LicenseAlias.create(name: 'MIT')
+        dependency
+      end
+
+      let(:dep2) do
+        dependency = Dependency.new(
+          'name' => 'gem_b',
+          'version' => '1.0',
+          'summary' => 'Summary',
+          'description' => 'Description'
+        )
+        dependency.license = LicenseFinder::LicenseAlias.create(name: 'MIT')
+        dependency
+      end
+
+      subject { DetailedTextReport.new([dep2, dep1]).to_s }
+
+      it 'should generate a text report with the name, version, license, summary and description of each dependency, sorted by name' do
+        should == "gem_a,1.0,MIT,Summary,Description\ngem_b,1.0,MIT,Summary,Description\n"
+      end
+    end
+  end
+end

data/spec/lib/license_finder/markdown_report_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+
+module LicenseFinder
+  describe MarkdownReport do
+    describe '#to_s' do
+      let(:dep1) do
+        dependency = Dependency.new(
+          'name' => 'gem_a',
+          'version' => '1.0'
+        )
+        dependency.license = LicenseFinder::LicenseAlias.create(name: 'MIT')
+        dependency.approval = Approval.create(state: false)
+        dependency
+      end
+
+      let(:dep2) do
+        dependency = Dependency.new(
+          'name' => 'gem_b',
+          'version' => '2.3'
+        )
+        dependency.license = LicenseFinder::LicenseAlias.create(name: 'BSD')
+        dependency.approval = Approval.create(state: true)
+        dependency
+      end
+
+      subject { MarkdownReport.new([dep2, dep1]).to_s }
+
+      it 'should have the correct header' do
+        LicenseFinder.config.project_name = "new_project_name"
+        should match "# new_project_name"
+      end
+
+      it 'should list the total, and unapproved counts' do
+        should match "2 total, _1 unapproved_"
+      end
+
+      it "should list the unapproved dependency" do
+        should match "href='#gem_a'"
+      end
+
+      it "should display a summary" do
+        should match "## Summary"
+        should match /\s+\* 1 MIT/
+        should match /\s+\* 1 BSD/
+      end
+
+      it "should list both gems" do
+        should match "## Items"
+        should match "### gem_a v1.0"
+        should match "### gem_b v2.3"
+      end
+    end
+  end
+end

data/spec/lib/license_finder/npm_spec.rb

@@ -3,52 +3,97 @@ require 'spec_helper'
 module LicenseFinder
   describe NPM do
     describe '.current_modules' do
+      before { NPM.instance_variable_set(:@modules, nil) }
+
       it 'lists all the current modules' do
-        json = <<-resp
-{
-  "dependencies": {
-    "dependency.js": {
-      "name": "depjs",
-      "version": "1.3.3.7",
-      "description": "description",
-      "readme": "readme",
-      "path": "/path/to/thing"
-    },
-    "dependency2.js": {
-      "name": "dep2js",
-      "version": "4.2",
-      "description": "description2",
-      "readme": "readme2",
-      "path": "/path/to/thing2"
-    }
-  }
-}
-        resp
-        allow(NPM).to receive(:`).with(/npm/).and_return(json)
+        json = <<-JSON
+          {
+            "dependencies": {
+              "dependency.js": {
+                "name": "depjs",
+                "version": "1.3.3.7",
+                "description": "description",
+                "readme": "readme",
+                "path": "/path/to/thing"
+              },
+              "dependency2.js": {
+                "name": "dep2js",
+                "version": "4.2",
+                "description": "description2",
+                "readme": "readme2",
+                "path": "/path/to/thing2"
+              }
+            },
+            "devDependencies": {
+              "dependency3.js": {
+                "name": "dep3js",
+                "version": "4.2",
+                "description": "description3",
+                "readme": "readme3",
+                "path": "/path/to/thing3"
+              }
+            },
+            "bundledDependencies": {
+              "dependency4.js": {
+                "name": "dep4js",
+                "version": "4.2",
+                "description": "description4",
+                "readme": "readme4",
+                "path": "/path/to/thing4"
+              }
+            },
+            "bundleDependencies": {
+              "dependency5.js": {
+                "name": "dep5js",
+                "version": "4.2",
+                "description": "description5",
+                "readme": "readme5",
+                "path": "/path/to/thing5"
+              }
+            },
+            "notADependency": {
+              "dependency6.js": {
+                "name": "dep6js",
+                "version": "4.2",
+                "description": "description6",
+                "readme": "readme6",
+                "path": "/path/to/thing6"
+              }
+            }
+          }
+        JSON
+        allow(NPM).to receive(:capture).with(/npm/).and_return([json, true])
 
         current_modules = NPM.current_modules
 
-        expect(current_modules.size).to eq(2)
+        expect(current_modules.map(&:name)).to eq(["depjs 1.3.3.7", "dep2js 4.2", "dep3js 4.2", "dep5js 4.2", "dep4js 4.2"])
         expect(current_modules.first).to be_a(Package)
       end
 
       it 'memoizes the current_modules' do
-        allow(NPM).to receive(:`).with(/npm/).and_return('{}').once
+        allow(NPM).to receive(:capture).with(/npm/).and_return(['{}', true]).once
 
         NPM.current_modules
         NPM.current_modules
       end
+
+      it "fails when command fails" do
+        allow(NPM).to receive(:capture).with(/npm/).and_return('Some error', false).once
+        expect { NPM.current_modules }.to raise_error(RuntimeError)
+      end
     end
 
     describe '.harvest_license' do
       let(:node_module1) { {"license" => "MIT"} }
       let(:node_module2) { {"licenses" => [{"type" => "BSD", "url" => "github.github/github"}]} }
       let(:node_module3) { {"license" => {"type" => "PSF", "url" => "github.github/github"}} }
+      let(:node_module4) { {"licenses" => ["MIT"]} }
 
       it 'finds the license for both license structures' do
         NPM.harvest_license(node_module1).should eq("MIT")
         NPM.harvest_license(node_module2).should eq("BSD")
         NPM.harvest_license(node_module3).should eq("PSF")
+        NPM.harvest_license(node_module4).should eq("MIT")
       end
     end
 

data/spec/lib/license_finder/reporter_spec.rb

@@ -11,7 +11,11 @@ module LicenseFinder
 
         LicenseFinder.stub_chain(:config, :dependencies_html) { 'html_file_path' }
         LicenseFinder.stub_chain(:config, :dependencies_text) { 'text_file_path' }
+        LicenseFinder.stub_chain(:config, :dependencies_detailed_text) { 'detailed_text_file_path' }
+        LicenseFinder.stub_chain(:config, :dependencies_markdown) { 'markdown_file_path' }
 
+        MarkdownReport.stub_chain(:new, :to_s) { 'text report' }
+        DetailedTextReport.stub_chain(:new, :to_s) { 'text report' }
         TextReport.stub_chain(:new, :to_s) { 'text report' }
         HtmlReport.stub_chain(:new, :to_s) { 'text report' }
 
@@ -20,11 +24,15 @@ module LicenseFinder
 
         File.stub(:open).with('html_file_path', 'w+')
         File.stub(:open).with('text_file_path', 'w+')
+        File.stub(:open).with('detailed_text_file_path', 'w+')
+        File.stub(:open).with('markdown_file_path', 'w+')
       end
 
       it "writes an html file" do
         File.should_receive(:open).with('html_file_path', 'w+')
         File.should_receive(:open).with('text_file_path', 'w+')
+        File.should_receive(:open).with('detailed_text_file_path', 'w+')
+        File.should_receive(:open).with('markdown_file_path', 'w+')
         subject
       end
 

data/spec/lib/license_finder/text_report_spec.rb

@@ -6,7 +6,7 @@ module LicenseFinder
       let(:dep1) do
         dependency = Dependency.new(
           'name' => 'gem_a',
-          'version' => '1.0',
+          'version' => '1.0'
         )
         dependency.license = LicenseFinder::LicenseAlias.create(name: 'MIT')
         dependency
@@ -15,7 +15,7 @@ module LicenseFinder
       let(:dep2) do
         dependency = Dependency.new(
           'name' => 'gem_b',
-          'version' => '1.0',
+          'version' => '1.0'
         )
         dependency.license = LicenseFinder::LicenseAlias.create(name: 'MIT')
         dependency
@@ -23,7 +23,7 @@ module LicenseFinder
 
       subject { TextReport.new([dep2, dep1]).to_s }
 
-      it 'should generate a text report with the name, version, and license of each dependency, sorted by name' do
+      it 'should generate a text report with the name, version and license of each dependency, sorted by name' do
         should == "gem_a, 1.0, MIT\ngem_b, 1.0, MIT"
       end
     end

data/spec/spec_helper.rb

@@ -15,7 +15,8 @@ RSpec.configure do |config|
 end
 
 RSpec.configure do |config|
-  config.around(:each) do |example|
+  config.before { FileUtils.rm_f("config/license_finder.yml") }
+  config.around do |example|
     DB.transaction(rollback: :always) { example.run }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Jacob Maine
@@ -16,188 +16,188 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2014-01-05 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: sequel
   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: rake
   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'
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: rspec
   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: xpath
   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: cucumber
   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: 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: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.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'
 description: |2
@@ -213,9 +213,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
 - LICENSE
@@ -274,6 +274,7 @@ files:
 - lib/data/licenses/Ruby.txt
 - lib/data/licenses/SimplifiedBSD.txt
 - lib/license_finder.rb
+- lib/license_finder/bower.rb
 - lib/license_finder/bundle.rb
 - lib/license_finder/cli.rb
 - lib/license_finder/configuration.rb
@@ -299,7 +300,9 @@ files:
 - lib/license_finder/possible_license_files.rb
 - lib/license_finder/railtie.rb
 - lib/license_finder/reports/dependency_report.rb
+- lib/license_finder/reports/detailed_text_report.rb
 - lib/license_finder/reports/html_report.rb
+- lib/license_finder/reports/markdown_report.rb
 - lib/license_finder/reports/reporter.rb
 - lib/license_finder/reports/text_report.rb
 - lib/license_finder/tables.rb
@@ -310,6 +313,7 @@ files:
 - lib/license_finder/yml_to_sql.rb
 - lib/tasks/license_finder.rake
 - lib/templates/html_report.erb
+- lib/templates/markdown_report.erb
 - lib/templates/text_report.erb
 - license_finder.gemspec
 - readme.md
@@ -341,10 +345,12 @@ files:
 - spec/fixtures/readme/README
 - spec/fixtures/readme/Readme.markdown
 - spec/fixtures/utf8_gem/README
+- spec/lib/license_finder/bower_spec.rb
 - spec/lib/license_finder/bundle_spec.rb
 - spec/lib/license_finder/cli_spec.rb
 - spec/lib/license_finder/configuration_spec.rb
 - spec/lib/license_finder/dependency_manager_spec.rb
+- spec/lib/license_finder/detailed_text_report_spec.rb
 - spec/lib/license_finder/html_report_spec.rb
 - spec/lib/license_finder/license/apache_spec.rb
 - spec/lib/license_finder/license/bsd_spec.rb
@@ -358,6 +364,7 @@ files:
 - spec/lib/license_finder/license/simplified_bsd_spec.rb
 - spec/lib/license_finder/license_spec.rb
 - spec/lib/license_finder/license_url_spec.rb
+- spec/lib/license_finder/markdown_report_spec.rb
 - spec/lib/license_finder/npm_spec.rb
 - spec/lib/license_finder/package_saver_spec.rb
 - spec/lib/license_finder/package_spec.rb
@@ -383,17 +390,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Audit the OSS licenses of your application's dependencies.
@@ -448,10 +455,12 @@ test_files:
 - spec/fixtures/readme/README
 - spec/fixtures/readme/Readme.markdown
 - spec/fixtures/utf8_gem/README
+- spec/lib/license_finder/bower_spec.rb
 - spec/lib/license_finder/bundle_spec.rb
 - spec/lib/license_finder/cli_spec.rb
 - spec/lib/license_finder/configuration_spec.rb
 - spec/lib/license_finder/dependency_manager_spec.rb
+- spec/lib/license_finder/detailed_text_report_spec.rb
 - spec/lib/license_finder/html_report_spec.rb
 - spec/lib/license_finder/license/apache_spec.rb
 - spec/lib/license_finder/license/bsd_spec.rb
@@ -465,6 +474,7 @@ test_files:
 - spec/lib/license_finder/license/simplified_bsd_spec.rb
 - spec/lib/license_finder/license_spec.rb
 - spec/lib/license_finder/license_url_spec.rb
+- spec/lib/license_finder/markdown_report_spec.rb
 - spec/lib/license_finder/npm_spec.rb
 - spec/lib/license_finder/package_saver_spec.rb
 - spec/lib/license_finder/package_spec.rb