do 0.2.0.e → 0.2.0.f

data/lib/do/commands.rb

@@ -11,17 +11,13 @@ module DO
     def servers
       @_servers ||= []
     end
-
-    def all_remotes
-      servers.map(&:name)
-    end
+    alias :all_remotes :servers
 
     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
 
@@ -78,7 +74,6 @@ module DO
     def load_recipe(path)
       instance_eval(File.read(path), __FILE__, __LINE__)
     end
-    alias :load :load_recipe
 
     def role(name)
       servers_was = servers.dup
@@ -86,7 +81,7 @@ module DO
       (servers-servers_was).each do |s|
         s.instance_variable_set(:'@role', name)
       end
-      set name, servers.select { |s| s.role == name }.map(&:name)
+      set name, servers.select { |s| s.role == name }
     end
 
     def roles
@@ -107,7 +102,7 @@ module DO
       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 }.map(&:name) if current.role
+      set current.role, servers.select { |s| s.role == current.role } if current.role
       task name do |opts, b|
         @_current_server = servers.find { |s| s.name == current.name }
         begin

data/lib/do/parser.rb

@@ -31,7 +31,7 @@ module DO
           when /^false$/i  then options[k] = false
           when /^\d+$/     then options[k] = v.to_i
           when /^[\d\.]+$/ then options[k] = v.to_f
-          when /,/         then options[k] = v.split(",")
+          when /,/         then options[k] = v.split(",").map(&:strip)
         end
       end
 

data/lib/do/server.rb

@@ -113,15 +113,17 @@ module DO
     ##
     # Returns true if a given file exist on the remote server
     #
-    def exist?(file)
-      run("test -e #{file} && echo True", :hidden => true) == "True"
+    def exist?(file, options={})
+      options = { :hidden => true }.merge(options)
+      run("test -e #{file} && echo True", options) == "True"
     end
 
     ##
     # Return the content of a given file
     #
-    def cat(file)
-      run("cat #{file}", :silent => true)
+    def cat(file, options={})
+      options = { :hidden => true }.merge(options)
+      run("cat #{file}", options)
     end
 
     ##

data/lib/do/tasks.rb

@@ -53,8 +53,8 @@ module DO
         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] = task[:in].name if task[:in].is_a?(DO::Server)
         Array(task[:in]).each do |d|
+          d = d.is_a?(DO::Server) ? d.name : d
           parent = task_find(d)
           case parent[:block].arity
             when 1 then parent[:block].call(task[:block])

data/lib/do/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: do
 version: !ruby/object:Gem::Version 
-  hash: 54
+  hash: 55
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
-  - e
-  version: 0.2.0.e
+  - f
+  version: 0.2.0.f
 platform: ruby
 authors: 
 - Davide D'Agostino
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-03 00:00:00 +01:00
+date: 2011-12-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency