fifthed_sim 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddda2121cd3af4289eaa5961ed3d9f35630fa949
-  data.tar.gz: d2a0e56526dcbf6940c2dcea645ebff45113364f
+  metadata.gz: 013d357049f4fc8bad49ca544b13df32f870a7a4
+  data.tar.gz: 3e28e9a9267b05a799dafb8f1f4b483c1b3d552e
 SHA512:
-  metadata.gz: 2941d1d94a12b967b62fcd3702172698f59a3329c05cf135806dd7f34c6bfedb467e72f5c42249fe055e2a05fae8ecaa25df9cea5ebfa07d9af5d1b535f10f29
-  data.tar.gz: 664dd785fecba83b45f0a3374238cf9dcf5eddf80d003c8cfe49fba3ef08be466e267fb165ebb77f207d82970d4ee1ffd0acf13efa183c1b52b24fba069531bf
+  metadata.gz: a96cd8c16966da8e5499a29449d0c60fbdfaa1547071ac9600654f0e63c468a2eae9960c9dd171886dc0ebb790167d6820ed0f34352a9ddaa26c0f25272d74bf
+  data.tar.gz: 7c301fcfae55be5335fc9d34dec483d1bcb599e5a4125d3f60040345ca87db2701227839b47eb875ab1093345d63eb57a2ec6a7a2014c60a2dc2a98cc2c17da4

data/exe/diceroll

@@ -4,6 +4,4 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "../lib"))
 require 'fifthed_sim'
 require 'readline'
 
-
-
 FifthedSim::RollRepl.new.run

data/lib/fifthed_sim/compiler/parser.rb

@@ -15,7 +15,8 @@ class FifthedSim::Compiler
         .as(:dice)
     end
     rule(:base_term) { (dice | number) >> space? } 
-    rule(:primary) { lparen >> addition >> rparen | base_term }
+    rule(:parenthetical) { lparen >> addition >> rparen }
+    rule(:primary) { parenthetical | base_term }
 
     rule(:add_op) { match('\+|-').as(:op) >> space? }
     rule(:addition) do

data/lib/fifthed_sim/roll_repl.rb

@@ -1,8 +1,11 @@
 module FifthedSim
   class RollRepl
-    def initialize(inspect = true, errors = false)
+    def initialize(inspect: true,
+                   errors: false,
+                   auto_info: false)
       @inspect = inspect
       @errors = errors
+      @auto_info = auto_info
     end
 
     def run(kill_on_interrupt = false)
@@ -18,11 +21,15 @@ module FifthedSim
       end
     end
 
-    def info(cmd)
+    def info_command(cmd)
       s = cmd.gsub(/info/, "").chomp
       if s.length > 0
-        run_command(s)
+        roll(s)
       end
+      print_last_info
+    end
+
+    def print_last_info
       return error_msg("Have nothing to get info of") unless @last_roll
       lb = ->(x){Rainbow(x).color(:yellow).bright.to_s + ": "}
       a = %i(max min percentile).map do |p|
@@ -33,7 +40,8 @@ module FifthedSim
 
     def reroll
       return error_msg("Nothing to reroll") unless @last_roll
-      display_roll(@last_roll.reroll)
+      @last_roll = @last_roll.reroll
+      display_roll(@last_roll)
     end
 
     def run_cmd(cmd)
@@ -42,15 +50,16 @@ module FifthedSim
         self.exit
       when "rr", "reroll"
         self.reroll
-      when /info/
-
-        self.info(cmd)
+      when "info"
+        info_command(cmd)
       when "help"
         self.help
       when "inspect"
         toggle_inspect
       when "errors"
         toggle_errors
+      when "autoinfo"
+        toggle_auto_info
       else
         self.roll(cmd)
       end
@@ -69,12 +78,9 @@ module FifthedSim
     end
 
     def display_roll(r)
-      if @inspect
-        puts "  =  " + r.value_equation(terminal: true)
-        puts "  => " + Rainbow(r.value.to_s).underline.bright.to_s
-      else
-        puts r.value.to_s
-      end
+      puts "  =  " + r.value_equation(terminal: true) if @inspect  
+      puts "  => " + Rainbow(r.value.to_s).underline.bright.to_s
+      print_last_info if @auto_info
     end
 
     def error_msg(msg)
@@ -89,7 +95,7 @@ module FifthedSim
       end
     end
 
-    [:inspect, :errors].each do |m|
+    [:inspect, :errors, :auto_info].each do |m|
       send(:define_method, "toggle_#{m}") do
         t = instance_variable_get("@#{m}")
         puts "#{m}: #{t.inspect} => #{(!t).inspect}"

data/lib/fifthed_sim/version.rb

@@ -1,5 +1,5 @@
 module FifthedSim
   ##
   # Constant version string
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fifthed_sim
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Anthony Super
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet