cinch-dicebag 1.0.8 → 1.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: ab59f8709ed5aee1d8354910616d518933583bda
+  data.tar.gz: 353ef745e42b012d36c2e4efad611ef885eabcba
+SHA512:
+  metadata.gz: 20e7c611ae9235b4dab39e4d78717a39e169ecbbceecf2effacbb7870ea93b89cbbee0f744ff78e019300d9f285478290aaa167469e06b5d79670288b6dc2357
+  data.tar.gz: f38172852b8b6d52c37895a60167318f9010c2b8fe9655d558a701ef1aec62b8b024fc24da9e2beb8df3cc0f5ae7fe98aff1bdba2fe88fd51da8b969c7d848c9

data/.travis.yml

@@ -1,4 +1,24 @@
 language: ruby
+env:
+  global:
+    - "JRUBY_OPTS=-Xcext.enabled=true"
 rvm:
-  - 1.9.2
+  - 2.1.0
+  - 2.0.0
   - 1.9.3
+  - 1.9.2
+  - 1.8.7
+  - jruby-18mode
+  - jruby-19mode
+  - rbx
+  - ruby-head
+  - jruby-head
+  - ree
+matrix:
+  allow_failures:
+    - rvm: 1.8.7
+    - rvm: ree
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: jruby-head
+  fast_finish: true

data/lib/cinch/plugins/dicebag.rb

@@ -55,11 +55,8 @@ module Cinch::Plugins
     def roll(m, dice = '1d20')
       result = roll_dice(dice.split(' '))
 
-      if result.is_a?(String)
-        m.reply result
-      elsif result.is_a?(Integer)
-        m.reply "#{m.user.nick} rolls #{dice} totalling #{result}"
-      end
+      result = "#{m.user.nick} rolls #{dice} totalling #{result}" if result.is_a?(Integer)
+      m.reply result
     end
 
     # Takes an Array of dice rolls, sanitizes them, parses them, and dispatches
@@ -69,18 +66,18 @@ module Cinch::Plugins
     # @return [Fixnum] The total from rolling all of the dice.
     def roll_dice(dice)
       # Clean out anything invalid
-      dice.delete_if { |d| d.match(/\d*d\d+/).nil? }
+      dice.delete_if { |d| d.match(/\d*d\d+([\-\+]\d+)?/).nil? }
 
       return roll_check?(dice) if roll_check?(dice)
-
-      total = 0
-
+      
       # Roll each group and total up the returned value
+      total = nil
       dice.each do |die|
+        total ||= 0
         total += roll_die(die)
       end
 
-      return total.to_i unless total.zero?
+      total
     end
 
     # Takes an array of rolls and does sanity on it.
@@ -98,15 +95,27 @@ module Cinch::Plugins
     # @param [Fixn] count Number of times to roll the die.
     # @return [Fixnum] The total from rolling the die.
     def roll_die(die)
+      modifier = die[/[\-\+]\d+/]
+
       count = (die[/(\d+)d\d+/, 1] || 1).to_i
       sides = die[/\d?d(\d+)/, 1].to_i
+
       return 0 if count.nil? || sides.nil? || sides < 1 || count < 1
+
       total = 0
       count.times { total += rand(sides) + 1 }
 
+      return total += parse_modifier(modifier) unless modifier.nil?
+
       total
     end
 
+    def parse_modifier(modifier)
+      operator = modifier[/\A[\+\-]/]
+      int = modifier[/\d+\z/].to_i
+      0.send(operator, int)
+    end
+
     # Simple method to return a flavor text 'size' description based on
     #   how many dice you happened to get in your dicebag roll.
     # @param [Fixnum] size The number of dice in the dicebag.

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

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

data/spec/cinch-dicebag_spec.rb

@@ -18,6 +18,19 @@ describe Cinch::Plugins::Dicebag do
         should_not be_nil
     end
 
+    it 'should allow "+" modifiers' do
+      roll = get_replies(make_message(@bot, '!roll 1d3+5', { nick: 'ted' })).first.text
+      roll = roll[/totalling (\d+)/, 1]
+      (6..8).should include roll.to_i
+    end
+
+    it 'should allow "-" modifiers' do
+      roll = get_replies(make_message(@bot, '!roll 1d1-5', { nick: 'ted' }))
+              .first
+              .text[/totalling (\-?\d+)/, 1].to_i
+              .should == -4
+    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]
@@ -78,7 +91,6 @@ describe Cinch::Plugins::Dicebag do
       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
 
@@ -94,18 +106,32 @@ describe Cinch::Plugins::Dicebag do
     it 'should clear out any invalid dice rolls' do
       @bot.plugins.first.roll_dice(['33']).should be_nil
     end
+
+    it 'should allow modifiers' do
+      @bot.plugins.first.roll_dice(['1d1+1', '1d1-4']).should == -1
+    end
   end
 
   describe 'roll_die' do
     it 'should return an acceptable value for a given roll' do
       @bot.plugins.first.roll_die('1d1').should == 1
-      (5..15).should include(@bot.plugins.first.roll_die('3d5'))
+      (3..15).should include(@bot.plugins.first.roll_die('3d5'))
     end
 
     it 'should return 0 for any negetive values' do
       @bot.plugins.first.roll_die('1d-1').should == 0
       @bot.plugins.first.roll_die('-1d-1').should == 0
     end
+
+    it 'should add modifiers to the total' do
+      @bot.plugins.first.roll_die('1d1+2').should == 3
+      @bot.plugins.first.roll_die('3d1-2').should == 1
+    end
+
+    it 'should allow modifiers to take the total below zero' do
+      @bot.plugins.first.roll_die('1d1-1').should == 0
+      @bot.plugins.first.roll_die('1d1-2').should == -1
+    end
   end
 
   describe 'get_bag_size' do
@@ -149,4 +175,3 @@ describe Cinch::Plugins::Dicebag do
     end
   end
 end
-

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: cinch-dicebag
 version: !ruby/object:Gem::Version
-  version: 1.0.8
-  prerelease: 
+  version: 1.0.9
 platform: ruby
 authors:
 - Brian Haberer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: time-lord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch-cooldown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch-storage
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch-toolbox
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -178,29 +159,27 @@ files:
 homepage: https://github.com/bhaberer/cinch-dicebag
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ! 'Cinch Plugin: Dicebag and Dice rolls'
 test_files:
 - spec/cinch-dicebag_spec.rb
 - spec/spec_helper.rb
-has_rdoc: