marionetta 0.4.6 → 0.4.7

data/README.md

@@ -166,13 +166,18 @@ 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)
+ - Remove rollback feature... we don't need rollbacks IMO. (v0.5.x)
+ - Remove Marionetta::Manipulators::Debloyer (v0.5.x) 
  - Use rye for commands (https://github.com/delano/rye) (v0.5.x)
  - Use a single SSH connection per task (v0.5.x)
+ - Add ability to define shared directories with Manipulators::Deployer
+ - Add ability to define permissions with Manipulators::Deployer
+ - Change :before_script and :after_script to :before_scripts and :after_scripts
+   that take an array
+ - Use same technique for transfering puppet files as used by deployer
 
 ## Author
 

data/lib/marionetta.rb

@@ -27,7 +27,7 @@
 # 
 module Marionetta
 
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 
   ### Defining Servers
 

data/lib/marionetta/command_runner.rb

@@ -50,8 +50,9 @@ module Marionetta
           yield stdout, stderr if block_given?
 
           [stdout, stderr].each do |io|
-            str = io.read
-            server[:logger].debug(str) unless str.empty?
+            io.each do |line|
+              server[:logger].debug(line) unless line.empty?
+            end
           end
         end
       rescue

data/lib/marionetta/commandable.rb

@@ -0,0 +1,20 @@
+require 'marionetta/command_runner'
+
+module Marionetta
+  module Commandable
+    ### Dependency Injection
+
+    # To use your own alternative to `CommandRunner` you can
+    # set an object of your choice via the `.cmd=` method.
+    # 
+    attr_writer :cmd
+
+  private
+
+    attr_reader :server
+
+    def cmd()
+      @cmd ||= CommandRunner.new(server)
+    end
+  end
+end

data/lib/marionetta/directory_sync.rb

@@ -0,0 +1,58 @@
+require 'marionetta/commandable'
+
+module Marionetta
+  class DirectorySync
+    include Commandable
+
+    def self.sync(server, from, to, options)
+      new(server).sync(from, to, options)
+    end
+
+    def initialize(server)
+      @server = server
+    end
+
+    def sync(from, to, options)
+      create_dir(to)
+      sync_dir(from, to, options[:exclude])
+    end
+
+  private
+
+    def create_dir(dir)
+      cmd.ssh("test -d #{dir} || mkdir -p #{dir}")
+    end
+
+    def rsync_exclude_files(from, exclude_files)
+      exclude_files = exclude_files.clone
+
+      exclude_files.map! {|f| Dir["#{from}/#{f}"]}
+      exclude_files.flatten!
+
+      exclude_files.map! {|f| f.sub(from + '/', '')}
+
+      return exclude_files
+    end
+
+    def rsync_exclude_flags(exclude_files)
+      exclude_files.map! {|f| ['--exclude', f]}
+      exclude_files.flatten!
+
+      return exclude_files
+    end
+
+    def sync_dir(from, to, exclude_files = [])
+      args = [Dir[from+'/*'], to]
+
+      unless exclude_files.empty?
+        args.concat(rsync_exclude_flags(rsync_exclude_files(from, exclude_files)))
+      end
+
+      unless cmd.put(*args)
+        server[:logger].fatal(cmd.last)
+        server[:logger].fatal('Could not rsync cache dir')
+        exit(1)
+      end
+    end
+  end
+end

data/lib/marionetta/manipulators/deployer.rb

@@ -5,11 +5,13 @@
 # maintains a folder of releases so you may rollback quickly.
 # 
 require 'marionetta'
-require 'marionetta/command_runner'
+require 'marionetta/commandable'
+require 'marionetta/directory_sync'
 
 module Marionetta
   module Manipulators
     class Deployer
+      include Commandable
 
       ### RakeHelper tasks
 
@@ -75,8 +77,7 @@ module Marionetta
       def deploy()
         release = create_release_name()
 
-        create_cache_dir()
-        sync_cache_dir()
+        DirectorySync.sync(server, from_dir, cache_dir, server[:deployer])
         copy_cache_dir_to_release(release)
 
         send_scripts()
@@ -117,21 +118,8 @@ module Marionetta
           symlink_release_dir(rollback_to_release)
         end
       end
-      
-      ### Dependency Injection
-
-      # To use your own alternative to `CommandRunner` you can
-      # set an object of your choice via the `.cmd=` method.
-      # 
-      attr_writer :cmd
 
     private
-      
-      attr_reader :server
-
-      def cmd()
-        @cmd ||= CommandRunner.new(server)
-      end
 
       def from_dir()
         server[:deployer][:from]
@@ -165,12 +153,6 @@ module Marionetta
         "#{to_dir}/current"
       end
 
-      def fatal(message)
-        server[:logger].fatal(cmd.last)
-        server[:logger].fatal(message)
-        exit(1)
-      end
-
       def create_release_name()
         name = timestamp
 
@@ -186,32 +168,6 @@ module Marionetta
         return name
       end
 
-      def rsync_exclude_flags(exclude_files)
-        exclude_files = exclude_files.clone
-        exclude_files.map! {|f| Dir["#{from_dir}/#{f}"]}
-        exclude_files.flatten!
-        exclude_files.map! {|f| f.sub(from_dir+'/', '')}
-        exclude_files.map! {|f| ['--exclude', f]}
-        exclude_files.flatten!
-        return exclude_files
-      end
-
-      def create_cache_dir()
-        cmd.ssh("test -d #{cache_dir} || mkdir -p #{cache_dir}")
-      end
-
-      def sync_cache_dir()
-        args = [Dir[from_dir+'/*'], cache_dir]
-
-        if server[:deployer].has_key?(:exclude)
-          args.concat(rsync_exclude_flags(server[:deployer][:exclude]))
-        end
-
-        unless cmd.put(*args)
-          fatal('Could not rsync cache dir')
-        end
-      end
-
       def copy_cache_dir_to_release(release)
         release_dir = release_dir(release)
         cmd.ssh("mkdir -p #{releases_dir} && cp -r #{cache_dir} #{release_dir}")
@@ -247,7 +203,9 @@ module Marionetta
         release_dir = release_dir(release)
 
         unless cmd.ssh("rm -f #{current_dir} && ln -s #{release_dir} #{current_dir}")
-          fatal('Could not symlink release as current')
+          server[:logger].fatal(cmd.last)
+          server[:logger].fatal('Could not symlink release as current')
+          exit(1)
         end
       end
 

data/lib/marionetta/manipulators/puppet_manipulator.rb

@@ -7,11 +7,12 @@
 # master or want to push changes from your machine directly to
 # nodes them this class maybe what you're looking for.
 # 
-require 'marionetta/command_runner'
+require 'marionetta/commandable'
 
 module Marionetta
   module Manipulators
     class Puppet
+      include Marionetta::Commandable
 
       ### RakeHelper tasks
 
@@ -52,7 +53,10 @@ module Marionetta
       # to install puppet on debian or ubuntu servers.
       # 
       def install()
-        install_deb_repo
+        unless server[:puppet].has_key?(:use_distro_repo) and server[:puppet][:use_distro_repo] == true
+          install_deb_repo
+        end
+
         install_deb
       end
 
@@ -71,21 +75,8 @@ module Marionetta
         send_archive
         apply_archive
       end
-      
-      ### Dependency Injection
-
-      # To use your own alternative to `CommandRunner` you can
-      # set an object of your choice via the `.cmd=` method.
-      # 
-      attr_writer :cmd
 
     private
-    
-      attr_reader :server
-
-      def cmd()
-        @cmd ||= CommandRunner.new(server)
-      end
 
       def installed?()
         cmd.ssh('which puppet')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-01 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
@@ -140,6 +140,8 @@ files:
 - Rakefile
 - lib/marionetta.rb
 - lib/marionetta/command_runner.rb
+- lib/marionetta/commandable.rb
+- lib/marionetta/directory_sync.rb
 - lib/marionetta/group.rb
 - lib/marionetta/manipulators.rb
 - lib/marionetta/manipulators/debloyer.rb
@@ -175,12 +177,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 144075808825737942
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 144075808825737942
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24