cinch-dicebag 1.0.2 → 1.0.3

data/.travis.yml

@@ -1,5 +1,4 @@
-nguage: ruby
+language: ruby
 rvm:
-  - ruby-head
   - 1.9.2
   - 1.9.3

data/README.md

@@ -34,13 +34,13 @@ Just add the plugin to your list:
       end
     end
 
-Then in channel use .roll:
+Then in channel use !roll:
 
-    .roll 5d20
+    !roll 5d20
 
-You can also use .dicebag to roll a random assortment of dice.
+You can also use !dicebag to roll a random assortment of dice.
 
-    < Brian > .dicebag
+    < Brian > !dicebag
     < bot > Brian rolls a large bag of dice totalling 11052.
 
 ## Contributing

data/cinch-dicebag.gemspec

@@ -20,10 +20,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'coveralls'
+  gem.add_development_dependency 'cinch-test'
 
-  gem.add_dependency 'cinch',           '>= 2.0.0'
+  gem.add_dependency 'cinch',           '>= 2.0.5'
   gem.add_dependency 'time-lord',       '~> 1.0.1'
-  gem.add_dependency 'cinch-cooldown',  '>= 1.0.0'
-  gem.add_dependency 'cinch-storage',   '~> 0.0.2'
-  gem.add_dependency 'cinch-toolbox',   '~> 1.0.0'
+  gem.add_dependency 'cinch-cooldown',  '>= 1.0.1'
+  gem.add_dependency 'cinch-storage',   '~> 1.0.1'
+  gem.add_dependency 'cinch-toolbox',   '~> 1.0.3'
 end

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'cinch'
-require 'cinch-toolbox'
-require 'cinch-cooldown'
+require 'cinch/toolbox'
+require 'cinch/cooldown'
 require 'cinch-storage'
 require 'time-lord'
 
@@ -16,34 +16,36 @@ module Cinch::Plugins
 
     self.help = "Roll a random bag of dice with .dicebag, you can also use .roll (dice count)d(sides) to roll specific dice (e.g. '.roll 4d6 3d20')"
 
-    match /dicebag/
-    match /roll (.*)/
+    match /dicebag/,    method: :roll_dicebag
+    match /roll (.*)/,  method: :roll
 
     def initialize(*args)
       super
       @storage = CinchStorage.new(config[:filename] || 'yaml/dice.yml')
     end
 
-    def execute(m, dice = nil)
-      m.reply (dice.nil? ? roll_dicebag(m.user.nick, m.channel) : roll(m.user.nick, dice))
-    end
-
     # Roll a random assortment of dice, total the rolls, and record the score.
     # @param [String] nick Nickname of the user rolling.
     # @param [Cinch::Channel] channel The Channel object where the roll took place.
     # @return [String] A description of the roll that took place
-    def roll_dicebag(nick, channel)
-      return "You must use that command in the main channel." if channel.nil?
+    def roll_dicebag(m)
+      if m.channel.nil?
+        m.reply "You must use that command in the main channel."
+        return
+      end
 
-      dice  = { :d4 => rand(250), :d6 => rand(500), :d10 => rand(750), :d20 => rand(1000) }
+      nick    = m.user.nick
+      channel = m.channel.name
+
+      dice  = { d4: rand(250), d6: rand(500), d10: rand(750), d20: rand(1000) }
 
       total = roll_dice(dice.map { |die, count| "#{count}#{die}" })
       size  = get_bag_size(dice.values.inject(:+))
 
       message = "#{nick} rolls a #{size} bag of dice totalling #{total}. " +
-                score_check(nick.downcase, channel.name, total)
+                score_check(nick.downcase, channel, total)
 
-      return message
+      m.reply message
     end
 
     # Roll a specific set of dice and return the pretty result
@@ -51,12 +53,12 @@ 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(nick, dice)
-      return nil if dice.nil? || nick.nil?
+    def roll(m, dice)
+      return if dice.nil?
 
       result = roll_dice(dice.split(' '))
 
-      return "#{nick} rolls #{dice} totalling #{result}" unless result.nil?
+      m.reply "#{m.user.nick} rolls #{dice} totalling #{result}" unless result.nil?
     end
 
 
@@ -80,7 +82,7 @@ module Cinch::Plugins
         end
       end
 
-      return total
+      return total unless total.zero?
     end
 
     # Rolls an n-sided die a given amount of times and returns the total

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

@@ -1,5 +1,5 @@
 module Cinch
   module Dicebag
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/spec/cinch-dicebag_spec.rb

@@ -1,126 +1,143 @@
 require 'spec_helper'
 
 describe Cinch::Plugins::Dicebag do
+  include Cinch::Test
 
   before(:all) do
-    @plugin = Cinch::Plugins::Dicebag.new
+    @bot = make_bot(Cinch::Plugins::Dicebag, { filename: '/dev/null' })
   end
 
   describe 'rolling specific dice' do
-    it "should return a string from rolling multiple dice" do
-      @plugin.roll('thom', '3d3').should_not be_nil
+    it "should return a roll from rolling dice" do
+      get_replies(make_message(@bot, '!roll 3d3', { nick: 'ted' })).first.
+        should_not be_nil
     end
 
-    it "should return a string from rolling mixes of dice" do
-      @plugin.roll('thom', '3d3 d7 3d25').should_not be_nil
+    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]
+      (3..9).should include(roll.to_i)
     end
 
-    it "should return a string from rolling a single die" do
-      @plugin.roll('thom', 'd3').should_not be_nil
+    it "should return a roll from rolling mixes of dice" do
+      get_replies(make_message(@bot, '!roll 3d3 d7 3d21', { nick: 'ted' })).first.
+        should_not be_nil
     end
 
-    it "should not return a string from rolling dice without a name" do
-      @plugin.roll(nil, '3d3').should be_nil
+    it "should return a roll in bounds from rolling mixes of dice" do
+      roll = get_replies(make_message(@bot, '!roll 3d3 d7 3d21', { nick: 'ted' })).first.text
+      roll = roll[/totalling (\d+)/, 1]
+      (7..79).should include(roll.to_i)
+    end
+
+    it "should return a roll from rolling a single die" do
+      get_replies(make_message(@bot, '!roll d3', { nick: 'ted' })).first.
+        should_not be_nil
     end
 
     it "should not return a string from rolling dice without a name" do
-      @plugin.roll('joe', nil).should be_nil
+      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 = @plugin.roll('thom', '3d3')
-      text.match(/rolls\s3d3\stotalling\s\d+/).should_not be_nil
+      text = get_replies(make_message(@bot, '!roll 3d3', { nick: 'ted' })).first.text
+      text.should match(/rolls\s3d3\stotalling\s\d+/)
     end
   end
 
   describe 'roll_dicebag' do
     it "should return a string" do
-      @plugin.roll_dicebag('user', Cinch::Channel.new('foo', fake_bot)).should_not be_nil
+      get_replies(make_message(@bot, '!dicebag' , { nick: 'ted', channel: '#bar' })).first.
+        should_not be_nil
     end
 
     it "should return an error if the user is not in a channel" do
-      @plugin.roll_dicebag('user', nil).
+      get_replies(make_message(@bot, '!dicebag' , { nick: 'ted' })).first.text.
         should be_eql("You must use that command in the main channel.")
     end
 
     it "should return a string describing the user's bag roll" do
-      text = @plugin.roll_dicebag('user', Cinch::Channel.new('foo', fake_bot))
-      text.match(/user rolls a [a-z]+ bag of dice totalling \d+/).should_not be_nil
+      get_replies(make_message(@bot, '!dicebag' , { nick: 'ted', channel: '#bar' })).first.text.
+        should match(/ted rolls a [a-z]+ bag of dice totalling \d+/)
     end
 
     it "should announce a high score if the old score is higher" do
-      @plugin.storage.data['foo']['brian'] = { :score => 1, :time => Time.now }
-      text = @plugin.roll_dicebag('brian', Cinch::Channel.new('foo', fake_bot))
-      text.match(/A new high score/).should_not be_nil
-      text.match(/Their old high roll was \d+/).should_not be_nil
+      get_replies(make_message(@bot, '!dicebag' , { nick: 'brian', channel: '#foo' }))
+      @bot.plugins.first.storage.data['#foo']['brian'] = { score: 1, time: Time.now }
+      text = get_replies(make_message(@bot, '!dicebag' , { nick: 'brian', channel: '#foo' })).first.text
+      text.should match(/A new high score/)
+      text.should match(/Their old high roll was \d+/)
+
     end
   end
 
   describe 'roll_dice' do
-    it "should return zero if the dice list is empty" do
-      @plugin.roll_dice([]).should be_zero
+    it "should return nil if the dice list is empty" do
+      @bot.plugins.first.roll_dice([]).should be_nil
     end
 
     it "should return a non zero total on a normal dice list" do
-      @plugin.roll_dice(['3d3', '4d5']).should_not be_zero
+      @bot.plugins.first.roll_dice(['3d3', '4d5']).should_not be_zero
     end
 
     it "should clear out any invalid dice rolls" do
-      @plugin.roll_dice(['33']).should be_zero
+      @bot.plugins.first.roll_dice(['33']).should be_nil
     end
   end
 
   describe "roll_die" do
     it "should return an acceptable value for a given roll" do
-      @plugin.roll_die(1, 1).should == 1
-      (5..15).should include(@plugin.roll_die(3, 5))
+      @bot.plugins.first.roll_die(1, 1).should == 1
+      (5..15).should include(@bot.plugins.first.roll_die(3, 5))
     end
 
     it "should return 0 for any negetive values" do
-      @plugin.roll_die(-1,  1).should == 0
-      @plugin.roll_die( 1, -1).should == 0
-      @plugin.roll_die(-1, -1).should == 0
+      @bot.plugins.first.roll_die(-1,  1).should == 0
+      @bot.plugins.first.roll_die( 1, -1).should == 0
+      @bot.plugins.first.roll_die(-1, -1).should == 0
     end
   end
 
   describe "get_bag_size" do
     it "should return 'huge' for out of bounds queries" do
-      @plugin.get_bag_size(50000).should == 'huge'
+      @bot.plugins.first.get_bag_size(50000).should == 'huge'
     end
 
     it "should return the proper size for tiny range" do
-      @plugin.get_bag_size(0).should            == 'tiny'
-      @plugin.get_bag_size(rand(100)).should    == 'tiny'
-      @plugin.get_bag_size(100).should          == 'tiny'
+      @bot.plugins.first.get_bag_size(0).should            == 'tiny'
+      @bot.plugins.first.get_bag_size(rand(100)).should    == 'tiny'
+      @bot.plugins.first.get_bag_size(100).should          == 'tiny'
     end
 
     it "should return the proper size for small range" do
-      @plugin.get_bag_size(101).should              == 'small'
-      @plugin.get_bag_size(rand(399) + 101).should  == 'small'
-      @plugin.get_bag_size(500).should              == 'small'
+      @bot.plugins.first.get_bag_size(101).should              == 'small'
+      @bot.plugins.first.get_bag_size(rand(399) + 101).should  == 'small'
+      @bot.plugins.first.get_bag_size(500).should              == 'small'
     end
 
     it "should return the proper size for medium range" do
-      @plugin.get_bag_size(501).should              == 'medium'
-      @plugin.get_bag_size(rand(499) + 501).should  == 'medium'
-      @plugin.get_bag_size(1000).should             == 'medium'
+      @bot.plugins.first.get_bag_size(501).should              == 'medium'
+      @bot.plugins.first.get_bag_size(rand(499) + 501).should  == 'medium'
+      @bot.plugins.first.get_bag_size(1000).should             == 'medium'
     end
 
     it "should return the proper size for large range" do
-      @plugin.get_bag_size(1001).should              == 'large'
-      @plugin.get_bag_size(rand(499) + 1001).should  == 'large'
-      @plugin.get_bag_size(1500).should              == 'large'
+      @bot.plugins.first.get_bag_size(1001).should              == 'large'
+      @bot.plugins.first.get_bag_size(rand(499) + 1001).should  == 'large'
+      @bot.plugins.first.get_bag_size(1500).should              == 'large'
     end
 
     it "should return the proper size for hefty range" do
-      @plugin.get_bag_size(1501).should              == 'hefty'
-      @plugin.get_bag_size(rand(499) + 1501).should  == 'hefty'
-      @plugin.get_bag_size(2000).should              == 'hefty'
+      @bot.plugins.first.get_bag_size(1501).should              == 'hefty'
+      @bot.plugins.first.get_bag_size(rand(499) + 1501).should  == 'hefty'
+      @bot.plugins.first.get_bag_size(2000).should              == 'hefty'
     end
 
     it "should return the proper size for huge range" do
-      @plugin.get_bag_size(2001).should              == 'huge'
-      @plugin.get_bag_size(20001).should             == 'huge'
+      @bot.plugins.first.get_bag_size(2001).should              == 'huge'
+      @bot.plugins.first.get_bag_size(20001).should             == 'huge'
     end
   end
 end
+

data/spec/spec_helper.rb

@@ -1,26 +1,11 @@
 require 'coveralls'
-Coveralls.wear!
-require 'cinch-dicebag'
+require 'simplecov'
 
-def fake_bot
-  bot = Cinch::Bot.new do
-    configure do |c|
-      c.plugins.options[Cinch::Plugins::Dicebag][:filename] = '/dev/null'
-    end
-  end
-  bot.loggers.level = :fatal
-  bot
-  return bot
-end
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
 
-module Cinch
-  module Plugin
-    def initialize(opts = {})
-      @bot = fake_bot
-      @handlers = []
-      @timers   = []
-      # Don't init the bot
-      # __register
-    end
-  end
-end
+require 'cinch-dicebag'
+require 'cinch/test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-dicebag
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cinch-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: time-lord
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: cinch-storage
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: cinch-toolbox
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
 description: Cinch Plugin that allows uses in the channel to roll specific dice or
   roll a random assortment of dice to compete for high scores.
 email:
@@ -179,11 +195,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ! 'Cinch Plugin: Dicebag and Dice rolls'
 test_files:
 - spec/cinch-dicebag_spec.rb
 - spec/spec_helper.rb
-has_rdoc: