jssh 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c537fc623582c56e6324e18cb8d6c18e496109b4
-  data.tar.gz: 3db80a7f5038a1a84de106ad96ef65e80027c5bc
+  metadata.gz: 802cfe834425216c50891414dec0f5a71b4c6498
+  data.tar.gz: bca4531307cf24e4c6b654cd7c0a791b0acf8672
 SHA512:
-  metadata.gz: f9a9c26b683fa6f4fa4f1e98531f4bc0934497c7d8ed2cba3db7e146d512204cbfb16c27de9255b54da51a3cee2a6a8b550208989fd79f1cf1500fa20f7ff74f
-  data.tar.gz: 05e5cbd8b1e2ba7c541aae76e28aa4d7f58e4d8adec55069c4228d6024844520dbcc44589de2ae74f3e234d20eb1a0da522d95c7d1e82252ccf205bc8b8ca40c
+  metadata.gz: 4e7e49858f77e2d1d164d257a1197be768bbab91090a4650dbe811663c9b9d8b0bb944f6f16b268654b77f913bd399dd19b6bfc27b5b56a9d472fd226a82413c
+  data.tar.gz: dadbd6e0b570a80dd86568bbd5faccd83a30258a57a086333e5cb57358de33864b4938a418cbd8f8aee22c9df1e4503991bc8306529706ae44328527db03d648

data/README.md

@@ -1,6 +1,6 @@
 # Jssh
 
-TODO: Write a gem description
+Jssh is a batch ssh tool, which OP would like.
 
 ## Installation
 
@@ -18,7 +18,60 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Simple Usage:
+
+	$ jssh -f hosts -u jason -p jason  'hostname'
+	====================172.16.39.139====================
+	localcentos.vm
+	====================192.168.42.136====================
+	localcentos.vm
+	Finished!
+	
+The hosts is a hosts file which lists every host per line like:
+
+172.16.39.139
+
+192.168.42.136
+
+If you have configured the trusted relationship with each host, you can simply use:
+
+	$ jssh -f hosts -u jason 'hostname' 
+	
+Go further, if you place a file `~/.jsshrc`,and the content is:
+
+	keyfile: /home/USER/.ssh/id_rsa
+	user: jason
+	
+Then you can get more easier:
+
+	$ jssh -f hosts  'hostname' 
+	
+And, if you place multiple commands in a script such as `/path/to/script`, you can use like:
+
+	$ jssh -f hosts -c /path/to/script 
+	
+At last, I think this is very charming for OP, we can use a batch tool with pause. Just use the `-b or --break` option:
+
+	$ jssh -f hosts  'hostname' -b
+	
+After the operation of the first host is done, the jssh can auto login to the first host, which lets us can check our operation is ok.
+
+	====================172.16.39.139====================
+	localcentos.vm
+	Now the operations on the first host is completed, we're going to it for a check.
+	Press ENTER to automatic to login 172.16.39.139 ...
+	
+	Last login: Sat Mar 29 00:57:07 2014 from 172.16.39.1
+	jason@localcentos:~
+	
+After you finish check, `exit` back to jssh, we can choose to parallel or serial to finish the left operations, or just `Ctrl+C` to exit.
+
+	Continue to finish all the left operations by parallel(p) or serial(s), [p/s] p
+	====================192.168.42.136====================
+	localcentos.vm
+	Finished!
+	
+At last, type `jssh --help` for more help.
 
 ## Contributing
 

data/bin/jssh

@@ -42,7 +42,7 @@ OptionParser.new do |opts|
   opts.on("-f file","--hostfile file", "host file, every host occupy a line") do |v|
     options[:hostfile] = v
     unless File.exists? v
-	puts "host file doesn't exists!".to_red
+    	puts "host file doesn't exists!".to_red
 	exit
     end
   end
@@ -58,16 +58,13 @@ OptionParser.new do |opts|
   opts.on("-i keyfile", "the ssh id_rsa file") do |v|
     options[:key] = v
   end
-  opts.on("--nopause", "no pause for first operation") do |v|
-    options[:nopause] = v
+  opts.on("-b","--break", "pause after first operation") do |v|
+    options[:pause] = v
   end
-  opts.on("-c commands","--command commands", "commands") do |v|
-    options[:command] = v
-  end
-  opts.on("-C cmdfile","--cmdfile cmdfile", "script path") do |v|
+  opts.on("-c cmdfile","--cmdfile cmdfile", "script path") do |v|
     options[:cmdfile] = v
     unless File.exists? v
-	puts "command file doesn't exists!".to_red
+    	puts "command file doesn't exists!".to_red
 	exit
     end
   end
@@ -75,7 +72,12 @@ OptionParser.new do |opts|
       puts opts
       exit
   end
+  opts.on("--debug", "debug inputs") do |v|
+      options[:debug]=v
+  end
 end.parse!
+
+# If neither the rsa file or password specified, go get rsa file in home directory
 unless options[:key] || options[:password]
     if File.exists? ENV['HOME']+"/.jsshrc"
         config=YAML::load_file(ENV['HOME']+"/.jsshrc")
@@ -85,6 +87,19 @@ unless options[:key] || options[:password]
         options[:key]||=ENV['HOME']+'/.ssh/id_rsa'
     end
 end
+
+# If no script file, read command from command line
+options[:command]=ARGV.first if ARGV.size>0 && options[:cmdfile].nil?
+
+# If no user specified, use current user
+options[:user]||=ENV["USER"]
+
+if options[:debug]
+    puts "options: ".to_green+options.to_s
+    puts "ARGV: ".to_green+ARGV.to_s
+    exit
+end
+
 lambda{puts "No command or command file specify";exit}.call unless options[:cmdfile] || options[:command]
 lambda{puts "Please specify the user";exit}.call unless options[:user]
 lambda{puts "Please specify the rsa file or password";exit}.call unless options[:key] || options[:password]
@@ -96,15 +111,11 @@ class Jssh
 		@auth_cfg={}
         self.printer=:on
 		@queue=Queue.new
-		Thread.new(self) do |rssh|
-			while true
-				puts rssh.messages.pop if rssh.printer
-			end
-		end
 	end
     def messages
         @queue
     end
+    
 	def go(from=0,len=nil)
 		len||=self.hosts.size
         to=from+len-1
@@ -123,23 +134,31 @@ class Jssh
 		end
 	end
 	def execute(from=0,len=nil,group_size=10)
+        pr=start_printer(self)
 		threads=[]
 		len||=self.hosts.size
         to=from+len-1
 		divider(self.hosts[from..to].size,group_size) do |df,dt|
 			threads<<Thread.new(self,from+df,from+dt) do |rssh,f,t|
 				rssh.go(f,t) do |h,r|
-			        output="="*20+h+"="*20+"\n"+r
+			        output=("="*20+h+"="*20).to_yellow+"\n"+r
                     rssh.messages.push output
                 end
 			end
 		end	
-		while threads.find{|t| t.alive? }
-                sleep 1
-        end
+        threads.each{|t| t.join}
+        loop{ break if self.messages.size==0 } if  self.printer 
+        Thread.kill pr
 	end
 
 	private
+    def start_printer(jssh)
+		Thread.new(jssh) do |rssh|
+			while true
+				puts rssh.messages.pop if rssh.printer
+			end
+		end
+    end
 	def divider(total,gsize)
 		gcnt=total/gsize
 		gcnt=gcnt+1 if total%gsize!=0
@@ -165,7 +184,7 @@ if options[:cmdfile]
 else
 	rs.cmd=options[:command]
 end
-if options[:nopause]
+unless options[:pause]
     rs.hosts=orig_hosts
     rs.execute 0,nil,rs.hosts.size
     puts "Finished!".to_green
@@ -175,7 +194,7 @@ rs.hosts=orig_hosts.take 1
 rs.execute
 puts "Now the operations on the first host is completed, we're going to it for a check.".to_yellow
 print "Press ENTER to automatic to login #{rs.hosts.first.to_red} ..."
-gets
+$stdin.gets
 if options[:password]
         login_to_first=%Q|expect -c 'spawn ssh #{rs.user}@#{rs.hosts.first}
 expect {
@@ -190,7 +209,7 @@ else
 end
 system(login_to_first)
 print "Continue to finish all the left operations by parallel(p) or serial(s), [p/s] ".to_yellow
-ans=gets.chomp
+ans=$stdin.gets.chomp
 rs.hosts=orig_hosts[1..-1]
 if ans.downcase=='p'
 	rs.execute

data/lib/jssh/version.rb

@@ -1,3 +1,3 @@
 module Jssh
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jssh
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - qjpcpu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler