hazard 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 519e9ca60cdcf527c092c202fa70a30f404fadc2
-  data.tar.gz: a725503f7a8b4adca03a854e87bd9f4b5c7cda22
+  metadata.gz: 50b9cb69a3dcd78e8cc90e756d71a51869118c98
+  data.tar.gz: 80a6c159dfc55679123bebb37aad183d6249a102
 SHA512:
-  metadata.gz: ff7f2e7b962b426771ab8b162954d0bf39ecb9484cb8c2f006103f0792cc19765267cd6bdab749941f93ddb73b23f0c07b0e08cd0c0586b3fb7163c899871a0d
-  data.tar.gz: e196609727d242468d78879231c0b0c5d076746f66e1ca23366222023c273a53d93f836d12f7ccb1303f97ac723eb50cdc92bda0ea0cb2cb4b11b0c6043770f1
+  metadata.gz: d2cf192d13b710bcaefa0f4f4f36f3f5a2a0ead0d306d5c09120e440441475a846c559f4242a02c215d122ae7cb2c5d7de545289e307c3265cc9b8331a01b6d1
+  data.tar.gz: 5d616d381b83b74c07c150e50ad4d47adcd03fcc151141aa19aafd4ca8b9c692f13778a0dcf3253aa0b33f18a5fb5c5d41f7a313ac31a2ecb46a90aa391f52b9

data/Gemfile

@@ -2,9 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in hazard.gemspec
 gemspec
-
-group :test do
-  gem 'codeclimate-test-reporter', '~> 1.0.0'
-  gem 'mocha'
-  gem 'simplecov', '0.17.1', require: false
-end

data/hazard.gemspec

@@ -26,7 +26,10 @@ Gem::Specification.new do |spec|
 
   # spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'minitest', '~> 5.0'
+
+  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.0'
+  spec.add_development_dependency 'mocha'
+  spec.add_development_dependency 'simplecov', '0.17.1'
 
   spec.required_ruby_version = '>= 2.2'
 

data/lib/hazard.rb

@@ -64,21 +64,28 @@ class Hazard
     # Get the type of dice
     dice_type = dice_match[3].to_i
 
-    # Rolls the dice
-    rolls = ( 1..dice_amount(dice_match) ).map{ Kernel.rand( 1..dice_type ) }
-
-    # Unless splitted_result was requested, return the sum of the rolled dice
-    return rolls.reduce(:+) unless splitted_result
-
-    # Return a RolledDice otherwise
-    RolledDice.new( rolls )
+    # In some strange cases the user can request a roll of zero dice.
+    # in this case we return nil.
+    dm = dice_amount(dice_match)
+    if dm > 0
+      # Rolls the dice
+      rolls = ( 1..dice_amount(dice_match) ).map{ Kernel.rand( 1..dice_type ) }
+
+      # Unless splitted_result was requested, return the sum of the rolled dice
+      return rolls.reduce(:+) unless splitted_result
+
+      # Return a RolledDice otherwise
+      RolledDice.new( rolls )
+    end
   end
 
   def self.dice_amount( dice_match )
     # Get the dice amount
-    dice_amount = dice_match[2].to_i
+    dice_amount = dice_match[2]
+
     # If no amount is given then the amount is 1
-    dice_amount.zero? ? 1 : dice_amount
+    # But if zero dice is specifically required we respect this choice.
+    dice_amount.empty? ? 1 : dice_amount.to_i
   end
 
 end

data/lib/hazard/version.rb

@@ -1,3 +1,3 @@
 class Hazard
-  VERSION = '1.3.3'
+  VERSION = '1.3.4'
 end

data/test/hazard_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class HazardTest < Minitest::Test
+class HazardTest < Test::Unit::TestCase
 
   def test_dice
 
@@ -16,6 +16,7 @@ class HazardTest < Minitest::Test
 
     assert_equal RolledDice.new([6, 6 ] ), Hazard.s2d6
 
+    refute Hazard.s0d6
   end
 
   def test_dice_from_string
@@ -32,6 +33,7 @@ class HazardTest < Minitest::Test
 
     assert_equal RolledDice.new([6, 6 ] ), Hazard.from_string( 's2d6' )
 
+    refute Hazard.from_string( 's0d6' )
   end
 
   def test_lucky

data/test/test_helper.rb

@@ -5,7 +5,8 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'hazard'
 
-require 'minitest/autorun'
-require 'mocha/minitest'
+# require 'minitest/autorun'
+require 'test/unit'
+require 'mocha/test_unit'
 require 'pp'
 

data/test/weighted_table_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class HazardTest < Minitest::Test
+class HazardTest < Test::Unit::TestCase
 
 	def test_empty_table
 		assert_raises do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hazard
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Cédric ZUGER
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-22 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,19 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.1
 description: A very simple dice library for ruby
 email:
 - zuger.cedric@gmail.com