badgerbadgerbadger 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c2275056d6d78d8d187ba9513cf496220319068
-  data.tar.gz: 2f7b3f8cd6908965911ad8d13dbf311d89c3aedc
+  metadata.gz: 4ec7710cd5d4ef7c1241f118046e64b48c2d9d05
+  data.tar.gz: ae51cb87093ec657c6ab2a3722dab3bb354720a0
 SHA512:
-  metadata.gz: a2e731e86ee1b73e6ca3acfb56ce8c430aac671fe9f00cc5b5c94e6293afb265046fea654090f5ee21dcb298247c4f421fc7654e05f2df8e978b67249bf4ba31
-  data.tar.gz: 400f85d23d2a15c7b39bac6cbf505b73aff2f862a809f72811f4bf9291cc49ec4d36679fc15105a2dd256a5d2d8f5c641a94673d1c9cc29fc7f59a4f586e55cb
+  metadata.gz: a4f2b08424a3c9f284811befdb5f924ebf228a24e2623828ffd106f96cf025a18934059a4b81f07765c6d635bb93c42510d5a5919e37f76f2b62bdfaf6a411fe
+  data.tar.gz: 1deda617e2d5f783a3b48987d7e96189e519aa9cc0c267a12a92b7da8e9619467f90063bc83243557e783b57215e8c48bd6a7c7f66560ed3b51991809643f1d5

data/config/config.yaml

@@ -1 +1,2 @@
-badge_service:    img.shields.io
+badge_service:    img.shields.io
+license_colour:   blue

data/config/licenses.yaml

@@ -1,4 +1,4 @@
-# license_name: - as found in a gemspec
+# license_name: - as found in a gemspec (but downcased)
 #   url:        - where the license lives
 #   regex:      - text to look for in the license file
 #   badge-text: - text to use in the generated badge, if different from license_name

data/features/licenses.feature

@@ -44,6 +44,14 @@ GPL
 MIT
     """
 
+  @license @gpl3
+  Scenario: Generate GPL3 license
+    When I successfully run `badger badge /tmp/wow_repo`
+    Then the output should contain:
+    """
+![License](http://img.shields.io/:license-gpl3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0.html)
+    """
+
   @license @doge-license
   Scenario: Attempt to generate an unknown license type
     When I successfully run `badger badge /tmp/wow_repo`

data/features/rubygems.feature

@@ -10,4 +10,15 @@ Feature: Get rubygems badge
     """
 [![Gem Version](http://img.shields.io/gem/v/suchgem.svg)](https://rubygems.org/gems/suchgem)
 [![License](http://img.shields.io/:license-mit-blue.svg)](http://doge.mit-license.org)
-    """
+    """
+
+  @gemspecmultilicense @gpl3
+  Scenario: Get multiple licenses
+    When I successfully run `badger badge /tmp/wow_repo`
+    Then the output should contain:
+    """
+[![Gem Version](http://img.shields.io/gem/v/suchgem.svg)](https://rubygems.org/gems/suchgem)
+[![License](http://img.shields.io/:license-mit-blue.svg)](http://doge.mit-license.org)
+[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+[![License](http://img.shields.io/:license-gpl3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0.html)
+    """

data/features/support/hooks/rubygems.rb

@@ -10,6 +10,23 @@ Before '@gemspec' do
   end
 EOF
 
+  f = File.open "#{$temp_repo}/suchgem.gemspec", 'w'
+  f.write fakespec
+  f.close
+end
+
+Before '@gemspecmultilicense' do
+  fakespec = <<EOF
+  # coding: utf-8
+  lib = File.expand_path('../lib', __FILE__)
+  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+  Gem::Specification.new do |spec|
+    spec.name          = 'suchgem'
+    spec.licenses       = ['MIT', 'apache']
+  end
+EOF
+
   f = File.open "#{$temp_repo}/suchgem.gemspec", 'w'
   f.write fakespec
   f.close

data/lib/badger.rb

@@ -8,4 +8,5 @@ require 'badger/service'
 require 'badger/license'
 require 'badger/rubygem'
 require 'badger/helpers'
+require 'badger/badge'
 

data/lib/badger/badge.rb

@@ -0,0 +1,9 @@
+module Badger
+  def Badger.badge text, badge_url, target_url
+    "[![%s](%s)](%s)" % [
+        text,
+        badge_url,
+        target_url
+    ]
+  end
+end

data/lib/badger/cli.rb

@@ -58,7 +58,9 @@ The supported license details are in https://github.com/pikesley/badger/blob/mas
 
       if gemspec_params = Badger.search_gemspec(dir)
         @badger.rubygem gemspec_params[:rubygem]
-        @badger.license gemspec_params[:license]
+        gemspec_params[:licenses].each do |license_type|
+          @badger.license license_type
+        end
       end
 
       if license_type = Badger.find_license(dir)

data/lib/badger/config.rb

@@ -20,8 +20,8 @@ module Badger
       @licenses
     end
 
-    def badge_service
-      @config['badge_service']
+    def config
+      @config
     end
   end
 end

data/lib/badger/helpers.rb

@@ -16,20 +16,24 @@ module Badger
     lines.grep(/coveralls/).any?
   end
 
+  def Badger.spec_files dir
+    (Dir.entries dir).select { |i| i =~ /gemspec/ }
+  end
+
   def Badger.gemfiles dir
     targets = []
-    targets += (Dir.entries dir).select { |i| /Gemfile/.match i }
-    targets += (Dir.entries dir).select { |i| /gemspec/.match i }
+    targets += (Dir.entries dir).select { |i| i =~ /Gemfile/ }
+    targets += spec_files dir
     targets
   end
 
   def Badger.find_license dir
-    license_file = (Dir.entries dir).select { |i| /LICENSE/i.match i }[0]
+    license_file = (Dir.entries dir).select { |i| i =~ /LICENSE/ }[0]
 
     if license_file
       words = File.open(File.join(dir, license_file), 'r').read
       Config.instance.licenses.each_pair do |k, v|
-        if /#{v['regex']}/im.match words
+        if words =~ /#{v['regex']}/im
           return k
         end
       end
@@ -39,13 +43,14 @@ module Badger
   end
 
   def Badger.search_gemspec dir
-    spec_file = (Dir.entries dir).select { |i| /gemspec/.match i }[0]
+    spec_file = spec_files(dir)[0]
 
     if spec_file
       params           = {}
       gs               = File.readlines(File.join(dir, spec_file))
-      params[:rubygem] = (gs.grep /\.name /)[0].split('=')[-1].strip[1..-2]
-      params[:license] = (gs.grep /\.license /)[0].split('=')[-1].strip[1..-2]
+      params[:rubygem] = eval (gs.grep /\.name /)[0].sub('spec.', '')
+      l = eval (gs.grep /licenses?/)[0].sub('spec.', '')
+      params[:licenses] = l.class.name == 'Array' ? l : [l]
     end
 
     params || nil

data/lib/badger/license.rb

@@ -4,18 +4,19 @@ module Badger
       type = type.downcase
       return nil unless params = Config.instance.licenses[type]
 
-      url = params['url']
-      if /%s/.match url
-        url = url % owner
+      target_url = params['url']
+      if target_url =~ /%s/
+        target_url = target_url % owner
       end
 
       badge_text = type unless badge_text = params['badge_text']
-
-      "[![License](http://%s/:license-%s-blue.svg)](%s)" % [
-          Config.instance.badge_service,
+      badge_url  = 'http://%s/:license-%s-%s.svg' % [
+          Config.instance.config['badge_service'],
           badge_text,
-          url
+          Config.instance.config['license_colour']
       ]
+
+      Badger.badge 'License', badge_url, target_url
     end
 
     def self.licenses

data/lib/badger/rubygem.rb

@@ -1,11 +1,16 @@
 module Badger
   class Rubygem
     def self.badge name
-      "[![Gem Version](http://%s/gem/v/%s.svg)](https://rubygems.org/gems/%s)" % [
-          Config.instance.badge_service,
-          name,
+      badge_url = 'http://%s/gem/v/%s.svg' % [
+          Config.instance.config['badge_service'],
           name
       ]
+
+      target_url = 'https://rubygems.org/gems/%s' % [
+          name
+      ]
+
+      Badger.badge 'Gem Version', badge_url, target_url
     end
   end
 end

data/lib/badger/service.rb

@@ -4,14 +4,17 @@ module Badger
       return nil unless params = Config.instance.services[name]
       params = Config.instance.services[name]
 
-      "[![%s](http://%s/%s/%s.svg)](https://%s/%s)" % [
-          params['alt_text'],
-          Config.instance.badge_service,
+      badge_url  = 'http://%s/%s/%s.svg' % [
+          Config.instance.config['badge_service'],
           params['badge_slug'],
-          github_slug,
+          github_slug
+      ]
+      target_url = 'https://%s/%s' % [
           params['url'],
           github_slug
       ]
+
+      Badger.badge params['alt_text'], badge_url, target_url
     end
   end
 end

data/lib/badger/version.rb

@@ -1,3 +1,3 @@
 module Badger
-  VERSION = "0.5.0"
+  VERSION = "0.6.1"
 end

data/spec/badger_spec.rb

@@ -60,6 +60,13 @@ module Badger
         @badger[0].should == "[![License](http://img.shields.io/:license-gpl3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0.html)"
       end
 
+      it 'should be fine with multiple licenses' do
+        @badger.license 'mit'
+        @badger.license 'apache'
+        @badger[0].should == "[![License](http://img.shields.io/:license-mit-blue.svg)](http://doge.mit-license.org)"
+        @badger[1].should == "[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)"
+      end
+
       it 'should generate nothing for an unknown license' do
         @badger.license 'doge-license'
         @badger.length.should == 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: badgerbadgerbadger
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - pikesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -238,6 +238,7 @@ files:
 - features/support/hooks/rubygems.rb
 - features/support/hooks/services.rb
 - lib/badger.rb
+- lib/badger/badge.rb
 - lib/badger/badger.rb
 - lib/badger/cli.rb
 - lib/badger/config.rb