screwcap 0.6.2 → 0.6.3

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.2'
+  self.version  = '0.6.3'
   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

@@ -42,7 +42,8 @@ class Runner
   private
 
   def self.run_command(command, ssh, options)
-    if command[:type] == :remote
+    case command[:type]
+    when :remote
       stdout, stderr, exit_code, exit_signal = ssh_exec! ssh, command[:command]
       command[:stdout] = stdout
       command[:stderr] = stderr
@@ -53,7 +54,7 @@ class Runner
         _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
+    when :local
       ret = `#{command[:command]}`
       command[:stdout] = ret
       if $?.to_i == 0
@@ -62,12 +63,14 @@ class Runner
         _errorlog("\n    E: (local): #{command[:command]} return exit code: #{$?}\n", :color => :red) if $? != 0
       end
       return $?
-    elsif command[:type] == :scp
+    when :scp
       putc "."
       options[:server].__upload_to!(options[:address], command[:local], command[:remote])
 
       # this will need to be improved to allow for :onfailure
       return 0
+    when :block
+      command[:block].call
     end
   end
 

data/lib/screwcap/task.rb

@@ -54,6 +54,22 @@ class Task < Screwcap::Base
     end
   end
 
+  # execute a ruby command.
+  # command_set :test do
+  #   run "do this"
+  #   ex { @myvar = true }
+  #   run "do that"
+  # end
+  #
+  # this is good for calling an external service during your deployment.
+  #
+  # command_set :after_deploy do
+  #   ex { $hipchat_client.send "Deployment has finished" }
+  # end
+  def ex(&block)
+    self.__commands << {:type => :block, :from => self.__name, :block => block}
+  end
+
   # SCP a file from your local drive to a remote machine.
   #   task_for :item, :servers => :server do
   #     scp :local => "/tmp/pirate_booty", :remote => "/mnt/app/config/booty.yml"
@@ -214,7 +230,7 @@ class Task < Screwcap::Base
   private
 
   def method_missing(m, *args) # :nodoc
-    if m.to_s[0..1] == "__" or [:run].include?(m) or m.to_s.reverse[0..0] == "="
+    if m.to_s[0..1] == "__" or [:run, :ex].include?(m) or m.to_s.reverse[0..0] == "="
       super(m, args.first) 
     elsif m == :to_ary
       # In Ruby 1.9, Array#flatten calls #to_ary on each of the

data/lib/screwcap.rb

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

data/spec/runner_spec.rb

@@ -48,4 +48,18 @@ describe "The Runner" do
     commands = Runner.execute_locally! :name => :localtest, :commands => task.__build_commands, :silent => true
     commands[0][:stdout].should == "bongle\n"
   end
+
+  it "should be able to execute ex commands" do
+    @@testvar = :bingo
+    task = Task.new :name => :extest do
+      ex { @@testvar = :bango }
+    end
+    @@testvar.should == :bingo
+    commands = Runner.execute! :name => "test", 
+      :server => @server, 
+      :address => "fake.com", 
+      :commands => task.__build_commands, 
+      :silent => true
+    @@testvar.should == :bango
+  end
 end

data/spec/task_spec.rb

@@ -279,4 +279,14 @@ describe "Tasks" do
     commands = task.__build_commands [n1, n2, n3]
     commands.map {|c| c[:command] }.should == %w(unlock_the_gate release_the_hounds lock_the_gate)
   end
+
+  it "has an ex command" do
+    
+    task = Task.new :name => :task do
+      @test = "asdf"
+      ex { @test = "fdsa" }
+    end
+
+    commands = task.__build_commands([task])
+  end
 end

metadata

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