screwcap 0.6.pre3 → 0.6.pre4

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.pre3'
+  self.version  = '0.6.pre4'
   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/task.rb

@@ -9,6 +9,7 @@ class Task < Screwcap::Base
     self.__local_before_command_sets = []
     self.__local_after_command_sets = []
     self.__servers  = opts.delete(:servers)
+    self.__callback = opts.delete(:callback)
     self.__block = block
 
     if self.__options[:before] and self.__options[:before].class != Array
@@ -103,7 +104,7 @@ class Task < Screwcap::Base
   #    end
 
   def before name, &block
-    self.__local_before_command_sets << Task.new(:name => name, &block)
+    self.__local_before_command_sets << Task.new(:name => name, :callback => true, &block)
   end
 
   # For a task, declare a set of things to run before or after a command set. 
@@ -122,7 +123,7 @@ class Task < Screwcap::Base
   #    end
 
   def after name, &block
-    self.__local_after_command_sets << Task.new(:name => name, &block)
+    self.__local_after_command_sets << Task.new(:name => name, :callback => true, &block)
   end
 
   def __build_commands(command_sets = [], _self = self)
@@ -131,21 +132,23 @@ class Task < Screwcap::Base
     self.__commands = []
     self.instance_eval(&self.__block)
 
-    if self.__options[:before]
-      self.__options[:before].each do |before|
-        before = command_sets.find {|cs| cs.__name.to_s == before.to_s}
-        next if before.nil? or before == self
+    unless self.__callback == true
+      if self.__options[:before]
+        self.__options[:before].each do |before|
+          before = command_sets.find {|cs| cs.__name.to_s == before.to_s}
+          next if before.nil? or before == self
+          before.clone_from(self)
+          commands << before.__build_commands(command_sets)
+        end
+      end
+
+      command_sets.select {|cs| cs.__name.to_s == "before_#{self.__name}"}.each do |before|
+        next if before == self
         before.clone_from(self)
         commands << before.__build_commands(command_sets)
       end
     end
 
-    command_sets.select {|cs| cs.__name.to_s == "before_#{self.__name}"}.each do |before|
-      next if before == self
-      before.clone_from(self)
-      commands << before.__build_commands(command_sets)
-    end
-
     self.__commands.each do |command|
       if command[:type] == :unknown
         if cs = command_sets.find {|cs| cs.__name == command[:command] }
@@ -175,19 +178,21 @@ class Task < Screwcap::Base
       end
     end
 
-    if self.__options[:after]
-      self.__options[:after].each do |after|
-        after = command_sets.find {|cs| cs.__name.to_s == after.to_s}
-        next if after.nil? or after == self
-        after.clone_from(self)
-        commands << after.__build_commands(command_sets)
+    unless self.__callback == true
+      if self.__options[:after]
+        self.__options[:after].each do |after|
+          after = command_sets.find {|cs| cs.__name.to_s == after.to_s}
+          next if after.nil? or after == self
+          after.clone_from(self)
+          commands << after.__build_commands(command_sets)
+        end
       end
-    end
 
-    command_sets.select {|cs| cs.__name.to_s == "after_#{self.__name}"}.each do |after|
-      next if after == self
-      after.clone_from(self)
-      commands << after.__build_commands(command_sets, self)
+      command_sets.select {|cs| cs.__name.to_s == "after_#{self.__name}"}.each do |after|
+        next if after == self
+        after.clone_from(self)
+        commands << after.__build_commands(command_sets, self)
+      end
     end
 
     commands.flatten

data/lib/screwcap.rb

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

data/spec/task_manager_spec.rb

@@ -114,4 +114,20 @@ describe "Task Managers" do
 
     @tm.run!([:pet_donkey, :pet_global]).map {|c| c[:command] }.should == ["pet donkey","pet monkey"]
   end
+
+  it "should not run callback command sets twice" do
+    @tm.animal = "monkey"
+    @tm.server :server, :address => "test", :user => "root"
+    @tm.command_set(:pet_animal)  { run "pet_#{animal}" }
+    @tm.command_set(:before_pet_animal) { run "prepare_hand" }
+
+    @tm.task(:pet, :server => :server) do
+      before :pet_animal do
+        run "put_glove_on_hand"
+      end
+      pet_animal
+    end
+
+    @tm.run!(:pet).map {|c| c[:command] }.should == %w(put_glove_on_hand prepare_hand pet_monkey)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: screwcap
 version: !ruby/object:Gem::Version 
-  hash: -1876988234
+  hash: -1876988233
   prerelease: true
   segments: 
   - 0
   - 6
-  - pre3
-  version: 0.6.pre3
+  - pre4
+  version: 0.6.pre4
 platform: ruby
 authors: 
 - Grant Ammons
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-20 00:00:00 -05:00
+date: 2010-11-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency