Changeset 82

Timestamp:

02/11/08 18:22:38 (9 months ago)

Author:

jweiss

Message:

offer all tasks on deployment, filter shell and invoke tasks

Location:

trunk

Files:

• app/controllers/stages_controller.rb (modified) (1 diff)
• app/models/stage.rb (modified) (1 diff)
• app/views/stages/show.html.erb (modified) (1 diff)
• app/views/stages/tasks.html.erb (modified) (2 diffs)
• test/unit/webistrano_deployer_test.rb (modified) (2 diffs)

trunk/app/controllers/stages_controller.rb

@@ -7 +7 @@
   def show
     @stage = current_project.stages.find(params[:id])
+    @task_list = [['All tasks: ', '']] + @stage.list_tasks.collect{|x| [x.first, x.first]}.sort
 
     respond_to do |format|

trunk/app/models/stage.rb

@@ -124 +124 @@
     d.stage = self
     deployer = Webistrano::Deployer.new(d)
-    deployer.list_tasks.collect { |t| [t.fully_qualified_name, t.description] }
+    deployer.list_tasks.collect { |t| [t.fully_qualified_name, t.description] }.delete_if{|x| x.first == 'shell' || x.first == 'invoke'}
   end
   

trunk/app/views/stages/show.html.erb

@@ -3 +3 @@
 
 <div class="special_box deployments_box">
-   <p><%= link_to 'Deploy', new_project_stage_deployment_path(current_project, @stage) + '?task=deploy', :class => 'arrow_link_big' %></p>
+   <p><%= link_to 'Deploy', new_project_stage_deployment_path(current_project, @stage) + '?task=deploy', :class => 'arrow_link' %></p>
    <p><%= link_to 'Deploy and migrate', new_project_stage_deployment_path(current_project, @stage) + '?task=deploy:migrations', :class => 'arrow_link' %></p>
    <p><%= link_to 'Restart App Servers', new_project_stage_deployment_path(current_project, @stage) + '?task=deploy:restart', :class => 'arrow_link' %></p>
-   <p><%= link_to 'Rollback to previous', new_project_stage_deployment_path(current_project, @stage) + '?task=deploy:rollback', :class => 'arrow_link' %></p>
    <p><%= link_to 'Setup', new_project_stage_deployment_path(current_project, @stage) + '?task=deploy:setup', :class => 'arrow_link' %></p>
-   <p><%= link_to 'List all available tasks', tasks_project_stage_path(current_project, @stage), :class => 'arrow_link' %></p>
+   <p>
+     <%= select_tag('task', options_for_select(@task_list)) %>
+   </p>
+   <p>
+     <%= link_to 'Execute', new_project_stage_deployment_path(current_project, @stage), :class => 'arrow_link', 
+         :onclick => "location.href='#{new_project_stage_deployment_path(current_project, @stage)}?task=' + $F('task'); return false" %> |
+     <%= link_to 'Info', tasks_project_stage_path(current_project, @stage), :class => 'arrow_link',
+         :onclick => "location.href='#{tasks_project_stage_path(current_project, @stage)}#' + $F('task'); return false" %>
+   </p>
 </div>
 

trunk/app/views/stages/tasks.html.erb

@@ -6 +6 @@
     <% @tasks.sort.each do |key, value| %>
         <tr>
-        <td valign="top"><%= link_to key, new_project_stage_deployment_path(current_project, @stage) + "?task=#{key}"%></td>
-        <td valign="top"><%= simple_format value %></td>
+        <td valign="top"><%= link_to key, new_project_stage_deployment_path(current_project, @stage) + "?task=#{key}", :class => 'arrow_link', :name => h(key)%></td>
+        <td>&nbsp;&nbsp;</td>
+          <td valign="top"><%= simple_format value %></td>
         </tr>
     <% end %>
@@ -13 +14 @@
 
 </fieldset>
+
+<br />
+<%= link_to 'Back', project_stage_path(@project, @stage), :class => 'arrow_link'  %>

trunk/test/unit/webistrano_deployer_test.rb

@@ -681 +681 @@
     assert_not_nil deployer.list_tasks
     assert_equal 23, deployer.list_tasks.size
-    assert_equal 23, @stage.list_tasks.size
+    assert_equal 21, @stage.list_tasks.size # filter shell and invoke
     deployer.list_tasks.each{|t| assert t.is_a?(Capistrano::TaskDefinition) }
     
@@ -696 +696 @@
         
     assert_equal 24, deployer.list_tasks.size
-    assert_equal 24, @stage.list_tasks.size
+    assert_equal 22, @stage.list_tasks.size # filter shell and invoke
     assert_equal 1, deployer.list_tasks.delete_if{|t| t.fully_qualified_name != 'foo:bar'}.size
     assert_equal 1, @stage.list_tasks.delete_if{|t| t[0] != 'foo:bar'}.size