do 0.1.4 → 0.2.0.a

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.1.5 (Not yet released)
+
+* Append now add \n at the end of line if not present
+* Added options :recursive to download and upload methods
+* Added a new method for execute local task inside a remote server
+
 ## 0.1.4 - August 31, 2011
 
 * Added support to auto completion

data/lib/do/commands.rb

@@ -12,10 +12,19 @@ module DO
       @_servers ||= []
     end
 
-    def remote
+    def all_remotes
       servers.map(&:name)
     end
 
+    def remotes
+      @_remotes ||= begin
+        name = ARGV[0]
+        servers.select { |s| s.name.to_s == name } + servers.select { |s| s.role.to_s == name }
+      end
+      @_remotes.map(&:name)
+    end
+    alias :remote :remotes
+
     ##
     # Returns the current server
     #
@@ -23,11 +32,21 @@ module DO
       @_current_server
     end
 
+    ##
+    # Run a specific(s) command(s) outside the server
+    #
+    def locally(&block)
+      server_was, @_current_server = @_current_server, nil
+      block.call
+    ensure
+      @_current_server = server_was
+    end
+
     ##
     # Set an option to the given value
     #
-    def set(option, value)
-      define_method(option) { value }
+    def set(name, value)
+      (class << self; self; end).send(:define_method, name) { value }
     end
 
     ##
@@ -52,11 +71,27 @@ module DO
       recipes.each { |f| load_recipe(f) }
     end
 
+    def load_common
+      load File.expand_path('../common.rb', __FILE__)
+    end
+
     def load_recipe(path)
       instance_eval(File.read(path), __FILE__, __LINE__)
     end
     alias :load :load_recipe
 
+    def role(name)
+      servers_was = servers.dup
+      yield self
+      (servers-servers_was).each do |s|
+        s.instance_variable_set(:'@role', name)
+      end
+    end
+
+    def roles
+      servers.map(&:role).compact.uniq
+    end
+
     ##
     # This method define our servers
     #
@@ -69,18 +104,15 @@ module DO
     #
     def server(name, host, user, options={})
       servers.push(DO::Server.new(name, host, user, options))
+      current = servers[-1]
+      set current.name, current
+      set current.role, servers.select { |s| s.role == current.role } if current.role
       task name do |opts, b|
-        allowed  = opts.map { |k,v| k if remote.include?(k) && v }.compact
-        denied   = opts.map { |k,v| k if remote.include?(k) && v == false }.compact
-        if (allowed.empty? && denied.empty?) ||
-           (!allowed.empty? && allowed.include?(name)) ||
-           (!denied.empty? && !denied.include?(name))
-          @_current_server = servers.find { |s| s.name == name }
-          begin
-            b.arity == 1 ? b.call(opts) : b.call
-          ensure
-            @_current_server = nil
-          end
+        @_current_server = servers.find { |s| s.name == current.name }
+        begin
+          b.arity == 1 ? b.call(opts) : b.call
+        ensure
+          @_current_server = nil
         end
       end
     end

data/lib/do/server.rb

@@ -5,7 +5,7 @@ module DO
   class Server
     include DO::Utils
 
-    attr_reader :name, :host, :user, :options
+    attr_reader :name, :host, :user, :role, :options
 
     ##
     # Initialize a new DO Server
@@ -19,7 +19,7 @@ module DO
     #   srv1 = DO::Server.new(:srv1, 'srv1.lipsiasoft.biz', 'root', :keys => %w[/path/to/key.pem]
     #
     def initialize(name, host, user, options={})
-     @name, @host, @user, @options = name, host, user, options
+      @name, @host, @user, @role, @options = name, host, user, options.delete(:role), options
     end
 
     ##
@@ -72,9 +72,9 @@ module DO
       cmd = args.join(" ")
       if options[:as]
         if options[:as] == 'root'
-          cmd = "sudo #{cmd.gsub(/'/, "\'")}"
+          cmd = "sudo #{cmd}"
         else
-          cmd = "su #{options[:as]} -c '#{cmd.gsub(/'/, "\'")}'"
+          cmd = "su #{options[:as]} -c '#{cmd.gsub("'", "'\\\\''")}'"
         end
       end
       log cmd
@@ -126,8 +126,16 @@ module DO
     #   up(/my/dir, /tmp, :recursive => true)
     #
     def upload(from, to, options={})
-      log "upload from '%s' to '%s'" % [from, to]
-      sftp.upload!(from, to)
+      sftp.upload!(from, to, options) do |event, uploader, *args|
+        case event
+        when :put
+          DO_LOGGER.print("\r" << DO_LOGGER_FORMAT % [user, name, "writing: #{to} (#{args[1] * 100 / args[0].size}%)"]); DO_LOGGER.flush
+        when :finish
+          DO_LOGGER.puts("\r" << DO_LOGGER_FORMAT % [user, name, "writing: #{to} (100%)"]); DO_LOGGER.flush
+        when :mkdir
+          log "creating directory #{args[0]}"
+        end
+      end
     end
     alias :up :upload
 
@@ -142,8 +150,16 @@ module DO
     #   get(/tmp/dir, /my, :recursive => true)
     #
     def download(from, to, options={})
-      log "download from '%s' to '%s'" % [from, to]
-      sftp.download!(from, to)
+      sftp.download!(from, to, options) do |event, downloader, *args|
+        case event
+        when :get
+          DO_LOGGER.print("\r" << DO_LOGGER_FORMAT % [user, name, "sending: #{from} (#{args[1] * 100 / args[0].size}%)"]); DO_LOGGER.flush
+        when :finish
+          DO_LOGGER.puts("\r" << DO_LOGGER_FORMAT % [user, name, "sending: #{from} (100%)"]); DO_LOGGER.flush
+        when :mkdir
+          log "creating directory #{args[0]}"
+        end
+      end
     end
     alias :get :download
 
@@ -205,6 +221,7 @@ module DO
         log "'%s' already match your pattern" % file
         return false
       else
+        pattern += "\n" unless pattern[-1] == ?\n
         replacement = case where
           when :top, :start  then pattern+was
           when :bottom, :end then was+pattern

data/lib/do/tasks.rb

@@ -52,8 +52,9 @@ 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 && method_defined?(task[:in][0])
-        task[:in].each do |d|
+        task[:in] = send(task[:in][0]) if task[:in].size == 1 && (class << self; self; end).method_defined?(task[:in][0])
+        task[:in] = task[:in].name if task[:in].is_a?(DO::Server)
+        Array(task[:in]).each do |d|
           parent = task_find(d)
           case parent[:block].arity
             when 1 then parent[:block].call(task[:block])
@@ -63,7 +64,7 @@ module DO
         end
       end
     rescue NotFound => e
-      method_defined?(args_was[0]) ? send(args_was.shift) : raise(e)
+      (class << self; self; end).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.1.4" unless defined?(DO::VERSION)
+  VERSION = "0.2.0.a" unless defined?(DO::VERSION)
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: do
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: 58
+  prerelease: 6
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  - a
+  version: 0.2.0.a
 platform: ruby
 authors: 
 - Davide D'Agostino
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 +02:00
+date: 2011-11-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,12 +110,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: