sshx 0.1.0 → 0.1.1

data/lib/sshx/cli.rb

@@ -9,7 +9,8 @@ module Sshx
 			@@namespace_separator = '.'
 			@@enable_alias = true
 			@@ssh_path = `which ssh`
-			@@temporary_config_path = '/tmp/sshx_config'
+			@@ssh_config_path = @@home_directory + '/.ssh/config'
+			@@sshx_config_path = @@home_directory + '/.sshx/config'
 			def start(args = ARGV)
 
 				if !init()
@@ -17,6 +18,7 @@ module Sshx
 				end
 
 				load_config()
+				make_ssh_config()
 
 				if args.length == 0
 					puts 'sshx is just a wrapper of ssh.'
@@ -24,11 +26,8 @@ module Sshx
 				return
 				end
 
-				make_temporary_config()
-
 				if args.length == 2 && args[0] == 'init' && args[1] == '-'
 					puts make_commands().join("\n")
-					remove_temporary_config()
 				return
 				end
 
@@ -37,11 +36,9 @@ module Sshx
 					shell_args.push(arg.shellescape)
 				}
 
-				system(@@ssh_path + ' ' + shell_args.join(' ') + ' -F ' + @@temporary_config_path)
+				system(@@ssh_path + ' ' + shell_args.join(' '))
 				status = $?.exitstatus
 
-					remove_temporary_config()
-
 				exit status
 
 			end
@@ -67,7 +64,7 @@ module Sshx
 				puts 'Import ssh config file...'
 
 				Dir.mkdir(@@home_directory + '/.sshx')
-				FileUtils.symlink(@@home_directory + '/.ssh/config', @@home_directory + '/.sshx/ssh_config')
+				FileUtils.cp(@@home_directory + '/.ssh/config', @@home_directory + '/.sshx/ssh_config')
 
 				puts 'Make config file...'
 
@@ -75,7 +72,6 @@ module Sshx
 					file.puts('NamespaceSeparator ' + @@namespace_separator)
 					file.puts('EnableAlias ' + (@@enable_alias?'true':'false'))
 					file.puts('SshPath ' + @@ssh_path)
-					file.puts('TemporaryConfigPath ' + @@temporary_config_path)
 				}
 
 				puts 'Edit .bashrc file...'
@@ -114,6 +110,8 @@ module Sshx
 				file = open(@@home_directory + '/.sshx/config')
 				while line = file.gets
 
+					line = line.chomp
+
 					matches = line.scan(/NamespaceSeparator\s+([^\s]*)/i)
 					if matches.length > 0
 					@@namespace_separator = matches[0][0]
@@ -132,22 +130,24 @@ module Sshx
 					next
 					end
 
-					matches = line.scan(/TemporaryConfigPath\s+([^\s]*)/i)
-					if matches.length > 0
-					@@temporary_config_path = matches[0][0]
-					next
-					end
-
 				end
 				file.close
 
 			end
 
-			def make_temporary_config()
+			def make_ssh_config()
 
 				@@home_directory = File.expand_path('~')
 
 				configs = []
+
+				configs.push('#############################################################')
+				configs.push('# CAUTION!')
+				configs.push('# This config is auto generated by sshx')
+				configs.push('# You cannot edit this file. Edit ~/.sshx/ssh_config insted.')
+				configs.push('#############################################################')
+				configs.push('')
+
 				Dir::foreach(@@home_directory + '/.sshx/') {|file_path|
 
 					if /^\./ =~ file_path
@@ -164,6 +164,8 @@ module Sshx
 
 					while line = file.gets
 
+						line = line.chomp
+
 						matches = line.scan(/Namespace\s+([^\s]+)/i)
 						if matches.length > 0
 						namespace = matches[0][0]
@@ -182,29 +184,28 @@ module Sshx
 
 				}
 
-				file = open(@@temporary_config_path, 'w')
+				file = open(@@ssh_config_path, 'w')
 				file.write(configs.join("\n"))
 				file.close
 
 			end
 
-			def remove_temporary_config()
-
-				File.unlink(@@temporary_config_path)
-
-			end
-
 			def get_hosts()
 
 				hosts = []
 
-				open(@@temporary_config_path) {|file|
+				open(@@ssh_config_path) {|file|
 					while line = file.gets
+
+						line = line.chomp
+
 						matches = line.scan(/Host\s+([^\s]+)/i)
 						if matches.length == 0
 						next
 						end
+
 						hosts.push(matches[0][0])
+
 					end
 				}
 

data/lib/sshx/version.rb

@@ -1,3 +1,3 @@
 module Sshx
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sshx
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies: []
 description: Extended ssh command to use multi ssh_config, namespace and command completion.
 email: kataoka@sirok.co.jp