jssh 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 802cfe834425216c50891414dec0f5a71b4c6498
-  data.tar.gz: bca4531307cf24e4c6b654cd7c0a791b0acf8672
+  metadata.gz: dd8ac63db606331d0c105e6e284e684a31634683
+  data.tar.gz: e4033249bf64dd46edf79457b33397e1a9039b40
 SHA512:
-  metadata.gz: 4e7e49858f77e2d1d164d257a1197be768bbab91090a4650dbe811663c9b9d8b0bb944f6f16b268654b77f913bd399dd19b6bfc27b5b56a9d472fd226a82413c
-  data.tar.gz: dadbd6e0b570a80dd86568bbd5faccd83a30258a57a086333e5cb57358de33864b4938a418cbd8f8aee22c9df1e4503991bc8306529706ae44328527db03d648
+  metadata.gz: 593a5f5473b552ea2e9e350abbbf4a6b84570fa9f6de8cd540ced58c5718a76218078cfd574b03bac1758645f992e5ecab2569cfbba476ea597c19acb211d042
+  data.tar.gz: bff5756a0b8b6431585bd63a95bc9c9788f7d6193ed254a2b513c23de80597ade2882e3a5adb8de7168035b1d07cf651e32f3f3475a60868e1fb1e4dcf9b27f2

data/bin/jssh

@@ -2,42 +2,10 @@
 require 'net/ssh'
 require 'optparse'
 require 'yaml'
-
-class String
-    def to_black
-        "\033[30m#{self}\033[0m"
-    end
-    def to_red
-        "\033[31m#{self}\033[0m"
-    end
-    def to_yellow
-        "\033[33m#{self}\033[0m"
-    end
-    def to_blue
-        "\033[34m#{self}\033[0m"
-    end
-    def to_white
-        "\033[37m#{self}\033[0m"
-    end
-    def to_green
-        "\033[32m#{self}\033[0m"
-    end
-    def to_cyan
-        "\033[36m#{self}\033[0m"
-    end
-    def to_magenta
-        "\033[35m#{self}\033[0m"
-    end
-    def to_bold
-        "\033[1m#{self}\033[0m"
-    end
-    def to_underline
-        "\033[4m#{self}\033[0m"
-    end
-end
+require "jssh"
 
 options = {}
-OptionParser.new do |opts|
+op=OptionParser.new do |opts|
   opts.banner = "Usage: jssh [options]"
   opts.on("-f file","--hostfile file", "host file, every host occupy a line") do |v|
     options[:hostfile] = v
@@ -61,6 +29,9 @@ OptionParser.new do |opts|
   opts.on("-b","--break", "pause after first operation") do |v|
     options[:pause] = v
   end
+  opts.on("-g gsize","--groupsize gsize",OptionParser::OctalInteger, "The size of parallel group, default is 10") do |v|
+    options[:gsize] = v 
+  end
   opts.on("-c cmdfile","--cmdfile cmdfile", "script path") do |v|
     options[:cmdfile] = v
     unless File.exists? v
@@ -68,6 +39,9 @@ OptionParser.new do |opts|
 	exit
     end
   end
+  opts.on("-o outputfile","--output outputfile", "output file") do |v|
+    options[:output] = v
+  end
   opts.on("--help", "help") do |v|
       puts opts
       exit
@@ -75,7 +49,12 @@ OptionParser.new do |opts|
   opts.on("--debug", "debug inputs") do |v|
       options[:debug]=v
   end
-end.parse!
+end
+begin op.parse!
+rescue => e
+    puts e.to_s.to_red
+    exit
+end
 
 # If neither the rsa file or password specified, go get rsa file in home directory
 unless options[:key] || options[:password]
@@ -100,75 +79,9 @@ if options[:debug]
     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]
-
-class Jssh
-	attr_accessor :hosts,:user, :auth_cfg, :cmd, :printer
-    
-	def initialize
-		@auth_cfg={}
-        self.printer=:on
-		@queue=Queue.new
-	end
-    def messages
-        @queue
-    end
-    
-	def go(from=0,len=nil)
-		len||=self.hosts.size
-        to=from+len-1
-		password=self.auth_cfg[:password]
-        keys=[self.auth_cfg[:key]].reject{|x| x.nil?}
-		self.hosts[from..to].each_with_index do |host,i|
-            result=""
-			begin
-			Net::SSH.start(host,self.user,:keys=>keys,:password=>password) do |ssh|
-				result=ssh.exec!(self.cmd)
-			end
-			rescue=>e
-				result=e.to_s
-			end
-			yield host,result if block_given?
-		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).to_yellow+"\n"+r
-                    rssh.messages.push output
-                end
-			end
-		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
-		gcnt.times do |i|
-			from,len=i*gsize,gsize
-			len=total%gsize if i==gcnt-1
-			yield from,len
-		end
-	end
-end
+lambda{puts "No command or command file specify".to_red;exit}.call unless options[:cmdfile] || options[:command]
+lambda{puts "Please specify the user".to_red;exit}.call unless options[:user]
+lambda{puts "Please specify the rsa file or password".to_red;exit}.call unless options[:key] || options[:password]
 
 rs=Jssh.new
 if options[:hostfile]
@@ -176,6 +89,9 @@ if options[:hostfile]
 else
 	orig_hosts=options[:hostlist].split(",")
 end
+
+rs.printer=Printer.new(FileExecutor.new(options[:output])) if options[:output]
+
 rs.user=options[:user]
 rs.auth_cfg[:password]=options[:password]
 rs.auth_cfg[:key]=options[:key]
@@ -190,6 +106,7 @@ unless options[:pause]
     puts "Finished!".to_green
     exit
 end
+
 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
@@ -212,7 +129,10 @@ print "Continue to finish all the left operations by parallel(p) or serial(s), [
 ans=$stdin.gets.chomp
 rs.hosts=orig_hosts[1..-1]
 if ans.downcase=='p'
-	rs.execute
+    options[:gsize]= rs.hosts.size/100 if options[:gsize].nil? || rs.hosts.size/options[:gsize]>100 || options[:gsize]<1
+    gs=options[:gsize]==0 ? 1 : options[:gsize] 
+    rs.printer.instant=false
+	rs.execute 0,nil,gs
 else
 	rs.execute 0,nil,rs.hosts.size
 end

data/lib/jssh.rb

@@ -1,5 +1,74 @@
 require "jssh/version"
+require "jssh/printer"
+require 'jssh/string'
 
-module Jssh
-  # Your code goes here...
+class Jssh
+	attr_accessor :hosts,:user, :auth_cfg, :cmd, :printer
+    
+	def initialize
+		@auth_cfg={}
+        self.printer=Printer.new(StdoutExecutor.new)
+		@queue=Queue.new
+	end
+    def messages
+        @queue
+    end
+    
+	def go(from=0,len=nil)
+		len||=self.hosts.size
+        to=from+len-1
+		password=self.auth_cfg[:password]
+        keys=[self.auth_cfg[:key]].reject{|x| x.nil?}
+		self.hosts[from..to].each_with_index do |host,i|
+			begin
+			Net::SSH.start(host,self.user,:keys=>keys,:password=>password) do |ssh|
+				result=ssh.exec!(self.cmd) || ''
+				ssh.exec!(self.cmd) do |ch,stream,data|
+                    data||=''
+                    yield host,data,false if block_given?
+                end
+			end
+			rescue=>e
+                result=e.to_s
+			end
+            result||=''
+            yield host,result,true  if block_given?
+		end
+	end
+	def execute(from=0,len=nil,group_size=1)
+        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,over|
+                    rssh.messages.push({'host'=>h,'content'=>r,'finished'=>over})
+                end
+			end
+		end	
+        threads.each{|t| t.join}
+        loop{ break if self.printer.finished? }
+        Thread.kill pr
+	end
+
+	private
+    def start_printer(jssh)
+        jssh.printer.submit_jobs(jssh.hosts)
+		Thread.new(jssh) do |rssh|
+            while true
+			    data=rssh.messages.pop
+				rssh.printer.print data['host'],data['content'],data['finished']
+			end
+		end
+    end
+	def divider(total,gsize)
+		gcnt=total/gsize
+		gcnt=gcnt+1 if total%gsize!=0
+		gcnt.times do |i|
+			from,len=i*gsize,gsize
+			len=total%gsize if i==gcnt-1 && total%gsize!=0
+			yield from,len
+		end
+	end
 end

data/lib/jssh/printer.rb

@@ -0,0 +1,45 @@
+class Printer
+    attr_accessor :instant
+    def initialize(executor)
+        self.instant=true
+        @executor=executor
+    end
+    def submit_jobs(hosts)
+        @memo={}
+        hosts.each{|j| @memo[j]=nil }
+    end
+    def print(host,content,is_end)
+        if self.instant
+            lambda{ @executor.puts ("="*20+host+"="*20).to_yellow; @memo[host]='' }.call unless @memo[host]
+            @executor.puts content if content
+            @memo.delete host if is_end
+        else
+            @memo[host]=("="*20+host+"="*20).to_yellow+"\n"  unless @memo[host]
+            @memo[host] << content if content
+            lambda{ @executor.puts @memo[host]; @memo.delete host }.call if is_end
+        end
+    end
+    def finished?
+        @memo.empty?
+    end
+end
+
+class StdoutExecutor
+    def puts(str)
+        $stdout.puts str
+    end
+end
+class FileExecutor
+    def initialize(filename)
+        @file=File.open(filename,'a')
+    end
+    def puts(str)
+        @file.puts str
+    end
+end
+class NullExecutor
+    def puts(str)
+        #Do nothing
+    end
+end
+

data/lib/jssh/string.rb

@@ -0,0 +1,23 @@
+class String
+    def to_black
+        "\033[30m#{self}\033[0m"
+    end
+    def to_red
+        "\033[31m#{self}\033[0m"
+    end
+    def to_yellow
+        "\033[33m#{self}\033[0m"
+    end
+    def to_blue
+        "\033[34m#{self}\033[0m"
+    end
+    def to_white
+        "\033[37m#{self}\033[0m"
+    end
+    def to_green
+        "\033[32m#{self}\033[0m"
+    end
+    def to_cyan
+        "\033[36m#{self}\033[0m"
+    end
+end

data/lib/jssh/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jssh
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - qjpcpu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,8 @@ files:
 - bin/jssh
 - jssh.gemspec
 - lib/jssh.rb
+- lib/jssh/printer.rb
+- lib/jssh/string.rb
 - lib/jssh/version.rb
 homepage: https://github.com/qjpcpu/jssh
 licenses: