hue_switch 0.9.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ead8fa737e264f8dfacab9c256337c2f84a091a4
-  data.tar.gz: 12d051202e0b31677fb804cf90d36fa47800c84e
+  metadata.gz: 71118f28167bd6ca48882186c602645ec1135e03
+  data.tar.gz: b8f1ce3f43b8a2f77563fd5859c03973fe4435fd
 SHA512:
-  metadata.gz: c54ee80a93137306c7317da6027bec59d005603a8096cfed73b5e262a51cea1efba21a4eee17eae4d4e86efb8250b8e7efd37ec1c8777a099ae83180112b4076
-  data.tar.gz: 5cbae30d9e871376749985051c6c0a8d8791bdc98ed8529b68b4dce8ff6c1d1309f648df49c6d2d9f3a4c1f36a1e4d57f038012989801187d1ac6f8cdce4cc78
+  metadata.gz: 3fd0ff508760d89656f0c24b95df11b0cb08101754fb647a9b8038d31dbac2ae017a027d23b8608275ace5309b0fa3b98674e8cec8c3a69f0a4c90476e331bd4
+  data.tar.gz: 74de57fffc30b3f6384961c0d85bc48d2126a6fbe14bb60bb5b1233875e5dedb984450a5e86d5cb2b75a62b8b66d05385e3a0f7e08c594851b3538eabc50a13d

data/.gitignore

@@ -0,0 +1,9 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.2.1

data/README.md

@@ -1,11 +1,9 @@
-## Installation
 
+## Installation
 Add this line to your application's Gemfile:
-
 ```ruby
 gem 'hue_switch'
 ```
-
 And then execute:
 
     $ bundle
@@ -17,22 +15,19 @@ Or install it yourself as:
 ## Usage
 A Hue Switch is designed control Hue lights, groups, and scenes. You can schedule a Switch. You can save a Switch as a Hue Scene on the bridge.
 
-NOTE: The first time you run this gem, you'll need to press the link button on the bridge immediately beforehand. If you don't, you'll get an error telling you to do so and try again.
-
-Why is this different from other wrappers?  Hue-Switch is not designed to give full access to Hue API, but to make access to basic operations super easy. A Hue Switch can be assigned an existing group, scene, or one or more individual lights. Switches can be scheduled easily. Color effects can be added (color loop, random colors, etc.) For example, a switch could be three random lights, rotating through random colors (or colors in a range.) If you turn the switch off, the lights go off. Turn it on, and they continue to cycle through colors.
-
-Colors can be specified by 
+NOTE: The first time you run this gem, you'll need to press the link button on the bridge immediately beforehand. If you don't, you'll get an error telling you to do so and try again. You need to be logged into
 
-    1. Color name (pink, red, blue, etc) including Hue color names (reading, energize, etc.)
+Why is this different from other wrappers?  
 
-    2. Numeric value of hue [0-65535], or mired color value [0-500]
+1. Hue-Switch is not designed to give full access to Hue API, but to make access to basic operations super easy. A Hue Switch can be assigned an existing group, scene, or one or more individual lights. Switches can be scheduled easily. Color effects can be added (color loop, long and short alerts etc.) For example, a switch could be three random lights on a colorloop. If you turn the switch off, the lights go off. Turn it on, and they continue to cycle through colors.
 
+2. Hue-Switch comes with a utility method (dare I call it a DSL?), #voice. The voice method allows access to (almost) all of the Switch class funtionality with a single string. See below for important differences when using the #voice method
 
 ###Create a Switch
 
 Basic case, an on-off switch for all lights
 ```ruby
-switch = Switch.new {}
+switch = Switch.new
 ```
 
 Then
@@ -40,37 +35,50 @@ Then
 switch.on
 switch.off
 ```
-
-###Switch to control a group.
+You can fully specify a switch at creation
 
 ```ruby
 switch = Switch.new do
-  group :kitchen
+  light :kitchen
   color :blue
   saturation 255
   brightness 120
   fade 10  #specified in seconds
 end
 ```
-Use `group :all` to specify all lights.
+Then switch.on
+
+Colors can be specified by
+
+1. Color name (red, pink, purple, violet, blue, orange, turquoise, yellow, green, orange), including Hue mired color names (candle, relax, reading, concentrate, energize.)
+
+2. Numeric value of hue [0-65535], or mired color value [0-500]
+
+Groups are indicated by **:lights**, single lights by **:light**.
 
-###Switch to control a scene
+A switch can control multiple individual lights, even if they are not in a group.
 
+```ruby
+switch.lights :'living room' #controls a group
+switch.light :bedside #controls a single light
+switch.light :table, :"front door" #controls two lights not in a group together.
+```
+Note: multi-word group/light/scene names must be enclosed in quotation marks.
+###Scenes
+#####Recall
 ```ruby
 switch = Switch.new do
   scene :dinner
 end
-```
-
-###Switch to control one or more individually specified lights.
 
+switch.scene :dinner
+```
+#####Save
+The current switch state can be saved as a scene on the bridge.
 ```ruby
-switch = Switch.new do
-  lights :bedside, :floor, :table
-  hue 27000
-  brightness 120
-end
+switch.save_scene "romantic dinner"
 ```
+If a group is assigned to the switch, the scene will be assigned to that group. If no group is assigned, the scene will affect all lights.
 ###Modify Switch
 
 After the switch is created, you can modify it:
@@ -81,13 +89,10 @@ switch.color :red
 You can assign a new group, scene, or set of individual lights to a switch
 
 ####Or reset it
-
 ```ruby
 switch.reset
 ```
-
 ###Schedule the lights
-
 Switches can be scheduled:
 
 ```ruby
@@ -95,9 +100,11 @@ switch.schedule :on, "8:30 tonight"
 switch.schedule :off, "in three minutes"  # "tomorrow", "next week"
 ```
 
-If you don't specify :on, :off, or a time, schedule will default to turning on the current switch state in 24 hours.
+1. If you don't specify :on, :off, or a time, schedule will default to turning on the current switch state in 24 hours.
+2. Lights will flash once to let you know the scene was successfully sceduled.
+3. Schedules can be set a week up to a week ahead of time. You can specify days of the week (e.g, monday, next tuesday) but you cannot specify a date.
 
-####Delete the schedule[s] created by the switch:
+####Delete the schedule(s) created by the switch:
 
 ```ruby
 switch.delete_schedules!
@@ -105,53 +112,76 @@ switch.delete_schedules!
 
 ###Save Switch as a Hue Scene
 
-Just specify a name (words must be join with a hyphen.)
-
 The scene will be assigned to the group the switch is currently controlling (or all the lights if a group hasn't been assigned to the switch.)
 
 All features of the Switch (fade, group, color, etc) will be saved in the scene attributes.
-    
 ```ruby
-switch.save_scene "my-switch"
+switch.save_scene "my switch"
 ```
-
-
-###Switches can be dynamic:
+###Dynamic Effects:
 ```ruby
 switch.colorloop  # to cycle through colors
 switch.alert  # to flash lights once
 switch.long_alert  # to flash lights for 30 seconds
 ```
-then `switch.on`
-
-In addition
+Then `switch.on`
 
+Stop dynamic effects
 ```ruby
-switch.random_colors # to loop through random colors
+switch.colorloop :stop
+switch.alert :stop
 ```
-Hue, saturation, and brightness can be changed while the switch is cycling. If turned off, the switch will still be dynamic when turned back on.
+Then `switch.on`
+##Voice
+The voice method takes a single string and is meant to control the Switch class with voice commands. *This allows the Switch class to be used as a full-featured replacement for the Hue module on [Zach Feldman's](https://github.com/zachfeldman/alexa-home) Alexa-Home GitHub Repo.*
+
+Because #voice takes a string meant to be spoken, there are important differences between using switch and switch.voice:
+
+1. switch.voice takes no numeric inputs. Brightness and Saturation are set on a scale of one to ten. Fade times for lights are similarly specified in words by seconds. See examples below.
+2. Colors can only be specified by name (i.e., 'hue 40000' is not available using #voice).
+3. Only a single light can be specified after a 'light' command.
+4. .reset and .delete_scenes! methods not available with #voice
+5. **Changes take effect immediately.** Using the #voice method, you don't need to send a separate "on" command for switch properties to be sent to the lights. So:
 
-Speed and color range can optionally be assigned
 ```ruby
-switch.random_colors range: 20000..28000 #cycles through greens, roughly
+switch.color :blue : switch.on
+switch.lights :kitchen ; switch.saturation 255 ; switch.brightness 127 ; switch.on
 ```
-Stops dynamic effects.
+is now
 ```ruby
-switch.colorloop :stop
-switch.alert :stop
-switch.random_colors :stop
+switch.voice "color blue"
+swtich.voice "kitchen lights saturation ten brightness five"
+```
+###Examples
+#####Recall a scene
+```ruby
+switch.voice "romantic scene"
+switch.voice "purple paradise scene"
+```
+#####Save a scene
+Will save the current light configuration to a scene on the bridge.
+```ruby
+switch.voice "save scene as romantic dinner"
+```
+###Schedules
+Scheduling syntax is extremely flexible. Any command can be scheduled. You can schedule up to a week ahead of time.
+```ruby
+switch.voice "schedule kitchen lights color blue in ten minutes"
+switch.voice "start colorloop bedside light schedule at eight fifty three next Friday"
+switch.voice "romantic scene schedule tomorrow at eight in the evening"
+switch.voice "schedule purple paradise scene thursday evening at eight forty five"
+```
+###Dynamic Effects:
+```ruby
+"living room lights short alert" [flash lights in the group once]
+"short alert table light" [flash light for 30 seconds]
+"brightness five fireplace lights start colorloop"
+"fireplace lights stop colorloop"
+```
+
 
 
-## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/hue_switch/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request

data/hue_switch.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'httparty', '~> 0.13.0'
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'rspec', '~> 0'
 end

data/lib/hue_switch/version.rb

@@ -1,3 +1,3 @@
 module HueSwitch
-  VERSION = "0.9.2"
+  VERSION = "1.0.0"
 end

data/lib/hue_switch.rb

@@ -1,12 +1,12 @@
 require 'chronic'
 require 'chronic_duration'
 require 'httparty'
+require 'numbers_in_words'
+require 'numbers_in_words/duck_punch'
 
 class Switch
-
-	attr_accessor :description, :lights_array, :_group, :body, :schedule_params, :schedule_ids, :effect, :effect_state, :effect_thread, :switch_state
-
-	def initialize(description = "", _group = 0, &block)
+	attr_accessor :command, :lights_array, :_group, :body, :schedule_params, :schedule_ids
+	def initialize(command = "", _group = 0, &block)
 
 		@user = "1234567890"
 		@ip = HTTParty.get("https://www.meethue.com/api/nupnp").first["internalipaddress"]
@@ -19,17 +19,13 @@ class Switch
 		@colors = {red: 65280, pink: 56100, purple: 52180, violet: 47188, blue: 46920, turquoise: 31146, green: 25500, yellow: 12750, orange: 8618}
 		@mired_colors = {candle: 500, relax: 467, reading: 346, neutral: 300, concentrate: 231, energize: 136} ; puts @mired_colors
 		@scenes = [] ; HTTParty.get("http://#{@ip}/api/#{@user}/scenes").keys.each { |k| @scenes.push(k) }
-		@groups = {} ; HTTParty.get("http://#{@ip}/api/#{@user}/groups").each { |k,v| @groups["#{v['name']}".downcase.gsub(' ','_')] = k } ; @groups["all"] = "0"
+		@groups = {} ; HTTParty.get("http://#{@ip}/api/#{@user}/groups").each { |k,v| @groups["#{v['name']}".downcase] = k } ; @groups["all"] = "0"
 		@lights = {} ; HTTParty.get("http://#{@ip}/api/#{@user}/lights").each { |k,v| @lights["#{v['name']}".downcase] = k }
 		
-		switch_state = switch_state
 		self.lights_array = []
-		self.effect_thread = []
-		self.effect = ""
-		self.effect_state = :off
 		self.schedule_ids = []
 		self.schedule_params = nil
-		self.description = description
+		self.command = ""
 		self._group = :all
 		self.body = {}
 		instance_eval(&block) if block_given?
@@ -69,35 +65,43 @@ class Switch
 		self.body[:transitiontime] = in_seconds * 10
 	end	
 
-	def lights(*args)
+	def light (*args)
 		self.lights_array = []
 		self._group = nil
 		self.body.delete(:groups)
 		self.body.delete(:scene)
 		args.each { |l| self.lights_array.push @lights[l.to_s] if @lights.keys.include?(l.to_s) }
+		#self.send("on") if !self.command.include?("schedule")
 	end
 
-	def group(group_name)
+	def lights(group_name)
 		self.lights_array = []
 		self.body.delete(:scene)
 		self._group = @groups[group_name.to_s]
+		#self.send("on") if !self.command.include?("schedule")
 	end
 
 	def scene(scene_name)
 		self.lights_array = []
 		self._group = 0
 		self.body.delete(:groups)
+		self.body.delete(:hue)
+		self.body.delete(:ct)
 		self.body[:scene] = scene_name.to_s
+		#self.send("on") if !self.command.include?("schedule")
 	end
 
-	def save_scene (scene_name)
+	def save_scene(name)
 		self.fade 2 if self.body[:transitiontime] == nil
-		if self._group.empty?
-			light_group = HTTParty.get("http://10.100.100.3/api/#{@user}/groups/0")["lights"]
+		if self._group.nil?
+			light_group = HTTParty.get("http://#{@ip}/api/#{@user}/groups/0")["lights"]
 		else
-		 light_group = HTTParty.get("http://10.100.100.3/api/#{@user}/groups/#{self._group}")["lights"]
+			light_group = HTTParty.get("http://#{@ip}/api/#{@user}/groups/#{self._group}")["lights"]
 		end
+		scene_name = name
+		scene_name.gsub!(' ','-')
 		params = {name: scene_name, lights: light_group, transitiontime: self.body[:transitiontime]}
+		p params
 		response = HTTParty.put("http://#{@ip}/api/#{@user}/scenes/#{scene_name}", :body => params.to_json)
 		if response.first.keys[0] == "success"
 			puts "Scene created!"
@@ -107,11 +111,7 @@ class Switch
 	end
 
 	def on
-		if self.switch_state != "on"
-			self.switch_state = "on"
-			self.body[:on] = true
-		end
-
+		self.body[:on]=true
 		if self.lights_array.any?
 			self.lights_array.each { |l| HTTParty.put("http://#{@ip}/api/#{@user}/lights/#{l}/state", :body => (self.body).to_json) }
 		elsif self.body.include?(:scene)
@@ -119,26 +119,10 @@ class Switch
 		else 
 			HTTParty.put("http://#{@ip}/api/#{@user}/groups/#{self._group}/action", :body => (self.body).to_json)
 		end
-
-		#restart switch custom dynamic effects after switch is turned back on
-		if !self.effect.empty? && !self.effect_thread.last.alive?
-			self.effect_thread.each { |t| self.effect_thread.delete t if !t.alive?}
-			self.send(self.effect, :start) if !self.effect.nil?
-		end
-		# Don't keep sending "on" signal to lights as suggested by Hue API
-		self.body.delete(:on)
 	end
 
 	def off
-		# Stop Switch custom dynamic effects
-		if self.effect_state == :start
-			self.effect_thread.last.kill
-			self.effect_state = :stop
-		end
-		if self.switch_state != "off"
-			self.switch_state = "off"
-			self.body[:on] = false
-		end
+		self.body[:on] = false
 		if self.lights_array.any?
 			self.lights_array.each { |l| HTTParty.put("http://#{@ip}/api/#{@user}/lights/#{l}/state", :body => (self.body).to_json) }
 		elsif !self.body[:scene].nil? 
@@ -150,22 +134,35 @@ class Switch
 		end
 	end
 
-	def schedule(on_or_off = :default, set_time = "tomorrow")
-		if set_time.scan(/ seconds?| minutes?| hours?| days?| weeks?/).any? 
-			set_time = Time.now + ChronicDuration.parse(set_time)
-			set_time = set_time.to_s.split(' ')[0..1].join(' ').sub(' ',"T")
-		else
-			set_time = Chronic.parse(set_time).to_s.split(' ')[0..1].join(' ').sub(' ',"T")
-		end
-
+	def schedule (on_or_off = :default, string)
 		if on_or_off != :default
 			on_or_off = on_or_off == :on ? true : false
 			self.body[:on]=on_or_off
 		end 
 
-		if Chronic.parse(set_time) < Time.now
+		if string.scan(/ seconds?| minutes?| hours?| days?| weeks?/).any? 
+			set_time = Time.now + ChronicDuration.parse(string)
+		else
+			string.sub!(" noon", " twelve in the afternoon")
+			string.sub!("midnight", "twelve in the morning")
+			time_modifier = string.downcase.scan(/(evening)|(night|tonight)|(afternoon)|(pm)|(a.m.)|(morning)|(today)/).flatten.compact.first
+			guess = Time.now.strftime('%H').to_i >= 12 ?  "p.m." : "a.m."
+			time_modifier = time_modifier.nil? ? guess : time_modifier
+			day_modifier = string.scan(/(tomorrow)|(next )?(monday|tuesday|wednesday|thursday|friday|saturday|sunday)/).flatten.compact.join(' ')
+			set_time = string.scan(Regexp.union((1..59).map(&:in_words)))
+			set_time.map!(&:in_numbers)
+			set_time.map!(&:to_s)
+			set_time.push("0") if set_time[1] == nil
+			set_time = set_time.shift + ':' + (set_time[0].to_i + set_time[1].to_i).to_s
+			set_time.gsub!(':', ':0') if set_time.split(":")[1].length < 2
+			set_time = Chronic.parse(day_modifier +  ' ' + set_time + ' ' + time_modifier)
+			p set_time
+		end
+
+		if set_time < Time.now 
 			p "You've scheduled this in the past"
 		else
+			set_time = set_time.to_s.split(' ')[0..1].join(' ').sub(' ',"T")
 			self.schedule_params = {:name=>"Hue_Switch Alarm",
 						 :description=>"",
 						 :localtime=>"#{set_time}",
@@ -179,12 +176,17 @@ class Switch
 					self.schedule_ids.push(HTTParty.post("http://#{@ip}/api/#{@user}/schedules", :body => (self.schedule_params).to_json))
 				end
 			elsif !self.body[:scene].nil?
-				self.schedule_params[:command] = {:address=>"/api/#{@user}/groups/#{self._group}/action", :method=>"PUT", :body=>self.body.reject { |s| s == :scene }}
+				self.schedule_params[:command] = {:address=>"/api/#{@user}/groups/#{self._group}/action", :method=>"PUT", :body=>self.body }
 				self.schedule_ids.push(HTTParty.post("http://#{@ip}/api/#{@user}/schedules", :body => (self.schedule_params).to_json))
 			else
 				self.schedule_params[:command] = {:address=>"/api/#{@user}/groups/#{self._group}/action", :method=>"PUT", :body=>self.body}
 				self.schedule_ids.push(HTTParty.post("http://#{@ip}/api/#{@user}/schedules", :body => (self.schedule_params).to_json))
 			end
+			result = self.schedule_ids.flatten.last
+		  if result.keys.include?("success")
+		    params = {:alert => 'select'}
+		    HTTParty.put("http://#{@ip}/api/#{@user}/groups/0/action" , :body => params.to_json)
+		  end
 		end
 	end
 
@@ -197,42 +199,114 @@ class Switch
 	 	self.schedule_ids = []
 	end
 
+	def colorloop(start_or_stop)
+		if start_or_stop == :start
+			self.body[:effect] = "colorloop"
+		elsif start_or_stop == :stop
+			self.body[:effect] = "none"
+		end
+	end
+
+	def alert(value)
+		if value == :short
+			self.body[:alert] = "select"
+		elsif value == :long
+			self.body[:alert] = "lselect"
+		elsif value == :stop
+			self.body[:alert] = "none"
+		end
+	end
+
 	def reset
+		self.command = ""
 		self._group = 0
 		self.body = {}
 		self.schedule_params = nil
 	end
 
-# Switches can be dynamic
-	def colorloop(state = :on)
-		state == :on ? self.body[:effect] = "colorloop"  : self.body[:effect] = "none"
+	#The following two methods are required to use Switch for Zach Feldman's Alexa-home*
+	def wake_words
+		["light", "lights", "scene", "seen", "flash"]
 	end
 
-	def alert(state = :on)
-		state == :on ? self.body[:alert] = "select"  : self.body[:alert] = "none"
+	def process_command (command)
+		command.sub!("color loop", "colorloop")
+		command.sub!("too", "two")
+		command.sub!(/a half$/, 'thirty seconds')
+		self.voice command
 	end
+	
+	#This method allows access to most of the Switch class functionality by supplying a single string.
+	def voice (string)
+		trailing_methods = string.split(' ') & %w[lights light]
+		leading_methods = string.split(' ') & %w[hue brightness saturation fade color]
+		dynamic_methods = string.split(' ') & %w[colorloop alert]
+		scene_name = string.partition(" scene").first
+		self.command = ""
+		self.command << string
+		string.gsub!('schedule','')
 
-	def long_alert(state = :on)
-		state == :on ? self.body[:alert] = "lselect"  : self.body[:alert] = "none"
-	end
+		if string.include?('scene')
+			scene_name.gsub!(' ','-') if scene_name.size > 1
+			scene_name.gsub!(/schedule-?/,'') if scene_name.include?('schedule')
+			puts scene_name
+			self.send("scene", scene_name)
+		end
 
-	def random_colors(state = :start, range: 0..65500)
-		if state == :stop
-			self.effect = ""
-			self.effect_thread = []
-			self.effect_state = :stop
-		else
-			self.effect_state = state
-			self.effect = __method__.to_s
-			self.fade 2
-			Thread.new do
-				self.effect_thread.push Thread.list.last
-				while self.effect_state == :start do
-					self.body[:hue] = rand(range)
-					sleep (self.body[:transitiontime] / 10) + 0.5 
-					self.on
-				end
+		if leading_methods.any?
+			leading_methods.each do |l|
+				capture = (string.match (/\b#{l}\s\w+/)).to_s.split(' ')
+				method = capture[0]
+				value = capture[1]
+				value = value.in_numbers if value.scan(Regexp.union( (1..10).map {|k| k.in_words} ) ).any?
+				value = ((value.to_f/10.to_f)*255).to_i if (value.class == Fixnum) && (l != "fade")
+				self.send( method, value )
+			end
+		end
+
+		if trailing_methods.any?
+			trailing_methods.each do |t|
+				all_keys = []
+				all_keys.push(@groups.keys)
+				all_keys.push(@lights.keys)
+				all_keys.flatten!
+				all_keys = Regexp.union(all_keys)
+				value = string.match (all_keys).to_s
+				self.send( "#{t}", value )
+			end
+		end
+
+		if dynamic_methods.any?
+			dynamic_methods.each do |d|
+				capture = (string.match (/\w+ #{d}\b/)).to_s.split(' ')
+				capture = capture.reverse
+				method = capture[0]
+				value = capture[1].to_sym
+				self.send( method, value )
+			end
+		end
+
+		if self.command.scan(/save (scene|seen) as/).length > 0
+			scene_name = self.command.partition(/save (scene|seen) as /).last
+			self.send( "save_scene", scene_name)
+		end
+
+		if !self.command.include?("schedule")
+			if string.include?(" on")
+				self.send("on")
+			elsif string.include?(" off")
+			 	self.send("off")
+			end
+		end
+
+		if self.command.include?("schedule")
+			if string.include?(" on")
+				self.body[:on] = true
+			elsif string.include?(" off")
+				self.body[:on] = false
 			end
+			self.send("schedule", string)
 		end
+		self.send("on") unless string.include?(" off") && !string.include?("schedule")
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hue_switch
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 1.0.0
 platform: ruby
 authors:
 - sarkonovich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A 'switch' controls Hue lights, groups, or scenes. Switches can be scheduled,
   and given dynamic effects.
 email:
@@ -88,13 +102,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
-- hue_switch-0.1.0.gem
 - hue_switch.gemspec
 - lib/hue_switch.rb
 - lib/hue_switch/version.rb

data/Gemfile.lock

@@ -1,29 +0,0 @@
-PATH
-  remote: .
-  specs:
-    hue_switch (0.1.0)
-      chronic
-      chronic_duration
-      httparty
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    chronic (0.10.2)
-    chronic_duration (0.10.6)
-      numerizer (~> 0.1.1)
-    httparty (0.13.3)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
-    json (1.8.2)
-    multi_xml (0.5.5)
-    numerizer (0.1.1)
-    rake (10.4.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.9)
-  hue_switch!
-  rake (~> 10.0)