hue_switch 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64adcd5e85bbb5a263ef1fa50f507a3e03332577
-  data.tar.gz: edb437f0c473f4a26f5e1836cc5bb74caa854f6e
+  metadata.gz: 0436b41204a89e0553f8014d4e2e1765f5a72c8b
+  data.tar.gz: 4a0e10572daa901e68c7efaf76285e90f07ed93c
 SHA512:
-  metadata.gz: fdcffe7324e1f9a864b209a42cd0b89ab803aa8ff0ada99b941f77b067569c82efc7254a75ed712f83ae7753304ffddb926785c3c012745d87145dc2cb1690a8
-  data.tar.gz: 2739f12f7e324e388b2449e68151807a1420c4c850ef918f914ec7fe794c2c4298bb295ceb0c341b189cbd21bad6db873c83fefd0c45dd9e7c9925f02fcda709
+  metadata.gz: aa736f8cfdf609b955eaa7111aad12c9f65e14345da7760095153fc10121dd94ef9b2093d59f28f256904210287e85cb569abf6e03222112dd04662bbe0b2c65
+  data.tar.gz: 7b111dc0b67e3445cd9f31a1f0caf0e293dde6a8c2b9a16a3096c08b98da3d2ef39507e5070bec77ddf7e985b53caee737c512ec96e0eefc40dba3ca804ca091

data/Gemfile.lock

@@ -0,0 +1,56 @@
+PATH
+  remote: .
+  specs:
+    hue_switch (1.0.5)
+      chronic (~> 0.10.0)
+      chronic_duration (~> 0)
+      httparty (~> 0.13.0)
+      numbers_in_words (~> 0.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.4)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    chronic (0.10.2)
+    chronic_duration (0.10.6)
+      numerizer (~> 0.1.1)
+    diff-lcs (1.1.3)
+    httparty (0.13.5)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.8.0)
+    multi_xml (0.5.5)
+    numbers_in_words (0.2.0)
+      activesupport
+    numerizer (0.1.1)
+    rake (10.4.2)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.9)
+  hue_switch!
+  rake (~> 10.0)
+  rspec (~> 2.4, >= 2.4.0)
+
+BUNDLED WITH
+   1.10.3

data/lib/hue_switch/version.rb

@@ -1,3 +1,3 @@
 module HueSwitch
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/hue_switch.rb

@@ -3,13 +3,26 @@ require 'chronic_duration'
 require 'httparty'
 require 'numbers_in_words'
 require 'numbers_in_words/duck_punch'
+require 'timeout'
 
 class Switch
 	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"]
+		begin
+			Timeout::timeout(5) {
+				@ip = HTTParty.get("https://www.meethue.com/api/nupnp").first["internalipaddress"]
+			}
+		rescue Timeout::Error
+	  		"Time Out"
+		rescue NoMethodError
+		  	"Cannot Find Bridge"
+		rescue Errno::ECONNREFUSED
+		  	"connection refused"
+		rescue SocketError
+				"Cannot connect to local network"
+		end
 		
 		authorize_user
 		populate_switch
@@ -23,22 +36,6 @@ class Switch
 		instance_eval(&block) if block_given?
 	end
 
-	def authorize_user
-		unless HTTParty.get("http://#{@ip}/api/#{@user}/config").include?("whitelist")
-			if HTTParty.post("http://#{@ip}/api", :body => ({:devicetype => "Hue_Switch", :username=>"1234567890"}).to_json).first.include?("error")
-				raise "You need to press the link button on the bridge and run again"
-			end
-		end
-	end
-
-	def populate_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}
-		@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] = k } ; @groups["all"] = "0"
-		@lights = {} ; HTTParty.get("http://#{@ip}/api/#{@user}/lights").each { |k,v| @lights["#{v['name']}".downcase] = k }
-	end
-
 	def hue (numeric_value)
 		clear_attributes
 		self.body[:hue] = numeric_value
@@ -51,8 +48,11 @@ class Switch
 
 	def color(color_name)
 		clear_attributes
-		@colors.keys.include?(color_name.to_sym) ?
-		self.body[:hue] = @colors[color_name.to_sym] : self.body[:ct] = @mired_colors[color_name.to_sym]
+		if @colors.keys.include?(color_name.to_sym)
+			self.body[:hue] = @colors[color_name.to_sym]
+		else
+			self.body[:ct] = @mired_colors[color_name.to_sym]
+		end
 	end
 
 	def saturation(depth)
@@ -149,38 +149,7 @@ class Switch
 
 	# Parses times in words (e.g., "eight forty five") to standard HH:MM format
 
-	def numbers_to_times(numbers)
-		numbers.map!(&:in_numbers)
-		numbers.map!(&:to_s)
-		numbers.push("0") if numbers[1] == nil
-		numbers = numbers.shift + ':' + (numbers[0].to_i + numbers[1].to_i).to_s
-		numbers.gsub!(':', ':0') if numbers.split(":")[1].length < 2
-		numbers
-	end
-
-	def parse_time(string)
-		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(' ')
-		numbers_in_words = string.scan(Regexp.union((1..59).map(&:in_words)))
-		set_time = numbers_to_times(numbers_in_words)
-		set_time = Chronic.parse(day_modifier +  ' ' + set_time + ' ' + time_modifier)
-	end
-
-	def set_time(string)
-		if string.scan(/ seconds?| minutes?| hours?| days?| weeks?/).any? 
-			set_time = Time.now + ChronicDuration.parse(string)
-		elsif string.scan(/\d/).any?
-			set_time = Chronic.parse(string)
-		else
-			set_time = parse_time(string)
-		end
-	end
-
-	def schedule (on_or_off = :default, string)
+	def schedule (string, on_or_off = :default)
 		self.body[:on] = true if on_or_off == :on
 		self.body[:on] = false if on_or_off == :off
 		set_time = set_time(string)
@@ -253,7 +222,24 @@ class Switch
 		self.voice command
 	end
 	
-	#The rest of the methods allow access to most of the Switch class functionality by supplying a single string.
+	#The rest of the methods allow access to most of the Switch class functionality by supplying a single string
+
+	def voice(string)
+		self.reset
+		self.command << string
+
+		parse_voice(string)
+
+		if self.command.include?("schedule")
+			state = string.match(/off|on/)[0].to_sym rescue nil
+			self.send("schedule", *[string, state])
+		else
+			string.include?(' off') ? self.send("off") : self.send("on")
+		end	
+	end
+
+	private
+	
 	def parse_leading(methods)
 		methods.each do |l|
 			capture = (self.command.match (/\b#{l}\s\w+/)).to_s.split(' ')
@@ -282,7 +268,6 @@ class Switch
 
 	def parse_scene(scene_name)
 		scene_name.gsub!(' ','-') if scene_name.size > 1
-		p scene_name
 		self.send("scene", scene_name)
 	end
 	
@@ -305,18 +290,57 @@ class Switch
 		parse_save_scene if self.command.scan(/save (scene|seen) as/).length > 0
 	end
 
-	def voice(string)
-		self.reset
-		self.command << string
+	def numbers_to_times(numbers)
+		numbers.map!(&:in_numbers)
+		numbers.map!(&:to_s)
+		numbers.push("0") if numbers[1] == nil
+		numbers = numbers.shift + ':' + (numbers[0].to_i + numbers[1].to_i).to_s
+		numbers.gsub!(':', ':0') if numbers.split(":")[1].length < 2
+		numbers
+	end
 
-		parse_voice(string)
+	def parse_time(string)
+		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.)|(am)|(p.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(' ')
+		numbers_in_words = string.scan(Regexp.union((1..59).map(&:in_words)))
+		set_time = numbers_to_times(numbers_in_words)
+		set_time = Chronic.parse(day_modifier +  ' ' + set_time + ' ' + time_modifier)
+	end
 
-		if self.command.include?("schedule")
-			self.body[:on] = true if string.include?(' on')
-			self.body[:on] = false if string.include?(' off')
-			self.send("schedule", string)
+	def set_time(string)
+		if string.scan(/ seconds?| minutes?| hours?| days?| weeks?/).any? 
+			set_time = string.partition("in").last.strip!
+			set_time = Time.now + ChronicDuration.parse(string)
+		elsif string.scan(/\d/).any?
+			set_time = string.partition("at").last.strip!
+			set_time = Chronic.parse(set_time)
 		else
-			string.include?(' off') ? self.send("off") : self.send("on")
-		end	
+			set_time = string.partition("at").last.strip!
+			set_time = parse_time(set_time)
+		end
+	end
+
+	def authorize_user
+		begin
+			unless HTTParty.get("http://#{@ip}/api/#{@user}/config").include?("whitelist")
+				if HTTParty.post("http://#{@ip}/api", :body => ({:devicetype => "Hue_Switch", :username=>"1234567890"}).to_json).first.include?("error")
+					raise "You need to press the link button on the bridge and run again"
+				end
+			end
+		rescue Errno::ECONNREFUSED
+			"Cannot Reach Bridge"
+		end
+	end
+
+	def populate_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}
+		@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] = k } ; @groups["all"] = "0"
+		@lights = {} ; HTTParty.get("http://#{@ip}/api/#{@user}/lights").each { |k,v| @lights["#{v['name']}".downcase] = k }
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hue_switch
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - sarkonovich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -122,9 +122,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console

data/.gitignore

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

data/.travis.yml

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