lights 0.8.13 → 0.8.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDM3ZmNkN2M5OTJkNjVmZmYzNTBiNzVhNDdiZDJmNWYzNjYxNjA1YQ==
+    MTUxOTM1Yjg0NzgyMGJjZDYwMzI5NDFiYTMyMDc0ODUxODlhZjg4ZA==
   data.tar.gz: !binary |-
-    YmJjMjVjY2M5M2MyZWFmYTIwMmIyYTE2MjZhNTQxN2JjNTBhNDAxNw==
+    YjllMTc5ZDJmM2Q1MjE5NzY0ZGQ5NmZhYTk1NWNjNDY4NzcwN2U2Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDM1NjliNTIxYjc5MDgzYmU0OTMxMTYwZTllMmIxMjQxNTdmMTBkYjhkYjAy
-    ZDBkZjRjMmVhZGNiODlkMGQzNDNlOTY1NDhlMjEwNWIwZDRjMmFiMjEyZDQ2
-    ZmQ5MjM1ZjFmNmFjNmE5YTQxZmU0NGZlYWRiYjY3OTUxODA1YzQ=
+    YjljMjI2Yzk4MmU2OTVlMjA4OGViMzRiOGM3NDRmNmJiMDYwYjMzNTk2NDZj
+    NGE2MzkzMjdjNzhkMDMzZGQ2NWMyNjRkY2FjMGQxNzhkZTY1MjhkMjFkYjg0
+    ZWJhOWJiMDRjN2ZjZTZkMDc1N2NkNjNlYjRjOGE0YzQ5ZmFiZDE=
   data.tar.gz: !binary |-
-    NmNhNjFmMmRlNjY5Njc2OTQzZDc2YjQ4NDRhOWQ2MDg1NmRhOWFjMDIwMjY3
-    YWFlZDlkM2IyYWU0ODkxOTBhMmIyOGQxNWZjNGM2ZGFiM2Q3Mjg1OWFkYmRk
-    MzE5Y2U3ZDE4ZjI5MWVlOTc0MWY3NzQ2MjZjMDRjNGQxMGJiMmQ=
+    MGQzM2RhYmZkZmQ3NWZiNzBmOTU3YzVlNzIyZGRkYzM2MjBkNjMyNzNiZTFj
+    YmFlZDI4YjgwNzMwYTllMWEzYTc0M2I4MGM5ZjcxOTQ0Mjk3ZTg1MWViZmEz
+    NjU3M2NmMzA4ZmFhMjc3ZmQxNmYzMTVlOTg5YmU1MzA3OWJkYjM=

data/README.md

@@ -19,13 +19,14 @@ client = Lights.new( '192.168.x.x', 'username' )
 client.register_username
 client.request_bulb_list
 ```
+See [lights-examples](https://github.com/turnerba/lights-examples) for more usage examples.
 
 CLI Quick Setup
 ----
 
 ```
 lights discover -s
-lights config -f --user username
+lights config -f --user <username>
 lights register
 lights list
 lights on -l all

data/bin/lights

@@ -187,37 +187,37 @@ class LightsCli
     case type
     when nil, "","lights"
       response = options[:new] ? hue.request_new_bulb_list : hue.request_bulb_list
-      response.each{|id,value| objects << hue.request_bulb_info( id )}
+      objects = BulbList.new(response).list
       titles = ["ID","NAME"]
       methods = [:id,:name]
     when "sensors"
       response = options[:new] ? hue.request_new_sensor_list : hue.request_sensor_list
-      response.each { |id,value| objects << hue.request_sensor_info( id )}
+      objects = SensorList.new(response).list
       titles = ["ID","NAME"]
       methods = [:id,:name]
     when "groups"
       response = hue.request_group_list
-      response.each {|id,value| objects << hue.request_group_info( id )}
+      objects = GroupList.new(response).list
       titles = ["ID","NAME","LIGHTS"]
       methods = [:id,:name,:lights]
     when "scenes"
       response = hue.request_scene_list
-      response.each {|id,value| objects << Scene.new(id,value)}
+      objects = SceneList.new(response).list
       titles = ["ID","NAME","LIGHTS"]
       methods = [:id,:name,:lights]
     when "users"
       response = hue.request_config
-      response["whitelist"].each {|id,value| objects << User.new(id,value)}
+      objects = UserList.new(response["whitelist"]).list
       titles = ["ID","NAME","CREATE DATE","LAST USE DATE"]
       methods = [:id,:name,:create_date,:last_use_date]
     when "rules"
       response = hue.request_rules
-      response.each {|id,value| objects << Rule.new(id,value)}
+      objects = RuleList.new(response).list
       titles = ["ID","NAME"]
       methods = [:id,:name]
     when "schedules"
       response = hue.request_schedules
-      response.each {|id,value| objects << Schedule.new(id,value)}
+      objects = ScheduleList.new(response).list
       titles = ["ID","NAME","TIME","SCENE","STATUS"]
       methods = [:id,:name,:time,:scene,:status]
     when "datastore"
@@ -306,10 +306,6 @@ class LightsCli
       puts "Must specify a state to set."
       bad_args = true
     end
-    if !options[:lights] && !options[:groups]
-      puts "Must specify which lights/groups to control."
-      bad_args = true
-    end
     if (options[:hue] || options[:saturation]) \
         && options[:ct]
       puts "Cannot set both color temperature and hue/saturation."
@@ -357,9 +353,11 @@ class LightsCli
     end
 
     if options[:lights]
-    set_bulb_state(s,options[:lights])
+      set_bulb_state(s,options[:lights])
     elsif options[:groups]
       set_group_state(s,options[:groups])
+    else
+      set_group_state(s,[0])
     end
   end
 
@@ -398,10 +396,7 @@ private
       opts.on("-l", "--lights 1,2,...N", Array, "Which lights to control"){|l| options[:lights]=l}
     end.parse!
 
-    if !options[:lights]
-      puts "Must specify which lights to control."
-      exit 1
-    end
+    options[:lights] = ["all"] if !options[:lights]
 
     s = BulbState.new
     s.on = is_on

data/lib/lights/bridge.rb

@@ -1,8 +1,10 @@
-class Bridge
+require 'lights/hobject'
 
-  attr_reader :id, :ip, :name, :mac
+class Bridge < HObject
 
+  attr_reader :id, :ip, :name, :mac
   def initialize(data = {})
+    super
     @id = data["id"]
     @ip = data["internalipaddress"]
     @mac = data["macaddress"]

data/lib/lights/bulb.rb

@@ -1,17 +1,15 @@
 require 'lights/bulbstate'
+require 'lights/hobject'
 
-class Bulb
-
-  attr_reader :id, :name, :type, :swversion,
-              :state
-
+class Bulb < HObject
+  attr_reader :id, :name, :type, :swversion, :state
   def initialize(id,data = {})
+    super(data)
     @id = id
     @name = data["name"]
     @type = data["type"]
     @swversion = data["swversion"]
     @state = BulbState.new data["state"]
-    @data = data
   end
 
   def data
@@ -22,9 +20,5 @@ class Bulb
     data["state"] = @state.data if !@state.data.empty?
     data
   end
-
-  def to_json(options={})
-    data.to_json
-  end
 end
 

data/lib/lights/bulblist.rb

@@ -1,22 +1,9 @@
 require 'lights/bulb'
+require 'lights/list'
 
-class BulbList
-
-  attr_reader :bulbs
+class BulbList < List
   def initialize(data = {})
-    @bulbs = []
-    data.each{|id,value| @bulbs << Bulb.new(id,value)} if data
-    @data = data
-  end
-
-  def data
-    data = @data
-    @bulbs.each {|b| data[b.id] = b.data} if @bulbs
-    data
-  end
-  
-  def to_json(options={})
-    data.to_json
+    super
+    data.each{|id,value| @list << Bulb.new(id,value)} if data
   end
 end
-

data/lib/lights/bulbstate.rb

@@ -1,4 +1,6 @@
-class BulbState 
+require 'lights/hobject'
+
+class BulbState < HObject
 
   MAX_CT = 500
   MIN_CT = 153
@@ -42,7 +44,8 @@ class BulbState
               :alert, :effect, :color_mode, 
               :reachable, :transition_time
   def initialize( data = {} ) 
-    data = {} if data == nil 
+    data = {} if data == nil
+    super
     @on = data["on"] 
     set_bri data["bri"]
     set_hue data["hue"]
@@ -54,7 +57,6 @@ class BulbState
     set_color_mode data["colormode"] 
     @reachable = data["reachable"] 
     set_transition_time data["transitiontime"]
-    @data = data
   end
  
   def color_mode=(value) set_color_mode(value) end
@@ -184,9 +186,5 @@ class BulbState
     data["transitiontime"] = @transition_time if @transition_time
     data 
   end 
-
-  def to_json(options={})
-    data.to_json
-  end
 end
 

data/lib/lights/command.rb

@@ -1,10 +1,12 @@
-class Command
+require 'lights/hobject'
+
+class Command < HObject
   attr_reader :address, :method, :body
   def initialize(data = {})
+    super
     @address = data["address"]
     @body = data["body"]
     @method = data["method"]
-    @data = data
   end
 
   def data
@@ -14,10 +16,5 @@ class Command
     data["method"] = @method if @method
     data
   end
-
-  def to_json(options={})
-    data.to_json
-  end
 end
 
-

data/lib/lights/config.rb

@@ -1,14 +1,13 @@
 require 'lights/userlist'
+require 'lights/hobject'
 
-class HueConfig
-
+class HueConfig < HObject
   attr_reader :name, :swversion, :whitelist
-
   def initialize(data = {})
+    super
     @name = data["name"]
     @swversion = data["swversion"]
     @whitelist = UserList.new(data["whitelist"])
-    @data = data
   end
 
   def data
@@ -18,9 +17,5 @@ class HueConfig
     data["whitelist"] = @whitelist.data if !@whitelist.data.empty?
     data
   end
-
-  def to_json(options={})
-    data.to_json
-  end
 end
 

data/lib/lights/datastore.rb

@@ -5,13 +5,13 @@ require 'lights/scenelist'
 require 'lights/rulelist'
 require 'lights/schedulelist'
 require 'lights/sensorlist'
+require 'lights/hobject'
 
-class Datastore
-
+class Datastore < HObject
   attr_reader :lights, :groups, :config, :rules,
                 :scenes, :schedules, :sensors
   def initialize(data = {})
-    @data = {}
+    super
     @lights = BulbList.new(data["lights"]) 
     @groups = GroupList.new(data["groups"])
     @config = HueConfig.new(data["config"])
@@ -22,13 +22,13 @@ class Datastore
   end
 
   def all
-    @lights.bulbs + \
-      @groups.groups + \
+    @lights.list + \
+      @groups.list + \
       [@config] + \
-      @schedules.schedules + \
-      @scenes.scenes + \
-      @rules.rules + \
-      @sensors.sensors
+      @schedules.list + \
+      @scenes.list + \
+      @rules.list + \
+      @sensors.list
   end
 
   def data
@@ -42,9 +42,5 @@ class Datastore
     data["sensors"] = @sensors.data if !@sensors.data.empty?
     data
   end
-
-  def to_json(options={})
-    data.to_json
-  end
 end
 

data/lib/lights/group.rb

@@ -1,19 +1,16 @@
-class Group
+require 'lights/hobject'
 
-  attr_reader :id, :data, :name, :lights
-  attr_writer :name, :lights
+class Group < HObject
+  attr_reader :id, :data, :name, :lights, :action
+  attr_writer :name, :lights, :action
   def initialize( id = nil, data = {} )
+    super(data)
     @id = id
-    @data = data
     @action = BulbState.new(data["action"]) 
     @name = data["name"]
     @lights = data["lights"]
   end
 
-  def action
-    @action.data
-  end
-
   def data
     data = @data
     data["name"] = @name if @name
@@ -21,8 +18,4 @@ class Group
     data["action"] = @action.data if @action.data != {}
     data
   end
-
-  def to_json(options={})
-    data.to_json
-  end
 end

data/lib/lights/grouplist.rb

@@ -1,22 +1,10 @@
 require 'lights/group'
+require 'lights/list'
 
-class GroupList
-
-  attr_reader :groups
+class GroupList < List
   def initialize(data = {})
-    @groups = []
-    data.each{|id,value| @groups << Group.new(id,value)} if data
-    @data = data
-  end
-
-  def data
-    data = @data
-    @groups.each {|g| data[g.id] = g.data} if @groups
-    data
-  end
-  
-  def to_json(options={})
-    data.to_json
+    super
+    data.each{|id,value| @list << Group.new(id,value)} if data
   end
 end
 

data/lib/lights/hobject.rb

@@ -0,0 +1,10 @@
+class HObject
+  def initialize(data={})
+    @data = data
+  end
+
+  def to_json(options={})
+    data.to_json
+  end
+end
+

data/lib/lights/list.rb

@@ -0,0 +1,22 @@
+require 'forwardable'
+
+require 'lights/hobject'
+
+class List < HObject
+  include Enumerable
+  extend Forwardable
+  def_delegators :@list, :each, :<< ,:+
+
+  attr_reader :list
+  def initialize(data = {})
+    super
+    @list = []
+  end
+
+  def data
+    data = @data
+    @list.each {|b| data[b.id] = b.data} if @list
+    data
+  end
+end
+

data/lib/lights/rule.rb

@@ -1,9 +1,10 @@
-class Rule
+require 'lights/hobject'
 
+class Rule < HObject
   attr_reader :id, :data, :name
   def initialize( id = nil, data = {} )
+    super(data)
     @id = id
-    @data = data
     @name = data["name"]
   end
 
@@ -12,8 +13,4 @@ class Rule
     data["name"] = @name if @name
     data
   end
-
-  def to_json(options={})
-    data.to_json
-  end
 end

data/lib/lights/rulelist.rb

@@ -1,22 +1,10 @@
 require 'lights/rule'
+require 'lights/list'
 
-class RuleList
-
-  attr_reader :rules
+class RuleList < List
   def initialize(data = {})
-    @rules = []
-    data.each{|id,value| @rules << Rule.new(id,value)} if data
-    @data = data
-  end
-
-  def data
-    data = @data
-    @rules.each {|b| data[b.id] = b.data} if @rules
-    data
-  end
-  
-  def to_json(options={})
-    data.to_json
+    super
+    data.each{|id,value| @list << Rule.new(id,value)} if data
   end
 end
 

data/lib/lights/scene.rb

@@ -1,8 +1,9 @@
-class Scene
+require 'lights/hobject'
 
+class Scene < HObject
   attr_reader :id, :name, :active, :lights
-
   def initialize(id,data = {})
+    super(data)
     @id = id
     @name = data["name"]
     @active = data["active"]
@@ -16,9 +17,5 @@ class Scene
     data["lights"] = @lights if @lights
     data
   end
-
-  def to_json(options={})
-    data.to_json
-  end
 end
 

data/lib/lights/scenelist.rb

@@ -1,22 +1,10 @@
 require 'lights/scene'
+require 'lights/list'
 
-class SceneList
-
-  attr_reader :scenes
+class SceneList < List
   def initialize(data = {})
-    @scenes = []
-    data.each{|id,value| @scenes << Scene.new(id,value)} if data
-    @data = data
-  end
-
-  def data
-    data = @data
-    @scenes.each {|b| data[b.id] = b.data} if @scenes
-    data
-  end
-  
-  def to_json(options={})
-    data.to_json
+    super
+    data.each{|id,value| @list << Scene.new(id,value)} if data
   end
 end
 

data/lib/lights/schedule.rb

@@ -1,14 +1,15 @@
 require 'lights/command'
+require 'lights/hobject'
 
-class Schedule
+class Schedule < HObject
   attr_reader :id, :name, :time, :status
   def initialize(id,data = {})
+    super(data)
     @id = id
     @name = data["name"]
     @time = data["time"]
     @status = data["status"]
     @command = Command.new(data["command"])
-    @data = data
   end
 
   def scene
@@ -23,9 +24,5 @@ class Schedule
     data["command"] = @command.data if !@command.data.empty?
     data
   end
-
-  def to_json(options={})
-    data.to_json
-  end
 end
 

data/lib/lights/schedulelist.rb

@@ -1,22 +1,10 @@
 require 'lights/schedule'
+require 'lights/list'
 
-class ScheduleList
-
-  attr_reader :schedules
+class ScheduleList < List
   def initialize(data = {})
-    @schedules = []
-    data.each{|id,value| @schedules << Schedule.new(id,value)} if data
-    @data = data
-  end
-
-  def data
-    data = @data
-    @schedules.each {|s| data[s.id] = s.data} if @schedules
-    data
-  end
-  
-  def to_json(options={})
-    data.to_json
+    super
+    data.each{|id,value| @list << Schedule.new(id,value)} if data
   end
 end
 

data/lib/lights/sensor.rb

@@ -1,7 +1,7 @@
-class SensorState
-  attr_reader :data, :last_updated
+class SensorState < HObject
+  attr_reader :last_updated
   def initialize(data)
-    @data = data
+    super
     @last_updated = data["lastupdated"]
   end
 
@@ -10,17 +10,13 @@ class SensorState
     data["lastupdated"] = @last_updated if @last_updated
     data
   end
-
-  def to_json(options={})
-    data.to_json
-  end
 end
 
 class TapState < SensorState
   attr_reader :button_event
   def initialize(data)
-    @button_event = data["button_event"]
     super
+    @button_event = data["button_event"]
   end
 
   def data
@@ -28,17 +24,13 @@ class TapState < SensorState
     data["button_event"] = @button_event if @button_event
     data
   end
-
-  def to_json(options={})
-    data.to_json
-  end
 end
 
-class Sensor 
+class Sensor < HObject
   attr_reader :id, :data, :name, :type, :model_id, :manufacturer_name, :unique_id, :sw_version, :state
   def initialize( id, data = {} )
+    super(data)
     @id = id
-    @data = data
     @name = data["name"]
     @type = data["type"]
     @model_id = data["modelid"]
@@ -60,8 +52,4 @@ class Sensor
     data["state"] = @state.data if @state.data if !@state.data.empty?
     data
   end
-
-  def to_json(options={})
-    data.to_json
-  end
 end

data/lib/lights/sensorlist.rb

@@ -1,23 +1,10 @@
 require 'lights/sensor'
+require 'lights/list'
 
-class SensorList
-
-  attr_reader :sensors
-
+class SensorList < List
   def initialize(data = {})
-    @sensors = []
-    data.each{|id,value| @sensors << Sensor.new(id,value)} if data
-    @data = data
-  end
-
-  def data
-    data = @data
-    @sensors.each {|s| data[s.id] = s.data} if @sensors
-    data
-  end
-  
-  def to_json(options={})
-    data.to_json
+    super
+    data.each{|id,value| @list << Sensor.new(id,value)} if data
   end
 end
 

data/lib/lights/user.rb

@@ -1,9 +1,10 @@
-class User
+require 'lights/hobject'
 
+class User < HObject
   attr_reader :id, :name, :create_date, :last_use_date
   def initialize( id, data = {} )
+    super(data)
     @id = id
-    @data = data
     @name = data["name"]
     @create_date = data["create date"]
     @last_use_date = data["last use date"]
@@ -16,8 +17,4 @@ class User
     data["last use date"] = @last_use_date if @last_use_date
     data
   end
-
-  def to_json(options={})
-    data.to_json
-  end
 end

data/lib/lights/userlist.rb

@@ -1,22 +1,10 @@
 require 'lights/user'
+require 'lights/list'
 
-class UserList
-
-  attr_reader :users
+class UserList < List
   def initialize(data = {})
-    @users = []
-    data.each{|id,value| @users << User.new(id,value)} if data
-    @data = data
-  end
-
-  def data
-    data = @data
-    @users.each {|u| data[u.id] = u.data} if @users
-    data
-  end
-  
-  def to_json(options={})
-    data.to_json
+    super
+    data.each{|id,value| @list << User.new(id,value)} if data
   end
 end
 

data/lib/lights/version.rb

@@ -1,3 +1,3 @@
 module LightsConst
-  VERSION = "0.8.13"
+  VERSION = "0.8.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lights
 version: !ruby/object:Gem::Version
-  version: 0.8.13
+  version: 0.8.14
 platform: ruby
 authors:
 - Brady Turner
@@ -118,6 +118,8 @@ files:
 - lib/lights/exception.rb
 - lib/lights/group.rb
 - lib/lights/grouplist.rb
+- lib/lights/hobject.rb
+- lib/lights/list.rb
 - lib/lights/loggerconfig.rb
 - lib/lights/rule.rb
 - lib/lights/rulelist.rb