cinch-dicebag 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 8cadf85224bd800c25264d54cfee7bd153439006
-  data.tar.gz: aaa7727e81fd0826c4dff26ccd2bf0e530d4fdbd
+SHA1:
+  metadata.gz: bce7c45a031f56498b1317ce18abd158978c5dca
+  data.tar.gz: c350523add02d918d1c4ee42e22204cc29f1c1bb
 SHA512:
-  metadata.gz: 58eb0f35068118884637e3d32f89bdf49271899127fd137f1fe88b2eaadaa14f2eca75cff847b7bd8ac5304f157c1e578ce4516e62e30d1dc96f9ece2aa7e722
-  data.tar.gz: c10fafc541bba7b8f6817c01c17667d2e527fae5139ccf447993c0437c7e2c8cc9f819b5596917fce21ab7b39cfecb0ebb22f9fee87e74260673e412b339d4e3
+  metadata.gz: 6b385370b7d791de6af79bbb4a013ba8730b05651c3a8fb1abcee3d5f2a8cc8835bb8702e1b3495d8eb20f8abfa84e2f1bf09cd5c2a3ec2c891cc54223a82af9
+  data.tar.gz: 5db89bf5fd9185240dc64317bab4a9a3b7e1bcc4a9002acb8ac44598ea33ca796f413f3553351d08932caabe835e2f4303d462d3135e19b092f5ed3daccbafc3

data/.travis.yml

@@ -1,8 +1,16 @@
 language: ruby
+addons:
+  code_climate:
+    repo_token: d811b9c7bc95cfa5b0a3b7095e070abed229092bdbb1a5d53b738e4bd4ed973b
+before_install:
+  - gem update --system
+  - gem update bundler
 env:
   global:
     - "JRUBY_OPTS=-Xcext.enabled=true"
 rvm:
+  - 2.3.0
+  - 2.2.0
   - 2.1.0
   - 2.0.0
   - 1.9.3
@@ -15,9 +23,13 @@ rvm:
   - ree
 matrix:
   allow_failures:
+    - rvm: 1.9.3
+    - rvm: 1.9.2
+    - rvm: 1.8.7
     - rvm: 1.8.7
     - rvm: ree
     - rvm: jruby-18mode
     - rvm: jruby-19mode
     - rvm: jruby-head
+    - rvm: ruby-head
   fast_finish: true

data/cinch-dicebag.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake', '~> 10'
   gem.add_development_dependency 'rspec', '~> 3'
-  gem.add_development_dependency 'coveralls', '~> 0.7'
-  gem.add_development_dependency 'cinch-test', '~> 0.1', '>= 0.1.0'
+  gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
+  gem.add_development_dependency 'cinch-test', '~> 0.1', '>= 0.1.1'
+
   gem.add_dependency 'cinch', '~> 2'
   gem.add_dependency 'cinch-cooldown', '~> 1.1', '>= 1.1.5'
   gem.add_dependency 'cinch-storage', '~> 1.1'

data/lib/cinch/plugins/dicebag.rb

@@ -21,37 +21,39 @@ module Cinch
 
       match(/dicebag\z/, method: :dicebag)
       match(/dicebag stats/, method: :stats)
-      match /roll(?:\s(.*))/, method: :roll
-      match /roll\z/, method: :roll
+      match(/roll(?:\s(.*))/, method: :roll)
+      match(/roll\z/, method: :roll)
 
       def initialize(*args)
         super
+        # initialize storage
         @storage = Cinch::Storage.new(config[:filename] || 'yaml/dice.yml')
-        @bag = Bag.new(4 => 250, 6 => 750, 10 => 1200, 20 => 1000)
+
+        # Create a bag of dice, pass a hash of the maxcount for each type
+        #   for random rolls.
+        @bag = Bag.new(4 => 250, 6 => 750, 10 => 1500, 20 => 2000)
       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.
+      # @param [Message] message Nickname of the user rolling.
       # @return [String] A description of the roll that took place
-      def dicebag(m)
-        return if Cinch::Toolbox.sent_via_private_message?(m)
+      def dicebag(message)
+        return if Cinch::Toolbox.sent_via_private_message?(message)
 
         @bag.roll
-        user = m.user.nick.downcase
-        channel = m.channel.name
-        m.reply "#{m.user.nick} rolls a #{@bag.size} bag of dice totalling " \
-                "#{@bag.score}. #{score_check(user, channel, @bag.score)}"
+        user = message.user.nick
+        channel = message.channel.name
+        message.reply "#{user} rolls a #{@bag.size} bag of dice totalling " \
+                      "#{@bag.score}. #{score_check(user, channel, @bag.score)}"
       end
 
-      def stats(m)
-        return if Cinch::Toolbox.sent_via_private_message?(m)
+      def stats(message)
+        return if Cinch::Toolbox.sent_via_private_message?(message)
 
-        m.user.send 'Top ten dicebag rolls:'
-        top10 = top_ten_rolls(m.channel.name)
+        message.user.send 'Top ten dicebag rolls:'
+        top10 = top_ten_rolls(message.channel.name)
         top10.each_with_index do |r, i|
-          m.user.send "#{i + 1} - #{r.first} [#{r.last}]"
+          message.user.send "#{i + 1} - #{r.first} [#{r.last}]"
         end
       end
 
@@ -60,12 +62,12 @@ module Cinch
       # @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 = '1d20')
+      def roll(message, dice = '1d20')
         result = Die.roll(dice.split(' '))
         if result.is_a?(Integer)
-          result = "#{m.user.nick} rolls #{dice} totalling #{result}"
+          result = "#{message.user.nick} rolls #{dice} totalling #{result}"
         end
-        m.reply result
+        message.reply result
       end
 
       private
@@ -84,6 +86,7 @@ module Cinch
       # @return [String] If the new score is higher, returns an announcement
       #   to that effect, otherwise returns a blank string.
       def score_check(nick, channel, score)
+        nick = nick.downcase
         # If the chennel or nick are not already initialized, spin them up
         @storage.data[channel] ||= {}
         @storage.data[channel][nick] ||= { score: score, time: Time.now }

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

@@ -4,6 +4,11 @@ module Cinch
       # Class to handle rolling of a preset bag of dice.
       class Bag
         attr_accessor :count, :dice, :score
+
+        # Create a new bag
+        # @param [Hash] dice_hash Hash of dice, in the format of
+        #   { :num_sides => :max_dice_to_roll, ... }
+        #   The bag will randomly roll (1-:max_dice_to_roll) :num_sided dice.
         def initialize(dice_hash)
           fail unless good_hash?(dice_hash)
           @dice = dice_hash
@@ -11,16 +16,22 @@ module Cinch
           @score = 0
         end
 
+        def stats
+          max_score = @dice.keys.inject(0) { |sum, x| sum + (x * @dice[x]) }
+          min_score = @dice.keys.count
+          max_count = @dice.values.inject(0) { |sum, x| sum + x }
+          min_count = @dice.keys.count
+          { min_count: min_count, max_count: max_count,
+            min_score: min_score, max_score: max_score }
+        end
+
+        # Roll the bag of dice, this will roll the dice and update the current
+        #   score and count
         def roll
           dice = die_array
           @score = Die.roll(dice)
           @count = dice.map { |d| d[/(\d+)d\d+/, 1].to_i || 1 }.inject(0, :+)
-        end
-
-        def good_hash?(dice_hash)
-          dice_hash.keys { |k| return false unless k.is_a?(Integer) }
-          dice_hash.values { |k| return false unless k.is_a?(Integer) }
-          true
+          return self
         end
 
         # Simple method to return a flavor text 'size' description based on
@@ -28,21 +39,33 @@ module Cinch
         # @param [Fixnum] size The number of dice in the dicebag.
         # @return [String] Description of the size of the bag.
         def size
-          case @count
-          when 0..1000 then 'tiny'
-          when 1001..1500 then 'small'
-          when 1501..2500 then 'medium'
-          when 2501..3500 then 'large'
-          when 3501..4500 then 'hefty'
+          case
+          when @count < 1000 then 'tiny'
+          when @count < 2000 then 'small'
+          when @count < 3000 then 'medium'
+          when @count < 4000 then 'large'
+          when @count < 5000 then 'hefty'
           else 'massive'
           end
         end
 
         private
 
+        # Check to make sure that the passed hash of dice looks basically
+        #   reasonable.
+        # e.g. { 4 => 10, 6 => 20, 100 => 20 }
+        def good_hash?(dice_hash)
+          dice_hash.keys { |k| return false unless k.is_a?(Integer) }
+          dice_hash.values { |k| return false unless k.is_a?(Integer) }
+          true
+        end
+
+        # Render the @dice hash as an array of rolls to pass to the Die module.
+        #   This also is where we randomly select how many dice from the range
+        #   are actually rolled.
         def die_array
           @dice.keys.map do |sides|
-            "#{rand(@dice[sides])}d#{sides}"
+            "#{rand(@dice[sides] + 1)}d#{sides}"
           end
         end
       end

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

@@ -19,6 +19,7 @@ module Cinch
           # Clean out anything invalid
           dice = clean_roll(dice)
 
+          # Initialize a total
           total = nil
 
           # Return if the sanity fails
@@ -33,31 +34,37 @@ module Cinch
           total
         end
 
-        private
-
         # Rolls an n-sided die a given amount of times and returns the total
         # @param [String] count Number of times to roll the die.
         # @return [Fixnum] The total from rolling the die.
         def self.cast(die)
+          # Pull out the data from the roll. 
           modifier = die[MOD_REGEX]
           count = (die[ROLLS_REGEX, 1] || 1).to_i
           sides = die[SIDES_REGEX, 1].to_i
 
+          # init the total
           total = 0
+
+          # Bail if the roll isn't sane looking.
           return total unless check_die_sanity(count, sides)
 
+          # Roll dem dice!
           count.times { total += rand(sides) + 1 }
 
+          # Parse the modifier and apply it, if there is one
           return total += parse_modifier(modifier) unless modifier.nil?
 
           total
         end
 
+        # Makes sure people aren't doing silly things.
         def self.check_die_sanity(count, sides)
           return false if count.nil? || sides.nil? || sides < 1 || count < 1
           true
         end
 
+        # Remove any stupid crap people try to sneak into the rolls.
         def self.clean_roll(dice)
           dice.delete_if { |d| d.match(/\d*d\d+([\-\+]\d+)?/).nil? }
           dice
@@ -67,16 +74,14 @@ module Cinch
         # @param [Array] dice Array of strings that correspond to valid
         #   die rolls. (i.e. ['4d6', '6d10']
         # @return [Boolean] Result of sanity check.
-        def self.die_check?(dice_list)
+        def self.die_check?(dice)
           # Check to make sure it's not a stupid large roll, they clog threads.
-          count =
-            dice_list.map do |d|
-              d[/(\d+)d\d+/, 1].to_i || 1
-            end.inject(0, :+)
+          count = dice.map { |d| d[/(\d+)d\d+/, 1].to_i || 1 }.inject(0, :+)
           return false if count >= 10_000
           true
         end
 
+        # Parse out the modified and return it as an int.
         def self.parse_modifier(modifier)
           operator = modifier[/\A[\+\-]/]
           int = modifier[/\d+\z/].to_i

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

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

data/spec/cinch-dicebag_spec.rb

@@ -186,32 +186,32 @@ describe Cinch::Plugins::Dicebag do
     end
 
     it 'should return the proper size for small range' do
-      @bag.count = 1000
+      @bag.count = 900
       expect(@bag.size).to eq('tiny')
     end
 
     it 'should return the proper size for small range' do
-      @bag.count = 1001
+      @bag.count = 1000
       expect(@bag.size).to eq('small')
     end
 
     it 'should return the proper size for small range' do
-      @bag.count = rand(399) + 1001
+      @bag.count = rand(999) + 1000
       expect(@bag.size).to eq('small')
     end
 
     it 'should return the proper size for small range' do
-      @bag.count = 1500
+      @bag.count = 1999
       expect(@bag.size).to eq('small')
     end
 
     it 'should return the proper size for medium range' do
-      @bag.count = 1501
+      @bag.count = 2500
       expect(@bag.size).to eq('medium')
     end
 
     it 'should return the proper size for medium range' do
-      @bag.count = rand(499) + 1501
+      @bag.count = rand(999) + 2000
       expect(@bag.size).to eq('medium')
     end
 
@@ -221,12 +221,12 @@ describe Cinch::Plugins::Dicebag do
     end
 
     it 'should return the proper size for large range' do
-      @bag.count = 2501
+      @bag.count = 3500
       expect(@bag.size).to eq('large')
     end
 
     it 'should return the proper size for large range' do
-      @bag.count = rand(499) + 2501
+      @bag.count = rand(999) + 3000
       expect(@bag.size).to eq('large')
     end
 
@@ -236,12 +236,12 @@ describe Cinch::Plugins::Dicebag do
     end
 
     it 'should return the proper size for hefty range' do
-      @bag.count = 3501
+      @bag.count = 4500
       expect(@bag.size).to eq('hefty')
     end
 
     it 'should return the proper size for hefty range' do
-      @bag.count = rand(499) + 3501
+      @bag.count = rand(999) + 4000
       expect(@bag.size).to eq('hefty')
     end
 
@@ -251,12 +251,12 @@ describe Cinch::Plugins::Dicebag do
     end
 
     it 'should return the proper size for huge range' do
-      @bag.count = 4501
+      @bag.count = 5000
       expect(@bag.size).to eq('massive')
     end
 
     it 'should return the proper size for huge range' do
-      @bag.count = 20001
+      @bag.count = 20000
       expect(@bag.size).to eq('massive')
     end
   end

data/spec/spec_helper.rb

@@ -1,11 +1,5 @@
-require 'coveralls'
-require 'simplecov'
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-SimpleCov.start
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 
 require 'cinch-dicebag'
 require 'cinch/test'

metadata

@@ -1,137 +1,137 @@
 --- !ruby/object:Gem::Specification
 name: cinch-dicebag
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Brian Haberer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: cinch-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: cinch-cooldown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: cinch-storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: cinch-toolbox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 description: Cinch Plugin that allows uses in the channel to roll specific dice or
@@ -142,8 +142,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -166,20 +166,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: ! 'Cinch Plugin: Dicebag and Dice rolls'
+summary: 'Cinch Plugin: Dicebag and Dice rolls'
 test_files:
 - spec/cinch-dicebag_spec.rb
 - spec/spec_helper.rb