deriving_license 0.2.9 → 0.3.0

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gemspec
+gemspec :name => "deriving_license"
 
 # NB: For convenient testing, it's worth keeping this here.
 group :test do

data/deriving_license.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'deriving_license'
-  s.version     = '0.2.9'
+  s.version     = '0.3.0'
   s.summary     = "Deriving Licence finds the license agreements for all gems in your Gemfile"
   s.description = "Deriving Licence finds the license agreements for all gems in your Gemfile if included in your project, or in a Gemfile passed to the included binary"
   s.authors     = ["Tom Allen"]

data/lib/deriving_license.rb

@@ -64,23 +64,44 @@ class DerivingLicense
     end unless strategies.nil?
     available_strategies = strategies.nil? ? @strategies : strategies
     
-    if /(gemspec)+/.match(path.downcase)
-      content = Gemnasium::Parser::Gemspec.new(content)
-    else
+    gemspec_content = ""
+    deps = []
+    if /gemspec/.match(path.downcase) # Gemspecs...
+      deps = Gemnasium::Parser::Gemspec.new(content).dependencies
+    else # Gemfiles...
       content = Gemnasium::Parser::Gemfile.new(content)
+      if content.gemspec? # If the gemfile sources a gemspec.
+        begin
+          gemspec_content = File.open(content.gemspec, "r").read
+        rescue # If we fail to read the gemspec, search current directory
+          possible_gemspec_files = Find.find( File.dirname(content.gemspec) )
+          if possible_gemspec_files.count == 1
+            begin
+              gemspec_content = File.open(possible_gemspec_files[0], "r").read
+            rescue
+              raise "Could not open gemspec file \"#{possible_gemspec_files[0]}\" that was called by gemfile."
+            end
+          else
+            raise "Gemfile calls out to unnamed gemspec, but multiple gemspec files found in gemfile's directory. Tell the developer to name their sources!"
+          end
+        end
+      end
+      deps = content.dependencies
+      deps += Gemnasium::Parser::Gemspec.new(gemspec_content).dependencies unless gemspec_content.empty?
     end
     detected_licenses = Hash.new(0)
     detected_licenses["custom"]=[]
     
     # For each dependency specified...
-    content.dependencies.each do |d|
+    licenses = []
+    deps.each do |d|
       print "Determining license for #{d.name}:\n"
       # Try each license finding strategy...
       available_strategies.each do |s|
         print "\tTrying #{s} strategy..."
-        @licenses = eval("#{s}(\"#{d.name}\")")
-        unless @licenses.empty? # and break out of the search if successful
-          if @licenses.count == 1 and @licenses[0] == "custom"
+        licenses = eval("#{s}(\"#{d.name}\")")
+        unless licenses.empty? # and break out of the search if successful
+          if licenses.count == 1 and licenses[0] == "custom"
             print "CUSTOM\n"
           else
             print "SUCCESS\n"
@@ -89,7 +110,7 @@ class DerivingLicense
         end
         print "FAILED\n"
       end
-      @licenses.each do |l| # add each detected license to the results
+      licenses.each do |l| # add each detected license to the results
         unless l == "custom"
           detected_licenses[l]+=1
         else
@@ -136,16 +157,16 @@ class DerivingLicense
   
   def self.get_gem_spec(dep)
     # Check spec cache first.
-    @spec = @specs_cache[dep]
-    return @spec if @spec
+    spec = @specs_cache[dep]
+    return spec if spec
     # See if the gem is installed locally, and if not add -r to call
     Bundler.with_clean_env do # This gets out of the bundler context.
       remote = /#{dep}/.match( `gem list #{dep}` ) ? "" : "-r "      
       yaml = `gem specification #{remote}#{dep} --yaml`
-      @spec = YAML.load(yaml, :safe => true)
+      spec = YAML.load(yaml, :safe => true)
     end
-    @specs_cache[dep] = @spec # Cache it.
-    @spec
+    @specs_cache[dep] = spec # Cache it.
+    spec
   end
   
   def self.yield_gem_source_directory(dep)

data/test/test_deriving_license.rb

@@ -41,21 +41,23 @@ class DerivingLicenseTest < Test::Unit::TestCase
   end
   
   def test_run_with_valid_gemfile_arg
+    result = {}
     assert_nothing_raised do
       output = capture_stdout do
-        @result = DerivingLicense.run("Gemfile")
+        result = DerivingLicense.run("Gemfile")
       end
     end
-    assert_equal( true, @result.has_key?("MIT") )
+    assert_equal( true, result.has_key?("MIT") )
   end
   
   def test_run_with_valid_gemspec_arg
+    result = {}
     assert_nothing_raised do
       output = capture_stdout do
-        @result = DerivingLicense.run("deriving_license.gemspec")
+        result = DerivingLicense.run("deriving_license.gemspec")
       end
     end
-    assert_equal( true, @result.has_key?("MIT") )
+    assert_equal( true, result.has_key?("MIT") )
   end
   
   def test_run_with_non_existant_strategies
@@ -91,51 +93,72 @@ class DerivingLicenseTest < Test::Unit::TestCase
   end
   
   def test_from_scraping_strategy
+    result = {}
     output = capture_stdout do
-      @result = DerivingLicense.run("./test/requires_scraping.gemfile", ["from_scraping_homepage"])
+      result = DerivingLicense.run("./test/requires_scraping.gemfile", ["from_scraping_homepage"])
     end
-    assert_equal( false, @result.empty? )
+    assert_equal( false, result.empty? )
     assert_equal( false, /from_scraping_homepage strategy...SUCCESS/.match( output.string ).nil? ) # Should be SUCCESS
   end
   
   def test_from_scraping_strategy_with_invalid_homepage
+    result = {}
     output = capture_stdout do
-      @result = DerivingLicense.run("./test/requires_scraping_but_invalid_homepage.gemfile", ["from_scraping_homepage"])
+      result = DerivingLicense.run("./test/requires_scraping_but_invalid_homepage.gemfile", ["from_scraping_homepage"])
     end
-    assert_equal( true, @result.empty? )
+    assert_equal( true, result.empty? )
     assert_equal( false, /from_scraping_homepage strategy...FAILED/.match( output.string ).nil? ) # Should be FAILED
   end
 
   def test_from_license_filename
+    result = {}
     output = capture_stdout do
-      @result = DerivingLicense.run("./test/requires_license_filename.gemfile", ["from_license_file"])
+      result = DerivingLicense.run("./test/requires_license_filename.gemfile", ["from_license_file"])
     end
-    assert_equal( false, @result.empty? )
+    assert_equal( false, result.empty? )
     assert_equal( true, /from_license_file strategy...FAILED/.match( output.string ).nil? ) # Shouldn't be FAILED
   end
   
   def test_from_license_file_parsing
+    result = {}
     output = capture_stdout do
-      @result = DerivingLicense.run("./test/requires_license_file_parsing.gemfile", ["from_license_file"])
+      result = DerivingLicense.run("./test/requires_license_file_parsing.gemfile", ["from_license_file"])
     end
-    assert_equal( false, @result.empty? )
+    assert_equal( false, result.empty? )
     assert_equal( true, /from_license_file strategy...FAILED/.match( output.string ).nil? ) # Shouldn't be FAILED
   end
   
   def test_from_license_file_parsing_but_is_custom
+    result = {}
     output = capture_stdout do
-      @result = DerivingLicense.run("./test/requires_license_file_parsing_but_is_custom.gemfile", ["from_license_file"])
+      result = DerivingLicense.run("./test/requires_license_file_parsing_but_is_custom.gemfile", ["from_license_file"])
     end
-    assert_equal( false, @result.empty? )
+    assert_equal( false, result.empty? )
     assert_equal( false, /from_license_file strategy...CUSTOM/.match( output.string ).nil? ) # Should be CUSTOM
   end
   
   def test_from_readme_file_parsing
+    result = {}
     output = capture_stdout do
-      @result = DerivingLicense.run("./test/requires_readme_file_parsing.gemfile", ["from_parsing_readme"])
+      result = DerivingLicense.run("./test/requires_readme_file_parsing.gemfile", ["from_parsing_readme"])
     end
-    assert_equal( false, @result.empty? )
+    assert_equal( false, result.empty? )
     assert_equal( false, /from_parsing_readme strategy...SUCCESS/.match( output.string ).nil? )
   end
   
+  def test_gemfile_with_call_to_gemspec
+    gemfileResult = {}
+    gemspecResult = {}
+    output = capture_stdout do
+      gemfileResult = DerivingLicense.run("Gemfile")
+      gemspecResult = DerivingLicense.run("deriving_license.gemspec")
+    end
+    gemspecResult.each do |k,v|
+      # Each license found in the gemspec should be found in the gemfile too 
+      # (because the gemfile includes the gemspec, so it's a superset.)
+      assert_equal( true, gemfileResult.has_key?(k) )
+    end
+    assert_equal( true, gemfileResult.count >= gemspecResult.count )
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deriving_license
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemnasium-parser