license_finder 1.1.1-java → 1.2-java

data/lib/license_finder/yml_to_sql.rb

@@ -93,7 +93,7 @@ module LicenseFinder
           'summary' => 'summary',
           'description' => 'description',
           'homepage' => 'homepage',
-          'license' => 'license_name'
+          'license' => 'license_names'
         }
 
         def self.convert(attrs)

data/lib/templates/html_report.erb

@@ -52,7 +52,7 @@
               <a href='#<%= dependency.name %>'>
                 <%= dependency.name %>
               </a>
-              (<%= dependency.license.name %>)
+              (<%= dependency.licenses.map(&:name).join(', ') %>)
               </li>
             <% end -%>
           </ul>
@@ -66,7 +66,7 @@
         <blockquote class="pull-right">
           <% if dependency.approved_manually? -%>
             <p>
-              <%= link_to_license(dependency.license) %>
+            <%= dependency.licenses.map { |l| link_to_license(l) }.join(', ') %>
               manually approved
               <span class="badge badge-success">&#x2713;</span>
             </p>
@@ -79,13 +79,13 @@
             </small>
           <% elsif dependency.whitelisted? -%>
             <p>
-              <%= link_to_license(dependency.license) %>
+              <%= dependency.licenses.map { |l| link_to_license(l) }.join(', ') %>
               whitelisted
               <span class="badge badge-success">&#x2713;</span>
             </p>
           <% else -%>
             <p>
-            <%= link_to_license(dependency.license) %>
+            <%= dependency.licenses.map { |l| link_to_license(l) }.join(', ') %>
             unapproved
             <span class="badge badge-important">&#x2717;</span>
             </p>

data/lib/templates/markdown_report.erb

@@ -12,7 +12,7 @@ As of <%= Time.now.strftime("%B %e, %Y %l:%M%P") %>. <%= dependencies.size %> to
 <%= unapproved_dependencies.size %> *unapproved*
 
 <% unapproved_dependencies.each do |dependency| -%>
-* <a href='#<%= dependency.name %>'><%= dependency.name %></a> (<%= dependency.license.name %>)
+* <a href='#<%= dependency.name %>'><%= dependency.name %></a> (<%= dependency.licenses.map(&:name) %>)
 <% end %>
 <% end -%>
 
@@ -25,15 +25,15 @@ As of <%= Time.now.strftime("%B %e, %Y %l:%M%P") %>. <%= dependencies.size %> to
 #### <%= dependency.summary %>
 
 <% if dependency.approved_manually? -%>
-<%= link_to_license(dependency.license) %> manually approved
+<%= dependency.licenses.map { |l| link_to_license(l) }.join(', ') %> manually approved
 
 ><%= dependency.manual_approval.notes %>
 
 ><cite> <%= dependency.manual_approval.approver %> <%= dependency.manual_approval.safe_created_at.to_date %></cite>
 <% elsif dependency.whitelisted? -%>
-<%= link_to_license(dependency.license) %> whitelisted
+<%= dependency.licenses.map { |l| link_to_license(l) }.join(', ') %> whitelisted
 <% else -%>
-<%= link_to_license(dependency.license) %> _**unapproved**_
+<%= dependency.licenses.map { |l| link_to_license(l) }.join(', ') %> _**unapproved**_
 <% end -%>
 
 <% if dependency.description -%>

data/lib/templates/text_report.erb

@@ -1,3 +1,3 @@
 <% sorted_dependencies.each do |s| -%>
-<%=s.name %>, <%=s.version %>, <%=s.license.name%>
+<%=s.name %>, <%=s.version %>, <%=s.licenses.map(&:name).join(', ')%>
 <% end -%>

data/license_finder.gemspec

@@ -3,18 +3,33 @@ 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.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.version     = "1.2"
+
+  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",
+    "Mike Dalessio"
+  ]
+
   s.email       = ["commoncode@pivotalabs.com"]
   s.homepage    = "https://github.com/pivotal/LicenseFinder"
   s.summary     = "Audit the OSS licenses of your application's dependencies."
 
   s.description = <<-DESCRIPTION
-  Do you know the licenses of all your application's dependencies? What open source software licenses will your business accept?
-
-  LicenseFinder culls your package managers, detects the licenses of the packages in them, and gives you a report that you can act on. If you already know
-  what licenses your business is comfortable with, you can whitelist them, leaving you with an action report of only those dependencies that have
-  licenses that fall outside of the whitelist.
+    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.
   DESCRIPTION
 
   s.license     = "MIT"
@@ -26,14 +41,15 @@ Gem::Specification.new do |s|
   s.add_dependency "xml-simple"
   s.add_dependency LicenseFinder::Platform.sqlite_gem
 
-  %w(rake rspec-its xpath cucumber pry).each do |gem|
-    s.add_development_dependency gem
-  end
-
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec-its"
+  s.add_development_dependency "xpath"
+  s.add_development_dependency "cucumber"
+  s.add_development_dependency "pry"
   s.add_development_dependency "rspec", "~> 3"
   s.add_development_dependency "capybara", "~> 2.0.0"
   s.add_development_dependency "webmock", "~> 1.13"
-  s.add_development_dependency "cocoapods" if RUBY_PLATFORM =~ /darwin/
+  s.add_development_dependency "cocoapods" if LicenseFinder::Platform.darwin?
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/lib/license_finder/cli_spec.rb

@@ -2,286 +2,294 @@ require "spec_helper"
 
 module LicenseFinder
   module CLI
-    describe Dependencies do
-      describe "add" do
-        it "adds a dependency" do
-          DependencyManager.should_receive(:manually_add).with("MIT", "js_dep", "1.2.3")
+    context do
+      let!(:dependency_manager) { DependencyManager.new }
 
-          silence_stdout do
-            subject.add("MIT", "js_dep", "1.2.3")
+      before do
+        allow(DependencyManager).to receive(:new) { dependency_manager }
+      end
+
+      describe Dependencies do
+        describe "add" do
+          it "adds a dependency" do
+            expect(dependency_manager).to receive(:manually_add).with("MIT", "js_dep", "1.2.3")
+
+            silence_stdout do
+              subject.add("MIT", "js_dep", "1.2.3")
+            end
           end
-        end
 
-        it "does not require a version" do
-          DependencyManager.should_receive(:manually_add).with("MIT", "js_dep", nil)
+          it "does not require a version" do
+            expect(dependency_manager).to receive(:manually_add).with("MIT", "js_dep", nil)
 
-          silence_stdout do
-            subject.add("MIT", "js_dep")
+            silence_stdout do
+              subject.add("MIT", "js_dep")
+            end
           end
-        end
 
-        it "has an --approve option to approve the added dependency" do
-          DependencyManager.should_receive(:manually_add).with("MIT", "js_dep", "1.2.3")
-          DependencyManager.should_receive(:approve!).with("js_dep", "Julian", "We really need this")
+          it "has an --approve option to approve the added dependency" do
+            expect(dependency_manager).to receive(:manually_add).with("MIT", "js_dep", "1.2.3")
+            expect(dependency_manager).to receive(:approve!).with("js_dep", "Julian", "We really need this")
 
-          silence_stdout do
-            Main.start(["dependencies", "add", "--approve", "--approver", "Julian", "--message", "We really need this", "MIT", "js_dep", "1.2.3"])
+            silence_stdout do
+              Main.start(["dependencies", "add", "--approve", "--approver", "Julian", "--message", "We really need this", "MIT", "js_dep", "1.2.3"])
+            end
           end
         end
-      end
 
-      describe "remove" do
-        it "removes a dependency" do
-          DependencyManager.should_receive(:manually_remove).with("js_dep")
-          silence_stdout do
-            subject.remove("js_dep")
+        describe "remove" do
+          it "removes a dependency" do
+            expect(dependency_manager).to receive(:manually_remove).with("js_dep")
+            silence_stdout do
+              subject.remove("js_dep")
+            end
           end
         end
       end
-    end
 
-    describe Whitelist do
-      let(:config) { LicenseFinder.config }
+      describe Whitelist do
+        let(:config) { LicenseFinder.config }
 
-      describe "list" do
-        it "shows the whitelist of licenses" do
-          config.should_receive(:whitelist).and_return([])
+        describe "list" do
+          it "shows the whitelist of licenses" do
+            expect(config).to receive(:whitelist).and_return([])
 
-          silence_stdout do
-            subject.list
+            silence_stdout do
+              subject.list
+            end
           end
         end
-      end
 
-      describe "add" do
-        it "adds the specified license to the whitelist" do
-          config.whitelist.should_receive(:push).with("test")
-          config.should_receive(:save)
-          expect(DependencyManager).to receive(:sync_with_package_managers)
+        describe "add" do
+          it "adds the specified license to the whitelist" do
+            expect(config.whitelist).to receive(:push).with("test")
+            expect(config).to receive(:save)
+            expect(dependency_manager).to receive(:sync_with_package_managers)
 
-          silence_stdout do
-            subject.add("test")
+            silence_stdout do
+              subject.add("test")
+            end
           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)
-          expect(DependencyManager).to receive(:sync_with_package_managers)
+          it "adds multiple licenses to the whitelist" do
+            expect(config.whitelist).to receive(:push).with("test")
+            expect(config.whitelist).to receive(:push).with("rest")
+            expect(config).to receive(:save)
+            expect(dependency_manager).to receive(:sync_with_package_managers)
 
-          silence_stdout do
-            subject.add("test", "rest")
+            silence_stdout do
+              subject.add("test", "rest")
+            end
           end
         end
-      end
 
-      describe "remove" do
-        it "removes the specified license from the whitelist" do
-          config.should_receive(:save)
-          config.whitelist.should_receive(:delete).with("test")
-          expect(DependencyManager).to receive(:sync_with_package_managers)
+        describe "remove" do
+          it "removes the specified license from the whitelist" do
+            expect(config).to receive(:save)
+            expect(config.whitelist).to receive(:delete).with("test")
+            expect(dependency_manager).to receive(:sync_with_package_managers)
 
-          silence_stdout do
+            silence_stdout do
 
-            subject.remove("test")
+              subject.remove("test")
+            end
           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")
-          expect(DependencyManager).to receive(:sync_with_package_managers)
+          it "removes multiple licenses from the whitelist" do
+            expect(config).to receive(:save)
+            expect(config.whitelist).to receive(:delete).with("test")
+            expect(config.whitelist).to receive(:delete).with("rest")
+            expect(dependency_manager).to receive(:sync_with_package_managers)
 
-          silence_stdout do
-            subject.remove("test", "rest")
+            silence_stdout do
+              subject.remove("test", "rest")
+            end
           end
         end
       end
-    end
 
-    describe ProjectName do
-      let(:config) { LicenseFinder.config }
+      describe ProjectName do
+        let(:config) { LicenseFinder.config }
 
-      describe "set" do
-        it "sets the project name" do
-          config.should_receive(:save)
-          config.project_name.should_not eq("new_project_name")
-          expect(DependencyManager).to receive(:sync_with_package_managers)
+        describe "set" do
+          it "sets the project name" do
+            expect(config).to receive(:save)
+            expect(config.project_name).not_to eq("new_project_name")
+            expect(dependency_manager).to receive(:sync_with_package_managers)
 
-          silence_stdout do
-            subject.set("new_project_name")
-          end
+            silence_stdout do
+              subject.set("new_project_name")
+            end
 
-          config.project_name.should eq("new_project_name")
+            expect(config.project_name).to eq("new_project_name")
+          end
         end
       end
-    end
 
-    describe IgnoredBundlerGroups do
-      let(:config) { LicenseFinder.config }
+      describe IgnoredBundlerGroups do
+        let(:config) { LicenseFinder.config }
 
-      describe "list" do
-        it "shows the ignored groups in the standard output" do
-          config.should_receive(:ignore_groups).and_return(['development'])
+        describe "list" do
+          it "shows the ignored groups in the standard output" do
+            expect(config).to receive(:ignore_groups).and_return(['development'])
 
-          expect(capture_stdout { subject.list }).to match /development/
+            expect(capture_stdout { subject.list }).to match /development/
+          end
         end
-      end
 
-      describe "add" do
-        it "adds the specified group to the ignored groups list" do
-          config.ignore_groups.should_receive(:push).with("test")
-          config.should_receive(:save)
-          expect(DependencyManager).to receive(:sync_with_package_managers)
+        describe "add" do
+          it "adds the specified group to the ignored groups list" do
+            expect(config.ignore_groups).to receive(:push).with("test")
+            expect(config).to receive(:save)
+            expect(dependency_manager).to receive(:sync_with_package_managers)
 
-          silence_stdout do
-            subject.add("test")
+            silence_stdout do
+              subject.add("test")
+            end
           end
         end
-      end
 
-      describe "remove" do
-        it "removes the specified group from the ignored groups list" do
-          config.ignore_groups.should_receive(:delete).with("test")
-          config.should_receive(:save)
-          expect(DependencyManager).to receive(:sync_with_package_managers)
+        describe "remove" do
+          it "removes the specified group from the ignored groups list" do
+            expect(config.ignore_groups).to receive(:delete).with("test")
+            expect(config).to receive(:save)
+            expect(dependency_manager).to receive(:sync_with_package_managers)
 
-          silence_stdout do
-            subject.remove("test")
+            silence_stdout do
+              subject.remove("test")
+            end
           end
         end
       end
-    end
 
-    describe IgnoredDependencies do
-      let(:config) { LicenseFinder.config }
+      describe IgnoredDependencies do
+        let(:config) { LicenseFinder.config }
 
-      describe "list" do
-        context "when there is at least one ignored dependency" do
-          it "shows the ignored dependencies" do
-            expect(config).to receive(:ignore_dependencies).and_return(['bundler'])
-            expect(capture_stdout { subject.list }).to match /bundler/
+        describe "list" do
+          context "when there is at least one ignored dependency" do
+            it "shows the ignored dependencies" do
+              expect(config).to receive(:ignore_dependencies).and_return(['bundler'])
+              expect(capture_stdout { subject.list }).to match /bundler/
+            end
           end
-        end
 
-        context "when there are no ignored dependencies" do
-          it "prints '(none)'" do
-            expect(config).to receive(:ignore_dependencies).and_return([])
-            expect(capture_stdout { subject.list }).to match /\(none\)/
+          context "when there are no ignored dependencies" do
+            it "prints '(none)'" do
+              expect(config).to receive(:ignore_dependencies).and_return([])
+              expect(capture_stdout { subject.list }).to match /\(none\)/
+            end
           end
         end
-      end
 
-      describe "add" do
-        it "adds the specified group to the ignored groups list" do
-          config.ignore_dependencies.should_receive(:push).with("test")
-          config.should_receive(:save)
-          expect(DependencyManager).to receive(:sync_with_package_managers)
+        describe "add" do
+          it "adds the specified group to the ignored groups list" do
+            expect(config.ignore_dependencies).to receive(:push).with("test")
+            expect(config).to receive(:save)
+            expect(dependency_manager).to receive(:sync_with_package_managers)
 
-          silence_stdout do
-            subject.add("test")
+            silence_stdout do
+              subject.add("test")
+            end
           end
         end
-      end
 
-      describe "remove" do
-        it "removes the specified group from the ignored groups list" do
-          config.ignore_dependencies.should_receive(:delete).with("test")
-          config.should_receive(:save)
-          expect(DependencyManager).to receive(:sync_with_package_managers)
+        describe "remove" do
+          it "removes the specified group from the ignored groups list" do
+            expect(config.ignore_dependencies).to receive(:delete).with("test")
+            expect(config).to receive(:save)
+            expect(dependency_manager).to receive(:sync_with_package_managers)
 
-          silence_stdout do
-            subject.remove("test")
+            silence_stdout do
+              subject.remove("test")
+            end
           end
         end
       end
-    end
 
-    describe Main do
-      describe "default" do
-        it "checks for action items" do
-          DependencyManager.should_receive(:sync_with_package_managers)
-          Dependency.stub(:unapproved) { [] }
-          silence_stdout do
-            described_class.start([])
+      describe Main do
+        describe "default" do
+          it "checks for action items" do
+            expect(dependency_manager).to receive(:sync_with_package_managers)
+            allow(Dependency).to receive(:unapproved) { [] }
+            silence_stdout do
+              described_class.start([])
+            end
           end
         end
-      end
 
-      describe "#rescan" do
-        it "resyncs with Gemfile" do
-          DependencyManager.should_receive(:sync_with_package_managers)
-          Dependency.stub(:unapproved) { [] }
+        describe "#rescan" do
+          it "resyncs with Gemfile" do
+            expect(dependency_manager).to receive(:sync_with_package_managers)
+            allow(Dependency).to receive(:unapproved) { [] }
 
-          silence_stdout do
-            subject.rescan
+            silence_stdout do
+              subject.rescan
+            end
           end
         end
-      end
 
-      describe "#license" do
-        it "updates the license on the requested gem" do
-          DependencyManager.should_receive(:license!).with("foo_gem", "foo")
+        describe "#license" do
+          it "updates the license on the requested gem" do
+            expect(dependency_manager).to receive(:license!).with("foo_gem", "foo")
 
-          silence_stdout do
-            subject.license 'foo', 'foo_gem'
+            silence_stdout do
+              subject.license 'foo', 'foo_gem'
+            end
           end
         end
-      end
 
-      describe "#approve" do
-        it "approves the requested gem" do
-          DependencyManager.should_receive(:approve!).with("foo", nil, nil)
+        describe "#approve" do
+          it "approves the requested gem" do
+            expect(dependency_manager).to receive(:approve!).with("foo", nil, nil)
 
-          silence_stdout do
-            subject.approve 'foo'
+            silence_stdout do
+              subject.approve 'foo'
+            end
           end
-        end
 
-        it "approves multiple gem" do
-          DependencyManager.should_receive(:approve!).with("foo", nil, nil)
-          DependencyManager.should_receive(:approve!).with("bar", nil, nil)
+          it "approves multiple gem" do
+            expect(dependency_manager).to receive(:approve!).with("foo", nil, nil)
+            expect(dependency_manager).to receive(:approve!).with("bar", nil, nil)
 
-          silence_stdout do
-            subject.approve 'foo', 'bar'
+            silence_stdout do
+              subject.approve 'foo', 'bar'
+            end
           end
-        end
 
-        it "raises a warning if no gem was specified" do
-          DependencyManager.should_not_receive(:approve!)
+          it "raises a warning if no gem was specified" do
+            expect(dependency_manager).not_to receive(:approve!)
 
-          silence_stdout do
-            expect { subject.approve }.to raise_error(ArgumentError)
+            silence_stdout do
+              expect { subject.approve }.to raise_error(ArgumentError)
+            end
           end
-        end
 
-        it "sets approver and approval message" do
-          DependencyManager.should_receive(:approve!).with("foo", "Julian", "We really need this")
+          it "sets approver and approval message" do
+            expect(dependency_manager).to receive(:approve!).with("foo", "Julian", "We really need this")
 
-          silence_stdout do
-            Main.start(["approve", "--approver", "Julian", "--message", "We really need this", "foo"])
+            silence_stdout do
+              Main.start(["approve", "--approver", "Julian", "--message", "We really need this", "foo"])
+            end
           end
         end
-      end
 
-      describe "#action_items" do
-        it "reports unapproved dependencies" do
-          Dependency.stub(:unapproved) { ['one dependency'] }
-          TextReport.stub(:new) { double(:report, to_s: "a report!") }
-          silence_stdout do
-            subject.stub(:say)
-            subject.should_receive(:say).with(/dependencies/i, :red)
-            expect { subject.action_items }.to raise_error(SystemExit)
+        describe "#action_items" do
+          it "reports unapproved dependencies" do
+            allow(Dependency).to receive(:unapproved) { ['one dependency'] }
+            allow(TextReport).to receive(:new) { double(:report, to_s: "a report!") }
+            silence_stdout do
+              allow(subject).to receive(:say)
+              expect(subject).to receive(:say).with(/dependencies/i, :red)
+              expect { subject.action_items }.to raise_error(SystemExit)
+            end
           end
-        end
 
-        it "reports that all dependencies are approved" do
-          Dependency.stub(:unapproved) { [] }
-          silence_stdout do
-            subject.should_receive(:say).with(/approved/i, :green)
-            expect { subject.action_items }.to_not raise_error
+          it "reports that all dependencies are approved" do
+            allow(Dependency).to receive(:unapproved) { [] }
+            silence_stdout do
+              expect(subject).to receive(:say).with(/approved/i, :green)
+              expect { subject.action_items }.to_not raise_error
+            end
           end
         end
       end