mattmatt-cap-ext-webistrano 0.1.0 → 0.1.1

data/Rakefile

@@ -12,6 +12,7 @@ begin
     s.authors = ["Mathias Meyer"]
     s.files = FileList["[A-Z]*", "{lib,test}/**/*"]
     s.add_dependency 'capistrano'
+    s.add_dependency 'activeresource'
   end
 rescue LoadError 
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com" 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 0
+:patch: 1
 :major: 0

data/lib/cap_ext_webistrano.rb

@@ -5,7 +5,7 @@ require 'cap_ext_webistrano/project'
 
 module CapExtWebistrano
   def task(*args, &blk)
-    original_task(*args, &@hijack_runner)
+    original_task(*args, &hijack_runner)
   end
 
   def after(*args)
@@ -26,10 +26,13 @@ end
 Capistrano::Configuration::Execution.class_eval do
   alias :original_find_and_execute_task :find_and_execute_task
   
+  def hijack_runner
+    @hijack_runner ||= lambda { CapExtWebistrano::Task.new(current_task.fully_qualified_name, self).run }
+  end
+  
   def hijack_capistrano
-    @hijack_runner = lambda { CapExtWebistrano::Task.new(current_task.fully_qualified_name, self).run }
-    tasks.each {|tsk| tsk.last.instance_variable_set(:@body, @hijack_runner)}
-    namespaces.each {|nmspace| nmspace.last.tasks.each {|tsk| tsk.last.instance_variable_set(:@body, @hijack_runner)}}
+    tasks.each {|tsk| tsk.last.instance_variable_set(:@body, hijack_runner)}
+    namespaces.each {|nmspace| nmspace.last.tasks.each {|tsk| tsk.last.instance_variable_set(:@body, hijack_runner)}}
   end
   
   def find_and_execute_task(task, hooks = {})

data/lib/cap_ext_webistrano/task.rb

@@ -22,7 +22,7 @@ module CapExtWebistrano
       still_running = true
       while still_running
         sleep 5
-        @deployment = Deployment.find(@deployment.id, :params => {:project_id => @project.id, :stage_id => @stage.id})
+        @deployment.reload
         print_diff(@deployment)
         still_running = false unless @deployment.completed_at.nil?
       end

data/test/cap_ext_webistrano_shoulda.rb

@@ -0,0 +1,25 @@
+$:.unshift(File.dirname(File.expand_path(__FILE__)))
+
+require 'test_helper'
+require 'cap_ext_webistrano'
+require 'capistrano_stub'
+require 'cap_ext_webistrano/task'
+
+class CapExtWebistranoTest < Test::Unit::TestCase
+  context "when executing tasks" do
+    setup do
+      @cap = CapistranoStub.new
+      CapExtWebistrano::Task.stubs(:new).returns @cap
+    end
+    
+    should "convert all tasks to use the hijacking task" do
+      @cap.find_and_execute_task("deploy")
+      assert_nothing_raised {@cap.task.body.call}
+    end
+    
+    should "call run on the task runner" do
+      @cap.find_and_execute_task("deploy")
+      assert @cap.ran
+    end
+  end
+end

data/test/capistrano_stub.rb

@@ -0,0 +1,39 @@
+require 'capistrano'
+
+class CapistranoStub
+  include Capistrano::Configuration::Namespaces
+  include Capistrano::Configuration::Execution
+  attr_accessor :task, :ran
+  
+  def logger
+    Logger.new(STDOUT)
+  end
+  
+  def find_task(*args)
+    @task ||= Capistrano::TaskDefinition.new("deploy", top, {}) { raise "This shouldn't be raised" }
+  end
+  
+  def original_find_and_execute_task(*args)
+    find_task.body.call
+  end
+  
+  def namespaces
+    {:default => top}
+  end
+  
+  def tasks
+    @tasks = {"deploy" => find_task}
+  end
+  
+  def current_task
+    find_task
+  end
+  
+  def [](key)
+    "admin"
+  end
+  
+  def run
+    @ran = true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mattmatt-cap-ext-webistrano
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Mathias Meyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-20 00:00:00 -08:00
+date: 2009-01-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +21,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activeresource
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: meyer@paperplanes.de
 executables: []
@@ -39,6 +48,8 @@ files:
 - lib/cap_ext_webistrano/stage.rb
 - lib/cap_ext_webistrano/task.rb
 - lib/cap_ext_webistrano.rb
+- test/cap_ext_webistrano_shoulda.rb
+- test/capistrano_stub.rb
 - test/project_shoulda.rb
 - test/task_shoulda.rb
 - test/test_helper.rb