lights 0.8.4 → 0.8.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzUzMjA0NzFlODMzNmZjODIyZGZlNTQ2NTI3Y2QxNWQ5MjhhZmQ0OA==
+    ZGMwYmY0ZDcyN2M2MGI2NmY5ZmM4Y2E4ODFjOTUwOGNmMDU1Mjk5OA==
   data.tar.gz: !binary |-
-    YzgxNTIyZGNkODQxOTJhOTI4NDdmZDAzM2VhMzY1MDFmYjhkMGFhMw==
+    YzNiZGQ3ZDRlZjk0NjcxNDM0OTI4ZWY3YzVkZGI3YmRhNTU0NGM1ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDMwNzQ0OGUxZTBjYjY1NjY2MWU3Yjg2YWNhMmExYmM1MGIzMWIyZGI3OThl
-    OWM1MWExYzA1YTVlNTE3NGYzN2MzYzA3MmQwNjAxMTg3YTQzOWFlMjUxMjNm
-    YmFlMzUyYWJmMDk2ZTFmM2QxYmY5OGQ5ZGE3NWZjYWUyZGIzZDA=
+    NjdhMjU5NjJiNjNkNDZlMGI4MDExYWM1ZDZhODNlMWMyMWNhZGViNjU1NWI4
+    OTY1MTNkMDVmM2M3YmIyNmIzYmFmZDdiYjY2ODJiYmU1Yjg2NGNhYWEzMTU4
+    YmM3NmE1ZTViNDhiNWJjMjUxY2Q2MTQxOTdjOGUzMmYwMDlhMWY=
   data.tar.gz: !binary |-
-    ZDRjMjE0NmE2MDVlODVkYTJmNmNhZDc3NzQ5OTkxNmQ4MGRlZWQyMzNlNGVl
-    YmUzOTYyMjMxZDVjOTBlNzFkZGEzMGM3OGU2MjY1YTUxMzk1YjQzZDVhYmY4
-    ZjA0ZGRlZTRmY2JiOGI2MmI4MjI5NzY0OThiYjRkZWYxYjk4NWQ=
+    ZWY5ZTliNGMzOWI1NTcwOGMyYTVjM2MzYjIwMTczOGIxNmQ5NDM3ZTgxZmY2
+    NjZjNWJjNDliZTE5YWIzMDMwNWE3YTg3ZTBmZDYxZDllNDAzM2FjMjUyZWUw
+    YmNjOTQ5MzQxNDRkNTIyNzJjNjg3NjM0Zjk1Yzk3OTI3MTU1MzA=

data/bin/lights

@@ -2,6 +2,8 @@
 
 require 'lights'
 require 'optparse'
+require 'simpletable'
+include SimpleTable
 
 LIGHTS_CONFIG_PATH = "#{ENV["HOME"]}/.lightsconfig"
 
@@ -137,32 +139,20 @@ class LightsCli
       bulbs_response.each do |id,value|
         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
+      
+      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
-      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
+
+      titles = ["ID","NAME"]
+      methods = [:id,:name]
+      SimpleTable.create(sensors,titles,methods)
     elsif ARGV[0] == "groups"
       groups_response = hue.request_group_list
       groups = []
@@ -170,18 +160,9 @@ class LightsCli
         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
+      titles = ["ID","NAME","LIGHTS"]
+      methods = [:id,:name,:lights]
+      SimpleTable.create(groups,titles,methods)
     elsif ARGV[0] == "scenes"
       scenes_response = hue.request_scene_list
       scenes = []
@@ -189,40 +170,29 @@ class LightsCli
         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
+      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
-
-      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
+      
+      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
+
+      titles = ["ID","NAME"]
+      methods = [:id,:name]
+      SimpleTable.create(rules,titles,methods)
     end
   end
   

data/lib/lights.rb

@@ -11,6 +11,7 @@ require 'lights/exception'
 require 'lights/sensor'
 require 'lights/scene'
 require 'lights/user'
+require 'lights/rule'
 require 'lights/loggerconfig'
 
 def jp( s )
@@ -104,6 +105,10 @@ class Lights
     get "config"
   end
 
+  def request_rules
+    get "rules"
+  end
+
   def set_bulb_state( id, state )
     put "lights/#{id}/state", state
   end

data/lib/lights/rule.rb

@@ -0,0 +1,21 @@
+class Rule
+
+  attr_reader :id, :data, :name
+  def initialize( id = nil, data = {} )
+    @id = id
+    @data = data
+    @name = data["name"]
+  end
+
+  def data
+    data = @data
+    data["id"] = @id if @id
+    data["name"] = @name if @name
+    data
+  end
+
+  def to_json
+    data.to_json
+  end
+
+end

data/lib/lights/user.rb

@@ -2,7 +2,6 @@ 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"]

data/lib/lights/version.rb

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

data/lights.gemspec

@@ -19,6 +19,8 @@ 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.1.1"
+
   s.add_development_dependency "bundler", "~> 1.3"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 2.6"

data/spec/features/lights.feature

@@ -28,6 +28,9 @@ Feature: Lights
     When I run `lights list users`
     Then the output should contain "ID"
 
+  Scenario: List rules
+    When I run `lights list rules`
+    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
 #    When I run `lights set -l all -h test`

data/spec/rule_spec.rb

@@ -0,0 +1,15 @@
+require 'lights'
+
+describe Rule do
+  it "properly reconstucts object hash" do
+    data = {
+      "name" => "test name",
+      "key1" => "value 1",
+      "key2" => "value 2",
+    }
+    rule = Rule.new(1,data)
+    rule.id.should eql 1
+    rule.name.should eql "test name"
+    rule.data.should eql data
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lights
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Brady Turner
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2014-10-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: simpletable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +114,7 @@ files:
 - lib/lights/exception.rb
 - lib/lights/group.rb
 - lib/lights/loggerconfig.rb
+- lib/lights/rule.rb
 - lib/lights/scene.rb
 - lib/lights/sensor.rb
 - lib/lights/user.rb
@@ -111,6 +126,7 @@ files:
 - spec/features/lights.feature
 - spec/features/support/setup.rb
 - spec/group_spec.rb
+- spec/rule_spec.rb
 - spec/scene_spec.rb
 homepage: http://rubygems.org/gems/lights
 licenses:
@@ -143,4 +159,5 @@ test_files:
 - spec/features/lights.feature
 - spec/features/support/setup.rb
 - spec/group_spec.rb
+- spec/rule_spec.rb
 - spec/scene_spec.rb