sprout 0.7.167-x86-linux → 0.7.169-x86-linux

data/lib/sprout/tasks/tool_task.rb

@@ -136,7 +136,7 @@ module Sprout
     def prepare
       # Get each added param to inject prerequisites as necessary
       params.each do |param|
-        param.prepare_prerequisites
+        param.prepare
       end
       # Ensure there are no duplicates in the prerequisite collection
       @prerequisites = prerequisites.uniq
@@ -349,6 +349,10 @@ module Sprout
       end
     end
     
+    def prepare
+      prepare_prerequisites
+    end
+    
     def prepare_prerequisites
     end
     
@@ -513,6 +517,17 @@ module Sprout
   # Concrete param object for collections of files
   class FilesParam < StringsParam # :nodoc:
 
+    def prepare
+      super
+      usr = User.new
+      path = nil
+      value.each_index do |index|
+        path = value[index]
+        value[index] = usr.clean_path path
+#        p = usr.clean_path p
+      end
+    end
+
     def prepare_prerequisites
       value.each do |f|
         file f
@@ -522,9 +537,10 @@ module Sprout
   end
 
   # Concrete param object for collections of paths
-  class PathsParam < StringsParam # :nodoc:
-    
+  class PathsParam < FilesParam # :nodoc:
+
     def prepare_prerequisites
+      usr = User.new
       value.each do |f|
         files = FileList[f + file_expression]
         files.each do |req_file|

data/lib/sprout/user.rb

@@ -221,7 +221,10 @@ module Sprout
 
     def clean_path(path)
       if(path.index(' '))
-        return %{'#{path}'}
+        # Changed 2/26/2008 in attempt to support 
+        # ToolTask.PathsParam s that have spaces in the values
+        return path.split(' ').join('\ ')
+#        return %{'#{path}'}
       end
       return path
     end

data/lib/sprout/version.rb

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

data/rakefile.rb

@@ -56,7 +56,7 @@ def apply_shared_spec(s)
     s.add_dependency('rubyzip', '>= 0.9.1')
     s.add_dependency('archive-tar-minitar', '>= 0.5.1')
     s.add_dependency('rails', '>= 2.0.2') # Shared generator implementation
-    s.add_dependency('net-sftp', '>= 0.0.0')
+    s.add_dependency('net-sftp')
 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.167
+  version: 0.7.169
 platform: x86-linux
 authors: 
 - Luke Bayes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-24 00:00:00 -08:00
+date: 2008-03-04 00:00:00 -08:00
 default_executable: sprout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: open4