sprout 0.7.206 → 0.7.210

data/lib/progress_bar.rb

@@ -15,9 +15,30 @@ require 'singleton'
 
 class ProgressBar # :nodoc:[all]
   VERSION = "0.9"
+  @@debug = false
+  @@outio = $stderr
+  
   def self.new(title, total)
     return ProgressBarManager.instance.add(title, total)
   end
+
+  def self.debug?
+    @@debug
+  end
+  
+  def self.debug=(debug)
+    @@debug = debug
+    if(debug)
+      @@outio = StringIO.new
+    else
+      @@outio = $stderr
+    end
+  end
+  
+  def self.outio
+    @@outio
+  end
+
 end
 
 class ProgressBarImpl # :nodoc:[all]
@@ -45,7 +66,7 @@ class ProgressBarImpl # :nodoc:[all]
   attr_accessor :start_time,
                 :title_width,
                 :bar_mark
-
+                
   def fmt_bar
     bar_width = do_percentage * @terminal_width / 100
     sprintf("|%s%s|", 
@@ -99,9 +120,9 @@ class ProgressBarImpl # :nodoc:[all]
     sec = t % 60
     min  = (t / 60) % 60
     hour = t / 3600
-    sprintf("%02d:%02d:%02d", hour, min, sec);
+    sprintf("%02d:%02d:%02d", hour, min, sec)
   end
-
+  
   # ETA stands for Estimated Time of Arrival.
   def eta
     if @current == 0
@@ -290,7 +311,6 @@ class ProgressBarManager # :nodoc:[all]
   include Singleton
   
   def initialize
-    @outio = $stderr
     @finished = {}
     @bars = {}
     @outs = {}
@@ -308,8 +328,12 @@ class ProgressBarManager # :nodoc:[all]
     str = ''
     str += @outs[title].to_s
     str += "\r"
-    @outio.print "\r"
-    @outio.print str
+    outio.print "\r"
+    outio.print str
+  end
+  
+  def outio
+    ProgressBar.outio
   end
   
   def flush
@@ -320,7 +344,7 @@ class ProgressBarManager # :nodoc:[all]
     @bars.values.each do |bar|
       if(bar.finished?)
         print(bar.title)
-        @outio.print "\n"
+        outio.print "\n"
         @outs.delete(bar.title)
         @bars.delete(bar.title)
       end

data/lib/sprout.rb

@@ -18,8 +18,9 @@ require 'progress_bar'
 require 'sprout/log'
 require 'sprout/user'
 require 'sprout/zip_util'
-require 'sprout/remote_file_target'
 require 'sprout/remote_file_loader'
+require 'sprout/archive_unpacker'
+require 'sprout/remote_file_target'
 require 'sprout/simple_resolver'
 require 'sprout/template_resolver'
 
@@ -40,6 +41,9 @@ module Sprout
     SUDO_INSTALL_GEMS = 'false' == ENV['SUDO_INSTALL_GEMS'] ? false : true
   end
 
+  class UsageError < StandardError #:nodoc
+  end
+
   class SproutError < StandardError #:nodoc:
   end
 
@@ -127,6 +131,9 @@ module Sprout
     # This Rakefile will usually be loaded by the referenced Generator, and it should have a configured ProjectModel
     # defined in it.
     def self.generate(sprout_name, generator_name, params, project_path=nil)
+      # params.each_index do |index|
+      #   params[index] = clean_project_name(params[index])
+      # end
       RubiGen::Base.use_sprout_sources!(sprout_name, project_path)
       generator = RubiGen::Base.instance(generator_name, params)
       generator.command(:create).invoke!
@@ -234,7 +241,7 @@ EOF
     # Retrieve the file target to an executable by sprout name. Usually, these are tool sprouts.
     # * +name+ Full sprout gem name that contains an executable file
     # * +archive_path+ Optional parameter for tools that contain more than one executable, or for
-    # when you don't want to use the default executable presented by the tool. For example, the Flex 2 SDK
+    # when you don't want to use the default executable presented by the tool. For example, the Flex SDK
     # has many executables, when this method is called for them, one might use something like:
     #   Sprout::Sprout.get_executable('sprout-flex3sdk-tool', 'bin/mxmlc')
     # * +version+ Optional parameter to specify a particular gem version for this executable
@@ -255,6 +262,12 @@ EOF
         exe = target.archive_path
       end
       
+      
+      
+      if(!File.exists?(exe))
+        raise UsageError.new("Could not retrieve requested executable from path: #{exe}")
+      end
+      
       if(File.exists?(exe) && !File.directory?(exe) && File.stat(exe).executable?)
         File.chmod 0755, exe
       end
@@ -310,6 +323,14 @@ EOF
     # * +Windows+ C:/Documents And Settings/foo/Local Settings/Application Data/Sprouts/cache/0.7
     # * +Linux+ ~/.sprouts/cache/0.7
     def self.sprout_cache
+      @@sprout_cache ||= self.inferred_sprout_cache
+    end
+    
+    def self.sprout_cache=(cache)
+      @@sprout_cache = cache
+    end
+    
+    def self.inferred_sprout_cache
       home = User.application_home(@@name)
       return File.join(home, @@cache, "#{VERSION::MAJOR}.#{VERSION::MINOR}")
     end

data/lib/sprout/archive_unpacker.rb

@@ -0,0 +1,225 @@
+
+module Sprout
+  class ArchiveUnpackerError < StandardError #:nodoc:
+  end
+
+  # Unpack downloaded files from a variety of common archive types.
+  # This library should efficiently extract archived files
+  # on OS X, Win XP, Vista, DOS, Cygwin, and Linux.
+  # 
+  # It will attempt to infer the archive type by standard mime-type file
+  # extensions, but if there is a file with no extension, the unpack_archive
+  # method can be provided with an @archive_type symbol argument that is one
+  # of the following values:
+  #   :exe
+  #   :zip
+  #   :targz
+  #   :gzip
+  #   :swc
+  #   :rb
+  #   :dmg
+  class ArchiveUnpacker #:nodoc:
+    include Archive::Tar
+    
+    def unpack_archive(file_name, dir, force=false, archive_type=nil)
+      archive_type ||= inferred_archive_type(file_name)
+      suffix = suffix_for_archive_type(archive_type)
+      
+      unpacked = unpacked_file_name(file_name, dir, suffix)
+      if(File.exists?(unpacked) && force)
+        FileUtils.rm_rf(unpacked)
+      end
+      
+      if(!File.exists?(unpacked))
+        case archive_type.to_s
+          when 'zip'
+            unpack_zip(file_name, dir)
+          when 'targz'
+            unpack_targz(file_name, dir)
+          when 'dmg'
+            unpack_dmg(file_name, dir)
+          when 'exe'
+            FileUtils.mkdir_p(dir)
+            File.mv(file_name, dir)
+          when 'swc' || 'rb'
+            return
+          else
+            raise ArchiveUnpackerError.new("ArchiveUnpacker does not know how to unpack files of type: #{archive_type} for file_name: #{file_name}")
+        end
+      end
+    end
+    
+    def unpack_zip(zip_file, dir)
+      # Avoid the rubyzip Segmentation Fault bug
+      # at least on os x...
+      if(RUBY_PLATFORM =~ /darwin/)
+          # Unzipping on OS X
+          FileUtils.makedirs(dir)
+          zip_dir = File.expand_path(File.dirname(zip_file))
+          zip_name = File.basename(zip_file)
+          output = File.expand_path(dir)
+          # puts ">> zip_dir: #{zip_dir} zip_name: #{zip_name} output: #{output}"
+          %x(cd #{zip_dir};unzip #{zip_name} -d #{output})
+      else
+        retries = 0
+        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))
+              # Disgusting, Gross Hack to fix DOS/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...
+              begin
+                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
+              rescue NotImplementedError => ni_err
+                puts "[WARNING] #{ni_err} for: #{e}"
+              end
+            end
+          end
+        rescue StandardError => err
+          FileUtils.rm_rf(dir)
+          if(retries < 3)
+            FileUtils.makedirs(dir)
+            retry
+          end
+          raise err
+        end
+      end
+    end
+    
+    def unpacked_file_name(file, dir, suffix=nil)
+      basename = File.basename(file, suffix)
+      path = File.expand_path(dir)
+      return File.join(path, basename)
+    end
+    
+    def unpack_targz(tgz_file, dir)
+      if(!File.exists?(dir))
+        FileUtils.makedirs(dir)
+      end
+      tar = Zlib::GzipReader.new(File.open(tgz_file, 'rb'))
+      Minitar.unpack(tar, dir)
+      
+      # Recurse and unpack gzipped children (Adobe did this double 
+      # gzip with the Linux FlashPlayer for some reason)
+      Dir.glob("#{dir}/**/*.tar.gz").each do |child|
+        if(child != tgz_file)
+          unpack_targz(child, File.dirname(child))
+        end
+      end
+      
+    end
+    
+    # This is actually not unpacking the FlashPlayer
+    # Binary file as expected...
+    # OSX is treated the player binary as if it is
+    # a regular text file, but if it is copied manually,
+    # the command works fine!?
+    def unpack_dmg(dmg_file, dir)
+      # 1) Mount the dmg in place
+      # 2) Recursively Copy its contents to asproject_home
+      # 3) Unmount the dmg
+      if(mounted_path.nil?)
+        raise StandardError.new('DMG file downloaded, but the RemoteFileTask needs a mounted_path in order to mount it')
+      end
+
+      if(!File.exists?(full_mounted_path))
+        system("hdiutil mount #{dmg_file}")
+      end
+      
+      begin
+        mounted_target = File.join(full_mounted_path, extracted_file)
+  
+        # Copy the DMG contents using system copy rather than ruby utils
+        # Because OS X does something special with .app files that the
+        # Ruby FileUtils and File classes break...
+        from = mounted_target
+#        from = File.join(full_mounted_path, extracted_file)
+        to = File.join(@user.downloads, @name.to_s, extracted_file)
+        FileUtils.makedirs(File.dirname(to))
+        
+        if(File.exists?(from))
+          `ditto '#{from}' '#{to}'`
+        end
+      rescue StandardError => e
+        if(File.exists?(full_mounted_path))
+          system("hdiutil unmount -force \"#{full_mounted_path}\"")
+        end
+      end
+    end
+    
+    def suffix_for_archive_type(type)
+      if(type == :targz)
+        return '.tar.gz'
+      else
+        return ".#{type.to_s}"
+      end
+    end
+    
+    def inferred_archive_type(file_name)
+      if is_zip?(file_name)
+        return :zip
+      elsif is_targz?(file_name)
+        return :targz
+      elsif is_gzip?(file_name)
+        return :gz
+      elsif is_swc?(file_name)
+        return :swc
+      elsif is_rb?(file_name)
+        return :rb
+      elsif is_dmg?(file_name)
+        return :dmg
+      elsif is_exe?(file_name)
+        return :exe
+      else
+        return nil
+      end
+      
+    end
+    
+    def is_zip?(file)
+      return (file.split('.').pop == 'zip')
+    end
+    
+    def is_targz?(file)
+      parts = file.split('.')
+      part = parts.pop
+      return (part == 'tgz' || part == 'gz' && parts.pop == 'tar')
+    end
+    
+    def is_gzip?(file)
+      return (file.split('.').pop == 'gz')
+    end
+    
+    def is_swc?(file)
+      return (file.split('.').pop == 'swc')
+    end
+    
+    def is_rb?(file)
+      return (file.split('.').pop == 'rb')
+    end
+    
+    def is_dmg?(file)
+      return (file.split('.').pop == 'dmg')
+    end    
+
+    def is_exe?(file)
+      return (file.split('.').pop == 'exe')
+    end
+  end
+end

data/lib/sprout/builder.rb

@@ -1,14 +1,14 @@
 
 module Sprout
 
+  class BuilderError < StandardError #:nodoc:
+  end
+
   # accepts a destination path and a sprout specification
   # and will download and unpack the platform-specific
   # archives that are identified in the spec
   class Builder # :nodoc:
     
-    class BuilderError < StandardError #:nodoc:
-    end
-
     def self.build(file_targets_yaml, destination)
       data = nil
       
@@ -16,12 +16,15 @@ module Sprout
         data = f.read
       end
       
-      usr = User.new
-      platform = usr.platform.to_s
-      
       targets = YAML.load(data)
       targets.each do |target|
-        if(target.platform == 'universal' || target.platform == platform)
+        # iterate over the provided RemoteFileTargets until we 
+        # encounter one that is appropriate for our platform,
+        # or one that claims to be universal.
+        # When authoring a sprout.spec for libraries or tools,
+        # put the most specific RemoteFileTargets first, then
+        # universals to catch unexpected platforms.
+        if(target.platform == platform || target.platform == 'universal')
           target.install_path = FileUtils.mkdir_p(destination)
           target.resolve
           return target
@@ -30,6 +33,12 @@ module Sprout
       raise BuilderError.new("Sprout::Builder.build failed, unsupported platform or unexpected yaml")
     end
     
+    private
+    
+    def self.platform
+      @@platform ||= User.new.platform.to_s
+    end
+    
   end
 end
 

data/lib/sprout/generator/base_mixins.rb

@@ -48,8 +48,13 @@ class Gem::SourceIndex
         Gem::Platform.match spec.platform
       end
     end
-
-    specs.sort_by { |s| s.sort_obj }
+    
+    begin
+      specs.sort_by { |s| s.sort_obj }
+    rescue NoMethodError => e
+      puts "It looks like your RubyGems installation is not compatible with this version of Sprouts.\n\nTo update, run:\ngem update --system\n\n"
+      raise e
+    end
   end
 end
 

data/lib/sprout/generator/named_base.rb

@@ -144,7 +144,7 @@ module Sprout
       # Glob that is used to search for test cases and build 
       # up the test suites
       def test_glob
-        return @test_glob ||= '**/**/*Test.as'
+        return @test_glob ||= '**/**/?*Test.as'
       end
       
       def test_glob=(glob)

data/lib/sprout/process_runner.rb

@@ -27,6 +27,9 @@ module Sprout #:nodoc:
           require 'open4'
           @pid, @w, @r, @e = open4.popen4(*@command)
         end
+      rescue Errno::EACCES => e
+        update_executable_mode(*@command)
+        @pid, @w, @r, @e = open4.popen4(*@command)
       rescue Errno::ENOENT => e
         @alive = false
         part = command[0].split(' ').shift
@@ -34,6 +37,19 @@ module Sprout #:nodoc:
       end
     end
     
+    def update_executable_mode(*command)
+      parts = command.join(' ').split(' ')
+      str = parts.shift
+      while(parts.size > 0)
+        if(File.exists?(str))
+          FileUtils.chmod(744, str)
+          return
+        else
+          str << " #{parts.shift}"
+        end
+      end
+    end
+    
     def alive?
       @alive = update_status
     end

data/lib/sprout/remote_file_loader.rb

@@ -2,16 +2,13 @@
 module Sprout
   class RemoteFileLoaderError < StandardError #:nodoc:
   end
-  
+
   class RemoteFileLoader #:nodoc:
-    include Archive::Tar
     
-    def get_remote_file(uri, target, force=false, md5=nil)
-      if(force || !File.exists?(target))
-        response = fetch(uri.to_s)
-        if(response_is_valid?(response, md5))
-          write(response, target, force)
-        end
+    def get_remote_file(uri, force=false, md5=nil)
+      response = fetch(uri.to_s)
+      if(force || response_is_valid?(response, md5))
+        return response
       end
     end
     
@@ -34,22 +31,8 @@ module Sprout
       return true
     end
     
-    def write(response, target, force=false)
-      FileUtils.makedirs(File.dirname(target))
-      if(force && File.exists?(target))
-        File.delete(target)
-      end
-      File.open(target, 'wb') do |f|
-        f.write(response)
-      end
-    end
-    
     def fetch(uri)
       uri = URI.parse(uri)
-      # Download the file now to the downloads dir
-      # If the file is an archive (zip, gz, tar, tar.gz, dmg), extract to
-      # Sprouts/cache/@type/@name
-      # Check the location again...
       progress = nil
       response = nil
       name = uri.path.split("/").pop
@@ -84,164 +67,5 @@ module Sprout
       return response
     end
     
-    def unpack_downloaded_file(file_name, dir)
-      if(!File.exists?(dir))
-        if(is_zip?(file_name))
-          unpack_zip(file_name, dir)
-        elsif(is_targz?(file_name))
-          unpack_targz(file_name, dir)
-        elsif(is_dmg?(file_name))
-          unpack_dmg(file_name, dir)
-        elsif(is_swc?(file_name))
-          # just copy the swc...
-        elsif(is_rb?(file_name))
-          return
-        elsif(is_exe?(file_name))
-          FileUtils.mkdir_p(dir)
-          File.mv(file_name, dir)
-        else
-          raise UsageError.new("RemoteFileTask does not know how to unpack files of type: #{file_name}")
-        end
-      end
-    end
-    
-    def unpack_zip(zip_file, dir)
-      # Avoid the rubyzip Segmentation Fault bug
-      # at least on os x...
-      if(RUBY_PLATFORM =~ /darwin/)
-          # Unzipping on OS X
-          FileUtils.makedirs(dir)
-          zip_dir = File.expand_path(File.dirname(zip_file))
-          zip_name = File.basename(zip_file)
-          output = File.expand_path(dir)
-          #puts ">> zip_dir: #{zip_dir} zip_name: #{zip_name} output: #{output}"
-          %x(cd #{zip_dir};unzip #{zip_name} -d #{output})
-      else
-        retries = 0
-        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))
-              # Disgusting, Gross Hack to fix DOS/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...
-              begin
-                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
-              rescue NotImplementedError => ni_err
-                puts "[WARNING] #{ni_err} for: #{e}"
-              end
-            end
-          end
-        rescue StandardError => err
-          FileUtils.rm_rf(dir)
-          if(retries < 3)
-            puts ">> [ZIP ERROR ENCOUNTERED] trying again with: #{dir}"
-            FileUtils.makedirs(dir)
-            retry
-          end
-          raise err
-        end
-      end
-    end
-    
-    def unpack_targz(tgz_file, dir)
-      if(!File.exists?(dir))
-        FileUtils.makedirs(dir)
-      end
-      tar = Zlib::GzipReader.new(File.open(tgz_file, 'rb'))
-      Minitar.unpack(tar, dir)
-      
-      # Recurse and unpack gzipped children (Adobe did this double 
-      # gzip with the Linux FlashPlayer for some reason)
-      Dir.glob("#{dir}/**/*.tar.gz").each do |child|
-        if(child != tgz_file)
-          unpack_targz(child, File.dirname(child))
-        end
-      end
-      
-    end
-    
-    # This is actually not unpacking the FlashPlayer
-    # Binary file as expected...
-    # OSX is treated the player binary as if it is
-    # a regular text file, but if it is copied manually,
-    # the command works fine!?
-    def unpack_dmg(dmg_file, dir)
-      # 1) Mount the dmg in place
-      # 2) Recursively Copy its contents to asproject_home
-      # 3) Unmount the dmg
-      if(mounted_path.nil?)
-        raise StandardError.new('DMG file downloaded, but the RemoteFileTask needs a mounted_path in order to mount it')
-      end
-
-      if(!File.exists?(full_mounted_path))
-        system("hdiutil mount #{dmg_file}")
-      end
-      
-      begin
-        mounted_target = File.join(full_mounted_path, extracted_file)
-  
-        # Copy the DMG contents using system copy rather than ruby utils
-        # Because OS X does something special with .app files that the
-        # Ruby FileUtils and File classes break...
-        from = mounted_target
-#        from = File.join(full_mounted_path, extracted_file)
-        to = File.join(@user.downloads, @name.to_s, extracted_file)
-        FileUtils.makedirs(File.dirname(to))
-        
-        if(File.exists?(from))
-          `ditto '#{from}' '#{to}'`
-        end
-      rescue
-        if(File.exists?(full_mounted_path))
-          system("hdiutil unmount -force \"#{full_mounted_path}\"")
-        end
-      end
-    end
-    
-    def is_exe?(file)
-      return (file.split('.').pop == 'exe')
-    end
-    
-    def is_zip?(file)
-      return (file.split('.').pop == 'zip')
-    end
-    
-    def is_targz?(file)
-      parts = file.split('.')
-      part = parts.pop
-      return (part == 'tgz' || part == 'gz' && parts.pop == 'tar')
-    end
-    
-    def is_gzip?(file)
-      return (file.split('.').pop == 'gz')
-    end
-    
-    def is_swc?(file)
-      return (file.split('.').pop == 'swc')
-    end
-    
-    def is_rb?(file)
-      return (file.split('.').pop == 'rb')
-    end
-    
-    def is_dmg?(file)
-      return (file.split('.').pop == 'dmg')
-    end
   end
 end

data/lib/sprout/remote_file_target.rb

@@ -7,6 +7,9 @@ module Sprout
 
     attr_writer   :archive_path
     
+    # The string environment variable name to check before downloading anything.
+    attr_accessor :environment
+    
     # The user path where this gem will download and install files
     # This value is set by the Sprout::Builder that creates this RemoteFileTarget
     attr_accessor :install_path
@@ -29,6 +32,21 @@ module Sprout
 
     # URL where Sprouts can go to download the RemoteFileTarget archive
     attr_accessor :url
+    
+    # If the archive type cannot be assumed from the returned file name,
+    # it must be provided as one of the following:
+    #   :exe
+    #   :zip
+    #   :targz
+    #   :gzip
+    #   :swc
+    #   :rb
+    #   :dmg
+    # @see ArchiveUnpacker
+    attr_accessor :archive_type
+
+    # Filename for the downloaded file. Introduced to fix railsy URL issues.
+    attr_accessor :filename
 
     # Relative path within the archive to the executable or binary of interest
     def archive_path
@@ -36,18 +54,30 @@ module Sprout
     end
 
     # Resolve this RemoteFileTarget now. This method is called by the Sprout::Builder
-    # and will download, install and unpack the described archive
+    # and will download, install and unpack the described archive, unless it is
+    # already installed
     def resolve(update=false)
-      if(url)
-        @loader = RemoteFileLoader.new
-        if(url && (update || !File.exists?(downloaded_path)))
-          download(url, downloaded_path, update)
+      # Wanted to raise, but it seems we support RemoteFileTargets that are actually self-installed binaries...
+      # like SWFMill on Linux. @see the BuilderTest.test_build_no_install for more info.
+      # raise RemoteFileTargetError.new('Cannot retrieve a RemoteFileTarget without a url') if url.nil?
+      return if url.nil?
+      
+      if(filename)
+        self.downloaded_path = File.join(File.dirname(downloaded_path), filename)
+      end
+      
+      if(url && (update || !File.exists?(downloaded_path)))
+        content = download(url, update)
+        FileUtils.makedirs(File.dirname(downloaded_path))
+        FileUtils.touch(downloaded_path)
+        File.open(downloaded_path, 'r+') do |file|
+          file.write(content)
         end
+      end
 
-        if(!File.exists?(installed_path) || !File.exists?(File.join(installed_path, archive_path) ))
-          archive_root = File.join(install_path, 'archive')
-          install(downloaded_path, archive_root)
-        end
+      if(!File.exists?(installed_path) || !File.exists?(File.join(installed_path, archive_path) ))
+        archive_root = File.join(install_path, 'archive')
+        install(downloaded_path, archive_root, update, archive_type)
       end
     end
     
@@ -59,37 +89,62 @@ module Sprout
     # The root path to the unpacked archive files. This is the base path that will be added to any
     # +archive_path+ relative paths
     def installed_path
-      @installed_path ||= File.join(install_path, 'archive')
+      @installed_path ||= inferred_installed_path
       return @installed_path
     end
     
+    def downloaded_path=(path)
+      @downloaded_path = path
+    end
+    
     # Parent directory where archives are downloaded
     # can be something like: ~/Library/Sprouts/cache/0.7/sprout-somesprout-tool.x.x.x/
     def downloaded_path
-      @downloaded_path ||= File.join(install_path, file_name)
+      @downloaded_path ||= File.join(install_path, file_name(url))
       return @downloaded_path
     end
     
     # Base file name represented by the provided +url+
     # Will strip off any ? arguments and trailing slashes. May not play nice with Rails URLS,
     # We expect archive file name suffixes like, zip, gzip, tar.gz, dmg, etc.
