sprout 0.7.213-x86-linux → 0.7.215-x86-linux

data/lib/sprout/tasks/tool_task.rb

@@ -205,6 +205,8 @@ module Sprout
     
     # Create a string that represents this configured tool for shell execution
     def to_shell
+      return @to_shell_proc.call(self) if(!@to_shell_proc.nil?)
+
       result = []
       result << @prepended_args unless @prepended_args.nil?
       params.each do |param|
@@ -415,6 +417,7 @@ module Sprout
     attr_writer   :value
     attr_writer   :delimiter
     attr_writer   :shell_name
+    attr_writer   :to_shell_proc
 
     # Set the file_expression (blob) to append to each path
     # in order to build the prerequisites FileList.
@@ -495,7 +498,9 @@ module Sprout
     end
 
     def to_shell
-      if(hidden_name?)
+      if(!@to_shell_proc.nil?)
+        return @to_shell_proc.call(self)
+      elsif(hidden_name?)
         return shell_value
       elsif(hidden_value?)
         return shell_name
@@ -626,7 +631,10 @@ module Sprout
 
   # Concrete param object for :string values
   class StringParam < TaskParam # :nodoc:
-    
+
+    def shell_value
+      value.gsub(/ /, "\ ")
+    end
   end
 
   # Concrete param object for :symbol values
@@ -718,6 +726,8 @@ module Sprout
     
     # Returns a shell formatted string of the collection
     def to_shell
+      return @to_shell_proc.call(self) if(!@to_shell_proc.nil?)
+
       result = []
       value.each do |str|
         result << "#{shell_name}#{delimiter}#{str}"

data/lib/sprout/user.rb

@@ -143,8 +143,12 @@ module Sprout
       if(@home)
         return @home
       end
-
-      ["HOME", "USERPROFILE"].each do |homekey|
+      
+      # Original implementation:
+      #["HOME", "USERPROFILE"].each do |homekey|
+      # Change submitted by Michael Fleet (disinovate)
+      # Does this work for everyone on Windows?
+      ["USERPROFILE", "HOME"].each do |homekey|
         return @home = ENV[homekey] if ENV[homekey]
       end
 
@@ -209,8 +213,8 @@ module Sprout
       tool = clean_path(tool)
       runner = get_process_runner("#{tool} #{options}")
 
-      result = runner.read
       error = runner.read_err
+      result = runner.read
 
       if(result.size > 0)
         Log.puts result

data/lib/sprout/version.rb

@@ -3,7 +3,7 @@ module Sprout
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 7
-      TINY  = 213
+      TINY  = 215
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       MAJOR_MINOR = [MAJOR, MINOR].join('.')

data/rakefile.rb

@@ -55,9 +55,10 @@ def apply_shared_spec(s)
 
     s.add_dependency('rubyzip', '>= 0.9.1')
     s.add_dependency('archive-tar-minitar', '>= 0.5.1')
-    s.add_dependency('rubigen', '= 1.3.3')
+    s.add_dependency('rubigen', '= 1.5.2')
     s.add_dependency('net-sftp')
     s.add_dependency('net-ssh')
+    s.add_dependency('rake')
 end
 
 osx_spec = Gem::Specification.new do |s|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprout
 version: !ruby/object:Gem::Version 
-  version: 0.7.213
+  version: 0.7.215
 platform: x86-linux
 authors: 
 - Luke Bayes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-22 00:00:00 -07:00
+date: 2009-10-07 00:00:00 -07:00
 default_executable: sprout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.3
+        version: 1.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: net-sftp
@@ -62,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: open4
   type: :runtime