lights 0.8.0 → 0.8.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTEyNWE2YjJjODA3ZTk3Y2ZjNzRjZjk0OTY1NWI5NmFmMTMxNzU5Ng==
+    YTdhNGFiOWU0YWY5ZGZiYmY1N2YxNGNhN2M4Mjg5MGFiOTg4MDUxZg==
   data.tar.gz: !binary |-
-    NDRlMzY3NmRmYjNmNWJlMDczNTI1MzUxN2ZjMTVlYTY4YmMyZTQ4MA==
+    MzAwNjIxMmMyOTk2YTAxN2Q5NDZmNDU1NmY2MTAzMGY5NDdhOTFjYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmNhM2RkODM4N2I1MjQ1MTMxNzhjZDlkMmI2NGZlODUyNjQ4NDQxOTJiOGUx
-    YTZkMjg5YjhjZDE0ZWNjOGU4Y2E5ZDUyMmRjOGZlNThkN2ZmZjA1YjU0OTky
-    NTVmN2E3ODViZmQyNWY5MjQ1ZWMwYTFmYWNjZGRiNTdjN2YyYjI=
+    M2NjZjcwMTlhYjFkNDM0ZTIyMzk3YTgzODdiMjAzMmFhYzA3ZTEzMWIxNWFi
+    NjVlMTdlMTg4YmY4YzEwM2YyODYwZjM2NmUwMGFiYTdiNzZhNjk0ZTQwY2Vi
+    N2M3ZDljZDJiZmE3MGQzOWM2N2UyMjdkMTJiZmM2NTNhZjkxOTY=
   data.tar.gz: !binary |-
-    NWM2ODdiNTljNzhlODFiNDZhMjE4ZjlhYmNlMTFkOGE2YmY4OWRkNThkNzM4
-    MTgzMzllYTA0ZmIzZGVlN2QwY2E0Y2UyMTVmYThhODQ4Yzg2NGZmM2I3YzE3
-    ZTVmNGQwNjA2NGUzY2Y2YmU2OWMwYzRiN2Q2NDJlMjA3M2M5MGE=
+    ZThlOTU3NmI0ZTk2NGQwMDE4ODY0YTBkM2FhYzJhNDY1YjBiOWUwYjg3NzU1
+    N2U3NzgxM2I4NjI2ZjFlODYwYjliNzgzY2M3MzcyOGJmYTExN2M1YWU5MmVh
+    MzM2MDkwYjY5NzM4NTgxZjQzZDZhYWU4ODNmMjhmOGI4YTRjNWM=

data/README.md

@@ -2,7 +2,7 @@ lights
 ========
 A Ruby library & CLI for controlling Phillips Hue lightbulbs.
 
-Phillips Hue API Documentation: http://developers.meethue.com/index.html
+Phillips Hue API Documentation: http://www.developers.meethue.com/philips-hue-api
 
 Installation
 ----

data/bin/lights

@@ -68,24 +68,98 @@ class LightsCli
   end
   
   def list
-    lights = Lights.new @config["bridge_ip"], @config["username"]
+    hue = Lights.new @config["bridge_ip"], @config["username"]
     if !ARGV[0] || ARGV[0] == "lights"
-      bulbs_response = lights.request_bulb_list
+      bulbs_response = hue.request_bulb_list
+      bulbs = []
       bulbs_response.each do |id,value|
-        bulb = lights.request_bulb_info( id )
-        puts "[#{id}] #{bulb.name}"
+        bulbs << hue.request_bulb_info( id )
+      end
+      c1w = bulbs.collect{|s|s.id.to_s}.group_by(&:size).max.first + 2
+      c2w = bulbs.collect{|s|s.name.to_s}.group_by(&:size).max.first + 2
+      c1w = 4 if c1w < 4
+      c2w = 6 if c2w < 6
+
+      puts "ID".ljust(c1w) + "NAME".ljust(c2w)
+      puts "=" * (c1w+c2w)
+      bulbs.each do |b| 
+        puts b.id.ljust(c1w) + b.name.ljust(c2w)
       end
     elsif ARGV[0] == "sensors"
-      sensors_response = lights.request_sensor_list
+      sensors_response = hue.request_sensor_list
+      sensors = []
       sensors_response.each do |id,value|
-        sensor = lights.request_sensor_info( id )
-        puts "[#{id}] #{sensor.name}"
+        sensors << hue.request_sensor_info( id )
+      end
+      c1w = sensors.collect{|s|s.id.to_s}.group_by(&:size).max.first + 2
+      c2w = sensors.collect{|s|s.name.to_s}.group_by(&:size).max.first + 2
+      c1w = 4 if c1w < 4
+      c2w = 6 if c2w < 6
+
+      puts "ID".ljust(c1w) + "NAME".ljust(c2w)
+      puts "=" * (c1w+c2w)
+      sensors.each do |s| 
+        puts s.id.ljust(c1w) + s.name.ljust(c2w)
       end
     elsif ARGV[0] == "groups"
-      groups_response = lights.request_group_list
+      groups_response = hue.request_group_list
+      groups = []
       groups_response.each do |id,value|
-        group = lights.request_group_info( id )
-        puts "[#{id}] #{group.name} (#{group.lights.join(',')})"
+        groups << hue.request_group_info( id )
+      end
+
+      c1w = groups.collect{|g|g.id.to_s}.group_by(&:size).max.first + 2
+      c2w = groups.collect{|g|g.name.to_s}.group_by(&:size).max.first + 2
+      c3w = groups.collect{|g|g.lights.to_s}.group_by(&:size).max.first + 2
+      c1w = 4 if c1w < 4
+      c2w = 6 if c2w < 6
+      c3w = 8 if c3w < 8
+
+      puts "ID".ljust(c1w) + "NAME".ljust(c2w) + "LIGHTS".ljust(c3w)
+      puts "=" * (c1w+c2w+c3w)
+      groups.each do |g| 
+        puts g.id.ljust(c1w) + g.name.ljust(c2w) + g.lights.join(',').ljust(c3w)
+      end
+    elsif ARGV[0] == "scenes"
+      scenes_response = hue.request_scene_list
+      scenes = []
+      scenes_response.each do |id,value| 
+        scenes << Scene.new(id,value)
+      end
+
+      c1w = scenes.collect{|s|s.id.to_s}.group_by(&:size).max.first + 2
+      c2w = scenes.collect{|s|s.name.to_s}.group_by(&:size).max.first + 2
+      c3w = scenes.collect{|s|s.lights.to_s}.group_by(&:size).max.first + 2
+      c1w = 4 if c1w < 4
+      c2w = 6 if c2w < 6
+      c3w = 8 if c3w < 8
+
+      puts "ID".ljust(c1w) + "NAME".ljust(c2w) + "LIGHTS".ljust(c3w)
+      puts "=" * (c1w+c2w+c3w)
+      scenes.each do |s| 
+        puts s.id.ljust(c1w) + s.name.ljust(c2w) + s.lights.join(',').ljust(c3w)
+      end
+    elsif ARGV[0] == "users"
+      config_response = hue.request_config
+      
+      users = []
+      config_response["whitelist"].each do |id,value| 
+        users << User.new(id,value)
+      end
+
+      c1w = users.collect{|u|u.id.to_s}.group_by(&:size).max.first + 2
+      c2w = users.collect{|u|u.name.to_s}.group_by(&:size).max.first + 2
+      c3w = users.collect{|u|u.create_date.to_s}.group_by(&:size).max.first + 2
+      c4w = users.collect{|u|u.last_use_date.to_s}.group_by(&:size).max.first + 2
+      c1w = 4 if c1w < 4
+      c2w = 6 if c2w < 6
+      c3w = 15 if c3w < 15
+      c4w = 15 if c4w < 15
+
+      puts "ID".ljust(c1w) + "NAME".ljust(c2w) + "CREATE DATE".ljust(c3w) + "LAST USE DATE".ljust(c4w)
+      puts "=" * (c1w+c2w+c3w+c4w)
+      users.each do |u| 
+        puts u.id.ljust(c1w) + u.name.ljust(c2w) + u.create_date.ljust(c3w) + u.last_use_date.ljust(c4w)
       end
     end
   end
@@ -168,6 +242,9 @@ class LightsCli
       opts.on("-l", "--lights 1,2,...N", Array, "Which lights to control") do |l|
         options[:lights] = l
       end
+      opts.on("-g", "--groups 1,2,...N", Array, "Which groups to control") do |g|
+        options[:groups] = g
+      end
       opts.on("-d", "--duration seconds", OptionParser::DecimalInteger, "Transition duration in seconds") do |d|
         options[:duration] = d
       end
@@ -182,8 +259,8 @@ class LightsCli
       puts "Must specify a state to set."
       bad_args = true
     end
-    if !options[:lights]
-      puts "Must specify which lights to control."
+    if !options[:lights] && !options[:groups]
+      puts "Must specify which lights/groups to control."
       bad_args = true
     end
     if (options[:hue] || options[:saturation]) \
@@ -223,12 +300,16 @@ class LightsCli
     if options[:xy]
       s.xy = options[:xy]
     end
-    set_state(s,options[:lights])
-    
+
+    if options[:lights]
+    set_bulb_state(s,options[:lights])
+    elsif options[:groups]
+      set_group_state(s,options[:groups])
+    end
   end
 
 private
-  def set_state(state,bulbs)
+  def set_bulb_state(state,bulbs)
     lights = Lights.new @config["bridge_ip"], @config["username"]
     if bulbs.first == "all"
       lights.set_group_state 0,state
@@ -236,6 +317,11 @@ private
       bulbs.each { |l| lights.set_bulb_state(l,state) }
     end 
   end
+  
+  def set_group_state(state,groups)
+    hue = Lights.new @config["bridge_ip"], @config["username"]
+    groups.each { |g| hue.set_group_state(g,state) }
+  end
 
   def write_config
     File.open(LIGHTS_CONFIG_PATH,"w+") { |file| file.write(@config.to_json) }
@@ -256,7 +342,7 @@ private
 
     s = BulbState.new
     s.on = is_on
-    set_state s, options[:lights]
+    set_bulb_state s, options[:lights]
   end
 end
 

data/lib/lights.rb

@@ -4,12 +4,14 @@ require 'net/http'
 require 'uri'
 require 'json'
 
-require 'lights/bulb.rb'
-require 'lights/group.rb'
-require 'lights/bridge.rb'
-require 'lights/exception.rb'
-require 'lights/sensor.rb'
-require 'lights/loggerconfig.rb'
+require 'lights/bulb'
+require 'lights/group'
+require 'lights/bridge'
+require 'lights/exception'
+require 'lights/sensor'
+require 'lights/scene'
+require 'lights/user'
+require 'lights/loggerconfig'
 
 def jp( s )
   puts JSON.pretty_generate( s )
@@ -78,7 +80,7 @@ class Lights
   end
 
   def request_sensor_info( id )
-    response = get("sensors/#{id}")
+    response = get "sensors/#{id}"
     Sensor.new(id,response)
   end
 
@@ -94,6 +96,14 @@ class Lights
     get "schedules"
   end
 
+  def request_scene_list
+    get "scenes"
+  end
+  
+  def request_config
+    get "config"
+  end
+
   def set_bulb_state( id, state )
     put "lights/#{id}/state", state
   end

data/lib/lights/bulbstate.rb

@@ -148,8 +148,8 @@ class BulbState
       raise BulbStateValueTypeException, "Value has incorrect type. Requires array, got #{value.class}"
     elsif value.nil?
       return
-    elsif value.length == 2 && value[0].to_f.is_a?(Numeric) \
-            && value[1].to_f.is_a?(Numeric) &&  value[0].to_f >= MIN_XY \
+    elsif value.length == 2 && value[0].is_a?(Numeric) \
+            && value[1].is_a?(Numeric) &&  value[0].to_f >= MIN_XY \
             && value[0].to_f <= MAX_XY && value[1].to_f >= MIN_XY \
             && value[1].to_f <= MAX_XY
       @xy = []

data/lib/lights/scene.rb

@@ -0,0 +1,20 @@
+class Scene
+
+  attr_reader :id, :name, :active, :lights
+
+  def initialize(id,data = {})
+    @id = id
+    @name = data["name"]
+    @active = data["active"]
+    @lights = data["lights"]
+  end
+
+  def data
+    data = {}
+    data["name"] = @name if @name
+    data["active"] = @active if @active 
+    data["lights"] = @lights if @lights
+    data
+  end
+end
+

data/lib/lights/user.rb

@@ -0,0 +1,12 @@
+class User
+
+  attr_reader :id, :name, :create_date, :last_use_date
+  def initialize( id, data = {} )
+    puts data.inspect
+    @id = id
+    @data = data
+    @name = data["name"]
+    @create_date = data["create date"]
+    @last_use_date = data["last use date"]
+  end
+end

data/lib/lights/version.rb

@@ -1,3 +1,3 @@
 module LightsConst
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/spec/features/{rue.feature → lights.feature}

@@ -3,21 +3,30 @@ Feature: Lights
   Scenario: No command
     When I run `lights`
     Then the output should contain "Must specify a command."
+
   Scenario: List Default
     When I run `lights list`
-    Then the output should contain "[1]"
+    Then the output should contain "ID"
 
-  Scenario: List Hue bulbs
+  Scenario: List Hue lights
     When I run `lights list lights`
-    Then the output should contain "[1]"
+    Then the output should contain "ID"
 
   Scenario: List Hue groups
     When I run `lights list groups`
-    Then the output should contain "[1]"
+    Then the output should contain "ID"
 
   Scenario: List Hue sensors
     When I run `lights list sensors`
-    Then the output should contain "[1]"
+    Then the output should contain "ID"
+
+  Scenario: List Hue scenes
+    When I run `lights list scenes`
+    Then the output should contain "ID"
+
+  Scenario: List registered users
+    When I run `lights list users`
+    Then the output should contain "ID"
 
 # This test is failing because OptionParser is casting the string as an integer (0)
 #  Scenario: Incorrect parameters to set

data/spec/scene_spec.rb

@@ -0,0 +1,23 @@
+require 'lights'
+
+describe Scene do
+  it "properly parse input parameters" do
+    data = { "name" => "test name",
+             "lights" => ["1","2","3"],
+             "active" => true }
+    scene = Scene.new(1,data)
+    scene.name.should eql "test name"
+    scene.id.should eql 1
+    scene.lights.should eql ["1","2","3"]
+    scene.active.should eql true
+  end
+
+  it "properly reconstucts object hash" do
+    data = { "name" => "test name",
+             "lights" => ["1","2","3"],
+             "active" => true }
+    scene = Scene.new(1,data) 
+    scene.data.should eql data
+    scene.id.should eql 1
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lights
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Brady Turner
@@ -100,15 +100,18 @@ files:
 - lib/lights/exception.rb
 - lib/lights/group.rb
 - lib/lights/loggerconfig.rb
+- lib/lights/scene.rb
 - lib/lights/sensor.rb
+- lib/lights/user.rb
 - lib/lights/version.rb
 - lights.gemspec
 - spec/bridge_spec.rb
 - spec/bulb_spec.rb
 - spec/bulbstate_spec.rb
-- spec/features/rue.feature
+- spec/features/lights.feature
 - spec/features/support/setup.rb
 - spec/group_spec.rb
+- spec/scene_spec.rb
 homepage: http://rubygems.org/gems/lights
 licenses:
 - MIT
@@ -137,6 +140,7 @@ test_files:
 - spec/bridge_spec.rb
 - spec/bulb_spec.rb
 - spec/bulbstate_spec.rb
-- spec/features/rue.feature
+- spec/features/lights.feature
 - spec/features/support/setup.rb
 - spec/group_spec.rb
+- spec/scene_spec.rb