screwcap 0.6.1 → 0.6.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.6.1'
+  self.version  = '0.6.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

@@ -5,7 +5,7 @@ class Runner
   def self.execute! options
     @@silent = options[:silent]
     begin
-      _log "\n*** BEGIN executing task #{options[:name]} on #{options[:server].name} with address #{options[:address]}\n", :color => :blue unless options[:silent] == true
+      _log "\nExecuting task named #{options[:name]} on #{options[:server].name}..\n", :color => :blue
       options[:server].__with_connection_for(options[:address]) do |ssh|
         options[:commands].each do |command|
           ret = run_command(command, ssh, options)
@@ -14,10 +14,8 @@ class Runner
       end
     rescue Net::SSH::AuthenticationFailed => e
       raise Net::SSH::AuthenticationFailed, "Authentication failed for server named #{server.name}.  Please check your authentication credentials."
-    #rescue Exception => e
-    #  _errorlog "    F: (#{options[:address]}): #{e}", :color => :red
     ensure
-      _log "*** END executing task #{options[:name]} on #{options[:server].name} with address #{options[:address]}\n\n", :color => :blue
+      _log "\nComplete\n", :color => :blue
     end
     options[:commands] # for tests
   end
@@ -45,29 +43,27 @@ class Runner
 
   def self.run_command(command, ssh, options)
     if command[:type] == :remote
-      _log "    I: (#{options[:address]}):  #{command[:command]}\n", :color => :green
       stdout, stderr, exit_code, exit_signal = ssh_exec! ssh, command[:command]
       command[:stdout] = stdout
       command[:stderr] = stderr
       command[:exit_code] = exit_code
-      _log("    O: (#{options[:address]}):  #{stdout}", :color => :green) unless stdout.nil? or stdout == ""
-      _errorlog("    O: (#{options[:address]}):  #{stderr}", :color => :red) unless stderr.nil? or stderr == ""
-      _errorlog("    E: (#{options[:address]}): #{command[:command]} return exit code: #{exit_code}\n", :color => :red) if exit_code != 0
+      if exit_code == 0
+        _log(".", :color => :green)
+      else
+        _errorlog("\n    E: (#{options[:address]}): #{command[:command]} return exit code: #{exit_code}\n", :color => :red) if exit_code != 0
+      end
       return exit_code
     elsif command[:type] == :local
       ret = `#{command[:command]}`
       command[:stdout] = ret
       if $?.to_i == 0
-        _log "    I: (local):  #{command[:command]}\n", :color => :blue
-        _log "    O: (local):  #{ret}\n", :color => :blue
+        _log(".", :color => :green)
       else
-        _log "    I: (local):  #{command[:command]}\n", :color => :blue
-        _errorlog "    O: (local):  #{ret}\n", :color => :red
-        _errorlog("    E: (local): #{command[:command]} return exit code: #{$?}\n", :color => :red) if $? != 0
+        _errorlog("\n    E: (local): #{command[:command]} return exit code: #{$?}\n", :color => :red) if $? != 0
       end
       return $?
     elsif command[:type] == :scp
-      _log "    I: (#{options[:address]}): SCP #{command[:local]} to #{options[:server].__user}@#{options[:address]}:#{command[:remote]}\n", :color => :green
+      putc "."
       options[:server].__upload_to!(options[:address], command[:local], command[:remote])
 
       # this will need to be improved to allow for :onfailure

data/lib/screwcap.rb

@@ -16,7 +16,7 @@ require 'screwcap/sequence'
 require 'screwcap/task_manager'
 
 module Screwcap
-  VERSION='0.6.1'
+  VERSION='0.6.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.6"
+  s.version     = "0.6.2"
   s.platform    = Gem::Platform::RUBY
   s.author     = "Grant Ammons"
   s.email       = ["grant@pipelinedealsco.com"]

data/tasks/rspec.rake

@@ -17,5 +17,6 @@ end
 desc "Run the specs under spec/models"
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--options', "spec/spec.opts"]
+  t.rcov = true
   t.spec_files = FileList['spec/**/*_spec.rb']
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: screwcap
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Grant Ammons
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 -05:00
+date: 2011-02-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency