license_finder 0.9.4-java → 0.9.5-java

data/license_finder.gemspec

@@ -1,9 +1,9 @@
 require './lib/license_finder/platform'
 
 Gem::Specification.new do |s|
-  s.required_ruby_version = '>= 1.9.2'
+  s.required_ruby_version = '>= 1.9.3'
   s.name        = "license_finder"
-  s.version     = "0.9.4"
+  s.version     = "0.9.5"
   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"
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "sequel"
   s.add_dependency "thor"
   s.add_dependency "rake"
-  s.add_dependency "httparty", "0.11.0"
+  s.add_dependency "httparty"
   s.add_dependency LicenseFinder::Platform.sqlite_gem
 
   %w(rspec xpath cucumber pry).each do |gem|

data/readme.md

@@ -135,25 +135,25 @@ To remove a group from the ignored Bundler groups:
 $ license_finder ignored_bundler_groups remove development
 ```
 
-### Managing unsupported dependencies
+### Manually managing dependencies
 
-license_finder can track dependencies that Bundler/PyPi/NPM doesn't know about (JS libraries that don't
+license_finder can track dependencies that your package managers don't know about (JS libraries that don't
 appear in your Gemfile/requirements.txt/package.json, etc.)
 
 ```sh
 $ license_finder dependencies add MIT my_js_dep 0.1.2
 ```
 
-To automatically approve a non-bundler dependency when you add it, use:
+To automatically approve an unmanaged dependency when you add it, use:
 
 ```sh
 $ license_finder dependencies add MIT my_js_dep 0.1.2 --approve
 ```
 
 The version is optional.  Run `license_finder dependencies help` for additional documentation about
-managing non-Bundler dependencies.
+managing these dependencies.
 
-license_finder cannot automatically detect when a non-Bundler dependency has been removed from your
+license_finder cannot automatically detect when one of these dependencies has been removed from your
 project, so you can use:
 
 ```sh

data/spec/lib/license_finder/bower_package_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+module LicenseFinder
+  describe BowerPackage do
+    subject do
+      described_class.new(
+        "canonicalDir" => "/path/to/thing",
+        "pkgMeta" => {
+          "name" => "dependency-library",
+          "description" => "description",
+          "version" => "1.3.3.7",
+          "main" => "normalize.css",
+          "readme" => "some readme stuff"
+        }
+      )
+    end
+
+    it_behaves_like "it conforms to interface required by PackageSaver"
+
+    its(:name) { should == "dependency-library" }
+    its(:version) { should == "1.3.3.7" }
+    its(:summary) { should == "description" }
+    its(:description) { should == "some readme stuff" }
+
+    describe '#license' do
+      def stub_license_files(license_files)
+        PossibleLicenseFiles.stub(:find).with("/path/to/thing").and_return(license_files)
+      end
+
+      let(:package1) { { "pkgMeta" => {"license" => "MIT"} } }
+      let(:package2) { { "pkgMeta" => {"licenses" => [{"type" => "BSD", "url" => "github.github/github"}]} } }
+      let(:package3) { { "pkgMeta" => {"license" => {"type" => "PSF", "url" => "github.github/github"}} } }
+      let(:package4) { { "pkgMeta" => {"licenses" => ["MIT"]} } }
+
+      it 'finds the license for both license structures' do
+        BowerPackage.new(package1).license.should eq("MIT")
+        BowerPackage.new(package2).license.should eq("BSD")
+        BowerPackage.new(package3).license.should eq("PSF")
+        BowerPackage.new(package4).license.should eq("MIT")
+      end
+
+      it "returns a license in a file if detected" do
+        stub_license_files [double(:file, license: 'Detected License')]
+
+        subject.license.should == "Detected License"
+      end
+
+      it "returns 'other' otherwise" do
+        stub_license_files []
+
+        subject.license.should == "other"
+      end
+    end
+  end
+end
+

data/spec/lib/license_finder/bower_spec.rb

@@ -35,30 +35,9 @@ module LicenseFinder
         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
+    describe '.active?' do
       let(:package) { Pathname.new('bower.json').expand_path }
 
       context 'with a bower.json file' do
@@ -67,7 +46,7 @@ module LicenseFinder
         end
 
         it 'returns true' do
-          expect(Bower.has_package_file?).to eq(true)
+          expect(Bower.active?).to eq(true)
         end
       end
 
@@ -77,7 +56,7 @@ module LicenseFinder
         end
 
         it 'returns false' do
-          expect(Bower.has_package_file?).to eq(false)
+          expect(Bower.active?).to eq(false)
         end
       end
     end

data/spec/lib/license_finder/bundler_package_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+module LicenseFinder
+  describe BundlerPackage do
+    subject { described_class.new(gemspec, nil) }
+
+    it_behaves_like "it conforms to interface required by PackageSaver"
+
+    let(:gemspec) do
+      Gem::Specification.new do |s|
+        s.name = 'spec_name'
+        s.version = '2.1.3'
+        s.summary = 'summary'
+        s.description = 'description'
+        s.homepage = 'homepage'
+
+        s.add_dependency 'foo'
+      end
+    end
+
+    its(:name) { should == 'spec_name' }
+    its(:version) { should == '2.1.3' }
+    its(:summary) { should == "summary" }
+    its(:description) { should == "description" }
+    its(:groups) { should == [] }
+    its(:children) { should == [] }
+
+    describe "#license" do
+      def stub_license_files(license_files)
+        PossibleLicenseFiles.stub(:find).and_return(license_files)
+      end
+
+      it "returns the license from the gemspec if provided" do
+        gemspec.stub(:license).and_return('Gemspec License')
+
+        subject.license.should == "Gemspec License"
+      end
+
+      it "returns a license in a file if detected" do
+        stub_license_files [double(:file, license: 'Detected License')]
+
+        subject.license.should == "Detected License"
+      end
+
+      it "returns 'other' otherwise" do
+        stub_license_files []
+
+        subject.license.should == "other"
+      end
+    end
+
+    describe "#groups" do
+      subject { described_class.new(gemspec, bundler_dependency) }
+
+      let(:bundler_dependency) { double(:dependency, groups: [1, 2, 3]) }
+
+      it "returns bundler dependency's groups" do
+        subject.groups.should == bundler_dependency.groups
+      end
+    end
+  end
+end

