philips_hue 0.1.6 → 0.1.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    philips_hue (0.1.6)
+    philips_hue (0.1.7)
       httparty (>= 0.10.0)
       json (>= 1.6)
 

data/bin/flash.rb

@@ -16,6 +16,7 @@ options = OpenStruct.new
 options.light_id = 1
 options.delay    = 1
 options.repeat   = 1
+options.crazy    = false
 options.color    = colors["red"]
 options.app_name = "lightsapp"
 options.api_url  = "192.168.1.14"
@@ -40,16 +41,17 @@ OptionParser.new do |opts|
   opts.on("-n [num]", "--repeat [num]", Integer, "Repeat [num] times") do |num|
     options.repeat = num
   end
+  opts.on("-z", "--crazymode", "Enable crazymode") do |crazy|
+    options.crazy = crazy
+  end
 end.parse!
 
 # get everything ready...
 hue = PhilipsHue::Bridge.new(options.app_name, options.api_url)
 light = hue.light(options.light_id)
-old_xy = light.xy
 
 # ...make magic happen
-options.repeat.times do
-  # flash!
-  light.flash(options.color, :delay => options.delay, :old_xy => old_xy)
-  sleep options.delay
+options.repeat.times do |n|
+  light.flash(options.color, options.delay, options.crazy)
+  sleep options.delay unless n == options.repeat-1
 end

data/lib/philips_hue/light.rb

@@ -162,14 +162,60 @@ module PhilipsHue
     end
 
     # flash a specified color
-    # if you're flashing multiple times, specify :old_xy to minimize API calls
-    def flash(xy, options = {})
-      old_xy = options[:old_xy] || self.xy
-      delay = options[:delay] || 1
-      self.xy = xy
+    #  xy is the color to use
+    #  delay is the length of the flash (in seconds)
+    #  crazymode causes the light to blink during the flash
+    def flash(xy, delay = 1, crazymode = false)
+      # use state() and set() to minimize number of API calls
+      original = self.state
+
+      # turns the light on and maxes brightness too
+      flash_state = {
+        :xy  => xy,
+        :on  => true,
+        :bri => 255
+      }
+
+      # blink repeatedly if crazymode flag is set
+      # (works best for delay >2 seconds)
+      flash_state["alert"] = "lselect" if crazymode
+
+      # the state to which to restore
+      # (color gets set after)
+      final_state = {
+        :on => original["on"],
+        :bri => original["bri"],
+        :alert => original["alert"]
+      }
+
+      # smartly return to the original color
+      case original["colormode"]
+      when "xy"
+        final_state[:xy]  = original["xy"]
+      when "ct"
+        final_state[:ct]  = original["ct"]
+      when "hs"
+        final_state[:hue] = original["hue"]
+      end
+
+      # flash!
+      set(flash_state)
+      # zzz...
       sleep delay
-      self.xy = old_xy
-    end
+      # restore the light to its original state
+      set(final_state)
+    end
+
+    # handy aliases
+    alias_method :brightness, :bri
+    alias_method :brightness=, :bri=
+    alias_method :mode, :colormode
+    alias_method :saturation, :sat
+    alias_method :saturation=, :sat=
+    alias_method :temperature, :ct
+    alias_method :temperature=, :ct=
+    alias_method :color_temperature, :ct
+    alias_method :color_temperature=, :ct=
 
     # pretty-print the light's status
     def to_s

data/lib/philips_hue/version.rb

@@ -1,3 +1,3 @@
 module PhilipsHue
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: philips_hue
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty