marionetta 0.4.5 → 0.4.6

data/README.md

@@ -164,6 +164,16 @@ Oh and you can rollback to the last release too!
 staging.manipulate_each_server(:deployer, :rollback)
 ```
 
+## Upcoming
+
+ - Remove rollback feature... we don't need rollbacks IMO. (v0.5.x)
+ - Remove Marionetta::Manipulators::Debloyer (v0.5.x) 
+ - Output deploy excludes to tmp file for use with rsync --exclude-from (v0.4.x)
+ - Add clean up for deployments (v0.4.x)
+ - Add puppet safe-upgrade ability (v0.4.x)
+ - Use rye for commands (https://github.com/delano/rye) (v0.5.x)
+ - Use a single SSH connection per task (v0.5.x)
+
 ## Author
 
 Luke Morton a.k.a. DrPheltRight

data/lib/marionetta/group.rb

@@ -65,7 +65,8 @@ module Marionetta
     # Get servers in this group and all descendant groups.
     # 
     def servers()
-      servers = @servers
+      servers  = []
+      servers.concat(@servers)
 
       @groups.each do |g|
         servers.concat(g.servers)
@@ -113,16 +114,20 @@ module Marionetta
     # If block passed in then the server and return value for
     # each server will be passed in when complete.
     # 
-    def manipulate_each_server(manipulator_name, method_name)
+    def manipulate_each_server(manipulator_class, method_name)
       each_server do |s|
-        manipulator = Manipulators[manipulator_name].new(s)
+        if manipulator_class.is_a? Symbol
+          manipulator_class = Manipulators[manipulator_class]
+        end
+
+        manipulator = manipulator_class.new(s)
 
         if manipulator.can?
           return_val = manipulator.method(method_name).call()
           yield s, return_val if block_given?
         else
           s[:logger].warn(
-            "Could not Manipulators[:#{manipulator_name}].#{method_name}()")
+            "Could not Manipulators[:#{manipulator.class.name}].#{method_name}()")
         end
       end
     end

data/lib/marionetta/manipulators/deployer.rb

@@ -172,7 +172,18 @@ module Marionetta
       end
 
       def create_release_name()
-        timestamp
+        name = timestamp
+
+        if server[:deployer].has_key?(:version)
+          version_cmd = server[:deployer][:version][:command]
+
+          cmd.system("cd #{from_dir} && #{version_cmd}") do |stdout|
+            version = stdout.read.strip
+            name << "_#{version}" unless version.empty?
+          end
+        end
+
+        return name
       end
 
       def rsync_exclude_flags(exclude_files)

data/lib/marionetta/manipulators/puppet_manipulator.rb

@@ -11,7 +11,7 @@ require 'marionetta/command_runner'
 
 module Marionetta
   module Manipulators
-    class PuppetManipulator
+    class Puppet
 
       ### RakeHelper tasks
 
@@ -159,4 +159,4 @@ module Marionetta
       end
     end
   end
-end
+end

data/lib/marionetta/manipulators.rb

@@ -24,7 +24,7 @@ module Marionetta
       {
         :deployer => Deployer,
         :debloyer => Debloyer,
-        :puppet   => PuppetManipulator,
+        :puppet   => Puppet,
       }
     end
 
@@ -34,4 +34,4 @@ module Marionetta
       all[key]
     end
   end
-end
+end

data/lib/marionetta/rake_helper.rb

@@ -22,6 +22,27 @@ module Marionetta
       end
     end
 
+    def install_group_task(group, manipulation, task_deps = [])
+      groups = [group]
+
+      group.groups.each do |g|
+        groups << g
+      end
+
+      manipulator, method_name = manipulation
+
+      groups.each do |g|
+        class_name = manipulator.name.split('::').last.downcase
+        task_desc = task_desc(g, class_name, method_name)
+        task_name = task_name(g, class_name, method_name)
+
+        desc(task_desc)
+        task(task_name => task_deps) do
+          g.manipulate_each_server(manipulator, method_name)
+        end
+      end
+    end
+
   private
 
     def install_group_tasks_for(group)
@@ -47,4 +68,4 @@ module Marionetta
       "#{method_name} #{manipulator_name} on #{group.name} (marionetta)"
     end
   end
-end
+end

data/lib/marionetta.rb

@@ -27,7 +27,7 @@
 # 
 module Marionetta
 
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 
   ### Defining Servers
 
@@ -75,7 +75,10 @@ module Marionetta
       :puppet => {},
 
       :deployer => {
-        :tmp => '/tmp'
+        :tmp => '/tmp',
+        :version => {
+          :command => "git log --pretty=format:'%h' -n 1", 
+        }
       },
 
       :debloyer => {

data/spec/puppet_manipulator_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 require_relative '../lib/marionetta/manipulators/puppet_manipulator'
 
-describe Marionetta::Manipulators::PuppetManipulator do
+describe Marionetta::Manipulators::Puppet do
   it 'should manipulate one server map' do
-    Marionetta::Manipulators::PuppetManipulator.new(server).update
+    Marionetta::Manipulators::Puppet.new(server).update
   end
 end

data/spec/rake_helper_spec.rb

@@ -7,11 +7,23 @@ describe Marionetta::RakeHelper do
     vagrant = Marionetta::Group.new(:vagrant)
     vagrant.add_server(server)
 
-    Marionetta::RakeHelper.install_group_tasks(vagrant)
+    # Marionetta::RakeHelper.install_group_tasks(vagrant)
+    
+    task(:help) do; p 'ey'; end
+
+    Marionetta::RakeHelper.install_group_task(
+      vagrant,
+      [Marionetta::Manipulators::Deployer, :deploy],
+      [:help])
+
+    Marionetta::RakeHelper.install_group_task(
+      vagrant,
+      [Marionetta::Manipulators::Puppet, :update])
+
     Rake::Task.tasks.count.should > 0
 
     Rake::Task['puppet:vagrant:update'].invoke
     Rake::Task['deployer:vagrant:deploy'].invoke
-    Rake::Task['deployer:vagrant:rollback'].invoke
+    # Rake::Task['deployer:vagrant:rollback'].invoke
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4