screwcap 0.8.1 → 0.8.2

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.plugin :newgem
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.spec 'screwcap' do
-  self.version  = '0.8.1'
+  self.version  = '0.8.2'
   self.developer 'Grant Ammons', 'grant@pipelinedeals.com'
   self.rubyforge_name       = self.name # TODO this is default value
   self.extra_deps         = [['net-ssh','>= 2.0.23'],['net-ssh-gateway','>=1.0.1'], ['net-scp','>=1.0.4']]

data/lib/screwcap/runner.rb

@@ -6,18 +6,82 @@ class Runner
     @@silent = options[:silent]
     @@verbose = options[:verbose]
     task = options[:task]
-    results = []
 
     if (task.__servers.nil? or task.__servers == [] or task.__servers.compact == []) and task.__built_commands.any? {|c| c[:type] == :remote or c[:type] == :scp }
       raise Screwcap::ConfigurationError, "The task #{task.name} includes remote commands, however no servers were defined for this task."
     end
 
+    connections = []
+
+    _log "\nExecuting task #{task.name}\n", :color => :blue
+
+    if task.__options[:parallel] == false
+      run_serially(task, options)
+    else
+      run_parallel(task, options)
+    end
+  end
+
+  private
+
+  def self.run_serially(task, options)
+    results = []
+    connections = []
     if options[:servers] and task.__servers
-      servers = options[:servers].select {|s| task.__servers.include? s.__name }
+      servers = options[:servers].select {|s| task.__servers.flatten.include? s.__name }
       connections = servers.map {|server| server.connect! }.flatten
     end
 
-    _log "\nExecuting task #{task.name}\n", :color => :blue
+    connections.each do |connection|
+      task.__built_commands.each do |command|
+        ret = case command[:type]
+        when :remote
+          results << run_remote_command(command, connection[:connection], options)
+          if command[:block]
+            opts = task.__options.clone.merge(:stderr => command[:stderr], :stdout => command[:stdout], :exit_code => command[:exit_code])
+            opts[:servers] = task.__servers
+            opts[:name] = "Run results"
+
+            inner_task = Task.new(opts, &command[:block])
+            inner_task.__build_commands(options[:tasks])
+            results << self.execute!(options.merge(:task => inner_task))
+          end
+        when :local
+          result = {}
+          result[:stdout] = `#{command[:command]}`
+          result[:exit_code] = $?.to_i
+          results << result
+          if $?.to_i == 0
+            if options[:verbose]
+              _log "    O: #{ret}\n", :color => :green
+            else
+              _log(".", :color => :green)
+            end
+          else
+            _errorlog("    E: (local): #{command[:command]} return exit code: #{$?}\n", :color => :red) if $? != 0
+          end
+        when :scp
+          threads = []
+          servers.each do |server|
+            threads << Thread.new(server) { |_server| _server.upload! command[:local], command[:remote] }
+          end
+          threads.each {|t| t.join }
+        when :block
+          command[:block].call
+        end
+      end
+    end
+    _log "Complete\n", :color => :blue
+    results
+  end
+
+  def self.run_parallel(task, options)
+    results = []
+    connections = []
+    if options[:servers] and task.__servers
+      servers = options[:servers].select {|s| task.__servers.flatten.include? s.__name }
+      connections = servers.map {|server| server.connect! }.flatten
+    end
 
     task.__built_commands.each do |command|
       ret = case command[:type]
@@ -72,8 +136,6 @@ class Runner
     results
   end
 
-  private
-
   def self.run_remote_command(command, ssh, options)
     stdout, stderr, exit_code, exit_signal = ssh_exec! ssh, command[:command]
     ret = {:command => command[:command]}

data/lib/screwcap.rb

@@ -16,7 +16,7 @@ require 'screwcap/sequence'
 require 'screwcap/task_manager'
 
 module Screwcap
-  VERSION='0.8.1'
+  VERSION='0.8.2'
 
   class TaskNotFound < RuntimeError; end
   class NoServersDefined < Exception; end

data/screwcap.gemspec

@@ -6,7 +6,7 @@ require 'bundler/version'
  
 Gem::Specification.new do |s|
   s.name        = "screwcap"
-  s.version     = "0.8.1"
+  s.version     = "0.8.2"
   s.platform    = Gem::Platform::RUBY
   s.author     = "Grant Ammons"
   s.email       = ["grant@pipelinedealsco.com"]

data/spec/runner_spec.rb

@@ -86,6 +86,28 @@ describe "The Runner" do
     commands = Runner.execute! :name => :runblock, :task => task, :tasks => [task, revert_task], :servers => [@server], :silent => true
     command_names(commands).should == %w(do_something revert failed)
   end
+
+  it "should be able to run tasks parallel or serial" do
+    @server2 = Server.new :name => :server2,  :address => "fake2.com", :user => "fake"
+    Runner.stubs(:ssh_exec!).returns(["ok\n","",0,nil])
+    task = Task.new :name => :parallel_task, :servers => [:server, :server2] do
+      run "one"
+      run "two"
+    end
+    task.__build_commands
+    task.validate([@server, @server2])
+    commands = Runner.execute! :name => :parallel_task, :task => task, :tasks => [task], :servers => [@server, @server2]
+    command_names(commands).should == %w(one one two two)
+
+    task = Task.new :name => :serial_task, :parallel => false, :servers => [:server, :server2] do
+      run "one"
+      run "two"
+    end
+    task.__build_commands
+    task.validate([@server, @server2])
+    commands = Runner.execute! :name => :serial_task, :task => task, :tasks => [task], :servers => [@server, @server2], :silent => true
+    command_names(commands).should == %w(one two one two)
+  end
 end
 
 def command_names(commands)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: screwcap
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Grant Ammons
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -07:00
+date: 2011-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency