lights 0.8.5 → 0.8.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGMwYmY0ZDcyN2M2MGI2NmY5ZmM4Y2E4ODFjOTUwOGNmMDU1Mjk5OA==
+    NzliNjA3YjZmZGExOWQwMmU2MjU2MzJhNDhkZjI4N2Y2MDdhOGEwMw==
   data.tar.gz: !binary |-
-    YzNiZGQ3ZDRlZjk0NjcxNDM0OTI4ZWY3YzVkZGI3YmRhNTU0NGM1ZA==
+    YWM4OTcyNDZlMGIxOGRiMmU5M2I0ZmU0YTg5M2Q4MjVhNDcwOWE5ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjdhMjU5NjJiNjNkNDZlMGI4MDExYWM1ZDZhODNlMWMyMWNhZGViNjU1NWI4
-    OTY1MTNkMDVmM2M3YmIyNmIzYmFmZDdiYjY2ODJiYmU1Yjg2NGNhYWEzMTU4
-    YmM3NmE1ZTViNDhiNWJjMjUxY2Q2MTQxOTdjOGUzMmYwMDlhMWY=
+    ZjNjZGVhYzNiN2Q0OWYzODlhODMyYjhkZDc2MDE4ZTA1ZmUyOWY5M2Q2MDZh
+    Nzk3NGRhZmQyZTYyODEyN2Q1Njk2MjdjYTg4MzIyMDU4OTRlMmE3N2NkMTIy
+    OTI2NTU1ZWRhNGYxOGY2MzQ0NjBlMzJiODhkZjhlYzg2ODA4MGE=
   data.tar.gz: !binary |-
-    ZWY5ZTliNGMzOWI1NTcwOGMyYTVjM2MzYjIwMTczOGIxNmQ5NDM3ZTgxZmY2
-    NjZjNWJjNDliZTE5YWIzMDMwNWE3YTg3ZTBmZDYxZDllNDAzM2FjMjUyZWUw
-    YmNjOTQ5MzQxNDRkNTIyNzJjNjg3NjM0Zjk1Yzk3OTI3MTU1MzA=
+    MDUzZTkzMWEwYmNhNGNhNDQ0MGM0MDM0MmYxY2M3MDQ0OGQzMGU0ZjA0ZTVm
+    MTE5NGQ4YTZkODZmN2IyMmQ2ZGU1ZTYxZTA5M2RlNmM3OWM1M2FlYmRiMGYy
+    OTgxZGI2ZjExMWNkYzdlMGNjYjczZTQ1NzFkMDI1MzNlMWIwNDg=

data/bin/lights

@@ -3,7 +3,6 @@
 require 'lights'
 require 'optparse'
 require 'simpletable'
-include SimpleTable
 
 LIGHTS_CONFIG_PATH = "#{ENV["HOME"]}/.lightsconfig"
 
@@ -133,67 +132,44 @@ class LightsCli
  
   def list
     hue = Lights.new @config["bridge_ip"], @config["username"]
+    objects = []
+    titles = []
+    methods = []
     if !ARGV[0] || ARGV[0] == "lights"
-      bulbs_response = hue.request_bulb_list
-      bulbs = []
-      bulbs_response.each do |id,value|
-        bulbs << hue.request_bulb_info( id )
-      end
-      
+      response = hue.request_bulb_list
+      response.each{|id,value| objects << hue.request_bulb_info( id )}
       titles = ["ID","NAME"]
       methods = [:id,:name]
-      SimpleTable.create(bulbs,titles,methods)
     elsif ARGV[0] == "sensors"
-      sensors_response = hue.request_sensor_list
-      sensors = []
-      sensors_response.each do |id,value|
-        sensors << hue.request_sensor_info( id )
-      end
-
+      response = hue.request_sensor_list
+      response.each { |id,value| objects << hue.request_sensor_info( id )}
       titles = ["ID","NAME"]
       methods = [:id,:name]
-      SimpleTable.create(sensors,titles,methods)
     elsif ARGV[0] == "groups"
-      groups_response = hue.request_group_list
-      groups = []
-      groups_response.each do |id,value|
-        groups << hue.request_group_info( id )
-      end
-
+      response = hue.request_group_list
+      response.each {|id,value| objects << hue.request_group_info( id )}
       titles = ["ID","NAME","LIGHTS"]
       methods = [:id,:name,:lights]
-      SimpleTable.create(groups,titles,methods)
     elsif ARGV[0] == "scenes"
-      scenes_response = hue.request_scene_list
-      scenes = []
-      scenes_response.each do |id,value| 
-        scenes << Scene.new(id,value)
-      end
-
+      response = hue.request_scene_list
+      response.each {|id,value| objects << Scene.new(id,value)}
       titles = ["ID","NAME","LIGHTS"]
       methods = [:id,:name,:lights]
-      SimpleTable.create(scenes,titles,methods)
     elsif ARGV[0] == "users"
-      config_response = hue.request_config
-      users = []
-      config_response["whitelist"].each do |id,value| 
-        users << User.new(id,value)
-      end
-      
+      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]
-      SimpleTable.create(users,titles,methods)
     elsif ARGV[0] == "rules"
-      rules_response = hue.request_rules
-      rules = []
-      rules_response.each do |id,value|
-        rules << Rule.new(id,value)
-      end
-
+      response = hue.request_rules
+      response.each {|id,value| objects << Rule.new(id,value)}
       titles = ["ID","NAME"]
       methods = [:id,:name]
-      SimpleTable.create(rules,titles,methods)
+    else
+      puts "Don't know how to list \"#{ARGV[0]}\""
+      return
     end
+    SimpleTable.new.from_objects(objects,titles,methods).print_text
   end
   
   def register

data/lib/lights/version.rb

@@ -1,3 +1,3 @@
 module LightsConst
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

metadata

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