RpgTools 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e72bdc2ab301bc360b174d27c1ce2b22ed44b135
-  data.tar.gz: 6c3f36a0c7c460733b9e7eb3bb340843032b0e5c
+  metadata.gz: 427e48bcf495c311c8ce3d2e0e052bffaebf85e5
+  data.tar.gz: ceb0ae54214c6802528beebd14390d40045a86df
 SHA512:
-  metadata.gz: 67c945260be17a4e607431d0dea36add3789aa32a3cf17aa1a6152d9260918d011125df9d000a390a1c1a9304e40ace94cf78313b6d62d48b2ddde4265dcbf20
-  data.tar.gz: 4a2b45e6b52ed24102e20b6dc843368a2dcc4d13ce73b8f4c6925e44b0e4acce17473dcf4a6f14fe0c896639543ee41dcd59aa2d923139a3c114124b820c5cc1
+  metadata.gz: a9156b8611ac596ab1b87c522c91317c901f3f3c2b71fbe94681c1f1083ad5d072619ac21dd50661b6f62b3ee65880687be922b2f58fde8709b824d5ca1d7926
+  data.tar.gz: fdfa3ec4e3ce917b2ca97464de5368a74dd630c927223be6459a183ffb83cda3466dbd28f05d14d03d9edba4fb47dd04ebeffa750ada125c02fa99a85a04a241

data/README.md

@@ -1,9 +1,9 @@
-RpgTools
+RpgTools [![Dependency Status](https://gemnasium.com/Yinfei/rpg_tools.svg)](https://gemnasium.com/Yinfei/rpg_tools)
 =======
 
 A gem that gives you tools for your RPGs : dices, coins, cards !
 
-# Usage
+## Usage
 
 * <tt>RpgTools::Coin.flip</tt> returns a "heads" or "tails" string.
 * <tt>RpgTools::Dice.rool(arg)</tt> returns an array of dices of your choice (arg format : "1d6" or "4D10" for example).

data/lib/rpg_tools/dice.rb

@@ -1,22 +1,54 @@
 module RpgTools
   class Dice
     class << self
-      def roll(arg)
-        dices_num = arg.split(/d/i).first.to_i
-        max_value = arg.split(/d/i).last.to_i
+      def roll(dice)
+        dices = dice.split(/d/i).first.to_i
+        max_value = dice.split(/d/i).last.to_i
 
         # I mean, seriously ?
-        return true if dices_num.zero?
+        return true if dices.zero?
 
         # We don't roll d0 and d1 for obvious reasons.
         return true if [0, 1].include?(max_value)
 
+        # We do a normal roll if no bonus/malus is set on the dice
+        return standard_roll(dices, max_value) if dice =~ /^\d+[Dd]\d+$/
+
+        # We apply bonuses/maluses properly if any
+        if dice =~ /^\d+d\d+(\+)(\d+)/
+          bonus = dice.gsub(/^\d+d\d+(\+)/, '').to_i
+          roll_with_bonus(dices, max_value, bonus)
+        elsif dice =~ /^\d+d\d+(\-)(\d+)/
+          malus = dice.gsub(/^\d+d\d+(\-)/, '').to_i
+          roll_with_malus(dices, max_value, malus)
+        else
+          true
+        end
+      end
+
+      def standard_roll(dices, max_value)
         [].tap do |dice_set|
-          dices_num.times do
+          dices.times do
             dice_set << rand(1..max_value)
           end
         end
       end
+
+      def roll_with_bonus(dices, max_value, bonus)
+        [].tap do |dice_set|
+          dices.times do
+            dice_set << (rand(1..max_value) + bonus)
+          end
+        end
+      end
+
+      def roll_with_malus(dices, max_value, malus)
+        [].tap do |dice_set|
+          dices.times do
+            dice_set << (rand(1..max_value) - malus)
+          end
+        end
+      end
     end
   end
 end

data/rpg_tools.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = %q{RpgTools}
-  s.version     = '0.2.0'
+  s.version     = '0.3.0'
   s.author      = 'Yohan Piron'
   s.email       = 'yinfei84@gmail.com'
   s.date        = %q{2014-12-18}
@@ -11,6 +11,6 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
   s.test_files    = s.files.grep(%r{^(spec)/})
   s.require_paths = ['lib']
-  s.add_development_dependency 'rake', '~> 3.1'
+  s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'rspec', '~> 3.0'
 end

data/spec/dice_spec.rb

@@ -22,4 +22,16 @@ describe RpgTools::Dice do
     expect(described_class.roll('1d6').count).to eq(1)
     expect(described_class.roll('1D6').count).to eq(1)
   end
+
+  it 'rolls a dice with a bonus' do
+    expect(described_class.roll('1d6+2').count).to eq(1)
+  end
+
+  it 'rolls a dice with a malus' do
+    expect(described_class.roll('1d6-2').count).to eq(1)
+  end
+
+  it "doesn't roll a dice with an odd symbol" do
+    expect(described_class.roll('1d6%2')).to eq(true)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: RpgTools
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Yohan Piron
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement