badgerbadgerbadger 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3485c8ffd28bdd32ae9a4e42bbb32aa4fa1bad99
-  data.tar.gz: 79fb67b4e0ba61450275c3ceba1a5c79733d1870
+  metadata.gz: 20d17195725b29294f5856fe41ca79a9a5a8d40e
+  data.tar.gz: e074f95da2feee548aa73ad4360d851091ca5de0
 SHA512:
-  metadata.gz: 66ceff7a709d8034c19e2963c48d94af212e24936ccdd2882e44da808dc4e47fbf2bbc810fefe2f87a302ea70d81116748274a158ba36e6b4630aa2aaa9833d9
-  data.tar.gz: ab7fd3b07922f3354b7fd54a8027437e938bd6324ef242074ba5f2fcad4c73e409cff6914df32902ac7b0207fb18b3b96f1852f6d57aae9861aa2db52d20e515
+  metadata.gz: 5f3dd2b3dee49f29a1bd4a1bc8b8b9d43520ad67ec6643f86588407c9794dfa4777b6a31afb377e0832e79568b8852f5859b679b9e8890c030fe7b22b729f4f2
+  data.tar.gz: d909197dda9e0af3ca08dd7afd82129abb28586e90f647c752df8724af01192e288d8fbff0933ed6156f02069c404ef5488ea1539a273131d50649a550cb6877

data/features/rubygems.feature

@@ -22,3 +22,25 @@ Feature: Get rubygems badge
 [![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)
     """
+
+  @gemspecnolicense
+  Scenario: Handle a gemspec *without* a license
+    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)
+    """
+
+    And the output should not contain:
+    """
+License
+    """
+
+  @gemspecwiths
+  Scenario: Handle a gemspec with 's' not 'spec'
+    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)
+    """

data/features/support/hooks/rubygems.rb

@@ -27,6 +27,39 @@ Before '@gemspecmultilicense' do
   end
 EOF
 
+  f = File.open "#{$temp_repo}/suchgem.gemspec", 'w'
+  f.write fakespec
+  f.close
+end
+
+Before '@gemspecnolicense' 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'
+  end
+EOF
+
+  f = File.open "#{$temp_repo}/suchgem.gemspec", 'w'
+  f.write fakespec
+  f.close
+end
+
+Before '@gemspecwiths' 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 |s|
+    s.name          = 'suchgem'
+    s.licenses       = ['MIT', 'apache']
+  end
+EOF
+
   f = File.open "#{$temp_repo}/suchgem.gemspec", 'w'
   f.write fakespec
   f.close

data/lib/badger/cli.rb

@@ -26,9 +26,11 @@ module Badger
 
       if gemspec_params = Badger.search_gemspec(dir)
         @badger.rubygem gemspec_params[:rubygem]
-        gemspec_params[:licenses].each do |license_type|
+        if gemspec_params[:licenses]
+          gemspec_params[:licenses].each do |license_type|
           @badger.license license_type
         end
+        end
       end
 
       if license_type = Badger.find_license(dir)

data/lib/badger/helpers.rb

@@ -71,9 +71,12 @@ module Badger
     if spec_file
       params            = {}
       gs                = File.readlines(File.join(dir, spec_file))
-      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]
+      params[:rubygem]  = eval (gs.grep /\.name /)[0].sub(/^\s.*\./, '')
+      lines = (gs.grep /licenses?/)
+      if lines.any?
+        l                 = eval (lines[0]).sub(/^\s.*\./, '')
+        params[:licenses] = l.class.name == 'Array' ? l : [l]
+      end
     end
 
     params || nil

data/lib/badger/version.rb

@@ -1,3 +1,3 @@
 module Badger
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: badgerbadgerbadger
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - pikesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor