Changeset 34

Timestamp:

10/27/07 14:59:54 (13 months ago)

Author:

jweiss

Message:

A stage can list all available tasks, based on #11

Location:

trunk

Files:

• app/controllers/stages_controller.rb (modified) (1 diff)
• app/models/stage.rb (modified) (1 diff)
• app/views/stages/show.rhtml (modified) (1 diff)
• app/views/stages/tasks.rhtml (added)
• config/routes.rb (modified) (1 diff)
• lib/webistrano/deployer.rb (modified) (4 diffs)
• test/functional/stages_controller_test.rb (modified) (2 diffs)
• test/unit/webistrano_deployer_test.rb (modified) (1 diff)

trunk/app/controllers/stages_controller.rb

@@ -22 +22 @@
   def edit
     @stage = current_project.stages.find(params[:id])
+  end
+  
+  # GET /projects/1/stages/1/tasks
+  # GET /projects/1/stages/1/tasks.xml
+  def tasks
+    @stage = current_project.stages.find(params[:id])
+    @tasks = @stage.list_tasks
+    
+    respond_to do |format|
+      format.html # tasks.rhtml
+      format.xml  { render :xml => @tasks.to_xml }
+    end
   end
 

trunk/app/models/stage.rb

@@ -117 +117 @@
   end
   
+  # returns a lists of all availabe tasks for this stage
+  def list_tasks
+    d = Deployment.new
+    d.stage = self
+    deployer = Webistrano::Deployer.new(d)
+    deployer.list_tasks.collect { |t| [t.fully_qualified_name, t.description] }
+  end
+  
   protected
   def add_deployment_problem(key, desc)

trunk/app/views/stages/show.rhtml

@@ -8 +8 @@
    <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>
 </div>
 

trunk/config/routes.rb

@@ -23 +23 @@
     projects.resources :project_configurations
     
-    projects.resources :stages, :member => {:capfile => :get, :recipes => :any} do |stages|
+    projects.resources :stages, :member => {:capfile => :get, :recipes => :any, :tasks => :get} do |stages|
       stages.resources :stage_configurations
       stages.resources :roles

trunk/lib/webistrano/deployer.rb

@@ -22 +22 @@
     
       @deployment = deployment
-      @logger = Webistrano::Logger.new(deployment)
-      @logger.level = Webistrano::Logger::TRACE
-      validate
+      
+      if(@deployment.task && !@deployment.new_record?)
+        # a read deployment
+        @logger = Webistrano::Logger.new(deployment)
+        @logger.level = Webistrano::Logger::TRACE
+        validate
+      else
+        # a fake deployment in order to access tasks
+        @logger = Capistrano::Logger.new
+      end
     end
   
@@ -56 +63 @@
         set_webistrano_logger(config)
         
-        set_pre_vars(config)
-        load_recipes(config)
-
-        set_stage_configuration(config)
-        set_stage_roles(config)
-        set_project_and_stage_names(config)
-        load_project_template_tasks(config)
-        load_stage_custom_recipes(config)
+        set_up_config(config)
         
         exchange_real_revision(config) unless (config.fetch(:scm).to_s == 'git') # git cannot do a local query by default
@@ -86 +86 @@
       config = Webistrano::Configuration.new
       config.logger = logger
+      config
+    end
+    
+    def set_up_config(config)
+      set_pre_vars(config)
+      load_recipes(config)
+
+      set_stage_configuration(config)
+      set_stage_roles(config)
+      set_project_and_stage_names(config)
+      load_project_template_tasks(config)
+      load_stage_custom_recipes(config)
       config
     end
@@ -213 +225 @@
       end
     end
+    
+    # returns a list of all tasks defined for this deployer
+    def list_tasks
+      config = instantiate_configuration
+      config.load 'deploy'
+      
+      set_up_config(config)
+      
+      config.task_list(:all)
+    end
   
   end

trunk/test/functional/stages_controller_test.rb

@@ -13 +13 @@
     @response   = ActionController::TestResponse.new
     
-    @project = create_new_project
+    @project = create_new_project(:template => 'mongrel_rails')
     @stage = create_new_stage(:project => @project)
     @user = login
@@ -101 +101 @@
     assert_match "foobar here", @response.body
   end
+  
+  def test_should_show_stage_tasks
+    get :tasks, :id => @stage.id, :project_id => @project.id
+    assert_response :success
+    assert_match /webistrano:mongrel:start/, @response.body
+  end
+  
 end

trunk/test/unit/webistrano_deployer_test.rb

@@ -674 +674 @@
   end
   
+  def test_list_tasks
+    d = Deployment.new
+    d.stage = @stage
+    deployer = Webistrano::Deployer.new(d)
+    
+    assert_not_nil deployer.list_tasks
+    assert_equal 23, deployer.list_tasks.size
+    assert_equal 23, @stage.list_tasks.size
+    deployer.list_tasks.each{|t| assert t.is_a?(Capistrano::TaskDefinition) }
+    
+    # add a stage recipe
+    recipe_body = <<-EOS
+      namespace :foo do
+        task :bar do
+          run 'foobar'
+        end
+      end
+    EOS
+    recipe = create_new_recipe(:name => 'A new recipe', :body => recipe_body)
+    @stage.recipes << recipe
+        
+    assert_equal 24, deployer.list_tasks.size
+    assert_equal 24, @stage.list_tasks.size
+    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
+  end
+  
   
   protected