screwcap 0.5 → 0.6.pre

data/History.txt

@@ -2,3 +2,6 @@
 
 * 1 major enhancement:
   * Initial release
+
+=== 0.5 2010-11-19
+* Completed rewrite of internals of screwcap

data/README.rdoc

@@ -23,7 +23,6 @@ For more info, see the main screwcap page at http://gammons.github.com/screwcap
 == TODO:
 * Explore removing the 'use' keyword, favoring require or load
 * Add ability to parse user input
-* Add ability to parse user input
 * DONE add --dry-run to screwcap
 
 == RECIPES:

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.5'
+  self.version  = '0.6.pre'
   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

@@ -6,8 +6,17 @@ class Task < Screwcap::Base
     self.__name = opts.delete(:name)
     self.__options = opts
     self.__commands = []
+    self.__local_before_command_sets = []
+    self.__local_after_command_sets = []
     self.__servers  = opts.delete(:servers)
     self.__block = block
+
+    if self.__options[:before] and self.__options[:before].class != Array
+      self.__options[:before] = [self.__options[:before]] 
+    end
+    if self.__options[:after] and self.__options[:after].class != Array
+      self.__options[:after] = [self.__options[:after]] 
+    end
   end
 
   # Run a command.  This can either be a string, or a symbol that is the name of a command set to run.
@@ -78,13 +87,31 @@ class Task < Screwcap::Base
     end
   end
 
+  def before name, &block
+    self.__local_before_command_sets << Task.new(:name => name, &block)
+  end
+
+  def after name, &block
+    self.__local_after_command_sets << Task.new(:name => name, &block)
+  end
+
+
   def __build_commands(command_sets = [])
     commands = []
 
     self.instance_eval(&self.__block)
 
-    # :before for before_ callback
-    if before = command_sets.find {|cs| cs.__name.to_s == "before_#{self.__name}" or cs.__name == self.__options[:before] } and before != self
+    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
@@ -93,7 +120,23 @@ class Task < Screwcap::Base
       if command[:type] == :unknown
         if cs = command_sets.find {|cs| cs.__name == command[:command] }
           cs.clone_from(self)
+
+          self.__local_before_command_sets.each do |lcs|
+            if command[:command] == lcs.__name
+              lcs.clone_from(self)
+              commands << lcs.__build_commands(command_sets)
+            end
+          end
+
           commands << cs.__build_commands(command_sets)
+
+          self.__local_after_command_sets.each do |lcs|
+            if command[:command] == lcs.__name
+              lcs.clone_from(self)
+              commands << lcs.__build_commands(command_sets)
+            end
+          end
+
         else
           raise(NoMethodError, "Cannot find task, command set, or other method named '#{command[:command]}'")
         end
@@ -102,8 +145,17 @@ class Task < Screwcap::Base
       end
     end
 
-    # :after for after_ callback
-    if after = command_sets.find {|cs| cs.__name.to_s == "after_#{self.__name}" or cs.__name == self.__options[:after] } and after != self
+    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
+
+    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)
     end

data/lib/screwcap.rb

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

data/spec/task_spec.rb

@@ -147,4 +147,85 @@ describe "Tasks" do
     task = Task.new :name => :test, :servers => [:server, :server2]
     lambda { task.validate([server,other_server]) }.should_not raise_error
   end
+
+  it "should handle before and after inside a task" do
+    do_other_task = Task.new :name => :other_task do
+      run "task"
+    end
+    task = Task.new :name => :task do
+      before :other_task do
+        run "before"
+      end
+      after :other_task do
+        run "after"
+      end
+
+      other_task
+    end
+
+    commands = task.__build_commands([do_other_task])
+    commands.map {|c| c[:command] }.should == %w(before task after)
+  end
+
+  it "before and after call blocks can call command sets just like everything else" do
+    special = Task.new :name => :run_special_command do
+      run "special"
+    end
+    other = Task.new :name => :other_task do
+      run "other"
+    end
+
+    task = Task.new :name => :task do
+      before :other_task do
+        run_special_command
+      end
+      after :other_task do
+        run "after"
+      end
+      other_task
+    end
+    commands = task.__build_commands([special, other])
+    commands.map {|c| c[:command] }.should == %w(special other after)
+  end
+
+  it "should be able to handle multiple befores inside" do
+    special = Task.new :name => :run_special_command do
+      run "special"
+    end
+    other = Task.new :name => :other_task do
+      run "other"
+    end
+
+    task = Task.new :name => :task do
+      before :other_task do
+        run_special_command
+      end
+      before :other_task do
+        run "moon_pie"
+      end
+      after :other_task do
+        run "after"
+      end
+      other_task
+    end
+    commands = task.__build_commands([special, other])
+    commands.map {|c| c[:command] }.should == %w(special moon_pie other after)
+  end
+
+  it "should be able to handle multiple befores outside" do
+    before1 = Task.new :name => :do1 do
+      run "do1"
+    end
+
+    before2 = Task.new :name => :do2 do
+      run "do2"
+    end
+
+    task = Task.new :name => :new_task, :before => [:do1, :do2] do
+      run "task"
+    end
+
+    commands = task.__build_commands([before1, before2])
+    commands.map {|c| c[:command] }.should == %w(do1 do2 task)
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: screwcap
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 961915916
+  prerelease: true
   segments: 
   - 0
-  - 5
-  version: "0.5"
+  - 6
+  - pre
+  version: 0.6.pre
 platform: ruby
 authors: 
 - Grant Ammons
@@ -172,12 +173,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: screwcap