huebot 0.5.0 → 1.1.0

data/lib/huebot/device_mapper.rb

@@ -1,6 +1,6 @@
 module Huebot
   class DeviceMapper
-    Unmapped = Class.new(StandardError)
+    Unmapped = Class.new(Error)
 
     def initialize(bridge, inputs = [])
       all_lights, all_groups = bridge.lights, bridge.groups
@@ -9,43 +9,57 @@ module Huebot
       @lights_by_name = all_lights.reduce({}) { |a, l| a[l.name] = l; a }
       @groups_by_id = all_groups.reduce({}) { |a, g| a[g.id] = g; a }
       @groups_by_name = all_groups.reduce({}) { |a, g| a[g.name] = g; a }
-      @devices_by_var = inputs.each_with_index.reduce({}) { |a, (x, idx)|
-        dev = case x
-              when LightInput then @lights_by_id[x.val] || @lights_by_name[x.val]
-              when GroupInput then @groups_by_id[x.val] || @groups_by_name[x.val]
-              else raise "Invalid input: #{x}"
-              end || raise(Unmapped, "Could not find #{x.class.name[8..-6].downcase} with id or name '#{x.val}'")
-        a["$#{idx + 1}"] = dev
-        a
+      @devices_by_var = inputs.each_with_index.each_with_object({}) { |(x, idx), obj|
+        obj[idx + 1] =
+          case x
+          when Light::Input then @lights_by_id[x.val.to_i] || @lights_by_name[x.val]
+          when Group::Input then @groups_by_id[x.val.to_i] || @groups_by_name[x.val]
+          else raise Error, "Invalid input: #{x}"
+          end || raise(Unmapped, "Could not find #{x.class.name[8..-6].downcase} with id or name '#{x.val}'")
       }
       @all = @devices_by_var.values
     end
 
+    def each
+      if block_given?
+        @all.each { |device| yield device }
+      else
+        @all.each
+      end
+    end
+
     def light!(id)
-      case id
-      when Integer
-        @lights_by_id[id]
-      when String
-        @lights_by_name[id]
-      end || (raise Unmapped, "Unmapped light '#{id}'")
+      @lights_by_id[id] || @lights_by_name[id] || (raise Unmapped, "Unmapped light '#{id}'")
     end
 
     def group!(id)
-      case id
-      when Integer
-        @groups_by_id[id]
-      when String
-        @groups_by_name[id]
-      end || (raise Unmapped, "Unmapped group '#{id}'")
+      @groups_by_id[id] || @groups_by_name[id] || (raise Unmapped, "Unmapped group '#{id}'")
     end
 
     def var!(id)
       case id
-      when "$all"
+      when :all
         @all
       else
-        @devices_by_var[id]
-      end || (raise Unmapped, "Unmapped device '#{id}'")
+        @devices_by_var[id] || (raise Unmapped, "Unmapped device '#{id}'")
+      end
+    end
+
+    def missing_lights(names)
+      names - @lights_by_name.keys
+    end
+
+    def missing_groups(names)
+      names - @groups_by_name.keys
+    end
+
+    def missing_vars(vars)
+      missing = vars - @devices_by_var.keys
+      if @all.any?
+        missing - [:all]
+      else
+        missing
+      end
     end
   end
 end

data/lib/huebot/device_state.rb

@@ -1,7 +1,11 @@
 module Huebot
   module DeviceState
     def set_state(state)
-      client.put!(state_url, state)
+      client.put!(state_change_url, state)
+    end
+
+    def get_state
+      client.get!(url).fetch("state")
     end
   end
 end

data/lib/huebot/group.rb

@@ -1,22 +1,29 @@
 module Huebot
   class Group
+    #
+    # Struct for specifying a Group input (id or name)
+    #
+    # @attr val [Integer|String] id or name
+    #
+    Input = Struct.new(:val)
+
     include DeviceState
     attr_reader :client, :id, :name
 
     def initialize(client, id, attrs)
       @client = client
-      @id = id
+      @id = id.to_i
       @name = attrs.fetch("name")
       @attrs = attrs
     end
 
     private
 
-    def state_url
+    def state_change_url
       url "/action"
     end
 
-    def url(path)
+    def url(path = "")
       "/groups/#{id}#{path}"
     end
   end

data/lib/huebot/light.rb

@@ -1,22 +1,29 @@
 module Huebot
   class Light
+    #
+    # Struct for specifying a Light input (id or name)
+    #
+    # @attr val [Integer|String] id or name
+    #
+    Input = Struct.new(:val)
+
     include DeviceState
     attr_reader :client, :id, :name
 
     def initialize(client, id, attrs)
       @client = client
-      @id = id
+      @id = id.to_i
       @name = attrs.fetch("name")
       @attrs = attrs
     end
 
     private
 
-    def state_url
+    def state_change_url
       url "/state"
     end
 
-    def url(path)
+    def url(path = "")
       "/lights/#{id}#{path}"
     end
   end

data/lib/huebot/program.rb

@@ -1,32 +1,82 @@
 module Huebot
   class Program
-    Transition = Struct.new(:wait, :state, :devices)
-    ParallelTransition = Struct.new(:wait, :children)
+    #
+    # Struct for storing a program's Intermediate Representation and source filepath.
+    #
+    # @attr tokens [Hash]
+    # @attr filepath [String]
+    # @attr api_version [Float] API version
+    #
+    Src = Struct.new(:tokens, :filepath, :api_version) do
+      def default_name
+        File.basename(filepath, ".*")
+      end
+    end
 
-    attr_accessor :name
-    attr_accessor :initial_state
-    attr_accessor :transitions
-    attr_accessor :final_state
-    attr_accessor :loop
-    attr_accessor :loops
-    attr_accessor :errors
-    attr_accessor :warnings
-
-    def initialize
-      @name = nil
-      @initial_state = nil
-      @transitions = []
-      @final_state = nil
-      @loop = false
-      @loops = 0
-      @errors = []
-      @warnings = []
+    module AST
+      Node = Struct.new(:instruction, :children, :errors, :warnings)
+
+      Transition = Struct.new(:state, :devices, :sleep)
+      SerialControl = Struct.new(:loop, :sleep)
+      ParallelControl = Struct.new(:loop, :sleep)
+
+      InfiniteLoop = Struct.new(:pause)
+      CountedLoop = Struct.new(:n, :pause)
+      TimerLoop = Struct.new(:hours, :minutes, :pause)
+      DeadlineLoop = Struct.new(:stop_time, :pause)
+
+      DeviceRef = Struct.new(:ref)
+      Light = Struct.new(:name)
+      Group = Struct.new(:name)
+      NoOp = Struct.new(:x)
     end
 
+    attr_accessor :name
+    attr_accessor :api_version
+    attr_accessor :data
+
     def valid?
       errors.empty?
     end
 
-    alias_method :loop?, :loop
+    # Returns all light names hard-coded into the program
+    def light_names(node = data)
+      devices(AST::Light).uniq.map(&:name)
+    end
+
+    # Returns all group names hard-coded into the program
+    def group_names(node = data)
+      devices(AST::Group).uniq.map(&:name)
+    end
+
+    # Returns all device refs (e.g. $all, $1, $2) in the program
+    def device_refs(node = data)
+      devices(AST::DeviceRef).uniq.map(&:ref)
+    end
+
+    def errors(node = data)
+      node.children.reduce(node.errors) { |errors, child|
+        errors + child.errors
+      }
+    end
+
+    def warnings(node = data)
+      node.children.reduce(node.warnings) { |warnings, child|
+        warnings + child.warnings
+      }
+    end
+
+    private
+
+    def devices(type, node = data)
+      case node.instruction
+      when AST::Transition
+        node.instruction.devices.select { |d| d.is_a? type }
+      when AST::SerialControl, AST::ParallelControl
+        node.children.map { |n| devices type, n }.flatten
+      else
+        []
+      end
+    end
   end
 end

data/lib/huebot/version.rb

@@ -1,4 +1,4 @@
 module Huebot
   # Gem version
-  VERSION = '0.5.0'
+  VERSION = '1.1.0'
 end

data/lib/huebot.rb

@@ -1,6 +1,9 @@
 module Huebot
+  Error = Class.new(StandardError)
+
   autoload :Config, 'huebot/config'
   autoload :Client, 'huebot/client'
+  autoload :CLI, 'huebot/cli'
   autoload :Bridge, 'huebot/bridge'
   autoload :DeviceState, 'huebot/device_state'
   autoload :Light, 'huebot/light'
@@ -10,26 +13,4 @@ module Huebot
   autoload :Compiler, 'huebot/compiler'
   autoload :Bot, 'huebot/bot'
   autoload :VERSION, 'huebot/version'
-
-  #
-  # Struct for storing a program's Intermediate Representation and source filepath.
-  #
-  # @attr ir [Hash]
-  # @attr filepath [String]
-  #
-  ProgramSrc = Struct.new(:ir, :filepath)
-
-  #
-  # Struct for specifying a Light input (id or name)
-  #
-  # @attr val [Integer|String] id or name
-  #
-  LightInput = Struct.new(:val)
-
-  #
-  # Struct for specifying a Group input (id or name)
-  #
-  # @attr val [Integer|String] id or name
-  #
-  GroupInput = Struct.new(:val)
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: huebot
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
-dependencies: []
+date: 2023-12-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 description: Declare and run YAML programs for Philips Hue devices
 email: jordan.hollinger@gmail.com
 executables:
@@ -23,8 +51,11 @@ files:
 - lib/huebot/bot.rb
 - lib/huebot/bridge.rb
 - lib/huebot/cli.rb
+- lib/huebot/cli/helpers.rb
+- lib/huebot/cli/runner.rb
 - lib/huebot/client.rb
 - lib/huebot/compiler.rb
+- lib/huebot/compiler/api_v1.rb
 - lib/huebot/config.rb
 - lib/huebot/device_mapper.rb
 - lib/huebot/device_state.rb