Changeset 98

Timestamp:

04/29/08 16:39:54 (7 months ago)

Author:

jweiss

Message:

merge latest changes into 1.3

Location:

branches/1.3

Files:

• CHANGELOG.txt (modified) (1 diff)
• app/controllers/deployments_controller.rb (modified) (1 diff)
• app/controllers/stages_controller.rb (modified) (1 diff)
• app/models/project_configuration.rb (modified) (1 diff)
• lib/webistrano/template.rb (modified) (1 diff)
• lib/webistrano/template/mod_rails.rb (copied) (copied from trunk/lib/webistrano/template/mod_rails.rb)
• test/functional/stages_controller_test.rb (modified) (2 diffs)
• test/unit/project_configuration_test.rb (modified) (1 diff)

branches/1.3/CHANGELOG.txt

@@ -3 +3 @@
 
 1.3
+
+* Add support for mod_rails / Phusion Passenger. Use mod_rails as project type.
 
 * Ability to disable host per deloy. This way host that are down do not block a deployment

branches/1.3/app/controllers/deployments_controller.rb

@@ -11 +11 @@
     respond_to do |format|
       format.html # index.rhtml
-      format.xml  { render :xml => @deployment.to_xml }
+      format.xml  { render :xml => @deployments.to_xml }
     end
   end

branches/1.3/app/controllers/stages_controller.rb

@@ -2 +2 @@
 
   before_filter :load_project
+  
+  # GET /projects/1/stages.xml
+  def index
+    @stages = current_project.stages
+    respond_to do |format|
+      format.xml  { render :xml => @stages.to_xml }
+    end
+  end
 
   # GET /projects/1/stages/1

branches/1.3/app/models/project_configuration.rb

@@ -10 +10 @@
       'rails' => Webistrano::Template::Rails,
       'mongrel_rails' => Webistrano::Template::MongrelRails,
+      'mod_rails' => Webistrano::Template::ModRails,
       'pure_file' => Webistrano::Template::PureFile
     }

branches/1.3/lib/webistrano/template.rb

@@ -3 +3 @@
 require "webistrano/template/mongrel_rails"
 require "webistrano/template/pure_file"
+require "webistrano/template/mod_rails"

branches/1.3/test/functional/stages_controller_test.rb

@@ -14 +14 @@
     
     @project = create_new_project(:template => 'mongrel_rails')
-    @stage = create_new_stage(:project => @project)
+    @stage = create_new_stage(:project => @project, :name => 'my_stage')
     @user = login
   end
 
-  def test_should_not_get_index
-    assert_raise(ActionController::UnknownAction){
-      get :index, :project_id => @project.id 
-    }
+  def test_should_get_index
+    get :index, :project_id => @project.id 
+    assert_response :success
   end
 
@@ -108 +107 @@
   end
   
+  def test_index
+    get :index, :project_id => @project.id, :format => 'xml'
+    assert_response :success
+    assert_select 'stages' do |elements|
+      elements.each do |el|
+        assert_select 'stage>name', 'my_stage' 
+      end
+    end
+  end
+  
 end

branches/1.3/test/unit/project_configuration_test.rb

@@ -8 +8 @@
     assert_not_nil ProjectConfiguration.templates['mongrel_rails']
     assert_not_nil ProjectConfiguration.templates['pure_file']
+    assert_not_nil ProjectConfiguration.templates['mod_rails']
   end