games_dice 0.4.0 → 0.4.2

data/spec/readme_spec.rb

@@ -6,34 +6,35 @@ require 'helpers'
 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 = described_class.create '3d6+6'
       expect(d).to 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 = described_class.create '3d6'
       expect(d).to be_a GamesDice::Dice
-      d = GamesDice.create '2d4-1'
+      d = described_class.create '2d4-1'
       expect(d).to be_a GamesDice::Dice
     end
 
     it "takes an optional parameter 'prng', which should be an object that has a method 'rand( integer )'" do
       prng = TestPRNG.new
 
-      d = GamesDice.create '3d6', prng
+      d = described_class.create '3d6', prng
       expect(d).to be_a GamesDice::Dice
 
       (0..5).each do |dresult|
         allow(prng).to receive(:rand).and_return(dresult)
-        expect(prng).to receive(:rand).with(6)
-        expect(d.roll).to eql (dresult + 1) * 3
+        result = d.roll
+        expect(prng).to have_received(:rand).with(6).at_least(:once)
+        expect(result).to eql (dresult + 1) * 3
       end
     end
   end
 end
 
 describe GamesDice::Dice do
-  before :each do
+  before do
     srand(67_809)
   end
 
@@ -57,7 +58,7 @@ describe GamesDice::Dice do
       end
     end
 
-    it 'will be nil if no roll has been made yet' do
+    it 'is nil if no roll has been made yet' do
       expect(dice.result).to be_nil
     end
   end
@@ -76,20 +77,20 @@ describe GamesDice::Dice do
       end
     end
 
-    it 'will be nil if no roll has been made yet' do
+    it 'is nil if no roll has been made yet' do
       expect(dice.explain_result).to be_nil
     end
   end
 
   describe '#max' do
     it 'returns the maximum possible value from a roll of the dice' do
-      expect(dice.max).to eql 18
+      expect(dice.max).to be 18
     end
   end
 
   describe '#min' do
     it 'returns the minimum possible value from a roll of the dice' do
-      expect(dice.min).to eql 3
+      expect(dice.min).to be 3
     end
   end
 
@@ -123,34 +124,34 @@ describe GamesDice::Probabilities do
 
   describe '#max' do
     it 'returns maximum result in the probability distribution' do
-      expect(probs.max).to eql 18
+      expect(probs.max).to be 18
     end
   end
 
   describe '#min' do
     it 'returns minimum result in the probability distribution' do
-      expect(probs.min).to eql 3
+      expect(probs.min).to be 3
     end
   end
 
   describe '#p_eql( n )' do
     it 'returns the probability of a result equal to the integer n' do
       expect(probs.p_eql(3)).to be_within(1e-10).of 1.0 / 216
-      expect(probs.p_eql(2)).to eql 0.0
+      expect(probs.p_eql(2)).to be 0.0
     end
   end
 
   describe '#p_gt( n )' do
     it 'returns the probability of a result greater than the integer n' do
       expect(probs.p_gt(17)).to be_within(1e-10).of 1.0 / 216
-      expect(probs.p_gt(2)).to eql 1.0
+      expect(probs.p_gt(2)).to be 1.0
     end
   end
 
   describe '#p_ge( n )' do
     it 'returns the probability of a result greater than the integer n' do
       expect(probs.p_ge(17)).to be_within(1e-10).of 4.0 / 216
-      expect(probs.p_ge(3)).to eql 1.0
+      expect(probs.p_ge(3)).to be 1.0
     end
   end
 
@@ -164,13 +165,13 @@ describe GamesDice::Probabilities do
   describe '#p_lt( n )' do
     it 'returns the probability of a result less than the integer n' do
       expect(probs.p_lt(17)).to be_within(1e-10).of 212.0 / 216
-      expect(probs.p_lt(3)).to eql 0.0
+      expect(probs.p_lt(3)).to be 0.0
     end
   end
 end
 
 describe 'String Dice Description' do
-  before :each do
+  before do
     srand(35_241)
   end
 
@@ -245,7 +246,7 @@ describe 'String Dice Description' do
   end
 
   describe "'1d6r:1.'" do
-    it "should return same as '1d6r1'" do
+    it "return same as '1d6r1'" do
       srand(235_241)
       d = GamesDice.create '1d6r:1.'
       results1 = (1..50).map { d.roll }
@@ -259,7 +260,7 @@ describe 'String Dice Description' do
   end
 
   describe "'1d10r:10,replace,1.'" do
-    it 'should roll a 10-sided die, re-roll a result of 10 and take the value of the second roll' do
+    it 'roll a 10-sided die, re-roll a result of 10 and take the value of the second roll' do
       d = GamesDice.create '1d10r:10,replace,1.'
       expect((1..27).map do
                d.roll
@@ -268,7 +269,7 @@ describe 'String Dice Description' do
   end
 
   describe "'1d20r:<=10,use_best,1.'" do
-    it 'should roll a 20-sided die, re-roll a result if 10 or lower, and use best result' do
+    it 'roll a 20-sided die, re-roll a result if 10 or lower, and use best result' do
       d = GamesDice.create '1d20r:<=10,use_best,1.'
       expect((1..20).map do
                d.roll
@@ -277,7 +278,7 @@ describe 'String Dice Description' do
   end
 
   describe "'5d10r:10,add.k2', '5d10xk2' and '5d10x.k2'" do
-    it 'should all be equivalent' do
+    it 'all be equivalent' do
       srand(135_241)
       d = GamesDice.create '5d10r:10,add.k2'
       results1 = (1..50).map { d.roll }
@@ -307,6 +308,7 @@ describe 'String Dice Description' do
       d = GamesDice.create '9d6x.m:10.'
       expect((1..5).map { |_n| d.roll }).to eql [1, 2, 1, 1, 1]
     end
+
     it 'can be explained as number of exploding dice scoring 10+' do
       d = GamesDice.create '9d6x.m:10.'
       expect((1..5).map do |_n|
@@ -327,6 +329,7 @@ describe 'String Dice Description' do
       d = GamesDice.create '9d6x.m:10,1,S.'
       expect((1..5).map { |_n| d.roll }).to eql [1, 2, 1, 1, 1]
     end
+
     it "includes the string 'S' next to each success" do
       d = GamesDice.create '9d6x.m:10,1,S.'
       expect((1..5).map do |_n|
@@ -347,6 +350,7 @@ describe 'String Dice Description' do
       d = GamesDice.create '5d10m:>=6,1,S.m:==1,-1,F.'
       expect((1..10).map { |_n| d.roll }).to eql [2, 2, 4, 3, 2, 1, 1, 3, 3, 0]
     end
+
     it "includes the string 'S' next to each success, and 'F' next to each 'fumble'" do
       d = GamesDice.create '5d10m:>=6,1,S.m:==1,-1,F.'
       expect((1..5).map do |_n|
@@ -367,6 +371,7 @@ describe 'String Dice Description' do
       d = GamesDice.create '4d6k:3.r:1,replace,1.'
       expect((1..10).map { |_n| d.roll }).to eql [12, 14, 14, 18, 11, 17, 11, 15, 14, 14]
     end
+
     it 'includes re-rolls and keeper choice in explanations' do
       d = GamesDice.create '4d6k:3.r:1,replace,1.'
       expect((1..5).map do |_n|
@@ -387,6 +392,7 @@ describe 'String Dice Description' do
       d = GamesDice.create '2d20k:1,worst.'
       expect((1..10).map { |_n| d.roll }).to eql [18, 6, 2, 3, 5, 10, 15, 1, 7, 10]
     end
+
     it 'includes keeper choice in explanations' do
       d = GamesDice.create '2d20k:1,worst.'
       expect((1..5).map do |_n|

data/spec/reroll_rule_spec.rb

@@ -4,36 +4,36 @@ require 'helpers'
 
 describe GamesDice::RerollRule do
   describe '#new' do
-    it 'should accept self-consistent operator/value pairs as a trigger' do
-      GamesDice::RerollRule.new(5, :>, :reroll_subtract)
-      GamesDice::RerollRule.new((1..5), :member?, :reroll_replace)
+    it 'accept self-consistent operator/value pairs as a trigger' do
+      expect { described_class.new(5, :>, :reroll_subtract) }.not_to raise_error
+      expect { described_class.new(1..5, :member?, :reroll_replace) }.not_to raise_error
     end
 
-    it 'should reject inconsistent operator/value pairs for a trigger' do
-      expect(-> { GamesDice::RerollRule.new(5, :member?, :reroll_subtract) }).to raise_error(ArgumentError)
-      expect(-> { GamesDice::RerollRule.new((1..5), :>, :reroll_replace) }).to raise_error(ArgumentError)
+    it 'reject inconsistent operator/value pairs for a trigger' do
+      expect { described_class.new(5, :member?, :reroll_subtract) }.to raise_error(ArgumentError)
+      expect { described_class.new(1..5, :>, :reroll_replace) }.to raise_error(ArgumentError)
     end
 
-    it 'should reject bad re-roll types' do
-      expect(-> { GamesDice::RerollRule.new(5, :>, :reroll_again) }).to raise_error(ArgumentError)
-      expect(-> { GamesDice::RerollRule.new((1..5), :member?, 42) }).to raise_error(ArgumentError)
+    it 'reject bad re-roll types' do
+      expect { described_class.new(5, :>, :reroll_again) }.to raise_error(ArgumentError)
+      expect { described_class.new(1..5, :member?, 42) }.to raise_error(ArgumentError)
     end
   end
 
   describe '#applies?' do
-    it 'should return true if a trigger condition is met' do
-      rule = GamesDice::RerollRule.new(5, :>, :reroll_subtract)
+    it 'return true if a trigger condition is met' do
+      rule = described_class.new(5, :>, :reroll_subtract)
       expect(rule.applies?(4)).to be true
 
-      rule = GamesDice::RerollRule.new((1..5), :member?, :reroll_subtract)
+      rule = described_class.new(1..5, :member?, :reroll_subtract)
       expect(rule.applies?(4)).to be true
     end
 
-    it 'should return false if a trigger condition is not met' do
-      rule = GamesDice::RerollRule.new(5, :>, :reroll_subtract)
+    it 'return false if a trigger condition is not met' do
+      rule = described_class.new(5, :>, :reroll_subtract)
       expect(rule.applies?(7)).to be false
 
-      rule = GamesDice::RerollRule.new((1..5), :member?, :reroll_subtract)
+      rule = described_class.new(1..5, :member?, :reroll_subtract)
       expect(rule.applies?(6)).to be false
     end
   end

metadata

@@ -1,143 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: games_dice
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Neil Slater
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.7
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.1
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.3
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.6
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
-description: A library for simulating dice. Use it to construct dice-rolling systems
+        version: '2.0'
+description: 'A library for simulating dice. Use it to construct dice-rolling systems
   used in role-playing and board games.
+
+  '
 email:
 - slobo777@gmail.com
 executables: []
@@ -145,9 +34,9 @@ extensions:
 - ext/games_dice/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -161,6 +50,7 @@ files:
 - games_dice.gemspec
 - lib/games_dice.rb
 - lib/games_dice/bunch.rb
+- lib/games_dice/bunch_helpers.rb
 - lib/games_dice/complex_die.rb
 - lib/games_dice/complex_die_helpers.rb
 - lib/games_dice/constants.rb
@@ -187,8 +77,8 @@ files:
 homepage: https://github.com/neilslater/games_dice
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -196,28 +86,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 4.0.1
 specification_version: 4
 summary: Simulates and explains dice rolls from simple "1d6" to complex "roll 7 ten-sided
   dice, take best 3, results of 10 roll again and add on".
-test_files:
-- spec/bunch_spec.rb
-- spec/complex_die_spec.rb
-- spec/dice_spec.rb
-- spec/die_result_spec.rb
-- spec/die_spec.rb
-- spec/fixtures/probs_fair_die_6.dat
-- spec/helpers.rb
-- spec/map_rule_spec.rb
-- spec/parser_spec.rb
-- spec/probability_spec.rb
-- spec/readme_spec.rb
-- spec/reroll_rule_spec.rb
+test_files: []

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-
-before_install:
- - gem install bundler
-
-os:
-  - linux
-
-rvm:
-  - "2.7.1"
-  - "3.0.0"