cinch-dicebag 1.0.5 → 1.0.6

data/lib/cinch/plugins/dicebag.rb

@@ -18,8 +18,9 @@ module Cinch::Plugins
                 'use .roll (dice count)d(sides) to roll specific dice ' +
                 '(e.g. .roll 4d6 3d20)'
 
-    match /dicebag/,    method: :roll_dicebag
-    match /roll (.*)/,  method: :roll
+    match /dicebag/,        method: :roll_dicebag
+    match /roll(?:\s(.*))/, method: :roll
+    match /roll\z/,         method: :roll
 
     def initialize(*args)
       super
@@ -51,9 +52,7 @@ module Cinch::Plugins
     # @param [String] dice Space delimited string of dice to role.
     #   (i.e. '6d12 4d20 d10'
     # @return [String] String describing the dice that were rolled
-    def roll(m, dice)
-      return if dice.nil?
-
+    def roll(m, dice = '1d20')
       result = roll_dice(dice.split(' '))
 
       if result.is_a?(String)

data/lib/cinch/plugins/dicebag/version.rb

@@ -2,6 +2,6 @@
 module Cinch
   # Versioning information for plugin
   module Dicebag
-    VERSION = '1.0.5'
+    VERSION = '1.0.6'
   end
 end

data/spec/cinch-dicebag_spec.rb

@@ -13,6 +13,11 @@ describe Cinch::Plugins::Dicebag do
         should_not be_nil
     end
 
+    it 'should return a roll from using a blank roll' do
+      get_replies(make_message(@bot, '!roll', { nick: 'ted' })).first.
+        should_not be_nil
+    end
+
     it 'should return a roll in bounds from rolling dice' do
       roll = get_replies(make_message(@bot, '!roll 3d3', { nick: 'ted' })).first.text
       roll = roll[/totalling (\d+)/, 1]
@@ -45,11 +50,6 @@ describe Cinch::Plugins::Dicebag do
         should_not be_nil
     end
 
-    it 'should not return a string from rolling dice without a name' do
-      get_replies(make_message(@bot, '!roll .' , { nick: 'ted' })).first.
-        should be_nil
-    end
-
     it 'should return a string describing the dice that were rolled' do
       text = get_replies(make_message(@bot, '!roll 3d3', { nick: 'ted' })).first.text
       text.should match(/rolls\s3d3\stotalling\s\d+/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-dicebag
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake