sprout 0.5.13 → 0.5.15

data/bin/sprout

@@ -10,8 +10,8 @@ rescue LoadError
 end
 
 require 'optparse'
-#require 'sprout'
-require File.dirname(__FILE__) + '/../lib/sprout'
+require 'sprout'
+#require File.dirname(__FILE__) + '/../lib/sprout'
 include PatternPark
 
 OPTIONS = {

data/lib/process_runner.rb

@@ -8,7 +8,6 @@ module PatternPark
                 :e
     
     def initialize(*command)
-      require 'open3'
       @command = command
       @w, @r, @e = Open3.popen3(*@command)
     end

data/lib/remote_file_target.rb

@@ -20,9 +20,6 @@ module PatternPark
       if(!file_name.nil?)
         return
       end
-      if(url.nil? || url == '')
-        return
-      end
       @file_name = url.split('/').pop
       @downloaded_path = File.join(Sprout.cache, type, install_path, file_name)
       if(archive_type == 'txt' || archive_type == 'exe')
@@ -31,6 +28,11 @@ module PatternPark
         @install_path = File.join(Sprout.cache, type, install_path, archive_type)
       end
       @copy_path = File.join(install_path, archive_path)
+
+      if(url.nil? || url == '')
+        return
+      end
+
       loader = RemoteFileLoader.new
 
       if(Sprout.update || !File.exists?(downloaded_path))

data/lib/sprout/version.rb

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

data/lib/sprout.rb

@@ -25,7 +25,8 @@ module PatternPark
                   :config_cache,
                   :config
 
-    @@base_urls = ['http://projectsprouts.googlecode.com/svn/trunk/sprouts/',
+    @@base_urls = ['http://projectsprouts.googlecode.com/svn/branches/release/sprouts/',
+                   'http://projectsprouts.googlecode.com/svn/trunk/sprouts/',
                    'http://www.projectsprouts.org/sprout/']
     @@default_rakefiles = ['rakefile', 'Rakefile', 'rakefile.rb', 'Rakefile.rb'].freeze
     @@universal = 'universal'
@@ -35,6 +36,7 @@ module PatternPark
     @@home = nil
     @@cache = nil
     @@project_path = nil
+    @@base_url = nil
     
     ##
     # Given a simple string @name, request that sprout
@@ -48,6 +50,7 @@ module PatternPark
       else
         @@base_urls.each do |url|
           begin
+            @@base_url = url
             loader = RemoteFileLoader.new
             loader.get_remote_file(url + name, local)
             sprout = Sprout.load_local(local)
@@ -89,6 +92,10 @@ module PatternPark
       @@update = update
     end
     
+    def Sprout.base_url
+      return @@base_url
+    end
+    
     def Sprout.update
       return @@update
     end
@@ -195,7 +202,7 @@ module PatternPark
     end
     
     def Sprout.get_project_path(path)
-      if(path.nil? || path == '/')
+      if(path.nil? || path == '/' || path.match(/[A-Z]\:\//))
         return nil
       end
       @@default_rakefiles.each do |file|

data/lib/user.rb

@@ -81,6 +81,7 @@ module PatternPark
   class UnixUser
     
     def initialize
+      require 'open3'
       @home = nil
     end
     
@@ -191,6 +192,11 @@ module PatternPark
     @@LOCAL_SETTINGS = "Local\ Settings"
     @@APPLICATION_DATA = "Application\ Data"
     
+    def initialize
+      require 'win32/open3'
+      @home = nil
+    end
+    
     def home
       usr = super
       if(usr.index "My Documents")
@@ -223,12 +229,19 @@ module PatternPark
   end
 
   class CygwinUser < WinUser
+
+    def initialize
+      require 'open3'
+      @home = nil
+    end
+    
     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.13
-date: 2007-06-25 00:00:00 -07:00
+  version: 0.5.15
+date: 2007-07-02 00:00:00 -07:00
 summary: "Sprouts is an open-source, cross-platform project generation and configuration
   tool."
 require_paths: