screwcap 0.6.pre → 0.6.pre2

data/Manifest.txt

@@ -14,7 +14,6 @@ lib/screwcap/task.rb
 lib/screwcap/task_manager.rb
 lib/trollop.rb
 recipes/setup_rails.rb
-runrdoc
 screwcap.gemspec
 spec/runner_spec.rb
 spec/sequence_spec.rb

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.pre'
+  self.version  = '0.6.pre2'
   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/bin/screwcap

@@ -29,13 +29,14 @@ opts = Trollop::with_standard_exception_handling p do
     Debugger.start
   end
 
-  if opts[:tasks] == true
+  if opts[:tasks] == true or ARGV.size == 1
     recipe_file = ARGV.shift
     deployer = TaskManager.new(opts.merge(:recipe_file => recipe_file))
-    $stdout << "Tasks Available:\n" if deployer.__tasks.size > 0
+    $stdout << "\nTasks Available:\n" if deployer.__tasks.size > 0
     deployer.__tasks.map {|t| t.__name }.each {|name| $stdout << "  #{name}\n" }
-    $stdout << "Sequences Available:\n" if deployer.__sequences.size > 0
+    $stdout << "\nSequences Available:\n" if deployer.__sequences.size > 0
     deployer.__sequences.map {|t| t.__name }.each {|name| $stdout << "  #{name}\n" }
+    $stdout << "\n"
     exit
   end
 
@@ -63,7 +64,6 @@ opts = Trollop::with_standard_exception_handling p do
     exit
   end
 
-  raise Trollop::HelpNeeded if ARGV.size < 2
   recipe_file = ARGV.shift
   begin
     TaskManager.new(opts.merge(:recipe_file => recipe_file)).run! ARGV.map {|a| a.to_sym }

data/lib/screwcap/task.rb

@@ -87,16 +87,45 @@ class Task < Screwcap::Base
     end
   end
 
+  # For a task, declare a set of things to run before or after a command set. 
+  #    command_set :release_the_hounds do
+  #      run "release_the_hounds"
+  #    end
+  #
+  #    task :release do
+  #      before :release_the_hounds do
+  #        run "unlock_the_gate"
+  #      end
+  #      after :release_the_hounds do
+  #        run "find_and_gather_released_hounds"
+  #      end
+  #      release_the_hounds
+  #    end
+
   def before name, &block
     self.__local_before_command_sets << Task.new(:name => name, &block)
   end
 
+  # For a task, declare a set of things to run before or after a command set. 
+  #    command_set :release_the_hounds do
+  #      run "release_the_hounds"
+  #    end
+  #
+  #    task :release do
+  #      before :release_the_hounds do
+  #        run "unlock_the_gate"
+  #      end
+  #      after :release_the_hounds do
+  #        run "find_and_gather_released_hounds"
+  #      end
+  #      release_the_hounds
+  #    end
+
   def after name, &block
     self.__local_after_command_sets << Task.new(:name => name, &block)
   end
 
-
-  def __build_commands(command_sets = [])
+  def __build_commands(command_sets = [], _self = self)
     commands = []
 
     self.instance_eval(&self.__block)
@@ -119,21 +148,21 @@ class Task < Screwcap::Base
     self.__commands.each do |command|
       if command[:type] == :unknown
         if cs = command_sets.find {|cs| cs.__name == command[:command] }
-          cs.clone_from(self)
+          cs.clone_from(_self)
 
-          self.__local_before_command_sets.each do |lcs|
+          _self.__local_before_command_sets.each do |lcs|
             if command[:command] == lcs.__name
-              lcs.clone_from(self)
-              commands << lcs.__build_commands(command_sets)
+              lcs.clone_from(_self)
+              commands << lcs.__build_commands(command_sets, _self)
             end
           end
 
-          commands << cs.__build_commands(command_sets)
+          commands << cs.__build_commands(command_sets, _self)
 
-          self.__local_after_command_sets.each do |lcs|
+          _self.__local_after_command_sets.each do |lcs|
             if command[:command] == lcs.__name
-              lcs.clone_from(self)
-              commands << lcs.__build_commands(command_sets)
+              lcs.clone_from(_self)
+              commands << lcs.__build_commands(command_sets, _self)
             end
           end
 
@@ -157,7 +186,7 @@ class Task < Screwcap::Base
     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)
+      commands << after.__build_commands(command_sets, self)
     end
 
     commands.flatten

data/lib/screwcap.rb

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

data/spec/task_spec.rb

@@ -228,4 +228,55 @@ describe "Tasks" do
     commands = task.__build_commands([before1, before2])
     commands.map {|c| c[:command] }.should == %w(do1 do2 task)
   end
+
+  it "should be able to run before on deeply nested command sets" do
+    n1 = Task.new :name => :nested do
+      inner_nested
+    end
+
+    n2 = Task.new :name => :inner_nested do
+      run "inner_nested"
+      inner_inner_nested
+    end
+
+    n3 = Task.new :name => :inner_inner_nested do
+      run "inner_inner_nested"
+    end
+
+    task = Task.new :name => :deploy do
+      before :inner_inner_nested do
+        run "before_inner_inner_nested"
+      end
+      after :inner_nested do
+        run "after_inner_nested"
+      end
+      nested
+    end
+
+    commands = task.__build_commands [n1, n2, n3]
+    commands.map {|c| c[:command] }.should == %w(inner_nested before_inner_inner_nested inner_inner_nested after_inner_nested)
+  end
+
+  it "before and after should be able to run command sets on their own" do
+    n1 = Task.new :name => :release_the_hounds do
+      run "release_the_hounds"
+    end
+
+    n2 = Task.new :name => :lock_the_gate do
+      run "lock_the_gate"
+    end
+
+    n3 = Task.new :name => :unlock_the_gate do
+      run "unlock_the_gate"
+    end
+
+    task = Task.new :name => :deploy_the_animals do
+      before(:release_the_hounds) { unlock_the_gate }
+      after(:release_the_hounds) { lock_the_gate }
+      release_the_hounds
+    end
+
+    commands = task.__build_commands [n1, n2, n3]
+    commands.map {|c| c[:command] }.should == %w(unlock_the_gate release_the_hounds lock_the_gate)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: screwcap
 version: !ruby/object:Gem::Version 
-  hash: 961915916
+  hash: -1876988247
   prerelease: true
   segments: 
   - 0
   - 6
-  - pre
-  version: 0.6.pre
+  - pre2
+  version: 0.6.pre2
 platform: ruby
 authors: 
 - Grant Ammons
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -05:00
+date: 2010-11-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,7 +125,6 @@ files:
 - lib/screwcap/task_manager.rb
 - lib/trollop.rb
 - recipes/setup_rails.rb
-- runrdoc
 - screwcap.gemspec
 - spec/runner_spec.rb
 - spec/sequence_spec.rb

data/runrdoc

@@ -1 +0,0 @@
-rdoc -x trollop -x spec -x runner -x object -x message -x tasknotfound -x runrdoc