marionetta 0.3.3 → 0.3.4

data/Rakefile

@@ -34,6 +34,15 @@ task(:publish => :gem) do
   system(cmd.join(' && '))
 end
 
+task(:docs) do
+  docs_cmd = [
+    'rm -rf docs',
+    'cd lib',
+    'rocco -o ../docs -l ruby marionetta.rb',
+  ]
+  system(docs_cmd.join(' && '))
+end
+
 task(:clean) do
   system('rm *.gem')
 end

data/lib/marionetta/manipulators/deployer.rb

@@ -28,8 +28,13 @@ module Marionetta
 
         release = timestamp
         create_tmp_release_dir(release)
-        send_tmp_release_dir_as_archive(release)
-        extract_archive_into_release_dir(release)
+
+        cmd.ssh("mkdir -p #{release_dir}")
+
+        unless cmd.put(tmp_release_dir(release), release_dir)
+          fatal('Could not rsync release')
+        end
+
         symlink_release_dir(release)
 
         run_script(:after)
@@ -122,24 +127,6 @@ module Marionetta
         end
       end
 
-      def send_tmp_release_dir_as_archive(release)
-        release_archive = tmp_release_archive(release) 
-        
-        unless cmd.archive(tmp_release_dir(release), release_archive)
-          fatal('Could not create archive')
-        end
-
-        cmd.put(release_archive)
-      end
-
-      def extract_archive_into_release_dir(release)
-        release_archive = tmp_release_archive(release)
-
-        unless cmd.ssh_extract(release_archive, release_dir)
-          fatal('Could not extract archive')
-        end
-      end
-
       def symlink_release_dir(release)
         release_dir = release_dir(release)
 

data/lib/marionetta.rb

@@ -24,7 +24,9 @@
 # [author]: http://lukemorton.co.uk
 # [github]: https://github.com/DrPheltRight/marionetta
 module Marionetta
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
+
+  ### Defining Servers
 
   # In order to connect to servers you must define configs for
   # each. This method provides a default map describing some
@@ -49,7 +51,7 @@ module Marionetta
 
       :rsync => {
         :command => 'rsync',
-        :flags   => ['-azP', '--delete'],
+        :flags   => ['-azhP', '--delete'],
       },
 
       :archive => {
@@ -63,6 +65,8 @@ module Marionetta
         :flags => ['-xv'],
       },
 
+      :puppet => {},
+
       :deployer => {},
 
       :debloyer => {

data/marionetta.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
                    also deploy your application code (with rollbacks) via
                    rsync. With a RakeHelper you can integrate it into your
                    workflow with ease."
-                   
+
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- spec/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map {|f| File.basename(f)}
@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')
   s.add_development_dependency('vagrant')
+  s.add_development_dependency('fl-rocco')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fl-rocco
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "Marionetta is a ruby library for executing commands to one\n                   or
   more remote machines via SSH. It provides puppet\n                   provisioning
   without the need for a puppet master and can\n                   also deploy your