marionetta 0.3.1 → 0.3.2

data/lib/marionetta/command_runner.rb

@@ -75,8 +75,9 @@ module Marionetta
       archive_cmd = [
         server[:archive][:command],
         server[:archive][:flags],
-        save_to,
-        directory,
+        ['-f', save_to],
+        ['-C', File.dirname(directory)],
+        File.basename(directory),
       ]
 
       system(*archive_cmd.flatten)
@@ -91,7 +92,7 @@ module Marionetta
       extract_cmd = [
         server[:extract][:command],
         server[:extract][:flags],
-        archive_path,
+        ['-f', archive_path],
       ]
 
       cmds << extract_cmd.flatten.join(' ')

data/lib/marionetta/group.rb

@@ -65,8 +65,14 @@ module Marionetta
     def manipulate_each_server(manipulator_name, method_name)
       each_server do |s|
         manipulator = Manipulators[manipulator_name].new(s)
-        return_val = manipulator.method(method_name).call()
-        yield s, return_val if block_given?
+
+        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}].#{method_name}()")
+        end
       end
     end
   end

data/lib/marionetta/manipulators/debloyer.rb

@@ -13,6 +13,16 @@ module Marionetta
         @server = server
       end
 
+      def can?()
+        d = server[:debloyer]
+        
+        if d.has_key?(:from) and d.has_key?(:to)
+          return true
+        else
+          return false
+        end
+      end
+
       def deploy()
         deb_path = create_deb_path
         build_deb(deb_path)

data/lib/marionetta/manipulators/deployer.rb

@@ -13,21 +13,22 @@ module Marionetta
         @server = server
       end
 
-      def deploy()
-        release = timestamp
-        release_archive = "/tmp/#{release}.tar.gz"
-        cmd.archive(from_dir, release_archive)
-        cmd.put(release_archive)
-
-        release_dir = release_dir(release)
-
-        unless cmd.ssh_extract(release_archive, release_dir)
-          server[:logger].fatal(cmd.last)
-          server[:logger].fatal('Could not extract archive')
-          exit(1)
+      def can?()
+        d = server[:deployer]
+        
+        if d.has_key?(:from) and d.has_key?(:to)
+          return true
+        else
+          return false
         end
+      end
 
-        symlink_release(release)
+      def deploy()
+        release = timestamp
+        create_tmp_release_dir(release)
+        send_tmp_release_dir_as_archive(release)
+        extract_archive_into_release_dir(release)
+        symlink_release_dir(release)
       end
 
       def releases()
@@ -51,7 +52,7 @@ module Marionetta
           current_release_dir = release_dir(releases.last)
           skip_current_release_dir = release_dir("skip-#{releases.last}")
           cmd.ssh("mv #{current_release_dir} #{skip_current_release_dir}")
-          symlink_release(rollback_to_release)
+          symlink_release_dir(rollback_to_release)
         end
       end
 
@@ -67,6 +68,14 @@ module Marionetta
         server[:deployer][:from]
       end
 
+      def tmp_release_dir(release)
+        "/tmp/#{release}"
+      end
+
+      def tmp_release_archive(release)
+        "/tmp/#{release}.tar.gz"
+      end
+
       def to_dir()
         server[:deployer][:to]
       end
@@ -81,7 +90,28 @@ module Marionetta
         "#{to_dir}/current"
       end
 
-      def symlink_release(release)
+      def create_tmp_release_dir(release)
+        cmd.system("cp -r #{from_dir} #{tmp_release_dir(release)}")
+      end
+
+      def send_tmp_release_dir_as_archive(release)
+        release_archive = tmp_release_archive(release) 
+        cmd.archive(tmp_release_dir(release), release_archive)
+        cmd.put(release_archive)
+      end
+
+      def extract_archive_into_release_dir(release)
+        release_archive = tmp_release_archive(release)
+        release_dir = release_dir(release)
+
+        unless cmd.ssh_extract(release_archive, release_dir)
+          server[:logger].fatal(cmd.last)
+          server[:logger].fatal('Could not extract archive')
+          exit(1)
+        end
+      end
+
+      def symlink_release_dir(release)
         release_dir = release_dir(release)
 
         unless cmd.ssh("rm -rf #{current_dir} && ln -s #{release_dir} #{current_dir}")

data/lib/marionetta/manipulators/puppet_manipulator.rb

@@ -13,6 +13,10 @@ module Marionetta
         @server = server
       end
 
+      def can?()
+        server[:puppet].has_key?(:manifest)
+      end
+
       def install()
         install_deb_repo
         install_deb
@@ -73,6 +77,7 @@ module Marionetta
           cmds << "cp -r #{server[:puppet][:modules]} #{puppet_tmp}/modules"
         end
 
+        cmd.system(cmds.join(' && '))
         cmd.archive(puppet_tmp)
       end
 

data/lib/marionetta.rb

@@ -1,5 +1,5 @@
 module Marionetta
-  VERSION     = '0.3.1'
+  VERSION     = '0.3.2'
   DESCRIPTION = 'For lightweight puppet mastery. Organise
                  multiple machines via rsync and SSH rather
                  than using puppet master'
@@ -20,13 +20,13 @@ module Marionetta
 
       :archive => {
         :command => 'tar',
-        :flags => ['-zvcf'],
+        :flags => ['-zvc'],
         :ext => 'tar.gz',
       },
 
       :extract => {
         :command => 'tar',
-        :flags => ['-xvf'],
+        :flags => ['-xv'],
       },
 
       :deployer => {},

metadata

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