license_finder 0.9.2-java → 0.9.3-java

data/.travis.yml

@@ -12,3 +12,11 @@ matrix:
     - rvm: rbx-19mode
     - rvm: ruby-head
     - rvm: jruby-head
+
+notifications:
+  email:
+    - licensefinder@pivotallabs.com
+  webhooks:
+    urls:
+    - http://pulse.pivotallabs.com/projects/657d35b7-b896-4bf3-8837-9d558e2ab651/status
+    on_start: true

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+=== 0.9.3 / 2012-10-01
+
+* Features
+
+  * New Apache 2.0 license alias
+
+* Bugfixes
+
+  * Fix problem which prevented license finder from running in rails < 3.2
+
 === 0.9.2 / 2013-08-17
 
 * Features

data/features/step_definitions/html_report_steps.rb

@@ -53,7 +53,12 @@ Then(/^I should see only see GPL liceneses as unapproved in the html$/) do
   page.should have_content '1 unapproved'
   page.should have_content '1 GPL'
   page.should have_content '1 other'
-  page.should have_content '9 MIT'
+  if @user.jruby?
+    page.should have_content '9 MIT'
+    page.should have_content '1 Apache 2.0'
+  else
+    page.should have_content '10 MIT'
+  end
 end
 
 def is_html_status?(gem, approval)

data/features/step_definitions/shared_steps.rb

@@ -77,7 +77,6 @@ module DSL
       add_to_rakefile <<-RUBY
         require 'bundler/setup'
         require 'license_finder'
-        LicenseFinder.load_rake_tasks
       RUBY
     end
 
@@ -211,6 +210,10 @@ module DSL
       File.open(dependencies_file_path, 'w+') { |f| yield f }
     end
 
+    def jruby?
+      `ruby -v`.match /^jruby/
+    end
+
     private
 
     def add_to_gemfile(line)

data/lib/license_finder.rb

@@ -35,12 +35,10 @@ module LicenseFinder
   def self.config
     @config ||= Configuration.ensure_default
   end
-
-  def self.load_rake_tasks
-    load 'tasks/license_finder.rake'
-  end
 end
 
 require 'license_finder/railtie' if defined?(Rails)
-require 'license_finder/tables'
-LicenseFinder::YmlToSql.convert_if_required
+unless defined?(LicenseAudit)
+  require 'license_finder/tables'
+  LicenseFinder::YmlToSql.convert_if_required
+end

data/lib/license_finder/cli.rb

@@ -39,7 +39,7 @@ module LicenseFinder
     end
 
     class Dependencies < Subcommand
-      option :approve, type: :boolean, desc: "Approve the added dependency"
+      method_option :approve, type: :boolean, desc: "Approve the added dependency"
       desc "add LICENSE DEPENDENCY_NAME [VERSION] [--approve]", "Add a dependency that is not managed by Bundler"
       def add(license, name, version = nil)
         die_on_error {
@@ -145,7 +145,7 @@ module LicenseFinder
     end
 
     class Main < Base
-      option :quiet, type: :boolean, desc: "silences loading output"
+      method_option :quiet, type: :boolean, desc: "silences loading output"
       desc "rescan", "Find new dependencies. (Default action)"
       def rescan
         die_on_error {

data/lib/license_finder/license/apache2.rb

@@ -1,5 +1,5 @@
 class LicenseFinder::License::Apache2 < LicenseFinder::License::Base
-  self.alternative_names = ["Apache 2.0", "Apache2", "Apache-2.0", "Apache Software License"]
+  self.alternative_names = ["Apache 2.0", "Apache2", "Apache-2.0", "Apache Software License", "Apache License 2.0"]
   self.license_url       = "http://www.apache.org/licenses/LICENSE-2.0.txt"
 
   def self.pretty_name

data/license_finder.gemspec

@@ -2,7 +2,7 @@ require './lib/license_finder/platform'
 
 Gem::Specification.new do |s|
   s.name        = "license_finder"
-  s.version     = "0.9.2"
+  s.version     = "0.9.3"
   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"

data/readme.md

@@ -3,7 +3,7 @@
 [![Build Status](https://secure.travis-ci.org/pivotal/LicenseFinder.png)](http://travis-ci.org/pivotal/LicenseFinder)
 [![Code Climate](https://codeclimate.com/github/pivotal/LicenseFinder.png)](https://codeclimate.com/github/pivotal/LicenseFinder)
 
-With bundler and other dependency management tools, it's easy for your project to depend on many packages.  This decomposition is nice, but managing licenses becomes difficult.  License Finter gathers info about the licenses of the packages in your project.
+With bundler and other dependency management tools, it's easy for your project to depend on many packages.  This decomposition is nice, but managing licenses becomes difficult.  License Finder gathers info about the licenses of the packages in your project.
 
 License Finder currently supports ruby gems, python eggs, and node modules. If you are looking to manage licenses on a java/maven project, we recommend using the [license maven plugin](http://mojo.codehaus.org/license-maven-plugin/).
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
+  version: 0.9.3
   prerelease:
-  version: 0.9.2
 platform: java
 authors:
 - Jacob Maine
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -413,8 +413,8 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2
       version: '0'
+      hash: 2
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -422,8 +422,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2
       version: '0'
+      hash: 2
   none: false
 requirements: []
 rubyforge_project: