savant-echo 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c4fdd96a25708082b0030dd0cb8ff0e9a2c142e
-  data.tar.gz: 328a0b7ff4dc26732e9554e98b81f5133c8c23d7
+  metadata.gz: 7731edbd6b588d210341dc5011e1254df24b9927
+  data.tar.gz: da13adc92790f107e252b08c0df212a9f4079375
 SHA512:
-  metadata.gz: 6fe0e304fe68478422c1e38f9aba55dca49c0c4793eb040753d20dc3878ae1c4ad6c03b2a330b66129f1b4f7356eebf2d447c1c072ee89d890695af6e1635b8c
-  data.tar.gz: fb9b4b274462da58cc0cf5d361ccafe6c5c6929ffdcecdfc56c631322f2f9f41e2c9a84f7ee0165248c225748fb0203a82c671d7fbd9b5b12d92d4c3287bcf0d
+  metadata.gz: 0bdf3815c14962968b1da4494fb06d06118aa63c6552e7f3e6bfaa772bdba555ce4ea1322f7f8de05ac27ae39e593c5cba34a5c92e32a8ef30e3e90edf442d3b
+  data.tar.gz: 3ebaa6ad4579da36b8cfacc35fe919ecbfe455bb6c76401e1ac273761210ea3dcb79965f60296ca5c3592ced9a318e362c5a075fd92883698189803b148891b9

data/bin/habridge/com.habridge.plist

@@ -9,7 +9,7 @@
     <string>java</string>
     <string>-jar</string>
     <string>-Dconfig.file=/Users/RPM/habridge/data/habridge.config</string>
-    <string>/Users/RPM/habridge/ha-bridge-3.5.1.jar</string>
+    <string>/Users/RPM/habridge/ha-bridge.jar</string>
   </array>
   <key>RunAtLoad</key>
   <true/> 

data/bin/src/Savant.rb

@@ -1,10 +1,3 @@
-# TO DO
-
-# INSTALL PASSWORD PROMPT
-# ADD MENU ITEM FOR DEBUG?
-# PACKAGE INSTALLER
-
-
 require 'rubygems'
 require 'net/http'
 require 'net/scp'
@@ -163,6 +156,7 @@ class Savant
 					ssh.exec!("mkdir -p /Users/RPM/habridge/")
 					path = File.expand_path("..",__dir__)
 					ssh.scp.upload!(path + "/habridge/", '/Users/RPM/', :recursive => true)
+					ssh.exec!("sed -i '' 's/192.168.77.40/" + @savantURL + "/' /Users/RPM/habridge/data/habridge.config")
 					ssh.exec!("mv /Users/RPM/habridge/com.habridge.plist /Users/RPM/Library/LaunchAgents/")
 					ssh.exec!("mv /Users/RPM/habridge/com.SCLI_HTTP.plist /Users/RPM/Library/LaunchAgents/")
 					@builder["installStatus"].label += "\nFiles copied!\n\nInstalling Homebrew on Host...this might take a minute.\n"
@@ -299,7 +293,7 @@ class Savant
 		end
 	end
 	
-	##### Repeat install process in reverse for uninstall. BUG: Java uninstall can be flaky an might fail. #####
+	##### Repeat install process in reverse for uninstall. BUG: Java uninstall can be flaky and might fail. #####
 	def buttonHelpUninstall__clicked(*argv)
 		if IPAddress.valid? @savantURL
 			if is_port_open?(@savantURL,"11263")
@@ -388,9 +382,9 @@ class Savant
 					ssh.loop	
 					@builder["installStatus"].label += "\nRemoving Files..."
 					clear_events()
-					ssh.exec!("rm –Rf /Users/RPM/habridge/")
-					ssh.exec!("rm -f /Users/RPM/habridge/com.habridge.plist /Users/RPM/Library/LaunchAgents/")
-					ssh.exec!("rm -f /Users/RPM/habridge/com.SCLI_HTTP.plist /Users/RPM/Library/LaunchAgents/")
+					ssh.exec!("rm –R ~/habridge")
+					ssh.exec!("rm -f ~/Library/LaunchAgents/com.habridge.plist")
+					ssh.exec!("rm -f ~/Library/LaunchAgents/com.SCLI_HTTP.plist")
 					@builder["installStatus"].label += "Files removed!\n\n"
 					clear_events()
 					@builder["installStatus"].label += "Uninstallation complete.\n\n"
@@ -481,6 +475,12 @@ class Savant
 			
 	end
 	
+	#####  								   #####
+	##### 			IP FIltering		   #####
+	##### 		(not yet implemented)	   #####
+	
+
+	
 	##### 						 													  #####
 	##### Add command(s) to HA Bridge, first parsing for errors and needed parameters #####
 	##### 						 													  #####

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: savant-echo
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Corey Miller
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -1925,7 +1925,7 @@ files:
 - bin/habridge/com.SCLI_HTTP.plist
 - bin/habridge/com.habridge.plist
 - bin/habridge/data/habridge.config
-- bin/habridge/ha-bridge-3.5.1.jar
+- bin/habridge/ha-bridge.jar
 - bin/packaging/vendor/ruby/2.2.0/gems/atk-3.1.0/ext/atk/extconf.rb
 - bin/packaging/vendor/ruby/2.2.0/gems/atk-3.1.0/extconf.rb
 - bin/packaging/vendor/ruby/2.2.0/gems/atk-3.1.0/lib/atk.rb