license_finder 0.8.1-java → 0.8.2-java

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
 

data/spec/lib/license_finder/yml_to_sql_spec.rb

@@ -8,19 +8,20 @@ describe LicenseFinder::YmlToSql do
       'license' => "GPLv2",
       'license_url' => "www.license_url.org",
       'approved' => true,
-      'manual' => true,
       'summary' => "some summary",
       'description' => "some description",
       'homepage' => 'www.homepage.com',
       'children' => ["child1_name"],
       'parents' => ["parent1_name"],
       'bundler_groups' => [:test],
+      'source' => source,
 
       'notes' => 'some notes',
       'license_files' => ['/Users/pivotal/foo/lic1', '/Users/pivotal/bar/lic2'],
     }
   end
   let(:config) { LicenseFinder::Configuration.new }
+  let(:source) { nil }
 
   before do
     LicenseFinder.stub(:config) { config }
@@ -53,6 +54,28 @@ describe LicenseFinder::YmlToSql do
       (DB.tables - [:schema_migrations]).each { |table| DB[table].truncate }
     end
 
+    describe "when dependency source is set to bundle" do
+      let(:source) { "bundle" }
+
+      it "sets manual to be false" do
+        described_class.convert_all([legacy_attributes])
+
+        saved_dep = described_class::Sql::Dependency.first
+        saved_dep.manual.should == false
+      end
+    end
+
+    describe "when dependency source is not set to bundle" do
+      let(:source) { "" }
+
+      it "sets manual to be false" do
+        described_class.convert_all([legacy_attributes])
+
+        saved_dep = described_class::Sql::Dependency.first
+        saved_dep.manual.should == true
+      end
+    end
+
     it "persists all of the dependency's attributes" do
       described_class.convert_all([legacy_attributes])
 
@@ -71,7 +94,6 @@ describe LicenseFinder::YmlToSql do
       saved_dep = described_class::Sql::Dependency.first
       saved_dep.license.name.should == "GPLv2"
       saved_dep.license.url.should == "www.license_url.org"
-      saved_dep.license.manual.should == true
     end
 
     it "associates bundler groups" do

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'license_finder'
-
 require 'rspec'
 
 Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].each do |file|

data/spec/support/silence_stdout.rb

@@ -0,0 +1,13 @@
+module SilenceStdout
+  def silence_stdout
+    orig_stdout = $stdout
+    $stdout = File.open("/dev/null", "w")
+    yield
+  ensure
+    $stdout = orig_stdout
+  end
+end
+
+RSpec.configure do |c|
+  c.include(SilenceStdout)
+end

metadata

@@ -2,7 +2,7 @@
 name: license_finder
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.8.1
+  version: 0.8.2
 platform: java
 authors:
 - Jacob Maine
@@ -12,26 +12,25 @@ authors:
 - Paul Meskers
 - Brent Wheeldon
 - David Tengdin
+- William Ramsey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-14 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :runtime
@@ -39,17 +38,31 @@ dependencies:
   name: sequel
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: thor
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
   prerelease: false
   type: :runtime
@@ -57,17 +70,15 @@ dependencies:
   name: jdbc-sqlite3
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :runtime
@@ -75,17 +86,15 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :development
@@ -93,17 +102,15 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :development
@@ -111,17 +118,15 @@ dependencies:
   name: xpath
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :development
@@ -129,17 +134,15 @@ dependencies:
   name: cucumber
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :development
@@ -147,17 +150,15 @@ dependencies:
   name: database_cleaner
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: 0.9.1
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: 0.9.1
     none: false
   prerelease: false
   type: :development
@@ -165,13 +166,13 @@ dependencies:
   name: capybara
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
     none: false
@@ -181,13 +182,13 @@ dependencies:
   name: rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
     none: false
@@ -206,9 +207,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.rdoc
 - Gemfile
 - LICENSE
@@ -223,16 +224,19 @@ files:
 - db/migrate/201303291753_allow_null_license_names.rb
 - db/migrate/201304011027_allow_null_dependency_version.rb
 - db/migrate/201304020947_change_table_name_licenses_to_license_aliases.rb
+- db/migrate/201304181524_add_manual_to_dependencies.rb
 - features/approve_dependencies.feature
 - features/cli.feature
 - features/html_report.feature
 - features/ignore_bundle_groups.feature
+- features/non_bundler_dependencies.feature
 - features/rails_rake.feature
 - features/set_license.feature
 - features/step_definitions/approve_dependencies_steps.rb
 - features/step_definitions/cli_steps.rb
 - features/step_definitions/html_report_steps.rb
 - features/step_definitions/ignore_bundle_groups_steps.rb
+- features/step_definitions/non_bundler_steps.rb
 - features/step_definitions/rails_rake_steps.rb
 - features/step_definitions/set_license_steps.rb
 - features/step_definitions/shared_steps.rb
@@ -252,13 +256,12 @@ files:
 - lib/data/licenses/SimplifiedBSD.txt
 - lib/license_finder.rb
 - lib/license_finder/bundle.rb
-- lib/license_finder/bundle_syncer.rb
 - lib/license_finder/bundled_gem.rb
+- lib/license_finder/bundled_gem_saver.rb
+- lib/license_finder/bundler_group_manager.rb
 - lib/license_finder/cli.rb
 - lib/license_finder/configuration.rb
-- lib/license_finder/dependency_report.rb
-- lib/license_finder/gem_saver.rb
-- lib/license_finder/html_report.rb
+- lib/license_finder/dependency_manager.rb
 - lib/license_finder/license.rb
 - lib/license_finder/license/apache2.rb
 - lib/license_finder/license/bsd.rb
@@ -269,18 +272,20 @@ files:
 - lib/license_finder/license/new_bsd.rb
 - lib/license_finder/license/ruby.rb
 - lib/license_finder/license/simplified_bsd.rb
-- lib/license_finder/license_files.rb
 - lib/license_finder/license_url.rb
 - lib/license_finder/platform.rb
 - lib/license_finder/possible_license_file.rb
+- lib/license_finder/possible_license_files.rb
 - lib/license_finder/railtie.rb
-- lib/license_finder/reporter.rb
+- lib/license_finder/reports/dependency_report.rb
+- lib/license_finder/reports/html_report.rb
+- lib/license_finder/reports/reporter.rb
+- lib/license_finder/reports/text_report.rb
 - lib/license_finder/tables.rb
 - lib/license_finder/tables/approval.rb
 - lib/license_finder/tables/bundler_group.rb
 - lib/license_finder/tables/dependency.rb
 - lib/license_finder/tables/license_alias.rb
-- lib/license_finder/text_report.rb
 - lib/license_finder/yml_to_sql.rb
 - lib/tasks/license_finder.rake
 - lib/templates/html_report.erb
@@ -314,11 +319,12 @@ files:
 - spec/fixtures/readme/Readme.markdown
 - spec/fixtures/utf8_gem/README
 - spec/lib/license_finder/bundle_spec.rb
-- spec/lib/license_finder/bundle_syncer_spec.rb
+- spec/lib/license_finder/bundled_gem_saver_spec.rb
 - spec/lib/license_finder/bundled_gem_spec.rb
+- spec/lib/license_finder/bundler_group_manager_spec.rb
 - spec/lib/license_finder/cli_spec.rb
 - spec/lib/license_finder/configuration_spec.rb
-- spec/lib/license_finder/gem_saver_spec.rb
+- spec/lib/license_finder/dependency_manager_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
@@ -329,10 +335,10 @@ files:
 - spec/lib/license_finder/license/new_bsd_spec.rb
 - spec/lib/license_finder/license/ruby_spec.rb
 - spec/lib/license_finder/license/simplified_bsd_spec.rb
-- spec/lib/license_finder/license_files_spec.rb
 - spec/lib/license_finder/license_spec.rb
 - spec/lib/license_finder/license_url_spec.rb
 - spec/lib/license_finder/possible_license_file_spec.rb
+- spec/lib/license_finder/possible_license_files_spec.rb
 - spec/lib/license_finder/reporter_spec.rb
 - spec/lib/license_finder/tables/dependency_spec.rb
 - spec/lib/license_finder/tables/license_alias_spec.rb
@@ -341,6 +347,7 @@ files:
 - spec/lib/license_finder_spec.rb
 - spec/spec_helper.rb
 - spec/support/license_examples.rb
+- spec/support/silence_stdout.rb
 homepage: https://github.com/pivotal/LicenseFinder
 licenses:
 - MIT
@@ -350,23 +357,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
       hash: 2
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
       hash: 2
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project:
@@ -379,12 +384,14 @@ test_files:
 - features/cli.feature
 - features/html_report.feature
 - features/ignore_bundle_groups.feature
+- features/non_bundler_dependencies.feature
 - features/rails_rake.feature
 - features/set_license.feature
 - features/step_definitions/approve_dependencies_steps.rb
 - features/step_definitions/cli_steps.rb
 - features/step_definitions/html_report_steps.rb
 - features/step_definitions/ignore_bundle_groups_steps.rb
+- features/step_definitions/non_bundler_steps.rb
 - features/step_definitions/rails_rake_steps.rb
 - features/step_definitions/set_license_steps.rb
 - features/step_definitions/shared_steps.rb
@@ -418,11 +425,12 @@ test_files:
 - spec/fixtures/readme/Readme.markdown
 - spec/fixtures/utf8_gem/README
 - spec/lib/license_finder/bundle_spec.rb
-- spec/lib/license_finder/bundle_syncer_spec.rb
+- spec/lib/license_finder/bundled_gem_saver_spec.rb
 - spec/lib/license_finder/bundled_gem_spec.rb
+- spec/lib/license_finder/bundler_group_manager_spec.rb
 - spec/lib/license_finder/cli_spec.rb
 - spec/lib/license_finder/configuration_spec.rb
-- spec/lib/license_finder/gem_saver_spec.rb
+- spec/lib/license_finder/dependency_manager_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
@@ -433,10 +441,10 @@ test_files:
 - spec/lib/license_finder/license/new_bsd_spec.rb
 - spec/lib/license_finder/license/ruby_spec.rb
 - spec/lib/license_finder/license/simplified_bsd_spec.rb
-- spec/lib/license_finder/license_files_spec.rb
 - spec/lib/license_finder/license_spec.rb
 - spec/lib/license_finder/license_url_spec.rb
 - spec/lib/license_finder/possible_license_file_spec.rb
+- spec/lib/license_finder/possible_license_files_spec.rb
 - spec/lib/license_finder/reporter_spec.rb
 - spec/lib/license_finder/tables/dependency_spec.rb
 - spec/lib/license_finder/tables/license_alias_spec.rb
@@ -445,3 +453,4 @@ test_files:
 - spec/lib/license_finder_spec.rb
 - spec/spec_helper.rb
 - spec/support/license_examples.rb
+- spec/support/silence_stdout.rb