dicebag 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f932f637949ae902d7a548f3f840bbac83eb889986468e02c149b23800e00b04
-  data.tar.gz: 21e477659ac97f48eba24053a5a2e07852dbac9f2220a84474d04b4624e96395
+  metadata.gz: e374abd6451fc02ee28e17e0a87a2833a785643d89962708903717766c8ad8df
+  data.tar.gz: 6e339459b5f5aaa5d2dc5f26f55dc8331e1a976e2da9452f3fc2f2bfd9c9f00f
 SHA512:
-  metadata.gz: c7ee0173f907cac2f49d5f7e04750e0ea29b88d1a85ad21adbfa57217c1ab85fd731693e085b8265cdae78b18c1deb96776841ed66f98e90baaef4efce91a7ea
-  data.tar.gz: a7a1e68d305dcf024506262e63d1f08f12e9042280dadd80f711e6e25b2ec2edb685d6b04f103b464fd5bd5db7a242384d753c2d444b8efb615f6834da3bd53b
+  metadata.gz: d8f484c21149db59bec30f3c3935aeeb1f39001a4ab3c746dec41d1c87d7bfab2bef4c8c3ba5a70ed2efff6b598cb50811185b393b94941cbcee00d25991f080
+  data.tar.gz: e1c68214264adaf8b3023f4ae34309c862ba4fe707d562971eb73461bd866f1319106c4e9cdc7014f0762c72fff665477d3ad06f2ddec7877ae043fa8c34bf0f

data/bin/dicebag

@@ -7,6 +7,7 @@ require_relative '../lib/dicebag'
 # Define the Dicebag CLI app
 class DiceBagCLI
   attr_reader :params
+  attr_reader :dstr
 
   def self.call
     new.perform
@@ -18,7 +19,13 @@ class DiceBagCLI
 
   def opts
     @opts ||= OptionParser.new do |args|
-      args.banner = 'Usage: dicebag [-n | --notes] <dice string>'
+      args.banner = 'Usage: dicebag [-n|--notes] [--avg|--max|--min] <string>'
+
+      args.on '--avg', 'Display the average for the roll.'
+
+      args.on '--max', 'Display the maximum for the roll.'
+
+      args.on '--min', 'Display the minimum for the roll.'
 
       args.on '-n', '--notes', 'Display any notes for the roll.'
 
@@ -35,7 +42,28 @@ class DiceBagCLI
 
     nonopts = opts.parse! into: params
 
-    dstr   = nonopts.join(' ')
+    @dstr = nonopts.join(' ')
+
+    return do_average if params[:avg]
+    return do_maximum if params[:max]
+    return do_minimum if params[:min]
+
+    do_roll
+  end
+
+  def do_average
+    puts DiceBag.average dstr
+  end
+
+  def do_maximum
+    puts DiceBag.maximum dstr
+  end
+
+  def do_minimum
+    puts DiceBag.minimum dstr
+  end
+
+  def do_roll
     roll   = DiceBag::Roll.new dstr
     result = roll.roll
 

data/lib/dicebag/min_max_calc.rb

@@ -0,0 +1,59 @@
+module DiceBag
+  # This is service class to calculate the Maximum/Minimum for the given
+  # Roll.
+  class MinMaxCalc
+    attr_reader :roll
+    attr_reader :method
+    attr_reader :opposite
+
+    def self.average(roll)
+      (maximum(roll) + minimum(roll)) / 2.0
+    end
+
+    def self.maximum(roll)
+      call roll, :maximum
+    end
+
+    def self.minimum(roll)
+      call roll, :minimum
+    end
+
+    def self.call(roll, method)
+      new(roll, method).perform
+    end
+
+    def initialize(roll, method)
+      @roll     = roll
+      @method   = method
+      @opposite = opposite_method
+      @total    = 0
+    end
+
+    def perform
+      roll.tree.each do |op, part|
+        next unless part.is_a?(RollPart) || part.is_a?(StaticPart)
+
+        calculate op, part
+      end
+
+      @total
+    end
+
+    # Update the total based on the oper. For 'additive' operations, we
+    # use the method, but if it's 'subtractive' then it uses the
+    # opposite method.
+    def calculate(oper, part)
+      case oper
+      when :start then @total  = part.send(method)
+      when :add   then @total += part.send(method)
+      when :sub   then @total -= part.send(opposite)
+      when :mul   then @total *= part.send(method)
+      when :div   then @total /= part.send(opposite)
+      end
+    end
+
+    def opposite_method
+      method == :maximum ? :minimum : :maximum
+    end
+  end
+end

data/lib/dicebag/roll.rb

@@ -20,10 +20,10 @@ module DiceBag
       arr = []
       fmt = "For %s: %s\n"
 
-      tree.each do |_op, part|
-        if part.is_a?(RollPart) && !part.notes.empty?
-          arr.push format(fmt, part, part.notes)
-        end
+      tree.each_value do |part|
+        next unless part.is_a?(RollPart) && !part.notes.empty?
+
+        arr.push format(fmt, part, part.notes)
       end
 
       arr
