do 0.2.0.g → 0.2.0.h

data/lib/do.rb

@@ -2,6 +2,8 @@ DO_PATH = ENV['DO_PATH'] ||= File.expand_path("~/.do") unless defined?(DO_PATH)
 DO_LOGGER = $stdout unless defined?(DO_LOGGER)
 DO_LOGGER_FORMAT = "\e[36m%s\e[33m@\e[31m%s \e[33m~ \e[35m#\e[0m %s" unless defined?(DO_LOGGER_FORMAT)
 
+require 'do/support'
+
 module DO
   autoload :CLI,      'do/cli.rb'
   autoload :Server,   'do/server.rb'

data/lib/do/commands.rb

@@ -42,7 +42,7 @@ module DO
     # Set an option to the given value
     #
     def set(name, value)
-      (class << self; self; end).send(:define_method, name) { value }
+      singleton_class.send(:define_method, name) { value }
     end
 
     ##
@@ -73,6 +73,9 @@ module DO
 
     def load_recipe(path)
       instance_eval(File.read(path), __FILE__, __LINE__)
+    rescue Exception => e
+      puts path
+      raise(e)
     end
 
     def role(name)

data/lib/do/server.rb

@@ -68,17 +68,28 @@ module DO
     # ==== Examples:
     #   run 'ls -al'
     #   run 'ls', '-al'
+    #   run do |cmd|
+    #     cmd << 'cd /mnt/www/apps'
+    #     cmd << 'tar zxcf /tmp/backup.tar.gz project'
+    #   end
     #   run 'mysqladmin -u root -p password 'new', :input => 'oldpassword'
     #
-    def run(*args)
+    def run(*args, &block)
       options = args.last.is_a?(Hash) ? args.pop : {}
+      { :sep => " "}.merge(options)
+
+      # If we give a block we run commands one by one
+      if block_given?
+        options.merge!(:sep => " && ")
+        yield args
+      end
 
       # Set default options if not given
       options[:pty]    = request_pty unless options.has_key?(:pty)
       options[:hidden] = hidden      unless options.has_key?(:hidden)
       options[:silent] = silent      unless options.has_key?(:silent)
 
-      cmd = args.join(" ")
+      cmd = args.join(options[:sep] || ' ')
       if options[:as]
         if options[:as] == 'root'
           cmd = "sudo #{cmd}"
@@ -140,7 +151,7 @@ module DO
       sftp.upload!(from, to, options) do |event, uploader, *args|
         case event
         when :put
-          DO_LOGGER.print("\r" + DO_LOGGER_FORMAT % [user, name, "writing: #{args[0].local} (#{(args[1].to_f * 100 / args[0].size.to_f).to_i}%)"]); DO_LOGGER.flush
+          DO_LOGGER.print("\r" + DO_LOGGER_FORMAT % [user, name, "writing: #{to} (#{(args[1].to_f * 100 / args[0].size.to_f).to_i}%)"]); DO_LOGGER.flush
         when :finish
           DO_LOGGER.puts("\r" + DO_LOGGER_FORMAT % [user, name, "writing: #{to} (100%)"]); DO_LOGGER.flush
         # when :mkdir
@@ -165,7 +176,7 @@ module DO
         case event
         when :get
           size = args[0].size ? args[0].size : sftp.stat!(from).size
-          DO_LOGGER.print("\r" + DO_LOGGER_FORMAT % [user, name, "sending: #{args[0].remote} (#{(args[1].to_f * 100 / size.to_f).to_i}%)"]); DO_LOGGER.flush
+          DO_LOGGER.print("\r" + DO_LOGGER_FORMAT % [user, name, "sending: #{from} (#{(args[1].to_f * 100 / size.to_f).to_i}%)"]); DO_LOGGER.flush
         when :finish
           DO_LOGGER.puts("\r" + DO_LOGGER_FORMAT % [user, name, "sending: #{from} (100%)"]); DO_LOGGER.flush
         # when :mkdir

data/lib/do/support.rb

@@ -0,0 +1,7 @@
+module Kernel
+  def singleton_class
+    class << self
+      self
+    end
+  end unless defined?(singleton_class)
+end

data/lib/do/tasks.rb

@@ -52,7 +52,7 @@ module DO
       if task[:in].empty?
         task[:block].arity == 1 ? task[:block].call(opts) : task[:block].call if task[:block]
       else
-        task[:in] = send(task[:in][0]) if task[:in].size == 1 && (class << self; self; end).method_defined?(task[:in][0])
+        task[:in] = send(task[:in][0]) if task[:in].size == 1 && singleton_class.method_defined?(task[:in][0])
         Array(task[:in]).each do |d|
           d = d.is_a?(DO::Server) ? d.name : d
           parent = task_find(d)
@@ -64,7 +64,7 @@ module DO
         end
       end
     rescue NotFound => e
-      (class << self; self; end).method_defined?(args_was[0]) ? send(args_was.shift) : raise(e)
+      singleton_class.method_defined?(args_was[0]) ? send(args_was.shift) : raise(e)
     end
     alias :run_task :task_run
 

data/lib/do/version.rb

@@ -1,3 +1,3 @@
 module DO
-  VERSION = '0.2.0.g' unless defined?(DO::VERSION)
+  VERSION = '0.2.0.h' unless defined?(DO::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: do
 version: !ruby/object:Gem::Version 
-  hash: 52
+  hash: 53
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
-  - g
-  version: 0.2.0.g
+  - h
+  version: 0.2.0.h
 platform: ruby
 authors: 
 - Davide D'Agostino
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-11 00:00:00 +01:00
+date: 2012-01-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,7 @@ files:
 - lib/do/common.rb
 - lib/do/parser.rb
 - lib/do/server.rb
+- lib/do/support.rb
 - lib/do/tasks.rb
 - lib/do/utils.rb
 - lib/do/version.rb