savant-scenes 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e1e18993338df2f5af7ecf72cefd29641b6cf60d
-  data.tar.gz: b7cbed0345fbb29bc73ab0fd0c1bd957ad746b9a
+SHA256:
+  metadata.gz: 9a9b583febd68125774253935e34fecc64ead4849da89582c1550ac26c831e78
+  data.tar.gz: d02852ca0739a348d8ff4a7fbcc3843dc446af90cfc2da79b4356ba57296df82
 SHA512:
-  metadata.gz: b7b467d85c69a312edf819654cfc6171a15449fbd1966f2c781c72c59cd3634406ba1e4a9fc27e8765f311e0a2aef9574dd1deebb8c55ecb9e72978a54d8a428
-  data.tar.gz: 96c60c822028ac53c44ac22059ae3185d712e03d8dba366d8445e9d5d3696e8d40520cffbd390b8278a1a79b7dd4b93343dda974c2ae134ea0089a9ae7f95eac
+  metadata.gz: 1a52654ffb95eefb5e34823fb42e4e6d7229d4e474801e244ada5af5be504e8a9f1572712fc97c999424d79244a8c0f17e8f16a50375c71f83e6d3e936fafe75
+  data.tar.gz: ec880bdd7db5c68aff6552f3ffb95e578f18f6c2754729d0a3bcfc1a61f037567b5f77d8d0ed7f824f4e11f5025651a5e548f0db3b80d4f7cac4fe13acd4192a

data/bin/src/SceneManager.rb

@@ -46,7 +46,7 @@ class SceneManager
 			text.include?("@") && text.include?(".") && text.split(/[@,.]/).length == 3 && suffix.chr == "."
 		}
 		
-		#Validate id change to allow it to be copied for Bluepritn entry, but not actually changed
+		#Validate id change to allow it to be copied for Blueprint entry, but not actually changed
 		@listviewSavantScenes.renderer(:id).validate_block = Proc.new { |text, model_sym, row, view|
 			text == "this is never going to validate"
 		}
@@ -122,7 +122,7 @@ class SceneManager
 	def savantVersion?(ip)
 		begin
 			@builder["labelHostInfo"].label = ""
-			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
 				ssh.open_channel do |ch, success|
 					ch.exec("uname")
@@ -144,15 +144,15 @@ class SceneManager
 				if @scliBridge == "~/Applications/RacePointMedia/sclibridge "
 					ssh.open_channel do |ch, success|
 						
-						ch.exec("plutil -p 'library/application support/racepointmedia/statusfiles/scscredentials.plist'")
+						ch.exec("plutil -p 'library/application support/racepointmedia/rpmSystemInfo.plist'")
 						ch.on_data do |ch, data|
-							if data.to_s.include? 'savantcs.com'
-								x = data.split(%q{"name" => "})
+
+								x = data.split(%q{"RPMSystemName" => "})
 								x = x[1].split(%q{"})
 								@savantHostName = x[0]
 								@str = @scliBridge + "readstate \'" + @savantHostName + ".SoftwareVersion\'"
 								@savantHostVersion = ssh.exec!(@str)
-							end
+
 						end
 						ch.on_extended_data do |ch, type, data|
 							alert "Error: #{data.inspect}"
@@ -161,25 +161,47 @@ class SceneManager
 					ssh.loop
 				#parse the scscredentials.plist from the smart host to get host name and then version
 				elsif @scliBridge == "source ~/.zshrc && /usr/local/bin/sclibridge "
-					ssh.open_channel do |ch, success|
-						ch.exec("strings 'GNUstep/Library/ApplicationSupport/RacePointMedia/statusfiles/scsCredentials.plist'")
-						ch.on_data do |ch, data|
-							if data.to_s.include? 'savantcs.com'
-								x = data.split("name</key>")
-								x = x[1].split(%q{</string>})
-								x = x[0].split(%q{<string>})
-								@savantHostName = x[1]
-
-								@str = @scliBridge + "readstate \'" + @savantHostName + ".SoftwareVersion\'"
-								@savantHostVersion = ssh.exec!(@str)
-							end
-						end
-
-						ch.on_extended_data do |ch, type, data|
-							alert "Error: #{data.inspect}"
-						end
+					# 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
-					ssh.loop
+					@savantHostVersion = ssh.exec!(@str)		
+					if @savantHostVersion.include?("Deallocating")
+						tmpArray = @savantHostVersion.split("\n")
+						@savantHostVersion = tmpArray[2].chomp	
+					end
+					
+					
+					
+					
+					
+					# ssh.open_channel do |ch, success|
+# 						ch.exec("strings 'GNUstep/Library/ApplicationSupport/RacePointMedia/rpmSystemInfo.plist'")
+# 						ch.on_data do |ch, data|
+# 								puts data
+# 
+# 								x = data.split("RPMUserDefinedName</key>")
+# 								puts x
+# 								x = x[1].split(%q{</string>})
+# 								x = x[0].split(%q{<string>})
+# 								@savantHostName = x[1]
+# 
+# 								@str = @scliBridge + "readstate \'" + @savantHostName + ".SoftwareVersion\'"
+# 								@savantHostVersion = ssh.exec!(@str)
+# \
+# 						end
+# 
+# 						ch.on_extended_data do |ch, type, data|
+# 							alert "Error: #{data.inspect}"
+# 						end
+# 					end
+# 					ssh.loop
 
 				end	
 			end
@@ -196,7 +218,7 @@ class SceneManager
 		end
 	end
 	
-	#Enter key scans for hsot from IP address field
+	#Enter key scans for host from IP address field
 	def savantURL__key_press_event(view, evt)
   		return unless evt.keyval == 65293
   		buttonScanHost__clicked()
@@ -223,7 +245,7 @@ class SceneManager
 			begin
 				savantVersion?(@savantURL)
 				@listviewSavantScenes.model.clear
-				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 #{@dis} ] && echo 'true' || echo 'false'")
 					unless fileExists == 'false'
@@ -265,7 +287,7 @@ class SceneManager
 	#Transfer database from tmp folder to remote host
 	def updateDatabase()
 		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|
 				fileExists = ssh.exec!("[ -f #{@dis} ] && echo 'true' || echo 'false'")
 				unless fileExists == 'false'
 					ssh.scp.upload!('/tmp/dashboard.sqlite', @dis.chomp("dashboard.sqlite"))
@@ -291,7 +313,7 @@ class SceneManager
 			if row[:modify]
 				@str = @scliBridge + "activateScene \'" + row[:scene] + "\' \'" + row[:id] + "\' \'" + row[:user] + "\'"
 				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|
 						ssh.exec!(@str)		
 						alert("Scene activated: #{row[:scene]}", :parent => self)
 					end
@@ -338,7 +360,6 @@ class SceneManager
 					stm.bind_param 3, id
 					stm.execute
 					stm.close
-
 					count += 1
 				end
 				updateDatabase()
@@ -411,7 +432,7 @@ class SceneManager
 		#Check that folder contains correct files
 		if File.file?(backupDir + "/dashboard.sqlite")
 			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 #{@dis.chomp("dashboard.sqlite")} ] && echo 'true' || echo 'false'")
 					if dirExists
@@ -438,7 +459,7 @@ class SceneManager
 			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 #{@dis} ] && echo 'true' || echo 'false'")
 				unless fileExists == 'false'
@@ -497,7 +518,7 @@ class SceneManager
 		@builder["windowLoading"].show
 		begin
 			@listviewAdvanced.model.clear
-			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
 				if @scliBridge == "~/Applications/RacePointMedia/sclibridge "
 					@dis = "/Users/RPM/Library/Application Support/RacePointMedia/statusfiles/eventHistory.sqlite"
@@ -538,7 +559,7 @@ class SceneManager
 		@builder["windowLoading"].show
 		begin
 			@listviewAdvanced.model.clear
-			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
 				if @scliBridge == "~/Applications/RacePointMedia/sclibridge "
 					@dis = "/Users/RPM/Library/Application Support/RacePointMedia/statusfiles/eventHistory.sqlite"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: savant-scenes
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Corey Miller
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 2.4.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Savant Scene Manager