savant-echo 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 16b0cb3fdff0294e0f8655c9445fa4c55a78df50
-  data.tar.gz: 92227adeed112f8ea3dd2dc645ec464a95cf587a
+SHA256:
+  metadata.gz: 8cc4bd34ec332e241f05be05e3057e7162f7edab22db6db4d2ff95de6501d81e
+  data.tar.gz: 0aabb5a062552499d3be527782ece7c4059820a0cea58a690b442dc9cff600a3
 SHA512:
-  metadata.gz: 5229747110247cec4d58be9d4529516ca98ceb5d8db530d893d6d27c813dc473559209952a9aaa8f189cef9cc09dab94dfcdbc4f00fd75d22a9397ed1d5809c8
-  data.tar.gz: 68471853a9cdf144e291ac565ec77d5814e34b852650162ac419d44851b050346a147a734c777325fc15018d4c5b9aa153a7385c2537754632e1720ce1d727ef
+  metadata.gz: 2ceef65f1ffebf4753a11d48928292da59db518c2daa8edaa71fd9d5c50e5a6ca8cdb24095210175651921dbcdb581db14a74f918a36902d10bbf01bef704af8
+  data.tar.gz: c07e61b949661b51e95759ca6c5389e356a735d0cb455dfda2cdcd93dce6ce98c8e147d2b3f7c0ce006ed35f4b860e433c3f9a057dc03d6ec957403c3cfed0cf

data/bin/src/Savant.rb

@@ -78,10 +78,10 @@ class Savant #< VR::ListView
 				
 					@builder["buttonHabridgeStatus"].label = "HA Bridge is Online\nClick to open in browser."
 					@builder["buttonBackupRestore"].show
+					
 					if savantVersion?(@savantURL)
 						@builder["buttonSceneSync"].label = "Savant Scene Sync"
-					@builder["buttonSceneSync"].show
-					
+						@builder["buttonSceneSync"].show
 					end
 					@habridgeStatus = "Online"
 				end
@@ -120,11 +120,12 @@ class Savant #< VR::ListView
 		login = 'RPM'
 		@password = 'RPM'
 		begin
-			Net::SSH.start(ip, login, :password => @password, :paranoid => false, :timeout => 3) do |ssh|
+			Net::SSH.start(ip, login, :password => @password, :verify_host_key => :never, :timeout => 3) do |ssh|
 				#Check host type and update sclibridge location for reference, though only Pro Host is supported
 				ssh.open_channel do |ch, success|
 					ch.exec("uname")
 					ch.on_data do |ch, data|
+						puts data
 						if data.to_s.include? 'Darwin'
 							@scliBridge = "~/Applications/RacePointMedia/sclibridge "
 						else
@@ -149,22 +150,17 @@ class Savant #< VR::ListView
 					ssh.loop
 				#parse the rpmSystemInfo.plist from the smart host to get host name
 				elsif @scliBridge == "/usr/local/bin/sclibridge "
-					ssh.open_channel do |ch, success|
-						ch.exec("strings 'GNUstep/Library/ApplicationSupport/RacePointMedia/userConfig.rpmConfig/rpmSystemInfo.plist'")
-						ch.on_data do |ch, data|
-							if data.to_s.include? 'DOCTYPE'
-								x = data.split("RPMUserDefinedName</key><string>")
-								y = x[1].split("</string>")
-								x = x[1].split("VERSION</key><integer>")
-								x = x[1].split("</integer>")
-							elsif data.to_s.include? 'module'
-								x = data.split('module')
-								x = x[1].split("\n")
-								@str = @scliBridge + "readstate \"" + x[0][1..-1] + ".SoftwareVersion\""
-							end
-						end
-					end
-					ssh.loop
+					# test to see if remote files exist and transfer them if they do
+					fileExists = ssh.exec!("[ -f 'GNUstep/Library/ApplicationSupport/RacePointMedia/rpmSystemInfo.plist' ] && echo 'true' || echo 'false'")
+					unless fileExists == 'false'
+						ssh.scp.download!('GNUstep/Library/ApplicationSupport/RacePointMedia/rpmSystemInfo.plist', '/tmp/')
+						x = `plutil -p /tmp/RPMSystemInfo.plist`
+						x = x.split(%q{"RPMSystemName" => "})
+						x = x[1].split(%q{"})
+						@savantHostName = x[0]
+						@str = @scliBridge + "readstate \'" + @savantHostName + ".SoftwareVersion\'"
+					end					
+					alert "Only Pro Hosts are supported."
 				end
 				#Use host name to query SoftwareVersion state from host
 				ssh.open_channel do |ch, success|
@@ -174,9 +170,18 @@ class Savant #< VR::ListView
 					end
 				end
 				ssh.loop
+				if @version.include?("Deallocating")
+						tmpArray = @version.split("\n")
+						@version = tmpArray[2].chomp	
+				end
 			end
+			puts "Host version: " + @version
 			#return true if version is 8.3 or later
-			if @version.to_r > 8.2 && !@version.empty?
+			if @version.include?("-")
+				tmpArray = @version.split("-")
+				@version = tmpArray[0].chomp
+			end
+			if Gem::Version.new(@version) > Gem::Version.new('8.2.0')  && !@version.empty?
 				return true
 			else
 				return false
@@ -261,7 +266,7 @@ class Savant #< VR::ListView
 		#Check that folder contains correct files
 		if File.file?(backupDir + "/device.db") && File.file?(backupDir + "/habridge.config")
 			begin
-				Net::SSH.start(@savantURL, login, :password => @password, :paranoid => false, :timeout => 3) do |ssh|
+				Net::SSH.start(@savantURL, login, :password => @password, :verify_host_key => :never, :timeout => 3) do |ssh|
 					# test to see if remote folder exists, if so, transfer files and restart harbridge
 					dirExists = ssh.exec!("[ -d ~/habridge/data ] && echo 'true' || echo 'false'")
 					if dirExists == 'true'
@@ -291,7 +296,7 @@ class Savant #< VR::ListView
 			backupDir = File.dirname(backupDir)
 		end
 		begin
-			Net::SSH.start(@savantURL, login, :password => @password, :paranoid => false, :timeout => 3) do |ssh|
+			Net::SSH.start(@savantURL, login, :password => @password, :verify_host_key => :never, :timeout => 3) do |ssh|
 				# test to see if remote files exist and transfer them if they do
 				fileExists = ssh.exec!("[ -f ~/habridge/data/device.db ] && echo 'true' || echo 'false'")
 				if fileExists == 'true'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: savant-echo
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Corey Miller
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -75,22 +75,22 @@ dependencies:
   name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: Savant Integration with Amazon Echo
 email: cmiller@premieresystems.com
 executables:
@@ -127,8 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: nowarning
-rubygems_version: 2.4.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Savant Alexa