physh_roller 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9657b33b99f914a4cf30e78a51c1f7de5da71483
-  data.tar.gz: 8f2f0ebf7e929cade84e7c48cbd20aa497b38945
+  metadata.gz: ece651f5f73ec4aa0ad0685b543a592386957448
+  data.tar.gz: 10ba01555a7a6ae9135181fe5020c8c5fcb9497a
 SHA512:
-  metadata.gz: 853ca6638ef6436535a2384af558a01cf300b35450af660c3112cc69bca4850eec2d3e4fee4b1b7cbfdc76ac2df68e50f237ff1dea5f2e5ae36f76b6e540df26
-  data.tar.gz: c226a5dcf6bbc09837f49767ae4aa06596c409d4e1b1f590be4cb65d66015dd671e911057b01ac7e47dbc1e612fd33ff9a75c9364bf1af9e2beee84781f0df55
+  metadata.gz: 0d7453fdc65c19892d6d3139481a98646779534c1d63568eac990158cf4f3a4363c273e2ef924a9734d2d566d5274d65dffd3e45e4c6c78edaec21103e35ea6a
+  data.tar.gz: 30f52ad3cce8891cde2b32e72742b9730d9e1e4162432d35041aa806c6083d3dcf60e2b20bf76b017a7e2a1743819169698962e67977a9a47c82c3defb5cebb0

data/README

@@ -12,6 +12,14 @@ If you've installed the gem, you can simply run:
 
 Example dice strings are 4d6, 20d100-20, 14D2+6. Basically, anything that matches the regular expression /\A(\d+)?d(\d+)([\+-]\d*)?\z/i.
 
+Command line help is available with
+
+  dice --help
+
+Now supports FATE dice rolls with:
+
+  dice -f
+
 As A Module
 -----------
 

data/bin/dice

@@ -18,14 +18,21 @@ opt_parse = OptionParser.new do |opts|
 		puts opts
 		exit
 	end
+
+	# Fate diceroll switch
+	opts.on('-f', '--fate', 'Make a FATE dice roll.') do
+		options[:fate] = true
+	end
 end
 
 opt_parse.parse!
-
-
-dice_roll_string = ARGV.unshift[0]
-
-dice_roll = PhyshRoller::DiceRoll.new(dice_roll_string, $stdout)
+ 
+if options[:fate]
+	dice_roll = PhyshRoller::FateRoll.new
+else
+	dice_roll_string = ARGV.unshift[0]
+	dice_roll = PhyshRoller::DiceRoll.new(dice_roll_string, $stdout)
+end
 dice_roll.roll_dice
 dice_roll.output_results
 

data/lib/physh_roller/dice_roll.rb

@@ -60,7 +60,7 @@ module PhyshRoller
 		def output_results
 			results = self.results
 			@output.puts "You rolled: #{results[:dice_roll]}"
-			@output.puts "Dice rolls: #{results[:dice_rolls].join(',')}"
+			@output.puts "Dice rolls: #{results[:dice_rolls].join(', ')}"
 			@output.puts "Total: #{results[:sum]}"
 		end
 

data/lib/physh_roller/fate_roll.rb

@@ -0,0 +1,36 @@
+module PhyshRoller
+  class FateRoll < DiceRoll
+    def initialize(dice_roll_string='4d3',output=$stdout)
+      super
+    end
+
+    def results
+      results_hash = {
+        :dice_roll      => 'FATE Roll',
+        :dice_rolls     => convert_dice_to_fate,
+        :sum            => get_fate_total,
+        :roll_modifier  => 0
+      }
+    end
+
+    def convert_dice_to_fate
+      dice_rolls = @dice_array.map { |die| die.last_result - 2 }.sort.reverse
+      converted_dice = dice_rolls.map do |roll|
+        case roll
+        when -1
+          then '-'
+        when 0
+          then 'Nil'
+        when 1
+          then '+'
+        end
+      end
+      return converted_dice
+    end
+
+    def get_fate_total
+      sum = @dice_array.map { |die| die.last_result - 2 }.reduce(:+)
+      sum >= 0 ? '+' + sum.to_s : sum.to_s
+    end
+  end
+end

