deriving_license 0.3.0 → 0.3.1

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/README.md

@@ -9,7 +9,7 @@ Strategies:
 * from\_scraping\_homepage
 * from\_parsing\_readme
 
-[![Build Status](https://travis-ci.org/Schwolop/deriving_license.png)](https://travis-ci.org/Schwolop/deriving_license)
+[![Build Status](https://travis-ci.org/Schwolop/deriving_license.png)](https://travis-ci.org/Schwolop/deriving_license) [![Coverage Status](https://coveralls.io/repos/Schwolop/deriving_license/badge.png)](https://coveralls.io/r/Schwolop/deriving_license) [![Code Climate](https://codeclimate.com/github/Schwolop/deriving_license.png)](https://codeclimate.com/github/Schwolop/deriving_license)
 
 Example output:
 

data/deriving_license.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'deriving_license'
-  s.version     = '0.3.0'
+  s.version     = '0.3.1'
   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"]
@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "gemnasium-parser"
   s.add_runtime_dependency "safe_yaml"
   s.add_runtime_dependency "curb"
-  s.add_development_dependency "simplecov"
+  s.add_development_dependency "coveralls"
 end

data/lib/deriving_license.rb

@@ -42,7 +42,7 @@ class DerivingLicense
   
   @specs_cache = {} # Cache of gem specifications previously fetched.
 
-  def self.run(path=nil, strategies=nil)
+  def self.run(path=nil, strategies=[])
     unless path
       raise ArgumentError.new("Path to Gemfile or Gemspec required")
     end
@@ -57,71 +57,17 @@ class DerivingLicense
       raise "Invalid path to gemfile or gemspec."
     end
     
-    strategies.each do |s|
-      unless @strategies.include?(s)
-        raise "Supplied strategies must be from the following list: [#{@strategies.join(', ')}]"
-      end
-    end unless strategies.nil?
-    available_strategies = strategies.nil? ? @strategies : strategies
+    available_strategies = strategies.select{|s| @strategies.include?(s)}
+    raise "Supplied strategies must be from the following list: [#{@strategies.join(', ')}]" if available_strategies.count != strategies.count
+    available_strategies = @strategies if strategies.empty?
     
-    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
+    deps = find_deps(path, content)
     detected_licenses = Hash.new(0)
     detected_licenses["custom"]=[]
     
     # For each dependency specified...
-    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"
-            print "CUSTOM\n"
-          else
-            print "SUCCESS\n"
-          end
-          break
-        end
-        print "FAILED\n"
-      end
-      licenses.each do |l| # add each detected license to the results
-        unless l == "custom"
-          detected_licenses[l]+=1
-        else
-          detected_licenses["custom"] << "#{d.name}" # the 'custom' key is 
-            # special and holds an array of the deps with custom licenses.
-        end
-      end
-    end
-    if detected_licenses["custom"].empty?
-      detected_licenses.delete("custom")
-    end
+    determine_licenses(deps,detected_licenses,available_strategies)
+    
     detected_licenses
   end
   
@@ -155,6 +101,60 @@ class DerivingLicense
     end
   end
   
+  def self.find_deps(path, content)
+    deps = []
+    if /gemspec/.match(path.downcase) # Gemspecs...
+      deps = Gemnasium::Parser::Gemspec.new(content).dependencies
+    else # Gemfiles...
+      content = Gemnasium::Parser::Gemfile.new(content)
+      gemspec_content = ""
+      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) )
+        raise "Gemfile calls out to unnamed gemspec, but multiple gemspec files found in gemfile's directory. Tell the developer to name their sources!" unless 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
+      end if content.gemspec? # If the gemfile sources a gemspec.
+      deps = content.dependencies
+      deps += Gemnasium::Parser::Gemspec.new(gemspec_content).dependencies unless gemspec_content.empty?
+    end
+    deps
+  end
+  
+  def self.determine_licenses(deps,detected_licenses,available_strategies)
+    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
+          print "#{licenses.count == 1 and licenses[0] == "custom" ? "CUSTOM\n" : "SUCCESS\n"}"
+          break
+        end
+        print "FAILED\n"
+      end
+      add_to_detected_licenses(licenses,detected_licenses,d.name)
+    end
+    detected_licenses.delete("custom") if detected_licenses["custom"].empty?
+  end
+  
+  def self.add_to_detected_licenses(licenses,detected_licenses,dep_name)
+    licenses.each do |l| # add each detected license to the results
+      if l == "custom"
+        detected_licenses["custom"] << "#{dep_name}" # the 'custom' key is 
+          # special and holds an array of the deps with custom licenses.      
+      else
+        detected_licenses[l]+=1
+      end
+    end
+  end
+  
   def self.get_gem_spec(dep)
     # Check spec cache first.
     spec = @specs_cache[dep]

data/test/test_deriving_license.rb

@@ -1,5 +1,5 @@
-require 'simplecov'
-SimpleCov.start
+require 'coveralls'
+Coveralls.wear!
 
 require 'test/unit'
 require 'deriving_license'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deriving_license
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemnasium-parser
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -83,6 +83,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .travis.yml
 - Gemfile