deriving_license 0.2.6 → 0.2.7

data/deriving_license.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'deriving_license'
-  s.version     = '0.2.6'
+  s.version     = '0.2.7'
   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

@@ -90,6 +90,9 @@ class DerivingLicense
         end
       end
     end
+    if detected_licenses["custom"].empty?
+      detected_licenses.delete("custom")
+    end
     detected_licenses
   end
   
@@ -118,7 +121,7 @@ class DerivingLicense
     unless unrecognized.empty?
       puts "There #{unrecognized.count==1 ? "is" : "are"} also #{unrecognized.count} unrecognized license#{unrecognized.count==1 ? "" : "s"}: #{unrecognized.join(', ')}"
     end
-    unless licenses["custom"].empty?
+    if licenses["custom"] and !licenses["custom"].empty?
       puts "The following dependencies have custom licenses: #{licenses["custom"].join(', ')}"
     end
   end
@@ -155,6 +158,37 @@ class DerivingLicense
     `rm #{gem_filename}` # Remove fetched gem.
   end
   
+  def self.search_in_paths(paths)
+    licenses = []
+    paths.each do |p|
+      if File.exist?(p)
+        File.open(p).each_line do |l|
+          if /license/.match(l)
+            # Found the word "license", so now look for known license names.
+            (@@license_details.keys + @@license_aliases.keys).each do |n|
+              if /#{n}/.match(l)
+                licenses << n
+                break
+              end
+            end
+          end
+        end
+      end
+    end
+    licenses
+  end
+  
+  def self.search_in_content(content)
+    licenses = []
+    (@@license_details.keys + @@license_aliases.keys).each do |n|
+      if /#{n}/.match(content)
+        licenses << n
+        return licenses
+      end
+    end
+    licenses
+  end
+  
   ##############
   # STRATEGIES #
   ##############
@@ -177,31 +211,13 @@ class DerivingLicense
       # Found filename with the word "license", so now look for known license 
       # names in the rest of this filename.
       license_file_paths.each do |p|
-        (@@license_details.keys + @@license_aliases.keys).each do |n|
-          if /#{n}/.match(p)
-            licenses << n
-            break
-          end
-        end
+        licenses = search_in_content(p)
+        break unless licenses.empty?
       end
     
       if licenses.empty?
         # Failing that, open each file and check the content in a similar manner.
-        license_file_paths.each do |p|
-          if File.exist?(p)
-            File.open(p).each_line do |l|
-              if /license/.match(l)
-                # Found the word "license", so now look for known license names.
-                (@@license_details.keys + @@license_aliases.keys).each do |n|
-                  if /#{n}/.match(l)
-                    licenses << n
-                    break
-                  end
-                end
-              end
-            end
-          end
-        end
+        licenses = search_in_paths(license_file_paths)
       end
       
       # Finally, if we couldn't find a known license, but a license file 
@@ -229,13 +245,8 @@ class DerivingLicense
     end
     content.split('\n').each do |l|
       if /license/.match(l)
-        # Found the word "license", so now look for known license names.
-        (@@license_details.keys + @@license_aliases.keys).each do |n|
-          if /#{n}/.match(l)
-            licenses << n
-            return licenses
-          end
-        end
+        licenses = search_in_content(l)
+        break unless licenses.empty?
       end
     end
     return licenses # If we didn't return early, there's no match.
@@ -253,21 +264,7 @@ class DerivingLicense
       break unless readme_file_paths
     
       # Open each readme file and check the content.
-      readme_file_paths.each do |p|
-        if File.exist?(p)
-          File.open(p).each_line do |l|
-            if /license/.match(l)
-              # Found the word "license", so now look for known license names.
-              (@@license_details.keys + @@license_aliases.keys).each do |n|
-                if /#{n}/.match(l)
-                  licenses << n
-                  break
-                end
-              end
-            end
-          end
-        end
-      end
+      licenses = search_in_paths(readme_file_paths)
     
     end # end of call to yield_gem_source_directory
     return licenses

metadata

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