marionetta 0.2.1 → 0.2.2

data/lib/marionetta.rb

@@ -1,20 +1,22 @@
 module Marionetta
-  VERSION     = '0.2.1'
+  VERSION     = '0.2.2'
   DESCRIPTION = 'For lightweight puppet mastery. Organise
                  multiple machines via rsync and SSH rather
                  than using puppet master'
 
   def self.default_server()
     {
+      :logger => Logger.new($stdout),
+
       :ssh => {
         :command => 'ssh',
         :flags   => [],
       },
+
       :rsync => {
         :command => 'rsync',
         :flags   => ["-azP", "--delete"],
       },
-      :logger => Logger.new($stdout),
 
       :debloyer => {
         :name => 'debloyer',

data/lib/marionetta/rake_helper.rb

@@ -25,7 +25,7 @@ module Marionetta
     def install_group_tasks_for(group)
       Manipulators.all.each do |manipulator_name, manipulator_class|
         manipulator_class.tasks.each do |method_name|
-          desc("#{method_name} #{manipulator_name} on #{group.name} (marionetta)")
+          desc(task_desc(group, manipulator_name, method_name))
           task(task_name(group, manipulator_name, method_name)) do
             group.manipulate_each_server(manipulator_name, method_name)
           end
@@ -38,7 +38,11 @@ module Marionetta
         raise 'Group must be named'
       end
 
-      return "#{group.name}:#{manipulator_name}:#{method_name}"
+      return "#{manipulator_name}:#{group.name}:#{method_name}"
+    end
+
+    def task_desc(group, manipulator_name, method_name)
+      "#{method_name} #{manipulator_name} on #{group.name} (marionetta)"
     end
   end
 end

data/spec/marionetta_rake_helper_spec.rb

@@ -9,7 +9,7 @@ describe Marionetta::RakeHelper do
     Marionetta::RakeHelper.new(vagrant).install_group_tasks
     Rake::Task.tasks.count.should > 0
 
-    Rake::Task['vagrant:puppet:update'].invoke
-    Rake::Task['vagrant:debloyer:deploy'].invoke
+    Rake::Task['puppet:vagrant:update'].invoke
+    Rake::Task['debloyer:vagrant:deploy'].invoke
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: