sprout 0.7.229-mswin32 → 0.7.233-mswin32

data/lib/sprout.rb

@@ -275,7 +275,7 @@ EOF
         raise UsageError.new("Could not retrieve requested executable from path: #{exe}")
       end
       
-      if(File.exists?(exe) && !File.directory?(exe) && File.stat(exe).executable?)
+      if(File.exists?(exe) && !File.directory?(exe) && !File.stat(exe).executable?)
         File.chmod 0755, exe
       end
       
@@ -303,7 +303,7 @@ EOF
       end
       if(File.exists?(sprout_spec_path))
         # Ensure the requisite files get downloaded and unpacked
-        Builder.build(sprout_spec_path, gem_file_cache(gem_spec.name, gem_spec.version))
+        Builder.build(sprout_spec_path, gem_spec.name, gem_spec.version)
       else
         return gem_spec
       end

data/lib/sprout/archive_unpacker.rb

@@ -6,7 +6,7 @@ module Sprout
   # 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
@@ -20,16 +20,16 @@ module Sprout
   #   :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'
@@ -40,18 +40,15 @@ module Sprout
             unpack_dmg(file_name, dir)
           when 'exe'
             FileUtils.mkdir_p(dir)
-            FileUtils.mv(file_name, dir)
-          when 'swc'
-            FileUtils.mkdir_p(dir)
-            FileUtils.mv(file_name, dir)
-          when 'rb'
+            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...
@@ -73,12 +70,12 @@ module Sprout
               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
+              # 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
+              # into a new, empty directory as existing files will be 
               # clobbered...
               begin
                 if(File.exists?(fpath) && !File.directory?(fpath))
@@ -104,30 +101,30 @@ module Sprout
         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
+      
+      # 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)
+        if(child != tgz_file && dir != File.dirname(child))
           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
@@ -144,10 +141,10 @@ module Sprout
       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...
@@ -155,7 +152,7 @@ module Sprout
 #        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
@@ -165,7 +162,7 @@ module Sprout
         end
       end
     end
-
+    
     def suffix_for_archive_type(type)
       if(type == :targz)
         return '.tar.gz'
@@ -173,7 +170,7 @@ module Sprout
         return ".#{type.to_s}"
       end
     end
-
+    
     def inferred_archive_type(file_name)
       if is_zip?(file_name)
         return :zip
@@ -192,34 +189,34 @@ module Sprout
       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
+    end    
 
     def is_exe?(file)
       return (file.split('.').pop == 'exe')

data/lib/sprout/builder.rb

@@ -9,7 +9,8 @@ module Sprout
   # archives that are identified in the spec
   class Builder # :nodoc:
     
-    def self.build(file_targets_yaml, destination)
+    def self.build(file_targets_yaml, gem_name=nil, gem_version=nil)
+      destination = Builder.gem_file_cache(gem_name, gem_version)
       data = nil
       
       File.open(file_targets_yaml, 'r') do |f|
@@ -24,6 +25,8 @@ module Sprout
         # When authoring a sprout.spec for libraries or tools,
         # put the most specific RemoteFileTargets first, then
         # universals to catch unexpected platforms.
+        target.gem_name = gem_name
+        target.gem_version = gem_version
         if(target.platform == platform || target.platform == 'universal')
           target.install_path = FileUtils.mkdir_p(destination)
           target.resolve
@@ -34,6 +37,10 @@ module Sprout
     end
     
     private
+
+    def self.gem_file_cache(gem_name, gem_version)
+      Sprout.gem_file_cache(gem_name, gem_version)
+    end
     
     def self.platform
       @@platform ||= User.new.platform.to_s

data/lib/sprout/remote_file_target.rb

@@ -5,6 +5,10 @@ module Sprout
 
   class RemoteFileTarget # :nodoc:
 
+
+    attr_accessor :gem_name
+    attr_accessor :gem_version
+
     attr_writer   :archive_path
     
     # The string environment variable name to check before downloading anything.
@@ -65,8 +69,10 @@ module Sprout
       if(filename)
         self.downloaded_path = File.join(File.dirname(downloaded_path), filename)
       end
-      
-      if(url && (update || !File.exists?(downloaded_path)))
+
+      should_download = ( url && !File.exists?(installed_path) && !File.exists?(downloaded_path) )
+
+      if(should_download)
         content = download(url, update)
         FileUtils.makedirs(File.dirname(downloaded_path))
         FileUtils.touch(downloaded_path)
@@ -75,7 +81,7 @@ module Sprout
         end
       end
 
-      if(!File.exists?(installed_path) || !File.exists?(File.join(installed_path, archive_path) ))
+      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
@@ -130,13 +136,33 @@ module Sprout
     private
     
     def inferred_installed_path
-      if(!environment.nil? && !ENV[environment].nil? && File.exists?(ENV[environment]))
-        return ENV[environment]
-      end
-      
-      return File.join(install_path, 'archive')
+      return environment_path || File.join(install_path, 'archive')
     end
     
+    def environment_path
+      path_for_environmental_name(inferred_env_name_with_version) || path_for_environmental_name(inferred_env_name) || path_for_environmental_name(environment)
+    end
+
+    def path_for_environmental_name(name)
+      if(name && ENV[name])
+        if(!File.exist?(ENV[name]))
+          raise UsageError.new("Found Environmental variable at: #{name} but no files found at: #{ENV[name]}")
+        end
+        ENV[name]
+      end
+    end
+
+    def inferred_env_name_with_version
+      return nil if (gem_version.nil? || gem_name.nil?)
+      version = gem_version.to_s.gsub('.', '_')
+      "#{inferred_env_name}_#{version}"
+    end
+
+    def inferred_env_name
+      return nil if gem_name.nil?
+      return gem_name.gsub('-', '_').upcase
+    end
+
     def download(url, update=false)
       loader = RemoteFileLoader.new
       loader.get_remote_file(url, update, md5)
@@ -144,6 +170,7 @@ module Sprout
     
     def install(from, to, force, archive_type=nil)
       unpacker = ArchiveUnpacker.new
+      #puts "Unpacking from: #{from} to: #{to} force: #{force} type: #{archive_type}"
       unpacker.unpack_archive(from, to, force, archive_type)
     end
     

data/lib/sprout/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprout
 version: !ruby/object:Gem::Version 
-  version: 0.7.229
+  version: 0.7.233
 platform: mswin32
 authors: 
 - Luke Bayes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 -08:00
+date: 2010-03-03 00:00:00 -08:00
 default_executable: sprout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,7 +95,6 @@ extra_rdoc_files: []
 files: 
 - MIT-LICENSE
 - rakefile.rb
-- TODO
 - samples/gem_wrap/rakefile.rb
 - bin/sprout
 - lib/platform.rb

data/TODO

@@ -1,12 +0,0 @@
-
----------------------------------
-In the interest of being a better member of our growing community, 
-I have extracted the contents of this file to the googlecode site at:
-
-http://code.google.com/p/projectsprouts/issues/list?q=label:Beta1.0&can=2
-
-Please feel free to check over the available issues and see if any look appealing!
-
-If you're considering a contribution, please check in on our mailing list first just to be sure.
-(projectsprouts@googlegroups.com)
-