-    def file_name
-      if(url.split('').last == '/')
-        return name
+    def file_name(url=nil)
+      return @filename if(@filename)
+
+      url ||= self.url
+      url = url.split('?').shift
+      
+      parts = url.split('/')
+      if(parts.last == '/')
+        parts.pop
       end
-      file = url.split('/').pop
-      file = file.split('?').shift
+      
+      file = parts.pop
+      
+      if(!archive_type.nil? && file.match(/\.#{archive_type.to_s}$/).nil?)
+        file << ".#{archive_type.to_s}"
+      end
+      
       return file
     end
     
     private
-    def download(url, path, update=false)
-      @loader = RemoteFileLoader.new
-      @loader.get_remote_file(url, path, update, md5)
+    
+    def inferred_installed_path
+      if(!environment.nil? && !ENV[environment].nil? && File.exists?(ENV[environment]))
+        return ENV[environment]
+      end
+      
+      return File.join(install_path, 'archive')
+    end
+    
+    def download(url, update=false)
+      loader = RemoteFileLoader.new
+      loader.get_remote_file(url, update, md5)
     end
     
-    def install(from, to)
-      @loader.unpack_downloaded_file(from, to)
+    def install(from, to, force, archive_type=nil)
+      unpacker = ArchiveUnpacker.new
+      unpacker.unpack_archive(from, to, force, archive_type)
     end
     
   end

data/lib/sprout/tasks/gem_wrap_task.rb

@@ -105,10 +105,18 @@ module Sprout
           s.email         = @email
           s.homepage      = @homepage
           s.rubyforge_project = 'sprout'
-          s.requirements << {'sprout', '>= 0.7.1'}
           gem_dependencies.each do |dep|
             s.requirements << dep
           end
+          
+          sprout_requirement = s.requirements.collect { |req|
+            (req[0] == 'sprout')
+          }
+          
+          if(!sprout_requirement)
+            s.add_dependency('sprout', '>= 0.7.209')
+          end
+
           if(File.exists?('sprout.spec'))
             files << 'sprout.spec'
           end

data/lib/sprout/tasks/git_task.rb

@@ -1,4 +1,3 @@
-require 'git'
 require 'sprout/version_file'
 
 module Sprout
@@ -58,6 +57,12 @@ module Sprout
     end
 
     def self.define_task(args, &block)
+      begin
+        require 'git'
+      rescue LoadError => e
+        puts "You need to install the 'git' gem. Try running: sudo gem install git"
+        raise e
+      end
       t = super
       yield t if block_given?
       t.define

data/lib/sprout/tasks/library_task.rb

@@ -99,7 +99,12 @@ module Sprout
     
     def define_file_task(source, destination)
       file destination do |t|
-        FileUtils.cp_r(library_path, destination)
+        lib_path = library_path
+        FileUtils.makedirs(destination)
+        if(File.directory?(lib_path))
+          lib_path = "#{lib_path}/."
+        end
+        FileUtils.cp_r(lib_path, destination)
       end
       prerequisites << destination
     end

data/lib/sprout/template_resolver.rb

@@ -1,6 +1,6 @@
 
 module Sprout
-
+  
   class TemplateResolver < Hash #:nodoc:
     include Singleton
     
@@ -197,7 +197,7 @@ EOF
           puts "#{fn}: binary"
         end
       end
-    rescue
+    rescue StandardError => e
       puts "#$0: #$!"
     end
   end

data/lib/sprout/user.rb

@@ -154,7 +154,7 @@ module Sprout
 
       begin
         return @home = File.expand_path("~")
-      rescue StandardError
+      rescue StandardError => e
         if File::ALT_SEPARATOR
           return @home = "C:\\"
         else

data/lib/sprout/version.rb

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

data/rakefile.rb

@@ -32,7 +32,7 @@ PKG_LIST.each do |file|
   task :package => file
 end
 
-def apply_shared_spec(s)
+spec = Gem::Specification.new do |s|
     s.summary             = SUMMARY
     s.description         = DESCRIPTION
     s.name                = NAME
@@ -58,48 +58,15 @@ def apply_shared_spec(s)
     s.add_dependency('rubigen', '= 1.3.3')
     s.add_dependency('net-sftp')
     s.add_dependency('net-ssh')
+    
+    if(RUBY_PLATFORM.match('mswin'))
+      s.add_dependency('win32-open3', '0.2.5')
+    else
+      s.add_dependency('open4', '>= 0.9.6')
+    end
 end
 
-osx_spec = Gem::Specification.new do |s|
-  apply_shared_spec(s)
-  s.platform = 'darwin'
-  # Add osx-specific dependencies here
-
-  # Can't really depend on rb-appscript b/c this requires OS X dev-tool disk
-  #s.add_dependency('rb-appscript', '>= 0.5.0')
-  s.add_dependency('open4', '>= 0.9.6')
-end
-
-nix_spec = Gem::Specification.new do |s|
-  apply_shared_spec(s)
-  s.platform = 'x86-linux'
-  # Add nix-specific dependencies here
-  s.add_dependency('open4', '>= 0.9.6')
-end
-
-win_spec = Gem::Specification.new do |s|
-  apply_shared_spec(s)
-  s.platform = 'mswin32'
-  # Add win-specific dependencies here
-  s.add_dependency('win32-open3', '0.2.5')
-end
-
-ruby_spec = Gem::Specification.new do |s|
-  apply_shared_spec(s)
-  s.platform = Gem::Platform::RUBY
-  s.add_dependency('open4', '>= 0.9.6')
-end
-
-Rake::GemPackageTask.new(osx_spec) do |pkg|
-end
-
-Rake::GemPackageTask.new(nix_spec) do |pkg|
-end
-
-Rake::GemPackageTask.new(win_spec) do |pkg|
-end
-
-Rake::GemPackageTask.new(ruby_spec) do |pkg|
+Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 Rake::RDocTask.new do |t|
@@ -113,21 +80,6 @@ Rake::RDocTask.new do |t|
 end
 
 CLEAN.add('rdoc')
-
-
 require File.dirname(__FILE__) + '/script/build_helpers'
 
-def fix_x86_mswin
-  files = Dir.glob('pkg/*x86-mswin*')
-  files.each do |name|
-    new_name = name.gsub('-x86', '')
-    puts "Renaming x86-mswin gem from #{name} to #{new_name}"
-    File.mv(name, new_name)
-  end
-end
-
-task :package do
-  fix_x86_mswin
-end
-
 #task :release => :release_rubyforge

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprout
 version: !ruby/object:Gem::Version 
-  version: 0.7.206
+  version: 0.7.210
 platform: ruby
 authors: 
 - Luke Bayes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-28 00:00:00 -08:00
+date: 2009-07-15 00:00:00 -07:00
 default_executable: sprout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,28 +81,18 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin
-- doc
-- lib
 - MIT-LICENSE
-- pkg
 - rakefile.rb
-- samples
-- script
-- test
 - TODO
-- samples/gem_wrap
 - samples/gem_wrap/rakefile.rb
 - bin/sprout
 - lib/corelib.swc
 - lib/platform.rb
 - lib/progress_bar.rb
-- lib/sprout
+- lib/sprout/archive_unpacker.rb
 - lib/sprout/builder.rb
-- lib/sprout/commands
 - lib/sprout/commands/generate.rb
 - lib/sprout/general_tasks.rb
-- lib/sprout/generator
 - lib/sprout/generator/base_mixins.rb
 - lib/sprout/generator/named_base.rb
 - lib/sprout/generator.rb
@@ -112,7 +102,6 @@ files:
 - lib/sprout/remote_file_loader.rb
 - lib/sprout/remote_file_target.rb
 - lib/sprout/simple_resolver.rb
-- lib/sprout/tasks
 - lib/sprout/tasks/gem_wrap_task.rb
 - lib/sprout/tasks/git_task.rb
 - lib/sprout/tasks/library_task.rb
@@ -133,6 +122,8 @@ files:
 - doc/Tool
 has_rdoc: true
 homepage: http://www.projectsprouts.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -162,9 +153,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sprout
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Sprouts is an open-source, cross-platform project generation, configuration and build tool.
 test_files: []