license_finder 0.9.0-java → 0.9.1-java

data/spec/lib/license_finder/reporter_spec.rb

@@ -1,4 +1,38 @@
 require 'spec_helper'
 
-describe LicenseFinder::Reporter do
+module LicenseFinder
+  describe Reporter do
+    describe "#write_reports" do
+      subject { Reporter.write_reports }
+
+      before do
+        Dependency.stub(:all) { [double(:dep)] }
+        File.any_instance.stub(:puts)
+
+        LicenseFinder.stub_chain(:config, :dependencies_html) { 'html_file_path' }
+        LicenseFinder.stub_chain(:config, :dependencies_text) { 'text_file_path' }
+
+        TextReport.stub_chain(:new, :to_s) { 'text report' }
+        HtmlReport.stub_chain(:new, :to_s) { 'text report' }
+
+        LicenseFinder.stub_chain(:config, :dependencies_legacy_text) { 'legacy_text_path' }
+        File.stub(:exists?).with('legacy_text_path') { false }
+
+        File.stub(:open).with('html_file_path', 'w+')
+        File.stub(:open).with('text_file_path', 'w+')
+      end
+
+      it "writes an html file" do
+        File.should_receive(:open).with('html_file_path', 'w+')
+        File.should_receive(:open).with('text_file_path', 'w+')
+        subject
+      end
+
+      it "deletes old dependencies.txt file" do
+        File.stub(:exists?).with('legacy_text_path') { true }
+        File.should_receive(:delete).with('legacy_text_path')
+        subject
+      end
+    end
+  end
 end

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

@@ -76,12 +76,35 @@ module LicenseFinder
         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
       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
+      end
+    end
+
+    describe "#set_license_manually!" do
+      let(:license) { LicenseAlias.create(name: 'foolicense') }
+      let(:dependency) { Dependency.create(name: 'foogem') }
+
+      it "sets manual license to true" do
+        dependency.license_manual.should be_false
+        dependency.set_license_manually!('Updated')
+        dependency.license_manual.should be_true
+      end
+
+      it "modifies the license" do
+        LicenseAlias.should_receive(:find_or_create).with(name: 'Updated').and_return(license)
+        dependency.set_license_manually!('Updated')
+        dependency.reload.license.should == license
       end
     end
   end

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

@@ -10,22 +10,6 @@ module LicenseFinder
       end
     end
 
-    describe "#set_manually" do
-      subject do
-        described_class.create(name: 'Original')
-      end
-
-      it "modifies the license" do
-        subject.set_manually('Updated')
-        subject.reload.name.should == 'Updated'
-      end
-
-      it "marks the approval as manual" do
-        subject.set_manually('Updated')
-        subject.reload.manual.should be_true
-      end
-    end
-
     describe "#whitelisted?" do
       let(:config) { Configuration.new }
 

data/spec/lib/license_finder/yml_to_sql_spec.rb

@@ -61,7 +61,11 @@ describe LicenseFinder::YmlToSql do
         described_class.convert_all([legacy_attributes])
 
         saved_dep = described_class::Sql::Dependency.first
-        saved_dep.manual.should == false
+        if LicenseFinder::Platform.java?
+          saved_dep.manual.should == 0
+        else
+          saved_dep.manual.should == false
+        end
       end
     end
 
@@ -72,7 +76,11 @@ describe LicenseFinder::YmlToSql do
         described_class.convert_all([legacy_attributes])
 
         saved_dep = described_class::Sql::Dependency.first
-        saved_dep.manual.should == true
+        if LicenseFinder::Platform.java?
+          saved_dep.manual.should == 1
+        else
+          saved_dep.manual.should == true
+        end
       end
     end
 
@@ -93,7 +101,7 @@ 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.url.should == "http://www.gnu.org/licenses/gpl-2.0.txt"
     end
 
     it "associates bundler groups" do

data/spec/lib/license_finder_spec.rb

@@ -66,7 +66,7 @@ describe LicenseFinder do
         config = LicenseFinder.config
         config.dependencies_dir.should == './elsewhere'
         config.dependencies_yaml.should == './elsewhere/dependencies.yml'
-        config.dependencies_text.should == './elsewhere/dependencies.txt'
+        config.dependencies_text.should == './elsewhere/dependencies.csv'
         config.dependencies_html.should == './elsewhere/dependencies.html'
       end
 
@@ -74,7 +74,7 @@ describe LicenseFinder do
         config = LicenseFinder.config
         config.dependencies_dir.should == './doc/'
         config.dependencies_yaml.should == './doc/dependencies.yml'
-        config.dependencies_text.should == './doc/dependencies.txt'
+        config.dependencies_text.should == './doc/dependencies.csv'
         config.dependencies_html.should == './doc/dependencies.html'
       end
     end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 
+require 'pry'
 require 'license_finder'
 require 'rspec'
 
@@ -12,19 +13,8 @@ RSpec.configure do |config|
   config.mock_with :rspec
 end
 
-require 'database_cleaner'
-
 RSpec.configure do |config|
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation, except: [:schema_migrations])
-  end
-
-  config.before(:each) do
-    DatabaseCleaner.start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner.clean
+  config.around(:each) do |example|
+    DB.transaction(rollback: :always) { example.run }
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: license_finder
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.9.0
+  version: 0.9.1
 platform: java
 authors:
 - Jacob Maine
@@ -11,28 +11,27 @@ authors:
 - David Edwards
 - Paul Meskers
 - Brent Wheeldon
+- Trevor John
 - David Tengdin
 - William Ramsey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-30 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
@@ -40,17 +39,15 @@ 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
@@ -58,17 +55,15 @@ dependencies:
   name: thor
   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
@@ -76,17 +71,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: :runtime
@@ -94,17 +87,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
@@ -112,17 +103,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
@@ -130,17 +119,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
@@ -148,33 +135,31 @@ 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
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
     none: false
   prerelease: false
   type: :development
@@ -182,13 +167,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
@@ -198,13 +183,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
@@ -223,9 +208,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.rdoc
 - Gemfile
 - LICENSE
@@ -241,11 +226,16 @@ files:
 - 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
+- db/migrate/201307250917_add_license_manual_to_dependencies.rb
+- db/migrate/201307251004_data_fix_manual_licenses.rb
+- db/migrate/201307251107_reassociate_license.rb
+- db/migrate/201307251340_remove_manual_from_license_aliases.rb
 - features/approve_dependencies.feature
 - features/cli.feature
 - features/html_report.feature
 - features/ignore_bundle_groups.feature
 - features/non_bundler_dependencies.feature
+- features/project_name.feature
 - features/rails_rake.feature
 - features/set_license.feature
 - features/step_definitions/approve_dependencies_steps.rb
@@ -253,6 +243,7 @@ files:
 - 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/project_name_steps.rb
 - features/step_definitions/rails_rake_steps.rb
 - features/step_definitions/set_license_steps.rb
 - features/step_definitions/shared_steps.rb
@@ -260,7 +251,9 @@ files:
 - features/step_definitions/whitelist_steps.rb
 - features/text_report.feature
 - features/whitelist.feature
+- files/dependency_breakdown.png
 - files/license_finder.yml
+- files/report_breakdown.png
 - lib/data/licenses/Apache2.txt
 - lib/data/licenses/BSD.txt
 - lib/data/licenses/GPLv2.txt
@@ -307,7 +300,9 @@ files:
 - lib/templates/text_report.erb
 - license_finder.gemspec
 - readme.md
-- release.md
+- release/gem_version.rb
+- release/manual_instructions.md
+- release/publish.sh
 - spec/fixtures/APACHE-2-LICENSE
 - spec/fixtures/GPLv2
 - spec/fixtures/ISC-LICENSE
@@ -371,23 +366,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:
@@ -401,6 +394,7 @@ test_files:
 - features/html_report.feature
 - features/ignore_bundle_groups.feature
 - features/non_bundler_dependencies.feature
+- features/project_name.feature
 - features/rails_rake.feature
 - features/set_license.feature
 - features/step_definitions/approve_dependencies_steps.rb
@@ -408,6 +402,7 @@ test_files:
 - 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/project_name_steps.rb
 - features/step_definitions/rails_rake_steps.rb
 - features/step_definitions/set_license_steps.rb
 - features/step_definitions/shared_steps.rb