mattmatt-cap-ext-webistrano 0.0.4 → 0.1.0

data/{README → README.markdown}

@@ -4,7 +4,7 @@ your command line just using the cap command.
 Installation
 ============
 
-gem install mattmatt-cap-ext-webistrano
+    gem install mattmatt-cap-ext-webistrano
 
 Usage
 =====
@@ -14,25 +14,25 @@ Capistrano.
 
 In your Capfile, insert the following lines at the end.
 
-gem 'mattmatt-cap-ext-webistrano'
-require 'cap_ext_webistrano'
+    gem 'mattmatt-cap-ext-webistrano'
+    require 'cap_ext_webistrano'
 
 The Webistrano extensions require a couple of configuration options that you
 can specify in your deploy.rb. They're pretty much the standard options you'd
 configure for your application with Capistrano.
 
-set :application, "My project" # The project as named in Webistrano
-set :user, "admin"
-set :password, "admin"
-set :stage, "test" # specify the stage you want to deploy
-set :webistrano_home, "http://webistrano.mydomain.com/"
+    set :application, "My project" # The project as named in Webistrano
+    set :user, "admin"
+    set :password, "admin"
+    set :stage, "test" # specify the stage you want to deploy
+    set :webistrano_home, "http://webistrano.mydomain.com/"
 
 If you only have one stage in your project this should do, however with
 several stages it'd be better to ask for the stage to be deployed:
 
-set :stage do
-  Capistrano::CLI.ui.ask "Specify the stage to deploy: "
-end
+    set :stage do
+      Capistrano::CLI.ui.ask "Specify the stage to deploy: "
+    end
 
 (c) 2009 Mathias Meyer
 

data/VERSION.yml

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

data/lib/cap_ext_webistrano/task.rb

@@ -4,11 +4,12 @@ require 'cap_ext_webistrano/deployment'
 
 module CapExtWebistrano
   class Task
-    attr_accessor :task
+    attr_accessor :task, :log
     
     def initialize(task, config)
       @task = task
       @config = config
+      @log = ""
     end
 
     def set_access_data
@@ -17,11 +18,30 @@ module CapExtWebistrano
       end
     end
     
+    def loop_latest_deployment
+      still_running = true
+      while still_running
+        sleep 5
+        @deployment = Deployment.find(@deployment.id, :params => {:project_id => @project.id, :stage_id => @stage.id})
+        print_diff(@deployment)
+        still_running = false unless @deployment.completed_at.nil?
+      end
+    end
+    
+    def print_diff(deployment)
+      if deployment.log
+        diff = deployment.log.sub(log, "") 
+        print diff
+        log << diff
+      end
+    end
+    
     def run
       set_access_data
-      project = Project.find_by_name(@config[:application])
-      stage = project.find_stage(@config[:stage])
-      Deployment.create(:task => task, :stage_id => stage.id, :project_id => project.id)
+      @project = Project.find_by_name(@config[:application])
+      @stage = @project.find_stage(@config[:stage])
+      @deployment = Deployment.create(:task => task, :stage_id => @stage.id, :project_id => @project.id)
+      loop_latest_deployment
     end
   end
 end

data/test/task_shoulda.rb

@@ -15,6 +15,7 @@ class TaskTest < Test::Unit::TestCase
       @config[:user] = "chunky"
       @task = CapExtWebistrano::Task.new("deploy", @config)
       @task.set_access_data
+      @task.stubs(:sleep)
     end
     
     context "when setting up the configuration data" do
@@ -44,7 +45,9 @@ class TaskTest < Test::Unit::TestCase
         Project.stubs(:find).returns([@project1, @project2])
         @stage1 = Stage.new(:name => "test", :id => 3)
         Stage.stubs(:find).returns([@stage1])
-        Deployment.stubs(:create).returns nil
+        @deployment = Deployment.new(:completed_at => Time.now, :log => "Chunky bacon!")
+        Deployment.stubs(:create).returns @deployment
+        Deployment.stubs(:find).returns(@deployment)
         @config[:application] = "Bacon"
         @config[:stage] = "test"
       end
@@ -60,9 +63,30 @@ class TaskTest < Test::Unit::TestCase
       end
       
       should "create a deployment" do
-        Deployment.expects(:create).with(:task => "deploy", :project_id => 2, :stage_id => 3)
+        Deployment.expects(:create).with(:task => "deploy", :project_id => 2, :stage_id => 3).returns(@deployment)
         @task.run
       end
+      
+      should "find the latest deployment" do
+        Deployment.expects(:find).returns @deployment
+        @task.run
+      end
+      
+      context "when requesting the deployment multiple times" do
+        setup do
+          @seq = sequence("latest")
+          @deployment1 = Deployment.new(:completed_at => nil, :log => "Chunky bacon", :id => 2)
+          @deployment2 = Deployment.new(:completed_at => Time.now, :log => "Chunky bacon is my bitch", :id => 2)
+          Deployment.stubs(:create).returns(@deployment1)
+        end
+        
+        should "concat the deployment log" do
+          Deployment.expects(:find).returns(@deployment1).in_sequence(@seq)
+          Deployment.expects(:find).returns(@deployment2).in_sequence(@seq)
+          @task.run
+          assert_equal "Chunky bacon is my bitch", @task.log
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mattmatt-cap-ext-webistrano
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Mathias Meyer
@@ -31,7 +31,7 @@ extra_rdoc_files: []
 
 files: 
 - Rakefile
-- README
+- README.markdown
 - VERSION.yml
 - lib/cap_ext_webistrano
 - lib/cap_ext_webistrano/deployment.rb