data/lib/physh_roller.rb

@@ -2,4 +2,5 @@
 # Just holds require statements.
 
 require_relative 'physh_roller/dice_roll'
-require_relative 'physh_roller/die'
+require_relative 'physh_roller/die'
+require_relative 'physh_roller/fate_roll'

data/spec/physh_roller/dice_roll_spec.rb

@@ -15,6 +15,7 @@ module PhyshRoller
 				it { should respond_to(:roll_modifier) }
 				it { should respond_to(:dice_array) }
 				it { should respond_to(:results) }
+				it { should respond_to(:roll_dice) }
 			end
 
 			context "with an invalid dice_roll_string" do
@@ -134,7 +135,7 @@ module PhyshRoller
 			end
 
 			it "should output the dice rolls" do
-				@output.should_receive(:puts).with(/\ADice rolls: (\d,)+\d\z/)
+				@output.should_receive(:puts).with(/\ADice rolls: (\d, )+\d\z/)
 			end
 
 			it "should output the total" do

data/spec/physh_roller/fate_roll_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+module PhyshRoller
+  describe FateRoll do
+    before(:each) { @output = double('output').as_null_object }
+
+    describe "attributes and method tests" do
+      subject { FateRoll.new }
+
+      it { should respond_to(:results) }
+      it { should respond_to(:roll_dice) }
+      its(:dice_roll_string) { should == '4d3' }
+    end
+
+    describe "#results" do
+      before(:each) do
+        @fate_roll = FateRoll.new
+        @fate_roll.roll_dice
+      end
+
+      subject { @fate_roll.results }
+
+      it                    { should be_a_kind_of(Hash) }
+      its([:dice_roll])     { should == "FATE Roll"}
+      its([:dice_rolls])    { should have(4).dice }
+      its([:roll_modifier]) { should == 0 }
+      its([:sum])           { should match /\A[\+-][01234]\z/ }
+    end
+
+    describe "#convert_dice_to_fate" do
+      before { @fate_roll = FateRoll.new.roll_dice }
+
+      it "should have 4 dice in the array" do
+        @fate_roll.convert_dice_to_fate.size.should == 4
+      end
+ 
+      it "should have elements with value '+', 'Nil', or '-'" do
+        @fate_roll.convert_dice_to_fate.each { |n|
+          ['+', 'Nil', '-'].include?(n).should be_true
+        }
+      end
+    end
+
+    describe "#get_fate_total" do
+      before { @fate_roll = FateRoll.new.roll_dice }
+
+      subject { @fate_roll.get_fate_total }
+
+      it { should match /\A[\+-][01234]\z/ }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: physh_roller
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Kryptyk Fysh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -45,16 +45,17 @@ email: kryptykfysh@kryptykfysh.co.uk
 executables:
 - dice
 extensions: []
-extra_rdoc_files:
-- README
+extra_rdoc_files: []
 files:
 - bin/dice
 - lib/physh_roller/die.rb
 - lib/physh_roller/dice_roll.rb
+- lib/physh_roller/fate_roll.rb
 - lib/physh_roller.rb
 - LICENSE
 - README
 - spec/physh_roller/die_spec.rb
+- spec/physh_roller/fate_roll_spec.rb
 - spec/physh_roller/dice_roll_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/kryptykfysh/PhyshRoller
@@ -69,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -83,5 +84,6 @@ specification_version: 4
 summary: A dice rolling application
 test_files:
 - spec/physh_roller/die_spec.rb
+- spec/physh_roller/fate_roll_spec.rb
 - spec/physh_roller/dice_roll_spec.rb
 - spec/spec_helper.rb