license_finder 0.9.4-java → 0.9.5-java

data/spec/lib/license_finder/pip_spec.rb

@@ -2,25 +2,45 @@ require 'spec_helper'
 
 module LicenseFinder
   describe Pip do
-    describe '.current_dists' do
-      it 'lists all the current dists' do
-        allow(Pip).to receive(:`).with(/python/).and_return('[["jasmine", "1.3.1", "MIT"], ["jasmine-core", "1.3.1", "MIT"]]')
+    describe '.current_packages' do
+      def stub_pip(stdout)
+        allow(Pip).to receive(:`).with(/python/).and_return(stdout)
+      end
+
+      def stub_pypi(name, version, response)
+        stub_request(:get, "https://pypi.python.org/pypi/#{name}/#{version}/json").
+          to_return(response)
+      end
+
+      it 'fetches data from pip' do
+        stub_pip('[["jasmine", "1.3.1", "jasmine/path"], ["jasmine-core", "1.3.1", "jasmine-core/path"]]')
+        stub_pypi("jasmine", "1.3.1", status: 200, body: '{}')
+        stub_pypi("jasmine-core", "1.3.1", status: 200, body: '{}')
+
+        current_packages = Pip.current_packages
+
+        expect(current_packages.size).to eq(2)
+        expect(current_packages.first).to be_a(Package)
+      end
 
-        current_dists = Pip.current_dists
+      it "fetches data from pypi" do
+        stub_pip('[["jasmine", "1.3.1", "jasmine/path"]]')
+        stub_pypi("jasmine", "1.3.1", status: 200, body: JSON.generate(info: {summary: "A summary"}))
 
-        expect(current_dists.size).to eq(2)
-        expect(current_dists.first).to be_a(Package)
+        expect(PipPackage).to receive(:new).with("jasmine", "1.3.1", "jasmine/path/jasmine", "summary" => "A summary")
+        Pip.current_packages
       end
 
-      it 'memoizes the current_dists' do
-        allow(Pip).to receive(:`).with(/python/).and_return('[]').once
+      it "ignores pypi if it can't find useful info" do
+        stub_pip('[["jasmine", "1.3.1", "jasmine/path"]]')
+        stub_pypi("jasmine", "1.3.1", status: 404, body: '')
 
-        Pip.current_dists
-        Pip.current_dists
+        expect(PipPackage).to receive(:new).with("jasmine", "1.3.1", "jasmine/path/jasmine", {})
+        Pip.current_packages
       end
     end
 
-    describe '.has_requirements' do
+    describe '.active?' do
       let(:requirements) { Pathname.new('requirements.txt').expand_path }
 
       context 'with a requirements file' do
@@ -29,7 +49,7 @@ module LicenseFinder
         end
 
         it 'returns true' do
-          expect(Pip.has_requirements?).to eq(true)
+          expect(Pip.active?).to eq(true)
         end
       end
 
@@ -39,51 +59,9 @@ module LicenseFinder
         end
 
         it 'returns false' do
-          expect(Pip.has_requirements?).to eq(false)
+          expect(Pip.active?).to eq(false)
         end
       end
     end
-
-    describe '.license_for' do
-      let(:package) { PythonPackage.new(OpenStruct.new(name: 'jasmine', version: '1.3.1')) }
-
-      before :each do
-        stub_request(:get, "https://pypi.python.org/pypi/jasmine/1.3.1/json").
-            to_return(:status => 200, :body => "{}", :headers => {})
-      end
-
-      it 'reaches out to PyPI with the package name and version' do
-        Pip.license_for(package)
-
-        WebMock.should have_requested(:get, "https://pypi.python.org/pypi/jasmine/1.3.1/json")
-      end
-
-      it 'returns the license from info => license preferentially' do
-        data = { info: { license: "MIT", classifiers: [ 'License :: OSI Approved :: Apache 2.0 License' ] } }
-
-        stub_request(:get, "https://pypi.python.org/pypi/jasmine/1.3.1/json").
-            to_return(:status => 200, :body => JSON.generate(data), :headers => {})
-
-        expect(Pip.license_for(package)).to eq('MIT')
-      end
-
-      it 'returns the first license from the classifiers if no info => license exists' do
-        data = { info: { classifiers: [ 'License :: OSI Approved :: Apache 2.0 License' ] } }
-
-        stub_request(:get, "https://pypi.python.org/pypi/jasmine/1.3.1/json").
-            to_return(:status => 200, :body => JSON.generate(data), :headers => {})
-
-        expect(Pip.license_for(package)).to eq('Apache 2.0 License')
-      end
-
-      it 'returns other if no license can be found' do
-        data = {}
-
-        stub_request(:get, "https://pypi.python.org/pypi/jasmine/1.3.1/json").
-            to_return(:status => 200, :body => JSON.generate(data), :headers => {})
-
-        expect(Pip.license_for(package)).to eq('other')
-      end
-    end
   end
 end

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

@@ -12,14 +12,11 @@ module LicenseFinder
 
       it "should return all unapproved dependencies" do
         dependency = Dependency.create(name: "unapproved dependency", version: '0.0.1')
-        dependency.approval = Approval.create(state: false)
-        dependency.save
         approved = Dependency.create(name: "approved dependency", version: '0.0.1')
-        approved.approval = Approval.create(state: true)
+        approved.manually_approved = true
         approved.save
         whitelisted = Dependency.create(name: "approved dependency", version: '0.0.1')
         whitelisted.license = LicenseAlias.create(name: 'MIT')
-        whitelisted.approval = Approval.create(state: false)
         whitelisted.save
 
         unapproved = Dependency.unapproved
@@ -42,52 +39,33 @@ module LicenseFinder
         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')
-        dependency.approval = Approval.create(state: false)
-        dependency.save
         dependency.approve!
         dependency.reload.should be_approved
       end
     end
 
     describe "#approved?" do
-      let(:dependency) { Dependency.create(name: 'some gem') }
+      let(:not_manually_approved) { Dependency.create(name: 'some gem', manually_approved: false).reload }
+      let(:manually_approved) { Dependency.create(name: 'some gem', manually_approved: true).reload }
 
       it "is true if its license is whitelisted" do
-        dependency.stub_chain(:license, whitelisted?: true)
-        dependency.should be_approved
+        not_manually_approved.stub_chain(:license, whitelisted?: true)
+        not_manually_approved.should be_approved
       end
 
       it "is true if it has been approved" do
-        dependency.stub_chain(:license, whitelisted?: false)
-        dependency.stub_chain(:approval, state: true)
-        dependency.should be_approved
-
-        dependency.stub_chain(:approval, state: 1) # jruby
-        dependency.should be_approved
+        manually_approved.stub_chain(:license, whitelisted?: false)
+        manually_approved.should be_approved
       end
 
       it "is false otherwise" do
-        dependency.stub_chain(:license, whitelisted?: false)
-        dependency.stub_chain(:approval, state: false)
-        dependency.should_not be_approved
-
-        dependency.stub_chain(:approval, state: 0) # jruby
-        dependency.should_not be_approved
+        not_manually_approved.stub_chain(:license, whitelisted?: false)
+        not_manually_approved.should_not be_approved
       end
     end
 
@@ -102,11 +80,84 @@ module LicenseFinder
       end
 
       it "modifies the license" do
-        LicenseAlias.should_receive(:find_or_create).with(name: 'Updated').and_return(license)
+        LicenseAlias.should_receive(:named).with('Updated').and_return(license)
         dependency.set_license_manually!('Updated')
         dependency.reload.license.should == license
       end
     end
+
+    describe "#bundler_group_names=" do
+      let(:dependency) { Dependency.named('some gem') }
+
+      it "saves the bundler groups" do
+        dependency.bundler_group_names = %w[1 2 3]
+        dependency.bundler_groups.map(&:name).should =~ %w[1 2 3]
+      end
+
+      it "removed outdated groups and adds new groups" do
+        dependency.add_bundler_group BundlerGroup.named('old')
+        dependency.add_bundler_group BundlerGroup.named('maintained')
+        dependency.bundler_group_names = %w[new maintained]
+        dependency.bundler_groups.map(&:name).should =~ %w[new maintained]
+      end
+    end
+
+    describe "children_names=" do
+      let(:dependency) { Dependency.named('some gem') }
+
+      it "saves the children" do
+        dependency.children_names = %w[1 2 3]
+        dependency.children.map(&:name).should =~ %w[1 2 3]
+      end
+
+      it "removes outdated children and adds new children" do
+        dependency.add_child Dependency.named('old')
+        dependency.add_child Dependency.named('maintained')
+        dependency.children_names = %w[new maintained]
+        dependency.children.map(&:name).should =~ %w[new maintained]
+      end
+    end
+
+    describe "#apply_better_license" do
+      let(:dependency) { Dependency.named('some gem') }
+
+      it "keeps a manually assigned license" do
+        dependency.license = LicenseAlias.named("manual")
+        dependency.license_manual = true
+
+        dependency.apply_better_license "new"
+        dependency.license.name.should == "manual"
+      end
+
+      it "saves a new license" do
+        dependency.apply_better_license "new license"
+        dependency.license.name.should == "new license"
+      end
+
+      it "re-uses an existing, unassociated, license alias" do
+        dependency.license = LicenseAlias.named("old")
+
+        new_license = LicenseAlias.named("new license")
+
+        dependency.apply_better_license "new license"
+        dependency.license.should == new_license
+      end
+
+      it "updates the license's name" do
+        dependency.license = LicenseAlias.named("old")
+
+        dependency.apply_better_license "new license"
+        dependency.license.name.should == "new license"
+      end
+
+      it "does not change the approval" do
+        dependency.license = LicenseAlias.named("old")
+        dependency.manually_approved = true
+
+        dependency.apply_better_license "new license"
+        dependency.should be_approved
+      end
+    end
   end
 end
 

data/spec/lib/license_finder/yml_to_sql_spec.rb

@@ -51,7 +51,7 @@ describe LicenseFinder::YmlToSql do
 
   describe '.convert_all' do
     before do
-      (DB.tables - [:schema_migrations]).each { |table| DB[table].truncate }
+      (LicenseFinder::DB.tables - [:schema_migrations]).each { |table| LicenseFinder::DB[table].truncate }
     end
 
     describe "when dependency source is set to bundle" do
@@ -61,26 +61,18 @@ describe LicenseFinder::YmlToSql do
         described_class.convert_all([legacy_attributes])
 
         saved_dep = described_class::Sql::Dependency.first
-        if LicenseFinder::Platform.java?
-          saved_dep.manual.should == 0
-        else
-          saved_dep.manual.should == false
-        end
+        saved_dep.should_not be_manual
       end
     end
 
     describe "when dependency source is not set to bundle" do
       let(:source) { "" }
 
-      it "sets manual to be false" do
+      it "sets manual to be true" do
         described_class.convert_all([legacy_attributes])
 
         saved_dep = described_class::Sql::Dependency.first
-        if LicenseFinder::Platform.java?
-          saved_dep.manual.should == 1
-        else
-          saved_dep.manual.should == true
-        end
+        saved_dep.should be_manual
       end
     end
 
@@ -94,6 +86,7 @@ describe LicenseFinder::YmlToSql do
       saved_dep.summary.should == "some summary"
       saved_dep.description.should == "some description"
       saved_dep.homepage.should == "www.homepage.com"
+      saved_dep.manually_approved.should be_true
     end
 
     it "associates the license to the dependency" do

data/spec/spec_helper.rb

@@ -6,6 +6,8 @@ require 'license_finder'
 require 'rspec'
 require 'webmock/rspec'
 
+ENV['test_run'] = true.to_s
+
 Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].each do |file|
   require file
 end
@@ -15,8 +17,26 @@ RSpec.configure do |config|
 end
 
 RSpec.configure do |config|
-  config.before { FileUtils.rm_f("config/license_finder.yml") }
   config.around do |example|
-    DB.transaction(rollback: :always) { example.run }
+    LicenseFinder::DB.transaction(rollback: :always) { example.run }
+  end
+
+  config.after(:suite) do
+    ["./doc", "./elsewhere", "./test path", "./config"].each do |tmp_dir|
+      FileUtils.rm_rf(tmp_dir)
+    end
+  end
+end
+
+module LicenseFinder
+  shared_examples "it conforms to interface required by PackageSaver" do
+    it { expect { subject.name }.to_not raise_error }
+    it { expect { subject.version }.to_not raise_error }
+    it { expect { subject.summary }.to_not raise_error }
+    it { expect { subject.description }.to_not raise_error }
+    it { expect { subject.homepage }.to_not raise_error }
+    it { expect { subject.groups }.to_not raise_error }
+    it { expect { subject.children }.to_not raise_error }
+    it { expect { subject.license }.to_not raise_error }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: java
 authors:
 - Jacob Maine
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,14 +78,14 @@ dependencies:
   name: httparty
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -235,12 +235,15 @@ files:
 - db/migrate/201307251004_data_fix_manual_licenses.rb
 - db/migrate/201307251107_reassociate_license.rb
 - db/migrate/201307251340_remove_manual_from_license_aliases.rb
+- db/migrate/201311192002_add_manually_approved_to_dependencies.rb
+- db/migrate/201311192003_reassociate_manual_approval.rb
+- db/migrate/201311192010_drop_approvals.rb
 - features/approve_dependencies.feature
 - features/cli.feature
 - features/html_report.feature
 - features/ignore_bundle_groups.feature
+- features/manually_managed_dependencies.feature
 - features/node_dependencies.feature
-- features/non_bundler_dependencies.feature
 - features/project_name.feature
 - features/python_dependencies.feature
 - features/rails_rake.feature
@@ -249,8 +252,8 @@ files:
 - features/step_definitions/cli_steps.rb
 - features/step_definitions/html_report_steps.rb
 - features/step_definitions/ignore_bundle_groups_steps.rb
+- features/step_definitions/manually_managed_steps.rb
 - features/step_definitions/node_steps.rb
-- features/step_definitions/non_bundler_steps.rb
 - features/step_definitions/project_name_steps.rb
 - features/step_definitions/python_steps.rb
 - features/step_definitions/rails_rake_steps.rb
@@ -275,7 +278,9 @@ files:
 - lib/data/licenses/SimplifiedBSD.txt
 - lib/license_finder.rb
 - lib/license_finder/bower.rb
-- lib/license_finder/bundle.rb
+- lib/license_finder/bower_package.rb
+- lib/license_finder/bundler.rb
+- lib/license_finder/bundler_package.rb
 - lib/license_finder/cli.rb
 - lib/license_finder/configuration.rb
 - lib/license_finder/dependency_manager.rb
@@ -292,9 +297,11 @@ files:
 - lib/license_finder/license/simplified_bsd.rb
 - lib/license_finder/license_url.rb
 - lib/license_finder/npm.rb
+- lib/license_finder/npm_package.rb
 - lib/license_finder/package.rb
 - lib/license_finder/package_saver.rb
 - lib/license_finder/pip.rb
+- lib/license_finder/pip_package.rb
 - lib/license_finder/platform.rb
 - lib/license_finder/possible_license_file.rb
 - lib/license_finder/possible_license_files.rb
@@ -306,7 +313,6 @@ files:
 - 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
@@ -345,8 +351,10 @@ files:
 - spec/fixtures/readme/README
 - spec/fixtures/readme/Readme.markdown
 - spec/fixtures/utf8_gem/README
+- spec/lib/license_finder/bower_package_spec.rb
 - spec/lib/license_finder/bower_spec.rb
-- spec/lib/license_finder/bundle_spec.rb
+- spec/lib/license_finder/bundler_package_spec.rb
+- spec/lib/license_finder/bundler_spec.rb
 - spec/lib/license_finder/cli_spec.rb
 - spec/lib/license_finder/configuration_spec.rb
 - spec/lib/license_finder/dependency_manager_spec.rb
@@ -365,9 +373,10 @@ files:
 - spec/lib/license_finder/license_spec.rb
 - spec/lib/license_finder/license_url_spec.rb
 - spec/lib/license_finder/markdown_report_spec.rb
+- spec/lib/license_finder/npm_package_spec.rb
 - spec/lib/license_finder/npm_spec.rb
 - spec/lib/license_finder/package_saver_spec.rb
-- spec/lib/license_finder/package_spec.rb
+- spec/lib/license_finder/pip_package_spec.rb
 - spec/lib/license_finder/pip_spec.rb
 - spec/lib/license_finder/possible_license_file_spec.rb
 - spec/lib/license_finder/possible_license_files_spec.rb
@@ -392,7 +401,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -400,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.0
+rubygems_version: 2.2.1
 signing_key:
 specification_version: 4
 summary: Audit the OSS licenses of your application's dependencies.
@@ -409,8 +418,8 @@ test_files:
 - features/cli.feature
 - features/html_report.feature
 - features/ignore_bundle_groups.feature
+- features/manually_managed_dependencies.feature
 - features/node_dependencies.feature
-- features/non_bundler_dependencies.feature
 - features/project_name.feature
 - features/python_dependencies.feature
 - features/rails_rake.feature
@@ -419,8 +428,8 @@ test_files:
 - features/step_definitions/cli_steps.rb
 - features/step_definitions/html_report_steps.rb
 - features/step_definitions/ignore_bundle_groups_steps.rb
+- features/step_definitions/manually_managed_steps.rb
 - features/step_definitions/node_steps.rb
-- features/step_definitions/non_bundler_steps.rb
 - features/step_definitions/project_name_steps.rb
 - features/step_definitions/python_steps.rb
 - features/step_definitions/rails_rake_steps.rb
@@ -455,8 +464,10 @@ test_files:
 - spec/fixtures/readme/README
 - spec/fixtures/readme/Readme.markdown
 - spec/fixtures/utf8_gem/README
+- spec/lib/license_finder/bower_package_spec.rb
 - spec/lib/license_finder/bower_spec.rb
-- spec/lib/license_finder/bundle_spec.rb
+- spec/lib/license_finder/bundler_package_spec.rb
+- spec/lib/license_finder/bundler_spec.rb
 - spec/lib/license_finder/cli_spec.rb
 - spec/lib/license_finder/configuration_spec.rb
 - spec/lib/license_finder/dependency_manager_spec.rb
@@ -475,9 +486,10 @@ test_files:
 - spec/lib/license_finder/license_spec.rb
 - spec/lib/license_finder/license_url_spec.rb
 - spec/lib/license_finder/markdown_report_spec.rb
+- spec/lib/license_finder/npm_package_spec.rb
 - spec/lib/license_finder/npm_spec.rb
 - spec/lib/license_finder/package_saver_spec.rb
-- spec/lib/license_finder/package_spec.rb
+- spec/lib/license_finder/pip_package_spec.rb
 - spec/lib/license_finder/pip_spec.rb
 - spec/lib/license_finder/possible_license_file_spec.rb
 - spec/lib/license_finder/possible_license_files_spec.rb