hue-lib 0.7.1 → 0.7.2

data/Rakefile

@@ -16,4 +16,30 @@ rescue LoadError
   end
 end
 
+namespace :gem do
+  desc 'Build the gem'
+  task :build do
+    `mkdir -p pkg`
+    `gem build hue-lib.gemspec`
+    `mv *.gem pkg/`
+  end 
+
+  desc 'Publish the gem'
+  task :publish do
+    gem = `ls pkg`
+    # `gem push pkg/#{gem}`
+  end 
+
+  desc 'Install the gem locally'
+  task :install do
+    gem = `ls pkg`.split.sort
+    `gem install pkg/#{gem.last}`
+  end 
+end
+
+desc 'Remove generated files'
+task :clean do
+  `rm -rf pkg`
+end
+
 task :default => [:spec]

data/hue-lib.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "hue-lib"
-  s.version     = '0.7.1'
+  s.version     = '0.7.2'
   s.authors     = ["Birkir A. Barkarson", "Aaron Hurley"]
   s.email       = ["birkirb@stoicviking.net"]
   s.homepage    = "https://github.com/birkirb/hue-lib"

data/lib/hue/bridge.rb

@@ -104,7 +104,7 @@ module Hue
       begin
         http = Net::HTTP.new(url.host, url.port)
         http.open_timeout = 3  # Quick timeout on connection fail.
-        http.read_timeout = 10 # Slower timeout on read fail, but way faster than the default.
+        http.read_timeout = 8 # Slower timeout on read fail, but way faster than the default.
         response = http.start { |http| http.request(request) }
       rescue => err
         Hue.logger.error(err.message)

data/lib/hue/bulb.rb

@@ -5,6 +5,8 @@ module Hue
   class Bulb
 
     BRIGHTNESS_MAX = 255
+    NONE = 'none'
+    COLOR_LOOP = 'colorloop'
 
     include Animations::Candle
     include Animations::Sunrise
@@ -34,6 +36,11 @@ module Hue
       status['state']
     end
 
+    # Free for all, no checking.
+    def state=(value)
+      update_state(value)
+    end
+
     def [](item)
       state[item.to_s]
     end
@@ -104,36 +111,68 @@ module Hue
       set_color
     end
 
+    def effect
+      self['effect']
+    end
+
+    def effect=(value)
+      update_state(effect: value.to_s)
+    end
+
+    def effect?
+      NONE != self.effect
+    end
+
+    def color_loop
+      self.effect = COLOR_LOOP
+    end
+    alias :colorloop :color_loop
+
+    def color_loop?
+      COLOR_LOOP == self.effect
+    end
+
+    def clear_effect
+      self.effect = NONE
+    end
+
+    def alert
+      self['alert']
+    end
+
+    def alert=(value)
+      update_state(alert: value.to_s)
+    end
+
     def blinking?
       !solid?
     end
 
     def solid?
-      'none' == self['alert']
+      NONE == alert
     end
 
     def blink
-      update_state(alert: 'lselect')
+      self.alert = 'lselect'
     end
 
     def solid
-      update_state(alert: 'none')
+      self.alert = NONE
     end
 
     def flash
-      update_state(alert: 'select')
+      self.alert = 'select'
       # immediately update to expected state
-      @status['state']['alert'] = 'none'
+      @status['state']['alert'] = NONE
     end
 
+    # transition time in seconds
     def transition_time
-      # transition time in seconds
-      (options[:transitiontime] || 1).to_f / 10
+      (options[:transitiontime] || 0).to_f / 10
     end
 
     def transition_time=(time)
-      # transition time in seconds
-      self.options[:transitiontime] = (time * 10).to_i
+      self.options[:transitiontime] = (time.to_f * 10).to_i
     end
 
     private

data/lib/hue/config/abstract.rb

@@ -18,7 +18,9 @@ module Hue
       end
 
       def write(overwrite_existing_key = false)
-        yaml = YAML.load_file(self.path) rescue Hash.new
+        yaml = YAML.load_file(self.path) rescue nil
+        yaml ||= Hash.new
+
         if yaml.key?(name) && !overwrite_existing_key
           raise "Key named '#{name}' already exists in config file '#{self.path}'.\nPlease remove it before creating a new one with the same name."
         else

data/lib/hue/config/application.rb

@@ -16,7 +16,7 @@ module Hue
 
       def self.named(name)
         yaml = read_file(file_path)
-        if named_yaml = yaml[name]
+        if yaml && named_yaml = yaml[name]
           new(named_yaml[STRING_BRIDGE_ID], named_yaml[STRING_ID], name)
         else
           raise NotFound.new("Config named '#{name}' not found.")

data/lib/hue.rb

@@ -1,7 +1,6 @@
 require 'net/http'
-require 'digest/md5'
 require 'json'
-require 'uuid'
+require 'securerandom'
 
 module Hue
 
@@ -15,7 +14,7 @@ module Hue
   end
 
   def self.one_time_uuid
-    Digest::MD5.hexdigest(UUID.generate)
+    SecureRandom.hex(16)
   end
 
   def self.register_default
@@ -71,10 +70,16 @@ ST: ssdp:all
       loop do
         message, (address_family, port, hostname, ip_add) = socket.recvfrom(1024)
         if message =~ /IpBridge/ && location = /LOCATION: (.*)$/.match(message)
-          if uuid = /uuid:(.{36})/.match(message)
+          if uuid_match = /uuid:(.{36})/.match(message)
             # Assume this is Philips Hue for now.
-            bridges[uuid.captures.first] = "http://#{ip_add}/api"
+            uuid = uuid_match.captures.first
+            if bridges[uuid].nil?
+              logger.info("Found bridge (#{hostname}:#{port}) with uuid: #{uuid}")
+            end
+            bridges[uuid] = "http://#{ip_add}/api"
           end
+        else
+          logger.debug("Found #{hostname}:#{port}: #{message}")
         end
       end
     end

data/spec/config/empty.yml

@@ -0,0 +1 @@
+--- {}

data/spec/hue/bulb_spec.rb

@@ -48,10 +48,21 @@ describe Hue::Bulb do
     end
 
     it "should report the alert state" do
+      bulb.alert.should == 'none'
       bulb.blinking?.should be_false
       bulb.solid?.should be_true
     end
 
+    it "should report the effect state" do
+      bulb.effect?.should be_false
+      bulb.effect.should == 'none'
+      bulb.color_loop?.should be_false
+    end
+
+    it "should report the transition time" do
+      bulb.transition_time.should == 0
+    end
+
     context 'by changing state' do
 
       it 'should allow turning bulps on and off' do
@@ -107,6 +118,38 @@ describe Hue::Bulb do
           bulb.flash
           bulb.solid?.should be_true
         end
+
+        with_fake_update('lights/1/state', alert: 'crap') do
+          bulb.alert = 'crap'
+        end
+      end
+
+      it 'should allow setting colorloop, and effect' do
+        with_fake_update('lights/1/state', effect: 'new')
+        bulb.effect = 'new'
+        bulb.effect.should == 'new'
+        bulb.effect?.should be_true
+
+        with_fake_update('lights/1/state', effect: 'colorloop')
+        bulb.colorloop
+        bulb.effect.should == 'colorloop'
+        bulb.effect?.should be_true
+        bulb.color_loop?.should be_true
+
+        with_fake_update('lights/1/state', effect: 'none')
+        bulb.clear_effect
+        bulb.effect.should == 'none'
+
+        with_fake_update('lights/1/state', effect: 'colorloop')
+        bulb.color_loop
+        bulb.effect.should == 'colorloop'
+      end
+
+      it 'should allow setting the transitions time, and employ it for a state change' do
+        bulb.transition_time = 10
+
+        with_fake_update('lights/1/state', transitiontime: 100, bri: 255)
+        bulb.brightness = 255
       end
 
     end

data/spec/hue/config/abstract_spec.rb

@@ -32,4 +32,14 @@ describe Hue::Config::Abstract do
     end
   end
 
+  context 'given an existing config' do
+    config = described_class.new('test', EMPTY_CONFIG_FILE)
+
+    it 'should allow writing to the file' do
+      config.write
+      YAML.load_file(config.path)['test'].should be_a(Hash)
+      config.delete
+    end
+  end
+
 end

data/spec/hue/config/application_spec.rb

@@ -58,4 +58,15 @@ describe Hue::Config::Application do
     end
   end
 
+  context 'given an non existing config' do
+
+    it "should throw and error if a named config doesn't exist" do
+      described_class.expects(:file_path).returns(EMPTY_CONFIG_FILE).once
+
+      lambda do
+        described_class.named('not_default')
+      end.should raise_error(Hue::Config::NotFound, /Config named (.*) not found/)
+    end
+  end
+
 end

data/spec/hue/config/bridge_spec.rb

@@ -21,7 +21,7 @@ describe Hue::Config::Bridge do
   end
 
   context 'given an new config' do
-    uuid = UUID.generate
+    uuid = Hue.one_time_uuid
     uri = 'http://someip/api'
     config = described_class.new(uuid, uri)
 

data/spec/spec_helper.rb

@@ -36,6 +36,7 @@ def silence_warnings
 end
 
 SPEC_DIR = File.dirname(__FILE__)
+Hue.logger.level = Logger::DEBUG
 
 silence_warnings do
   Hue.const_set(:DEFAULT_UDP_TIMEOUT, 0.01)
@@ -43,6 +44,7 @@ end
 
 # APPLICATION CONFIG
 
+EMPTY_CONFIG_FILE = File.join(SPEC_DIR, 'config', 'empty.yml')
 TEST_CONFIG_APPLICATION_PATH = File.join(SPEC_DIR, 'config', 'applications.yml')
 TEST_CONFIG_APPLICATION = YAML.load_file(TEST_CONFIG_APPLICATION_PATH)
 TEST_JSON_DATA_PATH = File.join(SPEC_DIR, 'json')

data/test/connectivity.rb

@@ -0,0 +1,44 @@
+require 'hue'
+
+bridge = Hue.application
+
+MAX_LIGHTS = 4
+
+@run = true
+@command_count = 0
+@error_count = 0
+
+trap("SIGINT") do
+  @run = false
+end
+
+while(@run)
+  begin
+    @command_count += 1
+    number = rand(4)
+    light = rand(MAX_LIGHTS)
+    case number
+    when 0
+      puts bridge.status['config']['UTC']
+    when 1
+      print "#{light + 1} name: "
+      puts bridge.bulbs[light].refresh!['name']
+    when 2
+      print "#{light + 1} on: "
+      puts bridge.bulbs[light].on
+    when 3
+      print "#{light + 1} off: "
+      puts bridge.bulbs[light].off
+    else
+      raise "Unhandled case: #{number}"
+    end
+  rescue => err
+    puts err.message
+    @error_count += 1
+  end
+  sleep 1
+end
+
+puts "Command count: #{@command_count}"
+puts "Fail count:    #{@error_count}"
+puts "Success rate:  #{(1.0 - (@error_count/@command_count.to_f)) * 100}%"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hue-lib
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -106,6 +106,7 @@ files:
 - lib/hue/config/bridge.rb
 - spec/config/applications.yml
 - spec/config/bridges.yml
+- spec/config/empty.yml
 - spec/hue/bridge_spec.rb
 - spec/hue/bulb_spec.rb
 - spec/hue/colors/color_spec.rb
@@ -130,6 +131,7 @@ files:
 - spec/json/schedules.json
 - spec/json/unauthorized.json
 - spec/spec_helper.rb
+- test/connectivity.rb
 homepage: https://github.com/birkirb/hue-lib
 licenses: []
 post_install_message: 
@@ -155,4 +157,3 @@ signing_key:
 specification_version: 3
 summary: Ruby library for controlling the Philips Hue system's lights and bridge.
 test_files: []
-has_rdoc: