caterer 0.1.0 → 0.1.1

data/lib/caterer/communication/rsync.rb

@@ -1,13 +1,49 @@
+require 'pty'
+
 module Caterer
   module Communication
     class Rsync
       
       def initialize(server)
-        @server     = server
-        @logger     = Log4r::Logger.new("caterer::communication::ssh")
+        @server = server
+        @logger = Log4r::Logger.new("caterer::communication::ssh")
       end
 
-      
+      def sync(from, to)
+        PTY.spawn(rsync_cmd(from, to)) do |stdout, stdin|
+          eof = false
+          until eof do
+            begin
+              out = stdout.readpartial(4096)
+              if out.match /password:/
+                stdin.puts @server.password
+              else
+                print out if print_worthy out
+              end
+            rescue EOFError
+              eof = true
+            end
+          end
+        end
+      end
+
+      protected
+
+      def print_worthy(data)
+        [
+          /^\r\n$/, # empty lines
+          /^Warning: Permanently added/, # key added nonsense
+        ].each do |cruft|
+          if data.match cruft
+            return false
+          end
+        end
+        true
+      end
+
+      def rsync_cmd(from, to)
+        "rsync -zr -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p #{@server.port}' --delete #{from} #{@server.username}@#{@server.host}:#{to}"
+      end
 
     end
   end

data/lib/caterer/communication/ssh.rb

@@ -134,24 +134,32 @@ module Caterer
           ch.exec(shell) do |ch2, _|
             # Setup the channel callbacks so we can get data and exit status
             ch2.on_data do |ch3, data|
+
               @logger.debug("stdout: #{data}")
-              if block_given?
-                # Filter out the clear screen command
-                data = remove_ansi_escape_codes(data)
-                yield :stdout, data
-              end
+
+              # Filter out the clear screen command
+              data = remove_ansi_escape_codes(data)
+              # Filter annoying messages
+              data = remove_cruft(data)
+
+              yield :stdout, data if block_given?
+
               if opts[:stream]
                 @server.ui.info data, {:prefix => false, :new_line => false}
               end
             end
 
             ch2.on_extended_data do |ch3, type, data|
+
               @logger.debug("stderr: #{data}")
-              if block_given?
-                # Filter out the clear screen command
-                data = remove_ansi_escape_codes(data)
-                yield :stderr, data
-              end
+
+              # Filter out the clear screen command
+              data = remove_ansi_escape_codes(data)
+              # Filter annoying messages
+              data = remove_cruft(data)
+
+              yield :stderr, data if block_given?
+
               if opts[:stream]
                 @server.ui.info data, {:prefix => false, :new_line => false}
               end
@@ -180,6 +188,13 @@ module Caterer
         return exit_status
       end
 
+      def remove_cruft(string)
+        ["stdin: is not a tty\n"].each do |m|
+          string.gsub! m, ''
+        end
+        string
+      end
+
     end
   end
 end

data/lib/caterer/config/provision/chef_solo.rb

@@ -24,6 +24,10 @@ module Caterer
           @run_list << "role[#{role}]"
         end
 
+        def add_image(image)
+          @run_list += Caterer.config.images[image].provisioner.run_list
+        end
+
         def errors
           errors = {}
 

data/lib/caterer/provisioner/chef_solo.rb

@@ -83,17 +83,22 @@ module Caterer
       end
 
       def cleanup
-        server.ssh.sudo "rm -rf #{base_path}", :stream => true
+        # server.ssh.sudo "rm -rf #{base_path}", :stream => true
       end
 
       protected
 
       def upload_directory(from, to)
         if File.exists? from
-          unique = Digest::MD5.hexdigest(from)
-          server.ssh.upload from, "#{to}/#{unique}"
-          server.ssh.sudo "mv #{to}/#{unique}/* #{to}/", :stream => true
-          server.ssh.sudo "rm -rf #{to}/#{unique}", :stream => true
+          if @server.can_rsync?
+            from += "/" if not from.match /\/$/
+            @server.rsync.sync(from, to)        
+          else
+            unique = Digest::MD5.hexdigest(from)
+            server.ssh.upload from, "#{to}/#{unique}"
+            server.ssh.sudo "mv #{to}/#{unique}/* #{to}/", :stream => true
+            server.ssh.sudo "rm -rf #{to}/#{unique}", :stream => true
+          end
         end
       end
 
@@ -114,7 +119,7 @@ module Caterer
       end
 
       def data_bags_path
-        "#{base_path}/data_bags" 
+        "#{base_path}/data_bags"
       end
 
       def config_bootstrap

data/lib/caterer/server.rb

@@ -53,6 +53,14 @@ module Caterer
       @ssh ||= Communication::SSH.new(self)
     end
 
+    def rsync
+      @rsync ||= Communication::Rsync.new(self)
+    end
+
+    def can_rsync?
+      true
+    end
+
     def ssh_opts
       {
         :port => port,

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r