@@ -7,6 +7,8 @@ class Recipe < ActiveRecord::Base attr_accessible :name, :body, :description + named_scope :ordered, :order => "name ASC" + version_fu rescue nil # hack to silence migration errors when the original table is not there def validate app/models/recipe.rb @@ -9,7 +9,7 @@ <th width="40%">Name</th> <th width="60%">Description</th> </tr> - <% for recipe in @stage.recipes %> + <% for recipe in @stage.recipes.ordered %> <tr class="<%= cycle :even, :odd, :name => 'recipes' %>"> <td><%= link_to h(recipe.name), recipe_path(recipe) %></td> <td><%=h recipe.description %></td> app/views/stages/_recipes.html.erb @@ -162,7 +162,7 @@ module Webistrano # load custom project recipes def load_stage_custom_recipes(config) begin - deployment.stage.recipes.each do |recipe| + deployment.stage.recipes.ordered.each do |recipe| logger.info("loading stage recipe '#{recipe.name}' ") config.load(:string => recipe.body) end lib/webistrano/deployer.rb @@ -569,6 +569,51 @@ class Webistrano::DeployerTest < ActiveSupport::TestCase deployer.invoke_task! end + def test_load_order_of_recipes + recipe_1 = create_new_recipe(:name => 'B', :body => 'foobar here') + @stage.recipes << recipe_1 + + recipe_2 = create_new_recipe(:name => 'A', :body => 'more foobar here') + @stage.recipes << recipe_2 + + # Logger stubing + mock_cap_logger = mock + mock_cap_logger.expects(:level=).with(3) + + # config stubbing + mock_cap_config = mock + mock_cap_config.stubs(:trigger) + mock_cap_config.stubs(:logger).returns(mock_cap_logger) + mock_cap_config.stubs(:logger=) + mock_cap_config.stubs(:find_and_execute_task) + mock_cap_config.stubs(:[]) + mock_cap_config.stubs(:fetch).with(:scm) + + # vars + mock_cap_config.stubs(:set) + + # roles + mock_cap_config.stubs(:role) + + # + # now the interesting part, load + # + + seq = sequence('recipe_loading') + mock_cap_config.stubs(:load) + mock_cap_config.expects(:load).with(:string => recipe_2.body ).in_sequence(seq) + mock_cap_config.expects(:load).with(:string => recipe_1.body ).in_sequence(seq) + + # main mock install + Webistrano::Configuration.expects(:new).returns(mock_cap_config) + + # + # start + + deployer = Webistrano::Deployer.new(@deployment) + deployer.invoke_task! + end + def test_handling_of_exceptions_during_command_execution # Logger stubing mock_cap_logger = mock test/unit/webistrano_deployer_test.rb 10d0fbddb39e4c2a7588d4cd37c3d09bf18025bd Jonathan Weiss jw@innerewut.de http://github.com/peritor/webistrano/commit/3411dada9d6f9e1e0a7938ecbb7643779f29376f 3411dada9d6f9e1e0a7938ecbb7643779f29376f 2009-11-04T09:27:40-08:00 2009-11-04T09:27:36-08:00 load recipes in order (by name ASC) 7c4f97c618a411f5f92686b832f7c30c67ff0f14 Jonathan Weiss jw@innerewut.de