data/spec/lib/license_finder/{bundle_spec.rb → bundler_spec.rb}

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 module LicenseFinder
-  describe Bundle do
+  describe Bundler do
     let(:definition) do
       double('definition', {
         :dependencies => [],
@@ -26,15 +26,15 @@ module LicenseFinder
       end
     end
 
-    describe '.current_gems' do
+    describe '.current_packages' do
       subject do
-        Bundle.current_gems(config)
+        Bundler.current_packages(config)
       end
 
       let(:config) { double(:config, ignore_groups: ['dev', 'test']) }
 
       before do
-        Bundler::Definition.stub(:build).and_return(definition)
+        ::Bundler::Definition.stub(:build).and_return(definition)
       end
 
       it "should have 2 dependencies" do
@@ -63,7 +63,7 @@ module LicenseFinder
       end
     end
 
-    describe '.has_gemfile?' do
+    describe '.active?' do
       let(:gemfile) { Pathname.new('Gemfile').expand_path }
 
       before :each do
@@ -74,7 +74,7 @@ module LicenseFinder
         it 'returns false' do
           allow(File).to receive(:exists?).with(gemfile).and_return(false)
 
-          Bundle.has_gemfile?.should == false
+          Bundler.active?.should == false
         end
       end
 
@@ -82,7 +82,7 @@ module LicenseFinder
         it 'returns true' do
           allow(File).to receive(:exists?).with(gemfile).and_return(true)
 
-          Bundle.has_gemfile?.should == true
+          Bundler.active?.should == true
         end
       end
     end

data/spec/lib/license_finder/cli_spec.rb

@@ -5,7 +5,7 @@ module LicenseFinder
     describe Dependencies do
       describe "add" do
         it "adds a dependency" do
-          DependencyManager.should_receive(:create_non_bundler).with("MIT", "js_dep", "1.2.3")
+          DependencyManager.should_receive(:create_manually_managed).with("MIT", "js_dep", "1.2.3")
 
           silence_stdout do
             subject.add("MIT", "js_dep", "1.2.3")
@@ -13,7 +13,7 @@ module LicenseFinder
         end
 
         it "does not require a version" do
-          DependencyManager.should_receive(:create_non_bundler).with("MIT", "js_dep", nil)
+          DependencyManager.should_receive(:create_manually_managed).with("MIT", "js_dep", nil)
 
           silence_stdout do
             subject.add("MIT", "js_dep")
@@ -21,7 +21,7 @@ module LicenseFinder
         end
 
         it "has an --approve option to approve the added dependency" do
-          DependencyManager.should_receive(:create_non_bundler).with("MIT", "js_dep", "1.2.3")
+          DependencyManager.should_receive(:create_manually_managed).with("MIT", "js_dep", "1.2.3")
           DependencyManager.should_receive(:approve!).with("js_dep")
 
           silence_stdout do
@@ -32,7 +32,7 @@ module LicenseFinder
 
       describe "remove" do
         it "removes a dependency" do
-          DependencyManager.should_receive(:destroy_non_bundler).with("js_dep")
+          DependencyManager.should_receive(:destroy_manually_managed).with("js_dep")
           silence_stdout do
             subject.remove("js_dep")
           end
@@ -160,7 +160,7 @@ module LicenseFinder
     describe Main do
       describe "default" do
         it "checks for action items" do
-          DependencyManager.should_receive(:sync_with_bundler)
+          DependencyManager.should_receive(:sync_with_package_managers)
           Dependency.stub(:unapproved) { [] }
           silence_stdout do
             described_class.start([])
@@ -170,7 +170,7 @@ module LicenseFinder
 
       describe "#rescan" do
         it "resyncs with Gemfile" do
-          DependencyManager.should_receive(:sync_with_bundler)
+          DependencyManager.should_receive(:sync_with_package_managers)
           Dependency.stub(:unapproved) { [] }
 
           silence_stdout do

data/spec/lib/license_finder/dependency_manager_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'digest'
 
 module LicenseFinder
   describe DependencyManager do
@@ -22,29 +21,29 @@ module LicenseFinder
         Dependency.create(name: "old dependency 1")
         Dependency.create(name: "old dependency 2")
 
-        current_gems = [gem1, gem2]
-        Bundle.stub(:current_gems).with(config) { current_gems }
-        PackageSaver.should_receive(:save_packages).with(current_gems).and_return([cur1, cur2])
+        current_packages = [gem1, gem2]
+        Bundler.stub(:current_packages) { current_packages }
+        PackageSaver.should_receive(:save_all).with(current_packages).and_return([cur1, cur2])
 
-        described_class.sync_with_bundler
+        described_class.sync_with_package_managers
         Dependency.all.map(&:name).should =~ [cur1, cur2, man1].map(&:name)
       end
     end
 
-    describe ".create_non_bundler" do
+    describe ".create_manually_managed" do
       it "should add a Dependency" do
         expect do
-          described_class.create_non_bundler("MIT", "js_dep", "0.0.0")
+          described_class.create_manually_managed("MIT", "js_dep", "0.0.0")
         end.to change(Dependency, :count).by(1)
       end
 
       it "should mark the dependency as manual" do
-        described_class.create_non_bundler("MIT", "js_dep", "0.0.0")
+        described_class.create_manually_managed("MIT", "js_dep", "0.0.0")
           .should be_manual
       end
 
       it "should set the appropriate values" do
-        dep = described_class.create_non_bundler("GPL", "js_dep", "0.0.0")
+        dep = described_class.create_manually_managed("GPL", "js_dep", "0.0.0")
         dep.name.should == "js_dep"
         dep.version.should == "0.0.0"
         dep.license.name.should == "GPL"
@@ -53,16 +52,16 @@ module LicenseFinder
 
       it "should complain if the dependency already exists" do
         Dependency.create(name: "current dependency 1")
-        expect { described_class.create_non_bundler("GPL", "current dependency 1", "0.0.0") }
+        expect { described_class.create_manually_managed("GPL", "current dependency 1", "0.0.0") }
           .to raise_error(LicenseFinder::Error)
       end
     end
 
-    describe ".destroy_non_bundler" do
-      it "should remove a non bundler Dependency" do
-        described_class.create_non_bundler("GPL", "a non-bundler dep", nil)
+    describe ".destroy_manually_managed" do
+      it "should remove a manually managed Dependency" do
+        described_class.create_manually_managed("GPL", "a manually managed dep", nil)
         expect do
-          described_class.destroy_non_bundler("a non-bundler dep")
+          described_class.destroy_manually_managed("a manually managed dep")
         end.to change(Dependency, :count).by(-1)
       end
 
@@ -70,7 +69,7 @@ module LicenseFinder
         Dependency.create(name: "a bundler dep")
         expect do
           expect do
-            described_class.destroy_non_bundler("a bundler dep")
+            described_class.destroy_manually_managed("a bundler dep")
           end.to raise_error(LicenseFinder::Error)
         end.to_not change(Dependency, :count)
       end

data/spec/lib/license_finder/html_report_spec.rb

@@ -5,9 +5,8 @@ module LicenseFinder
   describe HtmlReport do
     describe "#to_s" do
       let(:dependency) do
-        dep = Dependency.new name: "the-name"
+        dep = Dependency.new name: "the-name", manually_approved: true
         dep.license = LicenseAlias.create name: 'MIT'
-        dep.approval = Approval.create state: true
         dep
       end
 
@@ -24,7 +23,7 @@ module LicenseFinder
       end
 
       context "when the dependency is not approved" do
-        before { dependency.approval.state = false }
+        before { dependency.manually_approved = false }
 
         it "should not add an approved class to he dependency's container" do
           should have_selector ".unapproved"

data/spec/lib/license_finder/markdown_report_spec.rb

@@ -6,20 +6,20 @@ module LicenseFinder
       let(:dep1) do
         dependency = Dependency.new(
           'name' => 'gem_a',
-          'version' => '1.0'
+          'version' => '1.0',
+          'manually_approved' => false
         )
         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'
+          'version' => '2.3',
+          'manually_approved' => true
         )
         dependency.license = LicenseFinder::LicenseAlias.create(name: 'BSD')
-        dependency.approval = Approval.create(state: true)
         dependency
       end