games_dice 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32e7a4b347340a1fce6ae0777e0e152ec0bd3f7c
-  data.tar.gz: f38a06b757f67e7066a8ccd01a6ecf4978cfbb18
+  metadata.gz: d19dba764a16a41817baaa3ccfd957f79433c9b0
+  data.tar.gz: 29037036e7fe3d1f5456e66bec3d8675a2434eaa
 SHA512:
-  metadata.gz: 6ada816ccb2d5a9930cc01617ec90847f3cd406a4b42e6cd27907fccd8df02a2564592e4eae67ebd375c6deb9b1034a177e001c5b25384906fc8c17d16ac86e0
-  data.tar.gz: 452ef531000721460c09170aff72672e5d6909b253647f7203691a7d24eee8c3c300ee2703f8b3c68d628af91432b3feae5d3182d2c7db7085101d7547778078
+  metadata.gz: 8420089013a0439dd92199fc276bdb718ab4abb9e5cef872542b1d87d545ab53a9c382bb8ebb3d2fe7226816e3a1cd9b4a071e6659cc0ad7d0fbd959ef5135e8
+  data.tar.gz: 69c75770fc39c5d4ada410cf16397105e6020380a320a6023380786591b80a3a7f1ace3a00c3e0a21b665f1b6260303db5bfce223bc23d9712142ac3042190d1

data/.travis.yml

@@ -1,10 +1,14 @@
 language: ruby
+before_install:
+ - gem install bundler
 rvm:
-  - "1.9.2"
-  - "1.9.3"
   - "2.0.0"
   - "2.1.0"
   - "2.1.1"
-  - jruby-19mode
-  - jruby-head
+  - "2.1.4"
+  - "2.2.0"
+  - "2.3.1"
+  - "2.4.1"
+  - "2.4.2"
+  - jruby-9.0.5.0
 

data/README.md

@@ -2,6 +2,7 @@
 [![Gem Version](https://badge.fury.io/rb/games_dice.png)](http://badge.fury.io/rb/games_dice)
 [![Build Status](https://travis-ci.org/neilslater/games_dice.png?branch=master)](http://travis-ci.org/neilslater/games_dice)
 [![Coverage Status](https://coveralls.io/repos/neilslater/games_dice/badge.png?branch=master)](https://coveralls.io/r/neilslater/games_dice?branch=master)
+[![Inline docs](http://inch-ci.org/github/neilslater/games_dice.png?branch=master)](http://inch-ci.org/github/neilslater/games_dice)
 [![Code Climate](https://codeclimate.com/github/neilslater/games_dice.png)](https://codeclimate.com/github/neilslater/games_dice)
 [![Dependency Status](https://gemnasium.com/neilslater/games_dice.png)](https://gemnasium.com/neilslater/games_dice)
 
@@ -29,12 +30,11 @@ gem as-is, and add them as features within your project code.
 
 ## Supported Ruby Versions
 
-GamesDice is tested routinely on
+GamesDice is tested routinely on MRI Rubies 1.9.3, 2.0.0, 2.1.0, 2.1.1 and JRuby, and the
+"build passing" badge is based on those tests.
 
- * MRI Ruby 1.8.7, 1.9.3 and 2.0.0
- * Rubinius 1.8 and 1.9
- * JRuby in 1.8 and 1.9 modes
- * Ruby Enterprise Edition
+It *should* also work in versions from 1.8.7, in Ruby Enterprise and in Rubinius, but it
+is not tested routinely on those Rubies.
 
 ## Installation
 

data/lib/games_dice/bunch.rb

@@ -98,7 +98,7 @@ class GamesDice::Bunch
   # @return [Array<GamesDice::DieResult>, nil] Sequence of GamesDice::DieResult objects.
   def result_details
     return nil unless @raw_result_details
-    @raw_result_details.map { |r| r.is_a?(Fixnum) ? GamesDice::DieResult.new(r) : r }
+    @raw_result_details.map { |r| r.is_a?(Integer) ? GamesDice::DieResult.new(r) : r }
   end
 
   # @!attribute [r] min

data/lib/games_dice/die_result.rb

@@ -145,7 +145,7 @@ class GamesDice::DieResult
   end
 
   # @!visibility private
-  # all coercions simply use #value (i.e. nil or a Fixnum)
+  # all coercions simply use #value (i.e. nil or a Integer)
   def coerce(thing)
     @value.coerce(thing)
   end

data/lib/games_dice/version.rb

@@ -1,3 +1,3 @@
 module GamesDice
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

data/spec/complex_die_spec.rb

@@ -153,7 +153,7 @@ describe GamesDice::ComplexDie do
       die = GamesDice::ComplexDie.new(10, :rerolls => [GamesDice::RerollRule.new(10, :<=, :reroll_add)] )
       probs = die.probabilities.to_h
       probs[8].should be_within(1e-10).of 0.1
-      probs[10].should be_false
+      probs[10].should be_nil
       probs[13].should be_within(1e-10).of 0.01
       probs[27].should be_within(1e-10).of 0.001
       probs.values.inject(:+).should be_within(1e-9).of 1.0

data/spec/die_result_spec.rb

@@ -223,25 +223,25 @@ describe GamesDice::DieResult do
   it "should support comparison with >,<,>=,<= as if it were an integer, based on #value" do
     die_result = GamesDice::DieResult.new(7)
 
-    (die_result > 3).should be_true
-    (14 > die_result).should be_true
-    (die_result >= 7).should be_true
-    (9.5 >= die_result).should be_true
-    (die_result < 3).should be_false
-    (14 < die_result).should be_false
-    (die_result <= 8).should be_true
-    (14 <= die_result).should be_false
+    (die_result > 3).should == true
+    (14 > die_result).should == true
+    (die_result >= 7).should == true
+    (9.5 >= die_result).should == true
+    (die_result < 3).should == false
+    (14 < die_result).should == false
+    (die_result <= 8).should == true
+    (14 <= die_result).should == false
 
     other_die_result = GamesDice::DieResult.new(6)
     other_die_result.add_roll(6,:reroll_add)
-    (die_result > other_die_result).should be_false
-    (other_die_result > die_result).should be_true
-    (die_result >= other_die_result).should be_false
-    (other_die_result >= die_result).should be_true
-    (die_result < other_die_result).should be_true
-    (other_die_result < die_result).should be_false
-    (die_result <= other_die_result).should be_true
-    (other_die_result <= die_result).should be_false
+    (die_result > other_die_result).should == false
+    (other_die_result > die_result).should == true
+    (die_result >= other_die_result).should == false
+    (other_die_result >= die_result).should == true
+    (die_result < other_die_result).should == true
+    (other_die_result < die_result).should == false
+    (die_result <= other_die_result).should == true
+    (other_die_result <= die_result).should == false
 
   end
 

data/spec/die_spec.rb

@@ -47,7 +47,7 @@ describe GamesDice::Die do
     it "should return the die's probability distribution as a GamesDice::Probabilities object" do
       die = GamesDice::Die.new(6)
       probs = die.probabilities
-      probs.is_a?( GamesDice::Probabilities ).should be_true
+      probs.should be_a GamesDice::Probabilities
 
       probs.to_h.should be_valid_distribution
 

data/spec/helpers.rb

@@ -44,9 +44,9 @@ RSpec::Matchers.define :be_valid_distribution do
     @error = nil
     if ! given.is_a?(Hash)
       @error = "distribution should be a Hash, but it is a #{given.class}"
-    elsif given.keys.any? { |k| ! k.is_a?(Fixnum) }
-      bad_key = given.keys.first { |k| ! k.is_a?(Fixnum) }
-      @error = "all keys should be Fixnums, but found '#{bad_key.inspect}' which is a #{bad_key.class}"
+    elsif given.keys.any? { |k| ! k.is_a?(Integer) }
+      bad_key = given.keys.first { |k| ! k.is_a?(Integer) }
+      @error = "all keys should be Integers, but found '#{bad_key.inspect}' which is a #{bad_key.class}"
     elsif given.values.any? { |v| ! v.is_a?(Float) }
       bad_value = given.values.find { |v| ! v.is_a?(Float) }
       @error = "all values should be Floats, but found '#{bad_value.inspect}' which is a #{bad_value.class}"
@@ -60,11 +60,11 @@ RSpec::Matchers.define :be_valid_distribution do
     ! @error
   end
 
-  failure_message_for_should do |given|
+  failure_message do |given|
     @error ? @error : 'Distribution is valid and complete'
   end
 
-  failure_message_for_should_not do |given|
+  failure_message_when_negated do |given|
      @error ? @error : 'Distribution is valid and complete'
   end
 

data/spec/map_rule_spec.rb

@@ -31,12 +31,12 @@ describe GamesDice::MapRule do
       rule.map_from(4).should == 3
     end
 
-    it "should return false for no match" do
+    it "should return nil for no match" do
       rule = GamesDice::MapRule.new( 5, :>, -1 )
-      rule.map_from(6).should be_false
+      rule.map_from(6).should be_nil
 
       rule = GamesDice::MapRule.new( (1..5), :member?, 3 )
-      rule.map_from(6).should be_false
+      rule.map_from(6).should be_nil
     end
 
   end

data/spec/probability_spec.rb

@@ -163,7 +163,7 @@ describe GamesDice::Probabilities do
       it "should be either :c or :ruby" do
         lang = GamesDice::Probabilities.implemented_in
         lang.should be_a Symbol
-        [:c, :ruby].member?( lang ).should be_true
+        [:c, :ruby].member?( lang ).should == true
       end
     end
   end # describe "class methods"

data/spec/readme_spec.rb

@@ -6,21 +6,21 @@ describe GamesDice do
   describe '#create' do
     it "converts a string such as '3d6+6' into a GamesDice::Dice object" do
       d = GamesDice.create '3d6+6'
-      d.is_a?( GamesDice::Dice ).should be_true
+      d.should be_a GamesDice::Dice
     end
 
     it "takes a parameter 'dice_description', which is a string such as '3d6' or '2d4-1'" do
       d = GamesDice.create '3d6'
-      d.is_a?( GamesDice::Dice ).should be_true
+      d.should be_a GamesDice::Dice
       d = GamesDice.create '2d4-1'
-      d.is_a?( GamesDice::Dice ).should be_true
+      d.should be_a GamesDice::Dice
     end
 
     it "takes an optional parameter 'prng', which if provided it should be an object that has a method 'rand( integer )'" do
       prng = TestPRNG.new
 
       d = GamesDice.create '3d6', prng
-      d.is_a?( GamesDice::Dice ).should be_true
+      d.should be_a GamesDice::Dice
 
       (0..5).each do |dresult|
         prng.stub( :rand ) { dresult }
@@ -103,7 +103,7 @@ describe GamesDice::Dice do
   describe "#probabilities" do
     it "calculates probability distribution for the dice" do
       pd = dice.probabilities
-      pd.is_a?( GamesDice::Probabilities ).should be_true
+      pd.should be_a GamesDice::Probabilities
       pd.p_eql( 3).should be_within(1e-10).of 1.0/216
       pd.p_eql( 11 ).should be_within(1e-10).of 27.0/216
     end

data/spec/reroll_rule_spec.rb

@@ -25,18 +25,18 @@ describe GamesDice::RerollRule do
 
     it "should return true if a trigger condition is met" do
       rule = GamesDice::RerollRule.new( 5, :>, :reroll_subtract )
-      rule.applies?(4).should be_true
+      rule.applies?(4).should == true
 
       rule = GamesDice::RerollRule.new( (1..5), :member?, :reroll_subtract )
-      rule.applies?(4).should be_true
+      rule.applies?(4).should == true
     end
 
     it "should return false if a trigger condition is not met" do
       rule = GamesDice::RerollRule.new( 5, :>, :reroll_subtract )
-      rule.applies?(7).should be_false
+      rule.applies?(7).should == false
 
       rule = GamesDice::RerollRule.new( (1..5), :member?, :reroll_subtract )
-      rule.applies?(6).should be_false
+      rule.applies?(6).should == false
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: games_dice
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Neil Slater
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Simulates and explains dice rolls from simple "1d6" to complex "roll 7 ten-sided