badgerbadgerbadger 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c9af23f129d7fc0d0ff6c2da27abae3da5bc596
-  data.tar.gz: e08ce50e33fc38845c8131ca2ebbf4d7e3c003a3
+  metadata.gz: bda40099101531793bb11b4dd352cae00ee3f9ce
+  data.tar.gz: eb26b737315c9dec31a65f1025be60e6646bd361
 SHA512:
-  metadata.gz: ec577ef671de98f9030e4127077af545e9c36f5df6cc301bcec5bf2c437b3d1fe37c7d6ed715106655e33002993ba11d0db749926ee173c448c856c5e4ae0c97
-  data.tar.gz: 9490e09bed7a3a9c27c9b3568026bf9a0e44b3a0e8eb97112638344d64164968bd40a48e5b5b24bcc7b51b85d627c32b2aaa652219291c31e647418bc2c3c936
+  metadata.gz: b4254cf8270add88255ccf324cf649982f975ac9f94c97b41ba56914aa2e8f6f352877d61e0e8b153d6462d7eca1b52afc2a4004fcb4579bb5ec33b35d0fc172
+  data.tar.gz: d530e8342c7ef47240a9821f00f3214864cb21c369c98677b0b62534880b82994d2ba17a5deba9f1f7b1468eeb10d7334421b5b6ea16b01ac348c777882a6c4c

data/DESC.md

@@ -25,5 +25,3 @@ And if a license file is found, a License Badge will be generated. Currently sup
 * GPL-3
 
 The supported license details are in `https://github.com/badges/badgerbadgerbadger/blob/master/config/licenses.yaml`, if you're using a different license, send a PR! And if your gemspec license conflicts with your LICENSE file, you should probably fix that.
-
-Use the `--pulls` flag to add badges for open Github issues and pull-requests.

data/README.md

@@ -1,13 +1,12 @@
-[![Build Status](http://img.shields.io/travis/badges/badgerbadgerbadger.svg)](https://travis-ci.org/badges/badgerbadgerbadger)
-[![Dependency Status](http://img.shields.io/gemnasium/badges/badgerbadgerbadger.svg)](https://gemnasium.com/badges/badgerbadgerbadger)
-[![Coverage Status](http://img.shields.io/coveralls/badges/badgerbadgerbadger.svg)](https://coveralls.io/r/badges/badgerbadgerbadger)
-[![Code Climate](http://img.shields.io/codeclimate/github/badges/badgerbadgerbadger.svg)](https://codeclimate.com/github/badges/badgerbadgerbadger)
-[![Github Issues](http://githubbadges.herokuapp.com/badges/badgerbadgerbadger/issues.svg)](https://github.com/badges/badgerbadgerbadger/issues)
-[![Pending Pull-Requests](http://githubbadges.herokuapp.com/badges/badgerbadgerbadger/pulls.svg)](https://github.com/badges/badgerbadgerbadger/pulls)
-[![Gem Version](http://img.shields.io/gem/v/badgerbadgerbadger.svg)](https://rubygems.org/gems/badgerbadgerbadger)
-[![License](http://img.shields.io/:license-mit-blue.svg)](http://badges.mit-license.org)
-[![Badges](http://img.shields.io/:badges-9/9-ff6799.svg)](https://github.com/badges/badgerbadgerbadger)
-
+[![Build Status](http://img.shields.io/travis/badges/badgerbadgerbadger.svg?style=flat-square)](https://travis-ci.org/badges/badgerbadgerbadger)
+[![Dependency Status](http://img.shields.io/gemnasium/badges/badgerbadgerbadger.svg?style=flat-square)](https://gemnasium.com/badges/badgerbadgerbadger)
+[![Coverage Status](http://img.shields.io/coveralls/badges/badgerbadgerbadger.svg?style=flat-square)](https://coveralls.io/r/badges/badgerbadgerbadger)
+[![Code Climate](http://img.shields.io/codeclimate/github/badges/badgerbadgerbadger.svg?style=flat-square)](https://codeclimate.com/github/badges/badgerbadgerbadger)
+[![Github Issues](http://githubbadges.herokuapp.com/badges/badgerbadgerbadger/issues.svg?style=flat-square)](https://github.com/badges/badgerbadgerbadger/issues)
+[![Pending Pull-Requests](http://githubbadges.herokuapp.com/badges/badgerbadgerbadger/pulls.svg?style=flat-square)](https://github.com/badges/badgerbadgerbadger/pulls)
+[![Gem Version](http://img.shields.io/gem/v/badgerbadgerbadger.svg?style=flat-square)](https://rubygems.org/gems/badgerbadgerbadger)
+[![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://badges.mit-license.org)
+[![Badges](http://img.shields.io/:badges-9/9-ff6799.svg?style=flat-square)](https://github.com/badges/badgerbadgerbadger)
 #Badger
 
 Because I grow weary of copy-n-pasting the badge URLs into the README of every project, and the [img.shields.io](http://img.shields.io) API now supports all of the services I use

data/config/config.yaml

@@ -2,4 +2,7 @@ badge_service:      img.shields.io
 license_colour:     blue
 bonus_badge_colour: ff6799
 bonus_badge_link:   https://github.com/badges/badgerbadgerbadger
-badge_type:         svg
+badge_type:         svg
+valid_styles:
+  - flat
+  - flat-square

data/config/services.yaml

@@ -1,23 +1,23 @@
 travis:
-  alt_text:   Build Status
-  scheme:     https
-  url_path:   travis-ci.org
-  badge_slug: travis
+  alt_text:     Build Status
+  scheme:       https
+  url_path:     travis-ci.org
+  badge_slug:   travis
 
 coveralls:
-  alt_text:   Coverage Status
-  url_path:   coveralls.io/r
-  badge_slug: coveralls
+  alt_text:     Coverage Status
+  url_path:     coveralls.io/r
+  badge_slug:   coveralls
 
 gemnasium:
-  alt_text:   Dependency Status
-  url_path:   gemnasium.com
-  badge_slug: gemnasium
+  alt_text:     Dependency Status
+  url_path:     gemnasium.com
+  badge_slug:   gemnasium
 
 codeclimate:
-  alt_text:   Code Climate
-  url_path:   codeclimate.com/github
-  badge_slug: codeclimate/github
+  alt_text:     Code Climate
+  url_path:     codeclimate.com/github
+  badge_slug:   codeclimate/github
 
 pulls:
   alt_text:     Pending Pull-Requests

data/features/alternative-styles.feature

@@ -16,3 +16,10 @@ Feature: Alternative styles
 [![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://doge.mit-license.org)
 [![Badges](http://img.shields.io/:badges-7/7-ff6799.svg?style=flat-square)](https://github.com/badges/badgerbadgerbadger)
     """
+  Scenario: Invalid style choice
+    When I run `badger badge --style fluffy /tmp/wow_repo`
+    Then the output should contain:
+    """
+    Invalid style choice 'fluffy'
+    """
+    And the exit status should be 3

data/lib/badger/badger.rb

@@ -38,6 +38,11 @@ module Badger
     end
 
     def style style
+      unless Config.instance.config['valid_styles'].include? style
+        puts "Invalid style choice '#{style}'"
+        exit 3
+      end
+      
       Config.instance.config['badge_style'] = style
     end
 

data/lib/badger/cli.rb

@@ -14,12 +14,13 @@ module Badger
     long_desc File.read File.join File.dirname( __FILE__), '..', '..', 'DESC.md'
     method_option :png, :type => :boolean, :default => false, :desc => 'Generate PNG badges instead of the default SVG (because sometimes Github does caching things)'
     method_option :pulls, :type => :boolean, :default => false, :desc => 'Generate Github pull-request and issue-count badges'
-    method_option :style, :type => :string, :default => nil, :desc => "Choose a different badge style (currently supported: 'flat' or 'flat-square')"
+    method_option :style, :type => :string, :default => nil, :desc => "Choose a different badge style (currently supported: #{Config.instance.config['valid_styles'].join ', '})"
 
     def badge dir = '.'
       @badger = Badger.new Badger.git_remote dir
 
       @badger.badge_type 'png' if options[:png]
+
       @badger.style options[:style] if options[:style]
 
       @badger.add 'travis' if Badger.has_travis? dir

data/lib/badger/version.rb

@@ -1,3 +1,3 @@
 module Badger
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badgerbadgerbadger
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - pikesley