gems-license-finder 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a01609bf3346c47dc552b9232be5d69c1e90846d
-  data.tar.gz: 8f8383ad8bca15ed9b8e6110488767c679b5da89
+  metadata.gz: 1b21cfc843e5843f328e1ae633c63e6f0d312f9b
+  data.tar.gz: bfeb67385f723d004202e29543a2b1cf9dc0b095
 SHA512:
-  metadata.gz: 8e23caae8e928bdd1260a94b874a7f1e1f4b943cb30ae1e07d835581e2fb33ad0ca3ea39f3f39c64422ea160fa4bd75ae0c701f1e76833d01a9f5da93aa06973
-  data.tar.gz: 9643d7c373a601bb5779f046f89d7d320854fa7c639e362b6b0f4668a1bff027b0f4827be96855fe22b0f95b8e166a428b226e47b06e47e28e008205315212bf
+  metadata.gz: 30dd68d50f6ab6156f498edf5e3897510c9b3e249edd771d61f9f49bca942358e6fe4dca526dd6fcd129bbe9df25cd9066cf53abfbdcaaad6030f4c18fd0bf59
+  data.tar.gz: 648f4fe7e462579d3de271c7db3a21dd58b9f7bdc5622e09ae1edab7a1e847c8d1811397846e97fb02c6720f5c48969e782cfbd976f78b8b0491469c22b491e0

data/README.md

@@ -23,7 +23,7 @@ Usage: gems-license-finder gem-name [options]
     -o, --output FORMAT              output format [json, yaml]
     -t, --token TOKEN                github token string ( or by GITHUB_TOEKN environment variable )
 
-More information about how to generate the github token please look at:
+For more information about how to generate the github token please look at:
 https://help.github.com/articles/git-over-https-using-oauth-token
 ```
 
@@ -57,7 +57,7 @@ $ GITHUB_TOEKN=mygithubtoken gems-license-finder rails --output json
   "github_repo": "rails"
 }
 ```
-or 
+or via the `--token` switch
 ```
 $ gems-license-finder redis --output json --token mygithubtoken
 {
@@ -68,7 +68,7 @@ $ gems-license-finder redis --output json --token mygithubtoken
   "github_url": "https://github.com/redis/redis-rb",
   "github_user": "redis",
   "github_repo": "redis-rb"
-
+}
 ```
 via code
 
@@ -80,16 +80,17 @@ client = GemsLicenseFinder.new(oauth_token: "MY-GITHUB-TOKEN")
 pp client.find("rails")
 
 # this should be printed to the console
-
-{:license_type=>"MIT",
- :license_url=>"http://choosealicense.com/licenses/mit/",
- :homepage=>"http://github.com/rails/rails",
- :license=>"https://github.com/rails/rails/blob/master/README.md#license",
- :github_url=>"https://github.com/rails/rails",
- :github_user=>"rails",
- :github_repo=>"rails"}
+{
+  :license_type => "MIT",
+  :license_url  => "http://choosealicense.com/licenses/mit/",
+  :homepage     =>"http://github.com/rails/rails",
+  :license      =>"https://github.com/rails/rails/blob/master/README.md#license",
+  :github_url   =>"https://github.com/rails/rails",
+  :github_user  =>"rails",
+  :github_repo  =>"rails"
+}
 ```
 
 ## Warranty
-This software is provided “as is” and without any express or implied warranties, including, without limitation, the implied warranties of merchantability and fitness for a particular purpose.
+This software is provided "as is" and without any express or implied warranties, including, without limitation, the implied warranties of merchantability and fitness for a particular purpose.
 

data/bin/gems-license-finder

@@ -1,4 +1,5 @@
 #! /usr/bin/env ruby
+# encoding: utf-8
 
 $:.unshift File.expand_path("../../lib",__FILE__)
 
@@ -23,7 +24,7 @@ OptionParser.new do |opts|
   end
 
   opts.separator ""
-  opts.separator "More information about how to generate the github token please look at:"
+  opts.separator "For more information about how to generate the github token please look at:"
   opts.separator "https://help.github.com/articles/git-over-https-using-oauth-token"
   opts.separator ""
   

data/lib/gems-license-finder/version.rb

@@ -1,3 +1,3 @@
 module GemsLicenseFinder
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/gems-license-finder.rb

@@ -18,11 +18,26 @@ module GemsLicenseFinder
   end
 
   class Client
+    LICENSE_FILES = %w[LICENSE LICENSE.md LICENSE.markdown MIT-LICENSE
+                       LICENSE.txt MIT-LICENSE.txt MIT.LICENSE MIT-LICENSE.md
+                       COPYING COPYING.md]
 
-    LICENSE_FILES = %w[LICENSE LICENSE.md LICENSE.markdown MIT-LICENSE LICENSE.txt
-      MIT-LICENSE.txt MIT.LICENSE MIT-LICENSE.md  COPYING COPYING.md]
     README_FILES = %w[README.md README.rdoc README.markdown README.txt README]
 
+    LICENSES_STRINGS = {
+      "mit"      => "Permission is hereby granted",
+      "affero"   => "GNU AFFERO",
+      "artistic" => "artistic",
+      "apache"   => "apache",
+      "bsd-3"    => "Neither the name of the",
+      "bsd"      => "Redistribution and use in source and binary forms",
+      "gpl-3"    => "GNU GENERAL.*?Version 3",
+      "gpl"      => "GNU GENERAL",
+      "lgpl-3"   => "GNU LESSER GENERAL.*?Version 3",
+      "lgpl"     => "GNU LESSER",
+      "ruby"     => "You may make and give away verbatim copies"
+    }
+
     def initialize options = {}
       @github = Github.new options.clone
     end
@@ -33,6 +48,11 @@ module GemsLicenseFinder
 
     private
 
+    def type_from_license_text t
+      LICENSES_STRINGS.each {|n,s| return normalize_licence(n) if utf8_match(t,s)}
+      nil
+    end
+
     def rubygems_info name
       begin
         content = open("http://rubygems.org/gems/#{name}").read
@@ -54,38 +74,51 @@ module GemsLicenseFinder
       user, repo = URI(url).path.split("/")[1..2]
       info = {license: nil, github_url: url, github_user: user, github_repo: repo}
 
+      type, lurl = []
+
       LICENSE_FILES.each do |file|
-        info[:license] = "#{url}/blob/master/#{file}" if fetch_github_file(user, repo, file)
+        content = fetch_github_file(user, repo, file)
+        info[:license] = "#{url}/blob/master/#{file}" if content
 
         if info[:license]
-          info[:license_type], info[:license_url] = normalize_licence("mit") if file =~ /mit/i
+          type, lurl = (file =~ /mit/i) ? 
+            normalize_licence("mit") : type_from_license_text(content)
           break
         end
       end
 
-      if (!info[:license_type] and gemspec = fetch_github_file(user,repo,"#{name}.gemspec") )
-        info[:license_type], info[:license_url] = normalize_licence(gemspec)
+      if (!type and gemspec = fetch_github_file(user,repo,"#{name}.gemspec") )
+        type, lurl = normalize_licence(gemspec)
       end
 
       README_FILES.each do |file|
-        next if info[:license]
+        next if info[:license] and type
         page_url = "https://github.com/#{user}/#{repo}/blob/master/#{file}"
         raw_content = fetch_github_file(user, repo, file)
         content = GitHub::Markup.render(file, raw_content) rescue next
+        type, lurl = normalize_licence(content) if content and type.nil?
 
-        if content and info[:license_type].nil?
-          info[:license_type], info[:license_url] = normalize_licence(content) 
+        info[:license] ||=  page_url + "#" + 
+          utf8_match(content,'<h\d+>.*?(license.*?)<\/h\d+>')[1].to_s.downcase.gsub(/\s/,"-") rescue nil
+
+        if info[:license] and type.nil?
+          type, lurl = type_from_license_text(content)
         end
 
-        msi = Regexp::FIXEDENCODING | Regexp::IGNORECASE | Regexp::MULTILINE
-        regex = Regexp.new('<h\d+>.*?(license.*?)<\/h\d+>'.force_encoding("UTF-8"),msi)
-        info[:license] =  page_url + "#" + 
-          content.match(regex)[1].to_s.downcase.gsub(/\s/,"-") rescue nil
       end
 
+      info[:license_type] = type if type
+      info[:license_url] = lurl if lurl
       info
     end
 
+    def utf8_match text, regex
+       text.force_encoding("utf-8").match Regexp.new(
+         regex.force_encoding("utf-8"),
+         Regexp::FIXEDENCODING|Regexp::IGNORECASE|Regexp::MULTILINE
+       )
+    end
+
     def find_github_url name
       @github.search.repos(q: "#{name} language:ruby").to_a[1][1][0].html_url
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gems-license-finder
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Eran Barak Levi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest