character-roller 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f54f2ad00766b68f0f5d42b26e834ec2f252979
-  data.tar.gz: e0b3bb6ed89b0b8a31fb418053c7b5652ae0c01f
+  metadata.gz: f7806aacd52d3f77c37431a3cb767b48dfb4b307
+  data.tar.gz: 83d5af29011a70a52a5e98d846b4ae0905cc39aa
 SHA512:
-  metadata.gz: 959062159f5f66757a87e5e8b7f6aa9112010c60ba9d888cbfadb7dd0a268b9343f1a7e349996777f53573ec939b08ba68313e40d476042264622eee2e955cf7
-  data.tar.gz: cde46532697a13c65bea52885bee479e333147c2d1bbd3d9e1b1bd9d765f5f2d187fa4c88c75cbb849182be3ae53a85a14f6340721ea4e8538bd738d0edd55d6
+  metadata.gz: ad2f7521527f181327cd9a32c0e9236e7d4d07d156b7f7d0cb269d3896effeeb1ee56112416bd1f7e4b54b0759bca3b39ccc10ec987753c8743372f9b72b6184
+  data.tar.gz: abc394dc86ec7762b63182eac6b0215688aabc2913b3af9ea89ee346bf2e21e892b1afd5f384ec9b8f1e2010e8fab5a21e05563aca2df7b9d28c405c15dca00a

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/bin/dice

@@ -4,7 +4,7 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'roller'
 
 unless ARGV.empty?
-  if ARGV.first =~ /\d+[dD]\d+/
+  if ARGV.first =~ Roller::NDN_PATTERN
     Roller.new.roll(ARGV.first)
   else
     Roller.start

data/lib/roller.rb

@@ -9,7 +9,8 @@ require 'true-random'
 class Roller < Thor
   include Thor::Actions
 
-  JSONIP_URL = "http://jsonip.com/"
+  JSONIP_URL  = "http://jsonip.com/"
+  NDN_PATTERN = %r{(\d+)[dD](\d+)\+?(\d+)?}
 
   default_task :version
 
@@ -27,18 +28,25 @@ class Roller < Thor
 
   desc 'roll NdN', 'Rolls N, N-sided dice and returns the total result'
   def roll(ndn)
-    match_reg = %r{(\d+)[dD](\d+)}
-    matches   = match_reg.match ndn
+    matches = NDN_PATTERN.match ndn
+    bonus   = 0
 
-    if matches.length === 3
+    if matches.length === 4
       dice  = matches[1].to_i
       sides = matches[2].to_i
+      bonus = matches[3].to_i if matches[3]
 
-      rolls = roll_dice dice, sides
-      total = rolls.reduce :+
+      rolls  = roll_dice dice, sides
+      total  = rolls.reduce :+
+      total += bonus
 
-      p rolls if options.show_results
-      say total
+      if options.show_results
+        print rolls.to_s
+        print " + #{bonus.to_s}"
+        print " = #{total}\n"
+      else
+        say total
+      end
     else
       say "Invalid input", :red
       exit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: character-roller
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Mike Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake