remote_executor 0.9.2 → 0.9.3

data/bin/remote_executor

@@ -5,9 +5,4 @@ $:.unshift( File.join( File.dirname( __FILE__ ), %w[.. lib] ) )
 
 require 'loader'
 
-RemoteExecutor::CliApplication.run( 
-  Choice.choices[:config],
-  Choice.choices[:log],
-  Choice.choices[:threaded], 
-  Choice.choices[:system], 
-  Choice.choices[:commands] )
+RemoteExecutor::CliApplication.run

data/lib/remote_executor/cli_application.rb

@@ -1,58 +1,68 @@
 require 'rubygems'
+require 'choice'
 require 'mini_logger'
 require 'net/ssh'
 
 
 module RemoteExecutor
+  class SshExecutionError < StandardError
+  end
+
   ##
   # CLI Application a simple point of entry  
   class CliApplication
+    
+    DEFAULT_SSH_OPTIONS = { :config=>true }
         
-    COMMAND_SEPARATOR = ";"
-        
-        
-    def self.execute_commands( server, user, commands, ssh_options={ :config=>true } )
+    def self.execute_commands( server, user, commands, ssh_options=DEFAULT_SSH_OPTIONS )
       
       Net::SSH.start( server, user, ssh_options ) do |ssh| 
 
-        commands.split( COMMAND_SEPARATOR ).each do |command|
+        commands.each do |command|
         
           MiniLogger.debug( "Executing command #{user}@#{server} '#{command}'")
-          ssh.exec( "#{command}" ) 
-        end
+
+          channel = ssh.open_channel do |ch|
+           
+            ch.exec "#{command}" do |ch, success|
+             
+              raise SshExecutionError.new( "could not execute: #{command}" ) unless success
+
+              ch.on_data { |c, data| $stdout.print data }
+              ch.on_extended_data { |c, type, data| MiniLogger.error( "STDERR: #{data}" ) }
+
+              ch.on_close { MiniLogger.info( "done!" ) }
+            end
+          end
+
+          channel.wait
+        end      
       end
     end
     
     
-    def self.process_system( system, commands, threaded )
+    def self.run()
+         
+      MiniLogger.configure( :log_channel=>Choice.choices[:log], :log_level=>::Logger::DEBUG )
+
+      systems  = Systems.new( Choice.choices[:config] )
+      system   = systems.find_by_name( Choice.choices[:system] )
+      user     = system.user
+      commands = CommandSet.new( Choice.choices[:commands] )
       
-      if( threaded )
+      if( Choice.choices[:threaded] )
         
-        threads = []
-      
-        system.hosts.each do |server|
-          
-          threads << Thread.new( server ) { |t| execute_commands( server, system.user, commands ) }
-        end
-      
-        threads.each { |t| t.join }
+        # Launch the commands in threaded mode
+        ts = []
+        system.hosts.each { |s| ts << Thread.new( s ) { |t| execute_commands( s, user, commands ) } }
+        ts.each { |t| t.join }
       else
         
-        system.hosts.each do |server|
-          execute_commands( server, system.user, commands )
-        end
-      end
-    end
-
-
-    def self.run( systems_config, log, threaded, name, commands )
-      
-      MiniLogger.configure( :log_channel=>log, :log_level=>::Logger::DEBUG )
-      process_system( Systems.new( systems_config ).find_by_name( name ), commands, threaded )      
-    rescue SystemsFileError =>sfe
-      MiniLogger.error( sfe.message )
-    rescue SystemNotFound =>snf
-      MiniLogger.error( snf.message )
+        # Launch the commands in batch mode
+        system.hosts.each { |s| execute_commands( s, user, commands ) }
+      end              
+    rescue StandardError =>se
+      MiniLogger.error( se )
     end
   end
 end

data/lib/remote_executor/command_set.rb

@@ -0,0 +1,36 @@
+module RemoteExecutor
+  ##
+  # Command representation
+  class CommandSet
+    include Enumerable
+    
+    DEFAULT_COMMAND_SEPARATOR = ";"
+    
+    attr_reader :commands
+    
+    def self.parse( commands_str, separator=DEFAULT_COMMAND_SEPARATOR )
+      
+      commands = Array.new
+      commands_str.split( separator ).each { |command| commands << command.strip }
+      commands
+    end
+
+
+    def initialize( commands_str )
+
+      @commands = CommandSet.parse( commands_str ) if( commands_str )      
+      self
+    end
+    
+        
+    def each( &block )
+      
+      @commands.each { |command| block.call( command ) } if block_given?
+    end
+    
+    
+    def length
+      @commands.length
+    end
+  end
+end

data/lib/remote_executor/version.rb

@@ -3,7 +3,7 @@ module RemoteExecutor
     INFO = {
       :major =>0,
       :minor =>9,
-      :patch =>2
+      :patch =>3
     }  
 
     NAME   = 'remote_executor'

data/test/test_command_set.rb

@@ -0,0 +1,28 @@
+$:.unshift( File.join( File.dirname( __FILE__ ), %w[.. lib] ) )
+
+
+require 'rubygems'
+require 'shoulda'
+require 'remote_executor/command_set'
+
+
+class CommandSetTest < Test::Unit::TestCase
+  
+  context "CommandSet" do
+    
+    COMMANDSET_TEST_DATA = "command1; command2; command3"
+
+    setup do
+      @command_set = RemoteExecutor::CommandSet.new( COMMANDSET_TEST_DATA )
+    end 
+  
+    should "parse a command set" do
+      assert_equal( @command_set.commands, [ "command1", "command2", "command3" ] )
+      assert_equal( @command_set.length,   [ "command1", "command2", "command3" ].length )
+    end
+    
+    should "enumerate a command set" do
+      assert_equal( @command_set.length, 3 )
+    end
+  end
+end

data/test/test_system.rb

@@ -1,6 +1,5 @@
 $:.unshift( File.join( File.dirname( __FILE__ ), %w[.. lib] ) )
 
-#require 'test/unit'
 require 'rubygems'
 require 'shoulda'
 require 'remote_executor/system'

metadata

@@ -2,7 +2,7 @@
 name: remote_executor
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Javier Juarez
@@ -42,7 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: *id003
@@ -75,7 +75,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: *id006
@@ -91,11 +91,13 @@ files:
 - bin/remote_executor
 - lib/loader.rb
 - lib/remote_executor/cli_application.rb
+- lib/remote_executor/command_set.rb
 - lib/remote_executor/options_parser.rb
 - lib/remote_executor/system.rb
 - lib/remote_executor/systems.rb
 - lib/remote_executor/version.rb
 - README.rdoc
+- test/test_command_set.rb
 - test/test_system.rb
 - test/test_systems.rb
 has_rdoc: true
@@ -127,5 +129,6 @@ signing_key:
 specification_version: 3
 summary: A very simple gem that helps to launch remote commands over SSH connections
 test_files: 
+- test/test_command_set.rb
 - test/test_system.rb
 - test/test_systems.rb