lights 0.8.7 → 0.8.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjQwMmQ2OGY5NDlhZjE5MWZjMWY2YWE5MjFkYmYyMGM3ZGNjMGVkZg==
+    YTJiMjA2NzIxYTIyM2Q1NjM4NWJhY2MyNDI2OGQ4NmViOWFjMzQyZg==
   data.tar.gz: !binary |-
-    OGRmODc0ZGJkYjE4ZjVlN2QwMzM1ZDBiMzEzYWM3ZjNmZmFhZGNmMA==
+    MDA2ZjJhNTBiMzdhMGNkMGNkYzVjNDI3OWQ2Yjk0OThmNGRhODEzZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDRlNzA1YTdhMTk1M2I5OWViZDY1NGYyYWIwNDZhZWRlOTExM2YwZTdlOTUy
-    MDJmYmVjMjFkNGRlNjJhZDc2NjU1N2E1OTI5ZjNhZmViOWU3OWYzMDliNDNl
-    MDhhNWEzZTI1ZjMxYTY0MWI2ZDk4ZDk5MDIzNThjNWQ0NDU3OGY=
+    ODJkYjA0ZTdiZDYzY2Q4YjRhNzg3YmMxMjE1MTUxMTAzYmMxMTc0M2NmODhm
+    MTc3NTRiZDJlNmE1ZGZmOTdjYTJhNTI0NmRhNTZjN2ZmZWYzODgyNTU2MThm
+    NDI1YTZjZWRiMDM3ODQ5ZmNjMWU0NDJjN2ZmMWY5M2YzMTdlZTE=
   data.tar.gz: !binary |-
-    MzY0OTIyZDBkZmU0YzlkOTQxNzY4YjI0MGQzNzg5OWU3NDA1OGI5ZDI3ODU5
-    ZTY0ZDdhNmZiNDhkNTVhOTk3YmQwZmVhMmE0MGMxYTY0MmIzOTIwNGZkMWUx
-    NmRhZjdmZmJkYjU1YmUwMDgyYTZjYjBiMzc0ZjA0NGZjY2I4N2U=
+    ZmJiMWIyOTBlOWFjNzk2OGZkOTQ2ZDc4YjU2YjE0NGUxMzdkZmM1ZGUwY2Iw
+    MzNiMjI2ZTk0MzZmOWFjZTVkMjIyMDRhZTg0MTU4YTk3ZGQ1NGY1N2RiODU1
+    ZmY0MTA0M2IzY2I1NDZkOWYxODIxYmZlNjc2YjE5YTI2MzI3NGQ=

data/bin/lights

@@ -111,18 +111,23 @@ class LightsCli
 
     case type
     when "group"
-      OptionParser.new do |opts|
-        opts.on("-i", "--id <id>", String, "Group ID to delete") do |i|
-          options[:id] = i
-        end
-      end.parse!
+      id = ARGV.shift
 
-      if !options[:id]
+      if !id
         puts "Must specify group id."
         exit 1
       end
 
-      hue.delete_group(options[:id])
+      hue.delete_group id
+    when "user"
+      id = ARGV.shift
+
+      if !id
+        puts "Must specify user id."
+        exit 1
+      end
+
+      hue.delete_user id
     when nil
       STDERR.puts "Must specify a type to delete."
     else
@@ -135,41 +140,70 @@ class LightsCli
     objects = []
     titles = []
     methods = []
-    if !ARGV[0] || ARGV[0] == "lights"
+
+    options = {}
+    OptionParser.new do |opts|
+      opts.on("-j", "--json", "Print JSON response") do |j|
+        options[:json] = j
+      end
+    end.parse!
+
+    type = ARGV.shift
+    case type
+    when nil, "","lights"
       response = hue.request_bulb_list
       response.each{|id,value| objects << hue.request_bulb_info( id )}
       titles = ["ID","NAME"]
       methods = [:id,:name]
-    elsif ARGV[0] == "sensors"
+    when "sensors"
       response = hue.request_sensor_list
       response.each { |id,value| objects << hue.request_sensor_info( id )}
       titles = ["ID","NAME"]
       methods = [:id,:name]
-    elsif ARGV[0] == "groups"
+    when "groups"
       response = hue.request_group_list
       response.each {|id,value| objects << hue.request_group_info( id )}
       titles = ["ID","NAME","LIGHTS"]
       methods = [:id,:name,:lights]
-    elsif ARGV[0] == "scenes"
+    when "scenes"
       response = hue.request_scene_list
       response.each {|id,value| objects << Scene.new(id,value)}
       titles = ["ID","NAME","LIGHTS"]
       methods = [:id,:name,:lights]
-    elsif ARGV[0] == "users"
+    when "users"
       response = hue.request_config
       response["whitelist"].each {|id,value| objects << User.new(id,value)}
       titles = ["ID","NAME","CREATE DATE","LAST USE DATE"]
       methods = [:id,:name,:create_date,:last_use_date]
-    elsif ARGV[0] == "rules"
+    when "rules"
       response = hue.request_rules
       response.each {|id,value| objects << Rule.new(id,value)}
       titles = ["ID","NAME"]
       methods = [:id,:name]
+    when "schedules"
+      response = hue.request_schedules
+      response.each {|id,value| objects << Schedule.new(id,value)}
+      titles = ["ID","NAME","TIME","SCENE","STATUS"]
+      methods = [:id,:name,:time,:scene,:status]
+    when "datastore"
+      response = hue.request_datastore
+      response["lights"].each {|id,value| objects << Bulb.new(id,value)}
+      response["groups"].each {|id,value| objects << Group.new(id,value)}
+      response["config"]["whitelist"].each {|id,value| objects << User.new(id,value)}
+      response["rules"].each {|id,value| objects << Rule.new(id,value)}
+      response["scenes"].each {|id,value| objects << Scene.new(id,value)}
+      response["schedules"].each {|id,value| objects << Schedule.new(id,value)}
+      titles = ["TYPE","ID","NAME"]
+      methods = [:class,:id,:name]
     else
-      puts "Don't know how to list \"#{ARGV[0]}\""
+      puts "Don't know how to list \"#{type}\""
       return
     end
-    SimpleTable.new.from_objects(objects,titles,methods).print_text
+    if options[:json]
+      jp response
+    else
+      puts SimpleTable.new.from_objects(objects,titles,methods).text
+    end
   end
   
   def register

data/lib/lights/command.rb

@@ -0,0 +1,23 @@
+class Command
+  attr_reader :address, :method, :body
+  def initialize(data = {})
+    @address = data["address"]
+    @body = data["body"]
+    @method = data["method"]
+    @data = data
+  end
+
+  def data
+    data = @data
+    data["address"] = @address if @address
+    data["body"] = @body if @body
+    data["method"] = @method if @method
+    data
+  end
+
+  def to_json
+    data.to_json
+  end
+end
+
+

data/lib/lights/schedule.rb

@@ -0,0 +1,31 @@
+require 'lights/command'
+
+class Schedule
+  attr_reader :id, :name, :time, :status
+  def initialize(id,data = {})
+    @id = id
+    @name = data["name"]
+    @time = data["time"]
+    @status = data["status"]
+    @command = Command.new(data["command"])
+    @data = data
+  end
+
+  def scene
+    @command.body["scene"]
+  end
+
+  def data
+    data = @data
+    data["name"] = @name if @name
+    data["time"] = @time if @time
+    data["status"] = @status if @status
+    data["command"] = @command.data if !@command.data.empty?
+    data
+  end
+
+  def to_json
+    data.to_json
+  end
+end
+

data/lib/lights/version.rb

@@ -1,3 +1,3 @@
 module LightsConst
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

data/lib/lights.rb

@@ -12,6 +12,7 @@ require 'lights/sensor'
 require 'lights/scene'
 require 'lights/user'
 require 'lights/rule'
+require 'lights/schedule'
 require 'lights/loggerconfig'
 
 def jp( s )
@@ -109,6 +110,14 @@ class Lights
     get "rules"
   end
 
+  def request_schedules
+    get "schedules"
+  end
+
+  def request_datastore
+    get ""
+  end
+
   def set_bulb_state( id, state )
     put "lights/#{id}/state", state
   end
@@ -124,8 +133,12 @@ class Lights
   def delete_group( id )
     delete "groups/#{id}"
   end
-private
 
+  def delete_user( username )
+    delete "config/whitelist/#{username}"
+  end
+
+private
   def process_error(result)
     type = result["error"]["type"]
     case type

data/lights.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "simpletable", "~> 0.2.0"
+  s.add_runtime_dependency "simpletable", "~> 0.3.0"
 
   s.add_development_dependency "bundler", "~> 1.3"
   s.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lights
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Brady Turner
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,11 +111,13 @@ files:
 - lib/lights/bridge.rb
 - lib/lights/bulb.rb
 - lib/lights/bulbstate.rb
+- lib/lights/command.rb
 - lib/lights/exception.rb
 - lib/lights/group.rb
 - lib/lights/loggerconfig.rb
 - lib/lights/rule.rb
 - lib/lights/scene.rb
+- lib/lights/schedule.rb
 - lib/lights/sensor.rb
 - lib/lights/user.rb
 - lib/lights/version.rb