dicebag 3.3.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b36691cc7b34c8637154bac79f610b1867d55902b904e83b390b12ae1e6ebf37
-  data.tar.gz: d3fb57f5f563a1e599beb75831953ff3e8bc6dd2e60fcc82aee66a609ac96b1a
+  metadata.gz: f932f637949ae902d7a548f3f840bbac83eb889986468e02c149b23800e00b04
+  data.tar.gz: 21e477659ac97f48eba24053a5a2e07852dbac9f2220a84474d04b4624e96395
 SHA512:
-  metadata.gz: d0367e80fdfc838a465a5b431c766a3418dcb35ae99f8cce9a6ee9f040e6dd4b859b1c561a36f6bfbed16e88a4e9e817e9f9c077263de8721e72498ab9e6e63d
-  data.tar.gz: d1cf650ccb9d0a75fcfb9d278198b949c17291ebf488878f3c7df3a3accb63ac8c9e9ed8c00b1ffb6222369fd6ed9c0ad1bad8a5c5c8b471cefd59e7cffa63d7
+  metadata.gz: c7ee0173f907cac2f49d5f7e04750e0ea29b88d1a85ad21adbfa57217c1ab85fd731693e085b8265cdae78b18c1deb96776841ed66f98e90baaef4efce91a7ea
+  data.tar.gz: a7a1e68d305dcf024506262e63d1f08f12e9042280dadd80f711e6e25b2ec2edb685d6b04f103b464fd5bd5db7a242384d753c2d444b8efb615f6834da3bd53b

data/bin/dicebag

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
-# require 'dicebag'
+
 require_relative '../lib/dicebag'
 
 # Define the Dicebag CLI app
@@ -18,14 +18,25 @@ class DiceBagCLI
 
   def opts
     @opts ||= OptionParser.new do |args|
+      args.banner = 'Usage: dicebag [-n | --notes] <dice string>'
+
       args.on '-n', '--notes', 'Display any notes for the roll.'
+
+      args.on_head('-h', 'Displays this help.') do
+        puts args
+
+        exit
+      end
     end
   end
 
   def perform
+    abort(opts.help) if ARGV.empty?
+
     nonopts = opts.parse! into: params
 
-    roll   = DiceBag::Roll.new nonopts.first
+    dstr   = nonopts.join(' ')
+    roll   = DiceBag::Roll.new dstr
     result = roll.roll
 
     puts result

data/lib/dicebag/normalize.rb

@@ -101,13 +101,21 @@ module DiceBag
 
       explode = hash[:options][:explode]
 
-      return if explode.nil? || explode >= 2
+      # If we did not come with a value, set it to dice sides, but no
+      # need to note this, as this is what no values means.
+      return __set_explode_to_sides(hash) if explode.negative?
 
-      hash[:options][:explode] = nil
+      # But we do want to note if the explode value was set to 1. >:|
+      __set_explode_to_sides if explode == 1
 
       hash[:notes].push("Explode set to #{hash[:sides]}")
     end
 
+    # :nodoc:
+    def __set_explode_to_sides(hash)
+      hash[:options][:explode] = hash[:sides]
+    end
+
     # Prevent Reroll abuse.
     def normalize_reroll(hash)
       return unless hash[:options].key?(:reroll) &&

data/lib/dicebag/parser.rb

@@ -6,11 +6,11 @@ module DiceBag
     # Base rules.
     rule(:space?)  { str(' ').repeat }
 
-    # Numbers are limited to 3 digit places.
+    # Numbers are limited to 4 digit places.
     #
     # Why? To prevent abuse from people rolling: 999999999D999999999 and
     # 'DOS'-ing the app.
-    rule(:number)  { match('[0-9]').repeat(1, 3) }
+    rule(:number)  { match('[0-9]').repeat(1, 4) }
     rule(:number?) { number.maybe }
 
     # Label rule

data/lib/dicebag/roll_part.rb

@@ -96,14 +96,14 @@ module DiceBag
     def generate_results
       @results = []
 
-      explode = @options.key?(:explode)
+      explode = @options[:explode]
 
       count.times do
         roll = roll_die
 
         @results.push(roll)
 
-        handle_explode(roll) if explode
+        handle_explode(roll) unless explode.nil?
       end
     end
 

data/lib/dicebag/roll_part_string.rb

@@ -34,9 +34,9 @@ module RollPartString
   end
 
   def to_s_explode
-    return unless @options.key?(:explode)
+    return unless @options.key?(:explode) && @options[:explode].positive?
 
-    e = @options[:explode].nil? ? 'e' : format('e%s', @options[:explode])
+    e = format('e%s', @options[:explode])
 
     @parts.push e
   end

data/lib/dicebag/transform.rb

@@ -5,6 +5,8 @@ module DiceBag
   # pass later.)
   class Transform < Parslet::Transform
     def self.hashify_options(options)
+      return options if options.is_a? Hash
+
       opts = {}
 
       options.each { |val| opts.update val } if options.respond_to?(:each)
@@ -40,9 +42,9 @@ module DiceBag
     end
 
     # Explode is special, in that if it is nil, then we set it to -1 to
-    # reflect that.
+    # reflect that, and it'll be updated in the normalization phase.
     rule(explode: simple(:x)) do
-      { explode: (x ? Integer(x) : nil) }
+      { explode: (x ? Integer(x) : -1) }
     end
 
     # Match a label by itself.

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: dicebag
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.2
 platform: ruby
 authors:
-- SynTruth
+- Randy "syntruth" Carnahan
 autorequire:
 bindir: bin
 cert_chain: []
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: 'Dice Bag: Ruby Dice Rolling Library'