mattmatt-cap-ext-webistrano 0.1.1 → 0.1.2

data/README.markdown

@@ -21,11 +21,11 @@ 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:
@@ -34,6 +34,30 @@ several stages it'd be better to ask for the stage to be deployed:
       Capistrano::CLI.ui.ask "Specify the stage to deploy: "
     end
 
+You can ask for the password too:
+
+    set :password do
+        Capistrano::CLI.password_prompt "Enter the deploy password: "
+    end
+
+Optionally, you can specify configuration that you had setup webistrano to
+prompt it:
+
+    set :prompt_config, { :password => 'mysecretpassword' }
+
+Changes
+=======
+
+- Added support for prompt configuration (Lucas Mundim)
+- Restore prefix_options hash as Active Resource lost it when reload method is called (Lucas Mundim)
+- Solved "regular expression too big" exception error on large string 
+output (Michael Lim)
+- Workaround to solve bug in @deployment.reload() not loading the site url 
+correctly (Michael Lim)
+
+License
+=======
+
 (c) 2009 Mathias Meyer
 
 Released under the MIT license.

data/Rakefile

@@ -6,7 +6,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = 'cap-ext-webistrano'
-    s.summary = 'A drop-in replacement for Capistrano to fire off Webistrano deployments transparently without losing the joy of using the cap command.'
+    s.summary = 'A drop-in replacement for Capistrano to fire off Webistrano deployments transparently without losing the joy of using the cap command. You need a fully configured Webistrano installation.'
     s.email = 'meyer@paperplanes.de'
     s.homepage = 'http://github.com/mattmatt/cap-ext-webistrano'
     s.authors = ["Mathias Meyer"]

data/VERSION.yml

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

data/lib/cap_ext_webistrano.rb

@@ -38,6 +38,10 @@ Capistrano::Configuration::Execution.class_eval do
   def find_and_execute_task(task, hooks = {})
     hijack_capistrano
     @callbacks = {}
-    original_find_and_execute_task(task, {})
+    begin
+      original_find_and_execute_task(task, {})
+    rescue Capistrano::NoSuchTaskError
+      CapExtWebistrano::Task.new(task, self).run
+    end
   end
 end

data/lib/cap_ext_webistrano/task.rb

@@ -5,7 +5,7 @@ require 'cap_ext_webistrano/deployment'
 module CapExtWebistrano
   class Task
     attr_accessor :task, :log
-    
+
     def initialize(task, config)
       @task = task
       @config = config
@@ -17,30 +17,35 @@ module CapExtWebistrano
         klazz.configure(@config)
       end
     end
-    
+
     def loop_latest_deployment
       still_running = true
+      prefix_options = @deployment.prefix_options
       while still_running
         sleep 5
+        @deployment.prefix_options.merge!(prefix_options)
         @deployment.reload
         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, "") 
+        diff = deployment.log
+        diff.slice!(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 = Deployment.create(:task => task, :stage_id => @stage.id, :project_id => @project.id)
+      params = { :task => task, :stage_id => @stage.id, :project_id => @project.id }
+      params.merge!(:prompt_config => @config[:prompt_config]) if @config.exists?(:prompt_config)
+      @deployment = Deployment.create(params)
       loop_latest_deployment
     end
   end

data/test/cap_ext_webistrano_shoulda.rb

@@ -21,5 +21,11 @@ class CapExtWebistranoTest < Test::Unit::TestCase
       @cap.find_and_execute_task("deploy")
       assert @cap.ran
     end
+    
+    should "just call tasks that don't exist locally" do
+      @cap.stubs(:original_find_and_execute_task).raises(Capistrano::NoSuchTaskError.new, "the task activate:web does not exist")
+      @cap.find_and_execute_task("acticate:web")
+      assert @cap.ran
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mattmatt-cap-ext-webistrano
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Mathias Meyer
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-22 00:00:00 -08:00
+date: 2009-06-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: activeresource
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -79,6 +81,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: A drop-in replacement for Capistrano to fire off Webistrano deployments transparently without losing the joy of using the cap command.
+summary: A drop-in replacement for Capistrano to fire off Webistrano deployments transparently without losing the joy of using the cap command. You need a fully configured Webistrano installation.
 test_files: []