sprout 0.5.0 → 0.5.9

data/lib/process_runner.rb

@@ -0,0 +1,28 @@
+
+module PatternPark
+
+  class ProcessRunner
+    attr_reader :path,
+                :r,
+                :w,
+                :e
+    
+    def initialize(*command)
+      require 'open3'
+      @command = command
+      @w, @r, @e = Open3.popen3(*@command)
+    end
+    
+    def puts(msg)
+      @w.puts(msg)
+    end
+
+    def read
+      return r.read
+    end
+    
+    def read_err
+      return e.read
+    end
+  end
+end

data/lib/remote_file_loader.rb

@@ -90,11 +90,27 @@ module PatternPark
         begin
           retries += 1
           Zip::ZipFile::open(zip_file) do |zf|
-              zf.each do |e|
-                  fpath = File.join(dir, e.name)
-                  FileUtils.mkdir_p(File.dirname(fpath))
-                  zf.extract(e, fpath)
+            zf.each do |e|
+              fpath = File.join(dir, e.name)
+              FileUtils.mkdir_p(File.dirname(fpath))
+              # Disgusting, Gross Hack to fix Windows/Ruby Bug
+              # That makes the zip library throw a ZipDestinationFileExistsError
+              # When the zip archive includes two files whose names 
+              # differ only by extension.
+              # This bug actually appears in the File.exists? implementation
+              # throwing false positives!
+              # If you're going to use this code, be sure you extract
+              # into a new, empty directory as existing files will be 
+              # clobbered...
+              if(File.exists?(fpath) && !File.directory?(fpath))
+                hackpath = fpath + 'hack'
+                zf.extract(e, hackpath)
+                File.copy(hackpath, fpath)
+                File.delete(hackpath)
+              else
+                zf.extract(e, fpath)
               end
+            end
           end
         rescue StandardError => e
           if(retries < 3)

data/lib/remote_file_target.rb

@@ -9,7 +9,7 @@ module PatternPark
                   :archive_path,
                   :install_path,
                   :project_path,
-                  :post_install
+                  :post_install,
                   :mount_path
     attr_reader   :downloaded_path,
                   :file_name,
@@ -25,8 +25,11 @@ module PatternPark
       end
       @file_name = url.split('/').pop
       @downloaded_path = File.join(Sprout.cache, type, install_path, file_name)
-      a_type = (archive_type == 'txt') ? nil : archive_type
-      @install_path = File.join(Sprout.cache, type, install_path, a_type)
+      if(archive_type == 'txt' || archive_type == 'exe')
+        @install_path = File.join(Sprout.cache, type, install_path)
+      else
+        @install_path = File.join(Sprout.cache, type, install_path, archive_type)
+      end
       @copy_path = File.join(install_path, archive_path)
       loader = RemoteFileLoader.new
 

data/lib/sprout.rb

@@ -279,6 +279,7 @@ module PatternPark
       if(targets)
         universal_target = nil
         platform = usr.platform.to_s
+#        puts "platform: #{platform}"
         targets.each do |t|
           if(t.platform == platform)
             @target = t
@@ -319,6 +320,7 @@ module PatternPark
 
   require 'singleton'
   require 'progress_bar'
+  require 'process_runner'
   require 'template_resolver'
   require 'platform'
   require 'user'

data/lib/sprout/version.rb

@@ -2,7 +2,7 @@ module Sprout #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 1
+    TINY  = 10
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/user.rb

@@ -20,10 +20,10 @@ module PatternPark
         end
         if(os == :win32 && impl == :vista)
           @@user = VistaUser.new
+        elsif(os == :win32 && impl == :cygwin)
+          @@user = CygwinUser.new
         elsif(os == :win32)
           @@user = WinUser.new
-        elsif(os == :unix && impl == :cygwin)
-          @@user = CygwinUser.new
         elsif(os == :unix && impl == :macosx)
           @@user = OSXUser.new
         elsif(os == :unix && impl == :linux)
@@ -126,14 +126,17 @@ module PatternPark
       end
     end
     
+    def get_process_runner(command)
+      return ProcessRunner.new(command)
+    end
+    
     def execute(tool, options='')
       tool = Sprout.load(tool)
       target = tool.archive_path
       Log.puts(">> Execute: #{File.basename(target)} #{options}")
-      runner = CommandRunner.new("#{clean_path(target)} #{options}")
-      runner.run
+      runner = get_process_runner("#{clean_path(target)} #{options}")
       result = runner.read
-      error = runner.readError.to_s
+      error = runner.read_err
       if(result.size > 0)
         Log.puts result
       end
@@ -220,6 +223,12 @@ module PatternPark
   end
 
   class CygwinUser < WinUser
+    def clean_path(path)
+      if(path.index(' '))
+        return %{'#{path}'}
+      end
+      return path
+    end
   end
   
   class VistaUser < WinUser

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: sprout
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2007-06-10 00:00:00 -07:00
+  version: 0.5.9
+date: 2007-06-12 00:00:00 -07:00
 summary: "Sprouts is an open-source, cross-platform project generation and configuration
   tool."
 require_paths: 
@@ -50,6 +50,7 @@ files:
   - lib/library.rb
   - lib/log.rb
   - lib/platform.rb
+  - lib/process_runner.rb
   - lib/progress_bar.rb
   - lib/project.rb
   - lib/project_model.rb