hazard 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d28f43d4e9f1a73abe89da77c643f3c9a1cb14f6
-  data.tar.gz: af78c25a0727d93da1215ce37e64432d1b7f219d
+  metadata.gz: d73a6ac407a313337a1309b8f85680c2acdf9a36
+  data.tar.gz: f26d0073ed98e7d10483815e6b16f6456e582142
 SHA512:
-  metadata.gz: 7179aae07893c8d84ee89f4f0804bd3f0e8d997a84454b43fccf043016371f19b341a1cabd3d595664352e87be43e31c85c19e9d259a6ad915fd39397e4a6235
-  data.tar.gz: 42719dfc8336d02060838ece2fbf064e7d7d01361acd00f468bc9c10f0a1dc28ddf1d2de983e4d496c1f051c734156ace8e7052be2b8873320c9acda6b1f00e9
+  metadata.gz: 9b6aa19cf68606574fca81bbb5c3242fbabc44833806078de8a883de43fba72c16df8a10f42b163a0c18e829d70d873bb3e3450634cf30115c08254e43fe4fa4
+  data.tar.gz: 4decd66c91587ad5a1eba94d94d575432c874589801fd9a087e7ba88c50930e6feb1ca1d11a8dfe8d40bdf7cbb221393d0dcc531b6785febcb02f915bbbcd960

data/.ruby-version

@@ -0,0 +1 @@
+2.4.2

data/.travis.yml

@@ -1,5 +1,27 @@
-sudo: false
+#sudo: false
+
+#before_install: gem install bundler -v 1.13.6
+
+env:
+  global:
+    - CC_TEST_REPORTER_ID=909815ccc68b9e9eea2388daa1b7d8edfa32a4dc013c367ea2ca3442d1742964
+
 language: ruby
 rvm:
-  - 2.0.0
-before_install: gem install bundler -v 1.13.6
+  - 2.5
+  - 2.4
+  - 2.3
+  - 2.2
+  - 2.1
+  - 2.0
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+
+script:
+  - bundle exec rake
+
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/README.md

@@ -39,10 +39,10 @@ Examples :
     >> Hazard.d6
     => 2
     
-    Hazard.d8
+    >> Hazard.d8
     => 4
      
-    Hazard.d42
+    >> Hazard.d42
     => 38
      
     
@@ -50,19 +50,29 @@ Examples :
 
     >> Hazard.r<m>d<n>    # where m and n are numbers
     => Roll m n-sided dice and return the sum
+    
+    # You can also use
+    >> Hazard.m<m>d<n>    # where m and n are numbers       
+    >> Hazard.d<m>d<n>    # where m and n are numbers
 
 Examples : 
    
-    Hazard.r2d6
-     => 4
+    >> Hazard.r2d6
+    => 4
      
-    Hazard.r4d8
-     => 12
+    >> Hazard.r4d8
+    => 12
      
-    Hazard.r48d42
-     => 356
-         
-         
+    >> Hazard.r48d42
+    => 356
+    
+    >> Hazard.m2d6
+    => 6    
+     
+    >> Hazard.d2d6
+    => 8      
+    
+        
 **Roll dice and get the details**
 
     >> Hazard.s<m>d<n>    # where m and n are numbers
@@ -96,32 +106,21 @@ Examples :
     
     # You may want to roll 2 d20 dice with advantage (take the greatest)
     # This will rolls 2 d20, get the rolls and get the best of them
-    
     >> Hazard.s2d20.rolls.max 
     => 19
     
     # Obviously a disadvantage is
-    
     >> Hazard.s2d20.rolls.min
     => 13
     
     # Maybe you want to roll with an advantage and make the check (because you are as lazy as me)
-    
     >> Hazard.s2d20.rolls.max > 12
     => true or false
     
     # Should you have the Elemental Adept feat, which mean that you treat all 1 as 2
     # If you cast a fireball, this will do the trick : 
-    
-    >> Hazard.s6d6.rolls.map{ |d| d == 1 ? 2 : d }.reduce(:+)
-    => 13
-                    
-    
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+    >> Hazard.s8d6.rolls.map{ |d| d == 1 ? 2 : d }.reduce(:+)
+    => 24                   
 
 ## Contributing
 

data/lib/hazard/version.rb

@@ -1,3 +1,3 @@
 class Hazard
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/lib/hazard.rb

@@ -7,34 +7,31 @@ class Hazard
     # Transform the method_name to string
     method_name = method_name.to_s
 
-    # If first character is 's'
-    if method_name[0] == 's'
-      method_name = method_name[1..-1]
-      # Then we will return a splitted result
-      splitted_result = true
-    end
-
     # Parse the method name to get how many dice and what size of dice was required
-    dice_match = method_name.to_s.match( /(\d*)d(\d+)/ )
+    dice_match = method_name.to_s.match( /(d|r|m|s)?(\d*)d(\d+)/ )
     # Raise an error if match fail
     raise "Method mising : #{method_name}" unless dice_match
 
+    # Get the roll type
+    roll_type = dice_match[1]
+    splited_result = true if roll_type == 's'
+
     # Get the dice amount
-    dice_amount = dice_match[1].to_i
+    dice_amount = dice_match[2].to_i
     # If no amount is given then the amount is 1
     dice_amount = 1 if dice_amount == 0
     # Get the type of dice
-    dice_type = dice_match[2].to_i
+    dice_type = dice_match[3].to_i
 
     # Rolls the dice
-    rolls = (1..dice_amount).map{ Kernel.rand( 1..dice_type ) }
+    rolls = ( 1..dice_amount ).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 rolls.reduce(:+) unless splited_result
 
     # Return a RolledDice otherwise
-    RolledDice.new(rolls )
+    RolledDice.new( rolls )
 
   end
 
-end
+end

data/test/hazard_test.rb

@@ -10,6 +10,9 @@ class HazardTest < Minitest::Test
 
     assert_equal 12, Hazard.r2d6
     assert_equal 12, Hazard._2d6
+    assert_equal 12, Hazard.m2d6
+    assert_equal 12, Hazard.d2d6
+    assert_equal 18, Hazard.d3d6
 
     assert_equal RolledDice.new([6, 6 ] ), Hazard.s2d6
 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: hazard
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Cédric ZUGER
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-19 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 description: A very simple dice library for ruby
@@ -59,8 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -82,17 +83,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Dice library for ruby