apply roles to runlist before recipes

dagolden · May 11, 2012 · 21a164b · 21a164b
1 parent 6b5dc84
commit 21a164b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/Pantry/App/Command/apply.pm b/lib/Pantry/App/Command/apply.pm
@@ -78,12 +78,12 @@ sub _check_name {
 
 sub _apply_runlist {
   my ($self, $obj, $opt) = @_;
-  if ($opt->{recipe}) {
-    $obj->append_to_run_list(map { "recipe[$_]" } @{$opt->{recipe}});
-  }
   if ($opt->{role}) {
     $obj->append_to_run_list(map { "role[$_]" } @{$opt->{role}});
   }
+  if ($opt->{recipe}) {
+    $obj->append_to_run_list(map { "recipe[$_]" } @{$opt->{recipe}});
+  }
   return;
 }
 

diff --git a/t/app/apply.t b/t/app/apply.t
@@ -40,6 +40,12 @@ my @cases = (
           run_list => [ 'role[web]' ],
         },
       },
+      {
+        argv => [ qw/-r postfix -r iptables -R web/ ],
+        expected => {
+          run_list => [ qw/role[web] recipe[postfix] recipe[iptables]/ ],
+        },
+      },
       {
         argv => [ qw/-d nginx.port=80/ ],
         expected => {