license_finder 0.8.1 → 0.8.2

data/spec/lib/license_finder/bundle_spec.rb

@@ -26,20 +26,15 @@ module LicenseFinder
       end
     end
 
-    describe '.current_gem_dependencies' do
+    describe '.current_gems' do
       subject do
-        Bundle.current_gem_dependencies(definition)
+        Bundle.current_gems(definition)
       end
 
       it "should have 2 dependencies" do
         subject.size.should == 2
       end
 
-      it "returns persisted dependencies" do
-        subject.first.id.should be
-        subject.last.id.should be
-      end
-
       context "when initialized with a parent and child gem" do
         before do
           definition.stub(:specs_for).and_return([
@@ -49,11 +44,9 @@ module LicenseFinder
         end
 
         it "should update the child dependency with its parent data" do
-          gem1 = subject.first.reload
-          gem2 = subject.last.reload
+          gem1 = subject.first
 
-          gem2.parents.should == [gem1]
-          gem1.children.should == [gem2]
+          gem1.children.should == ["gem2"]
         end
       end
     end

data/spec/lib/license_finder/{gem_saver_spec.rb → bundled_gem_saver_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module LicenseFinder
-  describe GemSaver do
+  describe BundledGemSaver do
     let(:gemspec) do
       Gem::Specification.new do |s|
         s.name = 'spec_name'
@@ -30,6 +30,7 @@ module LicenseFinder
 
         it "associates children" do
           subject.children.map(&:name).should == ['foo']
+          subject.children.each { |child| child.approval.should be }
         end
 
         it "marks depenency as unapproved by default" do
@@ -37,7 +38,7 @@ module LicenseFinder
         end
 
         context "with a bundler dependency" do
-          let(:bundled_gem) { BundledGem.new(gemspec, stub(:bundler_dependency, groups: %w[1 2 3]))}
+          let(:bundled_gem) { BundledGem.new(gemspec, double(:bundler_dependency, groups: %w[1 2 3]))}
 
           it "saves the bundler groups" do
             subject.bundler_groups.map(&:name).should =~ %w[1 2 3]
@@ -47,13 +48,15 @@ module LicenseFinder
 
       context "when the dependency already existed" do
         let!(:old_copy) do
-          Dependency.create(
+          dep = Dependency.create(
             name: 'spec_name',
             version: '0.1.2',
             summary: 'old summary',
             description: 'old desription',
             homepage: 'old homepage'
           )
+          dep.approval = Approval.create
+          dep
         end
 
         it "merges in the latest data" do
@@ -85,7 +88,7 @@ module LicenseFinder
         end
 
         context "with a bundler dependency" do
-          let(:bundled_gem) { BundledGem.new(gemspec, stub(:bundler_dependency, groups: %w[1 2 3]))}
+          let(:bundled_gem) { BundledGem.new(gemspec, double(:bundler_dependency, groups: %w[1 2 3]))}
 
           before do
             old_copy.add_bundler_group BundlerGroup.find_or_create(name: 'a')

data/spec/lib/license_finder/bundled_gem_spec.rb

@@ -54,7 +54,7 @@ module LicenseFinder
 
     describe "#license_files" do
       it "delegates to the license files helper" do
-        LicenseFiles.should_receive(:new).with(gemspec.full_gem_path) { stub(files: [] )}
+        PossibleLicenseFiles.should_receive(:new).with(gemspec.full_gem_path) { double(find: [] )}
         subject.license_files
       end
     end

data/spec/lib/license_finder/cli_spec.rb

@@ -1,36 +1,104 @@
 require "spec_helper"
 
 module LicenseFinder
-  describe CLI do
-    describe "#execute!(options)" do
-      before { CLI.stub(:check_for_action_items) }
+  module CLI
+    describe Dependencies do
+      describe "add" do
+        it "should add a dependency" do
+          DependencyManager.should_receive(:create_non_bundler).with("MIT", "js_dep", "1.2.3")
 
-      context "when the approve option is provided" do
-        it "should approve the requested gem" do
-          dependency = double('dependency', :name => nil)
-          dependency.should_receive(:approve!)
+          silence_stdout do
+            subject.add("MIT", "js_dep", "1.2.3")
+          end
+        end
+
+        it "does not require a version" do
+          DependencyManager.should_receive(:create_non_bundler).with("MIT", "js_dep", nil)
+
+          silence_stdout do
+            subject.add("MIT", "js_dep")
+          end
+        end
+
+        it "should have a -a option to approve the added dependency" do
+          DependencyManager.should_receive(:create_non_bundler).with("MIT", "js_dep", "1.2.3")
+          DependencyManager.should_receive(:approve!).with("js_dep")
+
+          silence_stdout do
+            LicenseFinder::CLI::Main.start(["dependencies", "add", "--approve", "MIT", "js_dep", "1.2.3"])
+          end
+        end
+      end
+
+      describe "remove" do
+        it "should remove a dependency" do
+          DependencyManager.should_receive(:destroy_non_bundler).with("js_dep")
+          silence_stdout do
+            subject.remove("js_dep")
+          end
+        end
+      end
+    end
+
+    describe Main do
+      describe "default" do
+        it "should check for action items" do
+          DependencyManager.should_receive(:sync_with_bundler)
+          Dependency.stub(:unapproved) { [] }
+          silence_stdout do
+            described_class.start([])
+          end
+        end
+      end
 
-          Dependency.stub(:first).with(name: 'foo').and_return(dependency)
+      describe "#rescan" do
+        it "resyncs with Gemfile" do
+          DependencyManager.should_receive(:sync_with_bundler)
+          Dependency.stub(:unapproved) { [] }
 
-          CLI.execute! approve: true, dependency: 'foo'
+          silence_stdout do
+            subject.rescan
+          end
         end
       end
 
-      context "when the -l (--license) switch is provided" do
+      describe "#license" do
         it "should update the license on the requested gem" do
-          dependency = double :dependency, :name => nil
-          dependency.should_receive(:set_license_manually).with("foo")
+          DependencyManager.should_receive(:license!).with("foo_gem", "foo")
+
+          silence_stdout do
+            subject.license 'foo', 'foo_gem'
+          end
+        end
+      end
 
-          Dependency.stub(:first).with(name: "foo_gem").and_return dependency
+      describe "#approve" do
+        it "should approve the requested gem" do
+          DependencyManager.should_receive(:approve!).with("foo")
 
-          CLI.execute! license: "foo", dependency: 'foo_gem'
+          silence_stdout do
+            subject.approve 'foo'
+          end
         end
       end
 
-      context "when no options are provided" do
-        it "should check for action items" do
-          CLI.should_receive(:check_for_action_items)
-          CLI.execute!
+      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
+            $stdout.stub(:puts)
+            $stdout.should_receive(:puts).with(/dependencies/i)
+            expect { subject.action_items }.to raise_error(SystemExit)
+          end
+        end
+
+        it "reports that all dependencies are approved" do
+          Dependency.stub(:unapproved) { [] }
+          silence_stdout do
+            $stdout.should_receive(:puts).with(/approved/i)
+            expect { subject.action_items }.to_not raise_error
+          end
         end
       end
     end

data/spec/lib/license_finder/configuration_spec.rb

@@ -24,9 +24,12 @@ module LicenseFinder
           subject.dependencies_dir.should == attributes['dependencies_file_dir']
         end
       end
+    end
 
-      it "uses absolute path in database_path" do
-        subject.database_path.should_not start_with(".")
+    describe "#database_uri" do
+      it "should URI escape absolute path the dependencies_file_dir" do
+        config = described_class.new('dependencies_file_dir' => 'test path')
+        config.database_uri.should =~ /test%20path\/dependencies\.db$/
       end
     end
 

data/spec/lib/license_finder/dependency_manager_spec.rb

@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+module LicenseFinder
+  describe DependencyManager do
+    let(:config) { Configuration.new }
+
+    before do
+      LicenseFinder.stub(:config).and_return config
+      config.whitelist = ["MIT", "other"]
+      Reporter.stub(:write_reports)
+    end
+
+    describe "#sync_with_bundler" do
+      it "destroys every dependency except for the ones Bundler reports as 'current' or are marked as 'manual'" do
+        cur1 = Dependency.create(name: "current dependency 1")
+        cur2 = Dependency.create(name: "current dependency 2")
+        man1 = Dependency.create(name: "manual dependency", manual: true)
+        Dependency.create(name: "old dependency 1")
+        Dependency.create(name: "old dependency 2")
+
+        current_gems = [
+          double(:gem1, save_as_dependency: cur1),
+          double(:gem2, save_as_dependency: cur2)
+        ]
+        Bundle.stub(:current_gems) { current_gems }
+
+        described_class.sync_with_bundler
+        Dependency.all.map(&:name).should =~ [cur1, cur2, man1].map(&:name)
+      end
+    end
+
+    describe ".create_non_bundler" do
+      it "should add a Dependency" do
+        expect do
+          described_class.create_non_bundler("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")
+          .should be_manual
+      end
+
+      it "should set the appropriate values" do
+        dep = described_class.create_non_bundler("GPL", "js_dep", "0.0.0")
+        dep.name.should == "js_dep"
+        dep.version.should == "0.0.0"
+        dep.license.name.should == "GPL"
+        dep.should_not be_approved
+      end
+
+      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") }
+          .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)
+        expect do
+          described_class.destroy_non_bundler("a non-bundler dep")
+        end.to change(Dependency, :count).by(-1)
+      end
+
+      it "should not remove a bundler Dependency" do
+        Dependency.create(name: "a bundler dep")
+        expect do
+          expect do
+            described_class.destroy_non_bundler("a bundler dep")
+          end.to raise_error(LicenseFinder::Error)
+        end.to_not change(Dependency, :count)
+      end
+    end
+
+    describe ".approve!" do
+      it "approves the dependency" do
+        dep = Dependency.named("current dependency")
+        dep.reload.should_not be_approved
+        described_class.approve!("current dependency")
+        dep.reload.should be_approved
+      end
+
+      it "should raise an error if it can't find the dependency" do
+        expect { described_class.approve!("non-existent dependency") }
+          .to raise_error(LicenseFinder::Error)
+      end
+    end
+
+    describe ".license!" do
+      it "adds a license for the dependency" do
+        dep = described_class.create_non_bundler("old license", "current dependency", nil)
+        dep.reload.license.name.should == "old license"
+        described_class.license!("current dependency", "a license")
+        dep.reload.license.name.should == "a license"
+      end
+
+      it "should raise an error if it can't find the dependency" do
+        expect { described_class.license!("non-existent dependency", "a license") }
+          .to raise_error(LicenseFinder::Error)
+      end
+    end
+
+  end
+end
+

data/spec/lib/license_finder/html_report_spec.rb

@@ -36,7 +36,7 @@ module LicenseFinder
       end
 
       context "when the gem has at least one bundler group" do
-        before { dependency.stub(bundler_groups: [stub(name: "group")]) }
+        before { dependency.stub(bundler_groups: [double(name: "group")]) }
         it "should show the bundler group(s) in parens" do
           should have_text "(group)"
         end
@@ -52,7 +52,7 @@ module LicenseFinder
       end
 
       context "when the gem has at least one parent" do
-        before { dependency.stub(parents: [stub(:name => "foo parent")]) }
+        before { dependency.stub(parents: [double(:name => "foo parent")]) }
         it "should include a parents section" do
           should have_text "Parents"
           should have_text "foo parent"
@@ -66,7 +66,7 @@ module LicenseFinder
       end
 
       context "when the gem has at least one child" do
-        before { dependency.stub(children: [stub(:name => "foo child")]) }
+        before { dependency.stub(children: [double(:name => "foo child")]) }
 
         it "should include a Children section" do
           should have_text "Children"

data/spec/lib/license_finder/{license_files_spec.rb → possible_license_files_spec.rb}

@@ -1,35 +1,35 @@
 require 'spec_helper'
 
 module LicenseFinder
-  describe LicenseFiles do
+  describe PossibleLicenseFiles do
     def fixture_path(fixture)
       Pathname.new(File.join(File.dirname(__FILE__), '..', '..', '..', 'spec', 'fixtures', fixture)).realpath.to_s
     end
 
-    describe "#files" do
+    describe "#find" do
       it "is empty if there aren't any license files" do
         subject = described_class.new('/not/a/dir')
-        subject.files.should == []
+        subject.find.should == []
       end
 
       it "includes files with names like LICENSE, License or COPYING" do
         subject = described_class.new(fixture_path('license_names'))
 
-        subject.files.map(&:file_name).should =~
+        subject.find.map(&:file_name).should =~
         %w[COPYING.txt LICENSE Mit-License README.rdoc Licence.rdoc]
       end
 
       it "includes files deep in the hierarchy" do
         subject = described_class.new(fixture_path('nested_gem'))
 
-        subject.files.map { |f| [f.file_name, f.file_path] }.should =~ [
+        subject.find.map { |f| [f.file_name, f.file_path] }.should =~ [
           %w[LICENSE vendor/LICENSE]
         ]
       end
 
       it "includes both files nested inside LICENSE directory and top level files" do
         subject = described_class.new(fixture_path('license_directory'))
-        found_license_files = subject.files
+        found_license_files = subject.find
 
         found_license_files.map { |f| [f.file_name, f.file_path] }.should =~ [
           %w[BSD-2-Clause.txt LICENSE/BSD-2-Clause.txt],
@@ -43,7 +43,7 @@ module LicenseFinder
 
       it "handles non UTF8 encodings" do
         subject = described_class.new(fixture_path('utf8_gem'))
-        expect { subject.files }.not_to raise_error
+        expect { subject.find }.not_to raise_error
       end
     end
   end

data/spec/lib/license_finder/tables/dependency_spec.rb

@@ -2,39 +2,14 @@ require 'spec_helper'
 
 module LicenseFinder
   describe Dependency do
-    let(:attributes) do
-      {
-        'name' => "spec_name",
-        'version' => "2.1.3",
-        'license' => "GPLv2",
-        'approved' => false,
-        'notes' => 'some notes',
-        'homepage' => 'homepage',
-        'license_files' => ['/Users/pivotal/foo/lic1', '/Users/pivotal/bar/lic2'],
-        'bundler_groups' => ["test"]
-      }
-    end
-
-    let(:config) { Configuration.new }
-
-    before do
-      LicenseFinder.stub(:config).and_return config
-      config.whitelist = ["MIT", "other"]
-    end
-
-    describe ".destroy_obsolete" do
-      it "destroys every dependency except for the ones provided as 'current'" do
-        cur1 = Dependency.create(name: "current dependency 1")
-        cur2 = Dependency.create(name: "current dependency 2")
-        Dependency.create(name: "old dependency 1")
-        Dependency.create(name: "old dependency 2")
+    describe '.unapproved' do
+      let(:config) { Configuration.new }
 
-        Dependency.destroy_obsolete([cur1, cur2])
-        Dependency.all.should =~ [cur1, cur2]
+      before do
+        LicenseFinder.stub(:config).and_return config
+        config.whitelist = ["MIT", "other"]
       end
-    end
 
-    describe '.unapproved' do
       it "should return all unapproved dependencies" do
         dependency = Dependency.create(name: "unapproved dependency", version: '0.0.1')
         dependency.approval = Approval.create(state: false)
@@ -53,6 +28,32 @@ module LicenseFinder
       end
     end
 
+    describe ".named" do
+      it "creates a new dependency" do
+        dep = described_class.named("never_seen")
+        dep.name.should == "never_seen"
+        dep.should_not be_new
+      end
+
+      it "returns an existing dependency" do
+        described_class.named("referenced_again")
+        dep = described_class.named("referenced_again")
+        dep.name.should == "referenced_again"
+        dep.should_not be_new
+        Dependency.count(name: "referenced_again").should == 1
+      end
+
+      it "always attaches an approval" do
+        described_class.named("referenced_again").reload.approval.should be
+        described_class.named("referenced_again").reload.approval.should be
+      end
+
+      it "attaches an approval to a dependency that is currently missing one" do
+        Dependency.create(name: "foo")
+        described_class.named("foo").reload.approval.should be
+      end
+    end
+
     describe '#approve!' do
       it "should update the database to show the dependency is approved" do
         dependency = Dependency.create(name: "foo", version: '0.0.1')
@@ -83,20 +84,6 @@ module LicenseFinder
         dependency.should_not be_approved
       end
     end
-
-    describe "#set_license_manually" do
-      let(:gem) do
-        dependency = Dependency.new(name: "bob", version: '0.0.1')
-        dependency.license = LicenseAlias.create(name: 'Original')
-        dependency.save
-        dependency
-      end
-
-      it "delegates to the license" do
-        gem.license.should_receive(:set_manually).with('Updated')
-        gem.set_license_manually('Updated')
-      end
-    end
   end
 end