screwcap 0.7.4 → 0.8

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.7.4'
+  self.version  = '0.8'
   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.rb

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

data/lib/screwcap/runner.rb

@@ -6,18 +6,15 @@ 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
 
     if options[:servers] and task.__servers
-      begin
-        servers = options[:servers].select {|s| task.__servers.include? s.__name }
-        connections = servers.map {|server| server.connect! }.flatten
-      rescue Net::SSH::AuthenticationFailed => e
-        raise Net::SSH::AuthenticationFailed, "Authentication failed for server named #{server.name}.  Please check your authentication credentials."
-      end
+      servers = options[:servers].select {|s| task.__servers.include? s.__name }
+      connections = servers.map {|server| server.connect! }.flatten
     end
 
     _log "\nExecuting task #{task.name}\n", :color => :blue
@@ -25,20 +22,33 @@ class Runner
     task.__built_commands.each do |command|
       ret = case command[:type]
       when :remote
-        threads = []
-        if command[:parallel] == false
-          connections.each { |connection| run_remote_command(command, connection, options) }
+        if command[:parallel] == false or command[:block]
+          connections.each do |connection|
+            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
+          end
         else
+          threads = []
           connections.each do |connection|
             threads << Thread.new(connection) do |conn|
-              run_remote_command(command, conn, options)
+              results << run_remote_command(command, conn[:connection], options)
             end
           end
           threads.each {|t| t.join }
         end
       when :local
-        ret = `#{command[:command]}`
-        command[:stdout] = ret
+        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
@@ -48,7 +58,6 @@ class Runner
         else
           _errorlog("    E: (local): #{command[:command]} return exit code: #{$?}\n", :color => :red) if $? != 0
         end
-        ret
       when :scp
         threads = []
         servers.each do |server|
@@ -59,29 +68,30 @@ class Runner
         command[:block].call
       end
     end
-    _log "\nComplete\n", :color => :blue
-    task.__built_commands # for tests
+    _log "Complete\n", :color => :blue
+    results
   end
 
   private
 
   def self.run_remote_command(command, ssh, options)
     stdout, stderr, exit_code, exit_signal = ssh_exec! ssh, command[:command]
-    command[:stdout] = stdout
-    command[:stderr] = stderr
-    command[:exit_code] = exit_code
+    ret = {:command => command[:command]}
+    ret[:stdout] = command[:stdout] = stdout
+    ret[:stderr] = command[:stderr] = stderr
+    ret[:exit_code] = command[:exit_code] = exit_code
     if exit_code == 0
       if @@verbose
         _log("    I: #{command[:command]}\n", :color => :green)
         _log("    O: #{command[:stdout]}\n", :color => :green)
       else
         _log(".", :color => :green)
-        $stdout.flush
       end
     else
-      _errorlog("    E: (#{options[:address]}): #{command[:command]} return exit code: #{exit_code}\n", :color => :red) if exit_code != 0
+      _log("    I: #{command[:command]}\n", :color => :green)
+      _errorlog("    E: (exit code: #{exit_code}) #{command[:stderr]} \n", :color => :red)
     end
-    exit_code
+    ret
   end
 
   # courtesy of flitzwald on stackoverflow

data/lib/screwcap/server.rb

@@ -36,10 +36,18 @@ class Server < Screwcap::Base
 
   def connect!
     self.__addresses.each  do |address|
-      if self.__gateway
-        self.__connections << __gateway.__get_gateway_connection.ssh(address, self.__user, options_for_net_ssh)
-      else
-        self.__connections << Net::SSH.start(address, self.__user, options_for_net_ssh)
+
+      # do not re-connect.  return if we have already been connected
+      next if self.__connections.any? {|conn| conn[:address] == address }
+
+      begin
+        if self.__gateway
+          self.__connections << {:address => address, :connection => __gateway.__get_gateway_connection.ssh(address, self.__user, options_for_net_ssh) }
+        else
+          self.__connections << {:address => address, :connection => Net::SSH.start(address, self.__user, options_for_net_ssh) }
+        end
+      rescue Net::SSH::AuthenticationFailed => e
+        raise Net::SSH::AuthenticationFailed, "Authentication failed for server named #{self.name}.  Please check your authentication credentials."
       end
     end
     self.__connections

data/lib/screwcap/task.rb

@@ -47,11 +47,11 @@ class Task < Screwcap::Base
   #    run "ls -l", :onfailure => :rollback
   #   end 
   
-  def run arg, options = {}
+  def run arg, options = {}, &block
     if arg.class == Symbol
-      self.__commands << options.merge({:command => self.send(arg), :type => :remote, :from => self.__name})
+      self.__commands << options.merge({:command => self.send(arg), :type => :remote, :from => self.__name, :block => block})
     else
-      self.__commands << options.merge({:command => arg, :type => :remote, :from => self.__name})
+      self.__commands << options.merge({:command => arg, :type => :remote, :from => self.__name, :block => block})
     end
   end
 
@@ -221,6 +221,19 @@ class Task < Screwcap::Base
     self.__servers = [self.__servers] if self.__servers.class != Array
   end
 
+  # convenience function to look at the exit status of a parent task
+  def exit_code
+    self.__options[:exit_code]
+  end
+
+  def stdout
+    self.__options[:stdout]
+  end
+
+  def stderr
+    self.__options[:stderr]
+  end
+
   private
 
   def method_missing(m, *args) # :nodoc

data/lib/screwcap/task_manager.rb

@@ -182,7 +182,7 @@ class TaskManager < Screwcap::Base
     ret = []
     tasks_to_run.each do |task|
       ret << task.__build_commands(self.__tasks)
-      Runner.execute!(:task => task, :servers => self.__servers, :silent => self.__options[:silent], :verbose => self.__options[:verbose])
+      Runner.execute!(:task => task, :tasks => self.__tasks, :servers => self.__servers, :silent => self.__options[:silent], :verbose => self.__options[:verbose])
     end
 
     $stdout << "\033[0m"

data/screwcap.gemspec

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

data/spec/runner_spec.rb

@@ -64,4 +64,38 @@ describe "The Runner" do
       :silent => true
     @@testvar.should == :bango
   end
+
+  it "should yield a run block" do
+    Runner.stubs(:ssh_exec!).returns(["ok\n","",0,nil]).then.returns(["","no\n",1,nil])
+    revert_task = Task.new :name => :revert do
+      run "revert" do |results|
+        if results.exit_code != 0
+          run "failed"
+        else
+          run "succeeded"
+        end
+      end
+    end
+    task = Task.new :name => :runblock, :server => :server do
+      run "do_something" do |results|
+        revert
+      end
+    end
+    task.__build_commands
+    task.validate([@server])
+    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
+end
+
+def command_names(commands)
+  ret = []
+  commands.each do |command|
+    if command.class == Hash
+      ret << command[:command]
+    elsif command.class == Array
+      ret << command_names(command)
+    end
+  end
+  ret.flatten
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: screwcap
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 27
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 4
-  version: 0.7.4
+  - 8
+  version: "0.8"
 platform: ruby
 authors: 
 - Grant Ammons
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -04:00
+date: 2011-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,37 +66,21 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 35
         segments: 
         - 2
-        - 0
+        - 9
         - 4
-        version: 2.0.4
+        version: 2.9.4
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
-        version: 2.7.0
-  type: :development
-  version_requirements: *id005
 description: Screwcap is a library that wraps Net::SSH and makes it easy to perform actions on remote servers.
 email: 
 - grant@pipelinedeals.com
@@ -150,6 +133,7 @@ files:
 - test/config/upload.rb
 - test/config/use.rb
 - test/config/use2.rb
+- .gemtest
 has_rdoc: true
 homepage: http://gammons.github.com/screwcap
 licenses: []