lights 0.8.11 → 0.8.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzY0NTEyM2NiOWQ0Y2FjOGVlMTU5NmU0MDE2NTZiZjFhNGYxZGFjYg==
+    ZmRlODZhMWNjYzYyY2Y3ZWU4M2M4NmI0MzNjYWFmOTZlOTFmNWViNw==
   data.tar.gz: !binary |-
-    ZDYxNGU5OWQxMzk4NzZjYzQ3ZTAxMzllYmM4YjEzZjQwMmViMzdmOA==
+    MWI3MDc4ZmZlZjI1OWEyNTBjYjcwMTJmZGRhOTg2ZmQ0M2U1YTY5YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjY3ZjJjNjU5ZDUzNGUzNTI5NWU3YmY4NDNkMmNhMGMyYTU0NDNkZTZkNTEw
-    OTk1ODg3ZWQ3NDIyNjE5MDgxNzNiOGFmMTZlOTc1ODE1ZjMzMDUzZmQ4NjFl
-    NzA0NDMxNzIxMDljMzUyYjIxYTMxMGViYTk2OWI5MzkzOGU3MTU=
+    Y2NjYzcwMjA1M2Y0NmI4OTY5MmZiYTdjMjU1ZWFhNWQ3ZTFhNWMxN2U2YTM0
+    YmFkMDBkYzhjNjA3ODA2ZWE4NmExOWZmZDY3OTYzZGJkOTMzMmFhNmE5YTRl
+    NWQzMzU2NGNhYmY3MDJiOGNjNmFkM2QwYWU4NjkwNzA3M2FkYTM=
   data.tar.gz: !binary |-
-    ZjJhZTA3NGU5NzZlZjVhMzQ3YTI4YzkwZGQ1MDM2N2ZmMjgzM2ViMDM3ZWFh
-    YjFkMDFlMzJmZGZlNmRjMmMyZTJhZjM3MTFiMTZjODVhYjRiZTZkOTEyMjM3
-    NzI4NWY1OWIyMWMzNDk0YjE5YjcxODUwNmY0ZWFkZmUwNTJlMDk=
+    YzA4YWNlZWZmZTMwZWI4NDIyM2ZhZjM0NjY0Yzg0YjQ0MmY3YWVmODFkY2Qy
+    NWIwMWU5ZTc3MzBmNjM4OGEyNTFkY2ExODM1NzlkNWQxZmU4ZTJhMzE3MDgz
+    ODQzZmY0OTJlZDY0MTkyNzdiODE3OGQxMWUxN2RmNmM1ZjFiMDU=

data/bin/lights

@@ -92,11 +92,59 @@ class LightsCli
     end
   end
 
-  def delete
+  def edit
     type = ARGV.shift
     hue = Lights.new @config["bridge_ip"], @config["username"]
     options = {}
 
+    case type
+    when "light"
+      id = ARGV.shift
+      if !id
+        puts "Must specify light id."
+        exit 1
+      end
+
+      OptionParser.new do |opts|
+        opts.on("--name", "--name <name>", String, "Set light name"){|n| options[:name]=n}
+      end.parse!
+      if !options[:name]
+        puts "Must specify new light name."
+        exit 1
+      end
+
+      light = Bulb.new(id,{"name"=>options[:name]})
+      hue.edit_bulb light
+    when "group"
+      id = ARGV.shift
+      if !id
+        puts "Must specify group id."
+        exit 1
+      end
+
+      OptionParser.new do |opts|
+        opts.on("--name", "--name <name>", String, "Set light name"){|n| options[:name]=n}
+        opts.on("-l", "--lights 1,2,...N", Array, "Which lights to put in group"){|l| options[:lights]=l}
+      end.parse!
+      if !options[:name] && !options[:lights]
+        puts "Must specify a value to edit."
+        exit 1
+      end
+      group = Group.new(id)
+      group.name = options[:name] if options[:name]
+      group.lights = options[:lights] if options[:lights]
+      hue.edit_group group
+    when nil
+      STDERR.puts "Must specify a type to edit."
+    else
+      STDERR.puts "Don't know how to edit type \"#{type}\"."
+    end
+  end
+
+  def delete
+    type = ARGV.shift
+    hue = Lights.new @config["bridge_ip"], @config["username"]
+
     case type
     when "group"
       id = ARGV.shift
@@ -132,17 +180,18 @@ class LightsCli
     options = {}
     OptionParser.new do |opts|
       opts.on("-j", "--json", "Print JSON response"){|j| options[:json] = j}
+      opts.on("-n", "--new", "Only list new"){|n| options[:new] = n}
     end.parse!
 
     type = ARGV.shift
     case type
     when nil, "","lights"
-      response = hue.request_bulb_list
+      response = options[:new] ? hue.request_new_bulb_list : hue.request_bulb_list
       response.each{|id,value| objects << hue.request_bulb_info( id )}
       titles = ["ID","NAME"]
       methods = [:id,:name]
     when "sensors"
-      response = hue.request_sensor_list
+      response = options[:new] ? hue.request_new_sensor_list : hue.request_sensor_list
       response.each { |id,value| objects << hue.request_sensor_info( id )}
       titles = ["ID","NAME"]
       methods = [:id,:name]
@@ -305,6 +354,16 @@ class LightsCli
     end
   end
 
+  def search
+    lights = Lights.new @config["bridge_ip"], @config["username"]
+    response = lights.search_new
+    if response.first["success"]
+      puts "Started search."
+    else
+      puts "Unknown error. Did not begin search."
+    end
+  end
+
 private
   def set_bulb_state(state,bulbs)
     lights = Lights.new @config["bridge_ip"], @config["username"]
@@ -343,7 +402,7 @@ end
 
   
 if !ARGV[0]
-  STDERR.puts "Must specify a command. (config, list, register, discover, on, off, set, create, delete)"
+  STDERR.puts "Must specify a command. (config, list, register, discover, search, on, off, set, create, edit, delete)"
   exit 1
 end
 
@@ -370,11 +429,16 @@ begin
     cli.create
   elsif command == "delete"
     cli.delete
+  elsif command == "edit"
+    cli.edit
+  elsif command == "search"
+    cli.search
   else
     puts "Cannot find command #{command}."
   end
 rescue BridgeConnectException,
         UsernameException,
+        ResourceUnavailableException,
         BulbStateValueOutOfRangeException,
         BulbStateValueTypeException => e
   puts e.message

data/lib/lights.rb

@@ -57,10 +57,22 @@ class Lights
     @bulbs << Bulb.new( id, bulb_data )
   end
 
+  def search_new
+    post "lights"
+  end
+
   def request_bulb_list
     get "lights"
   end
 
+  def request_new_bulb_list
+    get "lights/new"
+  end
+
+  def request_new_sensor_list
+    get "sensors/new"
+  end
+
   def request_bulb_info( id )
     response = get "lights/#{id}"
     Bulb.new(id,response)
@@ -124,6 +136,14 @@ class Lights
     delete "groups/#{id}"
   end
 
+  def edit_bulb( bulb )
+    put "lights/#{bulb.id}", bulb
+  end
+
+  def edit_group( group )
+    put "groups/#{group.id}", group
+  end
+
   def delete_user( username )
     delete "config/whitelist/#{username}"
   end
@@ -134,10 +154,12 @@ private
     case type
     when 1
       raise UsernameException
+    when 3
+      raise ResourceUnavailableException, result["error"]["description"]
     when 101
       raise BridgeConnectException
     else
-      puts "Unknown Error."
+      raise "Unknown Error: #{result["error"]["description"]}"
     end
   end
 
@@ -154,7 +176,7 @@ private
     result
   end
 
-  def put( path, data )
+  def put( path, data={} )
     @logger.debug "==> PUT: #{path}"
     @logger.debug data.to_json 
     response = @http.put( "/api/#{@username}/#{path}", data.to_json )
@@ -163,7 +185,7 @@ private
     JSON.parse response.body
   end
 
-  def post( path, data )
+  def post( path, data={} )
     @logger.debug "==> POST: #{path}"
     @logger.debug data.to_json
     response = @http.post( "/api/#{@username}/#{path}", data.to_json )

data/lib/lights/exception.rb

@@ -21,3 +21,9 @@ class BulbStateValueTypeException < Exception
     super
   end
 end
+
+class ResourceUnavailableException < Exception
+  def initialize(msg = "ResourceUnavailable")
+    super
+  end
+end

data/lib/lights/version.rb

@@ -1,3 +1,3 @@
 module LightsConst
-  VERSION = "0.8.11"
+  VERSION = "0.8.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lights
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - Brady Turner