huebot 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 643b636258939c0eb021d13d9369d845be85a5854ca1f6c38fa66c6556551c68
-  data.tar.gz: e5e1e74fded7ed9d456f8a7ce0c65f8f787a08187eb019413bddaff7bddaca74
+  metadata.gz: 2fd718fb625c5f417b31619579459bdfcaffac98276d9981882df7d9b1e192b9
+  data.tar.gz: 213fb99651e6826283d4c0be21c26e9442f146ea2df1734a2acb5c53f0e6eafa
 SHA512:
-  metadata.gz: '084232072462be01ec7867aadb43df7b476e4c0b6fe0fcc33b1d10cd23f568b8474d83ed450f0487123ce874c33a729d84bfa9e4cc683a59958e3b5fe7bd64e0'
-  data.tar.gz: 99c1ba63f4ff21161017fe42180ae76c5ee27721e32e7663eb5d09906953ef88886dd7e003f40e783e0ede9e3e5e123fab5635b5e0413085bf5882ebcb386bb8
+  metadata.gz: caa7f46fb1d7ac5954f7b1e8f8b48c81b69c3cea59c7ce0ad246eb6ecafda318bd161eec1aff2a41e7e8f6a84af4d2a18a555f56dab808e97b39ff3396b91d9c
+  data.tar.gz: 2221b64eb67ab257232358e52657446cb3b8c95d7f102220954ee71e9a85bc1447ec1566712b651bd1a0d5c4db8be2eff82097551302186cd092688ad0df5548

data/lib/huebot/bot.rb

@@ -41,7 +41,7 @@ module Huebot
           # TODO error handling
           _res = device.set_state i.state
           @logger.log :set_state, {device: device.name, state: i.state, result: nil}
-          wait time if i.wait
+          wait Program::AST::Num.new(time) if i.wait
         }
       }.map(&:join)
       wait i.pause.post if i.pause&.post
@@ -81,7 +81,7 @@ module Huebot
           wait lp.pause.post if lp.pause&.post
         }
       when Program::AST::CountedLoop
-        lp.n.times {
+        number(lp.n).round.times {
           wait lp.pause.pre if lp.pause&.pre
           yield :counted
           wait lp.pause.post if lp.pause&.post
@@ -124,11 +124,23 @@ module Huebot
       }
     end
 
-    def wait(seconds)
+    def wait(n)
+      seconds = number n
       @logger.log :pause, {time: seconds}
       @waiter.call seconds
     end
 
+    def number(n)
+      case n
+      when Program::AST::Num
+        n.n
+      when Program::AST::RandomNum
+        rand(n.min..n.max)
+      else
+        raise Error, "Unknown numeric type. Expected Program::AST::Num, Program::AST::NRandomNum, found: #{n.class.name}"
+      end
+    end
+
     module Waiter
       def self.call(seconds)
         sleep seconds

data/lib/huebot/cli/helpers.rb

@@ -5,7 +5,7 @@ require 'json'
 module Huebot
   module CLI
     module Helpers
-      DEFAULT_API_VERSION = 1.1
+      DEFAULT_API_VERSION = 1.2
 
       #
       # Returns the command given to huebot.

data/lib/huebot/cli/runner.rb

@@ -8,6 +8,8 @@ module Huebot
       rescue ::Huebot::Error => e
         opts.stderr.puts "#{e.class.name}: #{e.message}"
         return 1
+      rescue Interrupt
+        return 130
       end
 
       def self.run(sources, lights, groups, opts)
@@ -25,6 +27,8 @@ module Huebot
       rescue ::Huebot::Error => e
         opts.stderr.puts "#{e.class.name}: #{e.message}"
         return 1
+      rescue Interrupt
+        return 130
       end
 
       def self.check(sources, lights, groups, opts)
@@ -47,6 +51,8 @@ module Huebot
       rescue ::Huebot::Error => e
         opts.stderr.puts "#{e.class.name}: #{e.message}"
         return 1
+      rescue Interrupt
+        return 130
       end
 
       def self.get_state(lights, groups, opts)
@@ -56,6 +62,8 @@ module Huebot
           opts.stdout.puts "  #{device.get_state}"
         end
         0
+      rescue Interrupt
+        return 130
       end
 
       def self.set_ip(config, ip, opts)
@@ -64,6 +72,8 @@ module Huebot
       rescue ::Huebot::Error => e
         opts.stderr.puts "#{e.class.name}: #{e.message}"
         return 1
+      rescue Interrupt
+        return 130
       end
 
       def self.clear_ip(config, opts)
@@ -72,6 +82,8 @@ module Huebot
       rescue ::Huebot::Error => e
         opts.stderr.puts "#{e.class.name}: #{e.message}"
         return 1
+      rescue Interrupt
+        return 130
       end
 
       def self.unregister(config, opts)
@@ -80,6 +92,8 @@ module Huebot
       rescue ::Huebot::Error => e
         opts.stderr.puts "#{e.class.name}: #{e.message}"
         return 1
+      rescue Interrupt
+        return 130
       end
     end
   end

data/lib/huebot/compiler/api_v1.rb

@@ -10,6 +10,8 @@ module Huebot
       PARALLEL_KEYS = ["parallel"].freeze
       INFINITE_KEYS = ["infinite"].freeze
       COUNT_KEYS = ["count"].freeze
+      RANDOM_KEYS = ["random"].freeze
+      MIN_MAX = ["min", "max"].freeze
       TIMER_KEYS = ["timer"].freeze
       DEADLINE_KEYS = ["until"].freeze
       HHMM = /\A[0-9]{2}:[0-9]{2}\Z/.freeze
@@ -187,26 +189,54 @@ module Huebot
           lp =
             case loop_val.keys
             when INFINITE_KEYS
-              loop_val["infinite"] == true ? Program::AST::InfiniteLoop.new : Program::AST::CountedLoop.new(1)
+              loop_val.fetch("infinite") == true ? Program::AST::InfiniteLoop.new : Program::AST::CountedLoop.new(Program::AST::Num.new(1))
             when COUNT_KEYS
-              num = loop_val["count"]
+              num = loop_val.fetch("count")
               errors << "'loop.count' must be an integer. Found '#{num.class.name}'" unless num.is_a? Integer
-              Program::AST::CountedLoop.new(num)
+              Program::AST::CountedLoop.new(Program::AST::Num.new(num))
+            when RANDOM_KEYS
+              n = build_random loop_val, errors, warnings
+              Program::AST::CountedLoop.new(n)
             when TIMER_KEYS
-              build_timer_loop loop_val["timer"], errors, warnings
+              build_timer_loop loop_val.fetch("timer"), errors, warnings
             when DEADLINE_KEYS
-              build_deadline_loop loop_val["until"], errors, warnings
+              build_deadline_loop loop_val.fetch("until"), errors, warnings
             else
               errors << "'loop' must contain exactly one of: 'infinite', 'count', 'timer', or 'until', and optionally 'pause'. Found: #{loop_val.keys.join ", "}"
-              Program::AST::CountedLoop.new(1)
+              Program::AST::CountedLoop.new(Program::AST::Num.new(1))
             end
           lp.pause = pause
           lp
         when nil
-          Program::AST::CountedLoop.new(1)
+          Program::AST::CountedLoop.new(Program::AST::Num.new(1))
         else
           errors << "'loop' must be an object. Found '#{loop_val.class.name}'"
-          Program::AST::CountedLoop.new(1)
+          Program::AST::CountedLoop.new(Program::AST::Num.new(1))
+        end
+      end
+
+      def build_random(t, errors, warnings)
+        random = t.delete("random") || {}
+        min = build_random_n(random, "min", errors, warnings)
+        max = build_random_n(random, "max", errors, warnings)
+        errors << "'random.max' must be greater than 'random.min'" unless max > min
+        errors << "Unknown keys in 'random': #{random.keys.join ", "}" if random.keys.any?
+        Program::AST::RandomNum.new(min, max)
+      end
+
+      def build_random_n(t, name, errors, warnings)
+        n = t.delete name
+        case n
+        when Integer, Float
+          if n >= 0
+            n
+          else
+            errors << "'random.#{name}' must be >= 0, found #{n}"
+            0
+          end
+        else
+          errors << "'random.#{name}' must be an integer or float > 0, found #{n.class.name}"
+          0
         end
       end
 
@@ -234,6 +264,7 @@ module Huebot
         case @api_version
         when 1.0 then build_pause_1_0(t, errors, warnings)
         when 1.1 then build_pause_1_1(t, errors, warnings)
+        when 1.2 then build_pause_1_2(t, errors, warnings)
         else raise Error, "Unknown api version '#{@api_version}'"
         end
       end
@@ -242,7 +273,7 @@ module Huebot
         pause_val = t.delete "pause"
         case pause_val
         when Integer, Float
-          Program::AST::Pause.new(nil, pause_val)
+          Program::AST::Pause.new(nil, Program::AST::Num.new(pause_val))
         when nil
           nil
         else
@@ -255,22 +286,69 @@ module Huebot
         pause_val = t.delete "pause"
         case pause_val
         when Integer, Float
-          Program::AST::Pause.new(nil, pause_val)
+          Program::AST::Pause.new(nil, Program::AST::Num.new(pause_val))
         when Hash
           pre = pause_val.delete "before"
           post = pause_val.delete "after"
           errors << "'pause.before' must be an integer or float" unless pre.nil? or pre.is_a? Integer or pre.is_a? Float
           errors << "'pause.after' must be an integer or float" unless post.nil? or post.is_a? Integer or post.is_a? Float
           errors << "Unknown keys in 'pause': #{pause_val.keys.join ", "}" if pause_val.keys.any?
+          pre = Program::AST::Num.new(pre) if pre
+          post = Program::AST::Num.new(post) if post
           Program::AST::Pause.new(pre, post)
         when nil
           nil
         else
-          errors << "'pause' must be an integer or float"
+          errors << "'pause' must be an integer or float, or an object with 'before' and/or 'after'"
           nil
         end
       end
 
+      def build_pause_1_2(t, errors, warnings)
+        pause_val = t.delete "pause"
+        case pause_val
+        when Integer, Float
+          Program::AST::Pause.new(nil, Program::AST::Num.new(pause_val))
+        when Hash
+          pre = build_pause_part(pause_val, "before", errors, warnings)
+          post = build_pause_part(pause_val, "after", errors, warnings)
+          errors << "'pause' requires one or both of 'before' or 'after'" if pre.nil? and post.nil?
+          errors << "Unknown keys in 'pause': #{pause_val.keys.join ", "}" if pause_val.keys.any?
+          Program::AST::Pause.new(pre, post)
+        when nil
+          nil
+        else
+          errors << "'pause' must be an integer or float, or an object with 'before' and/or 'after'"
+          nil
+        end
+      end
+
+      def build_pause_part(t, part, errors, warnings)
+        val = t.delete part
+        case val
+        when nil
+          nil
+        when Integer, Float
+          Program::AST::Num.new(val)
+        when Hash
+          if @api_version < 1.2
+            errors << "Unknown 'pause.#{part}' type (#{val.class.name})"
+            return Program::AST::Num.new(1)
+          end
+
+          case val.keys
+          when RANDOM_KEYS
+            build_random val, errors, warnings
+          else
+            errors << "Expected 'pause.#{part}' to contain 'random', found #{val.keys.join ", "}"
+            Program::AST::Num.new(1)
+          end
+        else
+          errors << "Unknown 'pause.#{part}' type (#{val.class.name})"
+          Program::AST::Num.new(1)
+        end
+      end
+
       def build_wait(t, errors, warnings)
         wait = t.delete "wait"
         case wait

data/lib/huebot/compiler/compiler.rb

@@ -13,7 +13,7 @@ module Huebot
     def self.build(src)
       compiler_class =
         case src.api_version
-        when 1.0, 1.1 then ApiV1
+        when 1.0, 1.1, 1.2 then ApiV1
         else raise Error, "Unknown API version '#{src.api_version}'"
         end
       compiler = compiler_class.new(src.api_version)

data/lib/huebot/program.rb

@@ -26,6 +26,8 @@ module Huebot
       DeadlineLoop = Struct.new(:stop_time, :pause)
 
       Pause = Struct.new(:pre, :post)
+      Num = Struct.new(:n)
+      RandomNum = Struct.new(:min, :max)
       DeviceRef = Struct.new(:ref)
       Light = Struct.new(:name)
       Group = Struct.new(:name)
@@ -56,14 +58,14 @@ module Huebot
     end
 
     def errors(node = data)
-      node.children.reduce(node.errors) { |errors, child|
-        errors + child.errors
+      node.children.reduce(node.errors) { |acc, child|
+        acc + errors(child)
       }
     end
 
     def warnings(node = data)
-      node.children.reduce(node.warnings) { |warnings, child|
-        warnings + child.warnings
+      node.children.reduce(node.warnings) { |acc, child|
+        acc + warnings(child)
       }
     end
 

data/lib/huebot/version.rb

@@ -1,4 +1,4 @@
 module Huebot
   # Gem version
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: huebot
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jordan Hollinger