@@ -51,12 +51,25 @@ module DiceBag
       @result = Result.new(@label, @total, @sections)
     end
 
+    def average
+      MinMaxCalc.average self
+    end
+
+    def maximum
+      MinMaxCalc.maximum self
+    end
+
+    def minimum
+      MinMaxCalc.minimum self
+    end
+
     private
 
     def handle_tree
       tree.each do |op, part|
         if op == :label
           @label = part.value
+
           next
         end
 

data/lib/dicebag/roll_part.rb

@@ -12,7 +12,7 @@ module DiceBag
     attr_reader :reroll_count
 
     def initialize(part)
-      super part
+      super(part)
 
       @total   = nil
       @tally   = []
@@ -44,7 +44,7 @@ module DiceBag
 
     # Checks to see if this instance has rolled yet or not.
     def rolled?
-      @total.nil? ? false : true
+      !@total.nil?
     end
 
     def roll
@@ -87,6 +87,18 @@ module DiceBag
       @total
     end
 
+    def average
+      (minimum + maximum) / 2.0
+    end
+
+    def maximum
+      count * sides
+    end
+
+    def minimum
+      count
+    end
+
     def <=>(other)
       total <=> other.total
     end
@@ -111,10 +123,10 @@ module DiceBag
     def roll_die
       num = __roll_die
 
+      return num unless options[:reroll].positive?
+
       # Handle Reroll
-      if options[:reroll].positive?
-        num = __roll_die while num <= @options[:reroll]
-      end
+      num = __roll_die while num <= @options[:reroll]
 
       num
     end

data/lib/dicebag/static_part.rb

@@ -5,13 +5,18 @@ module DiceBag
     def initialize(num)
       num = num.to_i if num.is_a?(String)
 
-      super num
+      super(num)
     end
 
     def total
       value
     end
 
+    # These are all just the same for this part.
+    alias average total
+    alias maximum total
+    alias minimum total
+
     def to_s
       value.to_s
     end

data/lib/dicebag/systems/dnd.rb

@@ -50,7 +50,7 @@ class D20Advantage < D20
     r1 = @roll.roll
     r2 = @roll.roll
 
-    r1 > r2 ? r1 : r2
+    [r1, r2].max
   end
 end
 
@@ -60,6 +60,6 @@ class D20Disadvantage < D20
     r1 = @roll.roll
     r2 = @roll.roll
 
-    r1 < r2 ? r1 : r2
+    [r1, r2].min
   end
 end

data/lib/dicebag/systems/fudge.rb

@@ -46,9 +46,7 @@ module Fudge
     def to_s
       base = "#{@number}dF"
 
-      "#{base} #{tally_to_s} => #{@total}" if @total
-
-      base
+      @total ? "#{base} #{tally_to_s} => #{@total}" : base
     end
 
     private

data/lib/dicebag.rb

@@ -15,11 +15,26 @@ module DiceBag
     Normalize.call ast
   end
 
-  ### Main Syntatic Sugar Interface
+  ###
+  # Main Syntatic Sugar Interface Methodds
+  ###
+
   def self.roll(dstr)
     DiceBag::Roll.new(dstr).roll
   end
 
+  def self.average(dstr)
+    DiceBag::Roll.new(dstr).average
+  end
+
+  def self.maximum(dstr)
+    DiceBag::Roll.new(dstr).maximum
+  end
+
+  def self.minimum(dstr)
+    DiceBag::Roll.new(dstr).minimum
+  end
+
   # The default roll if one is not given.
   def self.default_roll
     '1d6'
@@ -27,14 +42,15 @@ module DiceBag
 end
 
 # Our sub-modules.
-require_relative './dicebag/normalize'
-require_relative './dicebag/roll_string'
-require_relative './dicebag/roll_part_string'
-require_relative './dicebag/parser'
-require_relative './dicebag/transform'
-require_relative './dicebag/simple_part'
-require_relative './dicebag/label_part'
-require_relative './dicebag/static_part'
-require_relative './dicebag/roll_part'
-require_relative './dicebag/roll'
-require_relative './dicebag/result'
+require_relative 'dicebag/normalize'
+require_relative 'dicebag/min_max_calc'
+require_relative 'dicebag/roll_string'
+require_relative 'dicebag/roll_part_string'
+require_relative 'dicebag/parser'
+require_relative 'dicebag/transform'
+require_relative 'dicebag/simple_part'
+require_relative 'dicebag/label_part'
+require_relative 'dicebag/static_part'
+require_relative 'dicebag/roll_part'
+require_relative 'dicebag/roll'
+require_relative 'dicebag/result'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dicebag
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Randy "syntruth" Carnahan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2024-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -40,6 +40,7 @@ files:
 - bin/dicebag
 - lib/dicebag.rb
 - lib/dicebag/label_part.rb
+- lib/dicebag/min_max_calc.rb
 - lib/dicebag/normalize.rb
 - lib/dicebag/parser.rb
 - lib/dicebag/result.rb
@@ -59,7 +60,8 @@ files:
 homepage: https://github.com/syntruth/Dice-Bag
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: