license_finder 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6965ddeb70d6a9462f426dd9314a07920e83e953
-  data.tar.gz: 197642f07c0032fe03328103cdd7e6f7c4845640
+  metadata.gz: 8030930924c96e92dfe411bfc46702e5c8091e32
+  data.tar.gz: bdb0ead96b41b5e814508ba38107e4fd624e4e50
 SHA512:
-  metadata.gz: 978887a4a20f652a84f8af8347cc03764b23c8c487b5a8ca266bd578a8e3ee43c5b323f652bd7238b9ca915f01b676d66a0a12ea9681b8bfc93551ca9d17cd2d
-  data.tar.gz: 8fc6ec156a538862da5790caef509802d6f740c1d2257c37e1e1bc17d9c67beddaeb648f058e0d36bc9bbaeab1d4e0b05aa3ac13c51625c60d4a56a00243ba69
+  metadata.gz: c3ec0bfb8ef542b5494e884dfeb28d42959ce5349bdc74fb0884526ab6deb977fb8b81a6a2bc67025fc18f41222aeab073a30c95a822f55f7cb4211f85db7ce8
+  data.tar.gz: 54061bd80b908ee4973c6a283a82f0462d0e5e70da6b6a84649d9a7c201286deafdc270ef42849eca6c3973113b291b97535cb557a532af4c15fccc446bcc480

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+=== 1.1.1 / 2014-07-29
+
+* Bugfixes
+
+  * Process incorrectly-defined dependencies.
+    [Original issue.](https://github.com/pivotal/LicenseFinder/issues/108)
+  * Allow license_finder to process incorrectly-defined dependencies.
+
 === 1.0.1 / 2014-05-28
 
 * Features

data/features/step_definitions/manually_approved_steps.rb

@@ -17,7 +17,7 @@ end
 
 Then(/^I should see that gem approved in dependencies\.html$/) do
   @user.in_gem_html("gpl_gem") do |gpl_gem|
-    gpl_gem[:class].should == "approved"
+    gpl_gem[:class].split(' ').should include "approved"
     gpl_gem.should have_content "Julian"
     gpl_gem.should have_content "We really need this"
   end

data/features/step_definitions/report_html_steps.rb

@@ -55,6 +55,6 @@ end
 
 def is_html_status?(gem, approval)
   @user.in_gem_html(gem) do |gpl_gem|
-    gpl_gem[:class].should == approval
+    gpl_gem[:class].split(' ').should include approval
   end
 end

data/lib/license_finder/package.rb

@@ -8,6 +8,7 @@ module LicenseFinder
   class Package
     def self.license_names_from_standard_spec(spec)
       licenses = spec["licenses"] || [spec["license"]].compact
+      licenses = [licenses] unless licenses.is_a?(Array)
       licenses.map do |license|
         if license.is_a? Hash
           license["type"]

data/lib/templates/html_report.erb

@@ -62,7 +62,7 @@
   </div>
   <div class="dependencies">
     <% sorted_dependencies.each do |dependency| -%>
-      <div id="<%= dependency.name %>" class="<%= dependency.approved? ? "approved" : "unapproved" %>">
+      <div id="<%= dependency.name %>" class="clearfix <%= dependency.approved? ? "approved" : "unapproved" %>">
         <blockquote class="pull-right">
           <% if dependency.approved_manually? -%>
             <p>

data/license_finder.gemspec

@@ -3,7 +3,7 @@ require './lib/license_finder/platform'
 Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.3'
   s.name        = "license_finder"
-  s.version     = "1.1.0"
+  s.version     = "1.1.1"
   s.authors     = ["Jacob Maine", "Matthew Kane Parker", "Ian Lesperance", "David Edwards", "Paul Meskers", "Brent Wheeldon", "Trevor John", "David Tengdin", "William Ramsey", "David Dening", "Geoff Pleiss", "Mike Chinigo"]
   s.email       = ["commoncode@pivotalabs.com"]
   s.homepage    = "https://github.com/pivotal/LicenseFinder"

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

@@ -32,12 +32,14 @@ module LicenseFinder
       let(:node_module2) { {"licenses" => [{"type" => "BSD"}], "path" => "/some/path"} }
       let(:node_module3) { {"license" => {"type" => "PSF"}, "path" => "/some/path"} }
       let(:node_module4) { {"licenses" => ["MIT"], "path" => "/some/path"} }
+      let(:misdeclared_node_module) { {"licenses" => {"type" => "MIT"}} }
 
       it 'finds the license for both license structures' do
         NpmPackage.new(node_module1).license.name.should eq("MIT")
         NpmPackage.new(node_module2).license.name.should eq("BSD")
         NpmPackage.new(node_module3).license.name.should eq("Python Software Foundation License")
         NpmPackage.new(node_module4).license.name.should eq("MIT")
+        NpmPackage.new(misdeclared_node_module).license.name.should eq("MIT")
       end
 
       context "regardless of whether there are licenses in files" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jacob Maine
@@ -19,7 +19,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler