cinch-dicebag 1.0.3 → 1.0.4

data/lib/cinch-dicebag.rb

@@ -1,2 +1,3 @@
+# -*- encoding : utf-8 -*-
 require 'cinch/plugins/dicebag/version'
-require 'cinch/plugins/dicebag/dicebag'
+require 'cinch/plugins/dicebag'

data/lib/cinch/plugins/{dicebag/dicebag.rb → dicebag.rb}

@@ -5,8 +5,8 @@ require 'cinch/cooldown'
 require 'cinch-storage'
 require 'time-lord'
 
-
 module Cinch::Plugins
+  # Cinch Plugin to allow dice rolling.
   class Dicebag
     include Cinch::Plugin
 
@@ -14,7 +14,9 @@ module Cinch::Plugins
 
     attr_accessor :storage
 
-    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')"
+    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/,    method: :roll_dicebag
     match /roll (.*)/,  method: :roll
@@ -26,26 +28,22 @@ module Cinch::Plugins
 
     # 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 [Cinch::Channel] channel The Channel object where the roll took
+    #   place.
     # @return [String] A description of the roll that took place
     def roll_dicebag(m)
       if m.channel.nil?
-        m.reply "You must use that command in the main channel."
+        m.reply 'You must use that command in the main channel'
         return
       end
 
-      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, total)
-
-      m.reply message
+      m.reply "#{m.user.nick} rolls a #{size} bag of dice totalling " +
+              "#{total}. " +
+              score_check(m.user.nick.downcase, m.channel.name, total)
     end
 
     # Roll a specific set of dice and return the pretty result
@@ -58,10 +56,11 @@ module Cinch::Plugins
 
       result = roll_dice(dice.split(' '))
 
-      m.reply "#{m.user.nick} rolls #{dice} totalling #{result}" unless result.nil?
+      unless result.nil?
+        m.reply "#{m.user.nick} rolls #{dice} totalling #{result}"
+      end
     end
 
-
     # Takes an Array of dice rolls, sanitizes them, parses them, and dispatches
     #   their calculation to `roll_die`.
     # @param [Array] dice Array of strings that correspond to valid die rolls.
@@ -93,7 +92,7 @@ module Cinch::Plugins
       return 0 if sides < 1 || count < 1
       total = 0
       count.times { total += rand(sides) + 1 }
-      return total
+      total
     end
 
     # Simple method to return a flavor text 'size' description based on
@@ -102,18 +101,12 @@ module Cinch::Plugins
     # @return [String] Description of the size of the bag.
     def get_bag_size(size)
       case size
-      when 0..100
-        'tiny'
-      when 101..500
-        'small'
-      when 501..1000
-        'medium'
-      when 1001..1500
-        'large'
-      when 1501..2000
-        'hefty'
-      else
-        'huge'
+      when 0..100     then 'tiny'
+      when 101..500   then 'small'
+      when 501..1000  then 'medium'
+      when 1001..1500 then 'large'
+      when 1501..2000 then 'hefty'
+      else 'huge'
       end
     end
 
@@ -126,18 +119,17 @@ module Cinch::Plugins
     #   to that effect, otherwise returns a blank string.
     def score_check(nick, channel, score)
       # If the chennel or nick are not already initialized, spin them up
-      @storage.data[channel] ||= Hash.new
-      @storage.data[channel][nick] ||= { :score => score, :time => Time.now }
+      @storage.data[channel] ||= {}
+      @storage.data[channel][nick] ||= { score: score, time: Time.now }
 
       # Check and see if this is a higher score.
       old = @storage.data[channel][nick]
-      if @storage.data[channel][nick][:score] < score
-        @storage.data[channel][nick] = { :score => score, :time => Time.now }
-        @storage.synced_save(@bot)
-        return "A new high score! Their old high roll was #{old[:score]}, #{old[:time].ago.to_words}."
-      else
-        return ''
-      end
+      return '' unless @storage.data[channel][nick][:score] < score
+
+      @storage.data[channel][nick] = { score: score, time: Time.now }
+      @storage.synced_save(@bot)
+      "A new high score! Their old high roll was #{old[:score]}, " +
+        "#{old[:time].ago.to_words}."
     end
   end
 end

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

@@ -1,5 +1,7 @@
+# -*- encoding : utf-8 -*-
 module Cinch
+  # Versioning information for plugin
   module Dicebag
-    VERSION = "1.0.3"
+    VERSION = '1.0.4'
   end
 end

data/spec/cinch-dicebag_spec.rb

@@ -54,7 +54,7 @@ describe Cinch::Plugins::Dicebag do
 
     it "should return an error if the user is not in a channel" do
       get_replies(make_message(@bot, '!dicebag' , { nick: 'ted' })).first.text.
-        should be_eql("You must use that command in the main channel.")
+        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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-dicebag
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -171,7 +171,7 @@ files:
 - Rakefile
 - cinch-dicebag.gemspec
 - lib/cinch-dicebag.rb
-- lib/cinch/plugins/dicebag/dicebag.rb
+- lib/cinch/plugins/dicebag.rb
 - lib/cinch/plugins/dicebag/version.rb
 - spec/cinch-dicebag_spec.rb
 - spec/spec_helper.rb
@@ -202,3 +202,4 @@ summary: ! 'Cinch Plugin: Dicebag and Dice rolls'
 test_files:
 - spec/cinch-dicebag_spec.rb
 - spec/spec_helper.rb
+has_rdoc: