sprout 0.7.227-mswin32 → 0.7.228-mswin32

data/lib/platform.rb

@@ -54,9 +54,9 @@ module Platform #:nodoc:
    elsif RUBY_PLATFORM =~ /netbsd/i
       os = :unix
       impl = :netbsd
-  elsif RUBY_PLATFORM =~ /solaris/i
+   elsif RUBY_PLATFORM =~ /solaris/i
       os = :unix
-      impl = :solaris
+      impl = :linux # Our platform checks currently examine 'impl' instead of 'os'
    elsif RUBY_PLATFORM =~ /vista/i
       os = :win32
       impl = :vista

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,15 +40,18 @@ module Sprout
             unpack_dmg(file_name, dir)
           when 'exe'
             FileUtils.mkdir_p(dir)
-            File.mv(file_name, dir)
-          when 'swc' || 'rb'
+            File.move(file_name, dir)
+          when 'swc'
+            FileUtils.mkdir_p(dir)
+            File.move(file_name, dir)
+          when '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...
@@ -70,12 +73,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))
@@ -101,30 +104,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)
           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
@@ -141,10 +144,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...
@@ -152,7 +155,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
@@ -162,7 +165,7 @@ module Sprout
         end
       end
     end
-    
+
     def suffix_for_archive_type(type)
       if(type == :targz)
         return '.tar.gz'
@@ -170,7 +173,7 @@ module Sprout
         return ".#{type.to_s}"
       end
     end
-    
+
     def inferred_archive_type(file_name)
       if is_zip?(file_name)
         return :zip
@@ -189,34 +192,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/tasks/library_task.rb

@@ -27,7 +27,7 @@ module Sprout
 
   # :include: ../../../doc/Library
   class LibraryTask < Rake::Task
-    
+
     # The RubyGems gem version string for this library (e.g., +version = '0.0.1'+)
     attr_accessor :version
 
@@ -44,22 +44,22 @@ module Sprout
     def gem_name
       @gem_name ||= "sprout-#{clean_name}-library"
     end
-    
+
     # Ensure that namespaced rake tasks only use
     # the final part for name-based features
     def clean_name
       return name.split(':').pop
     end
-    
+
     # The path to the library source or swc that will be copied into your project.
     # This can actually be any full or relative path on your system, but should almost
     # always be left alone for automatic resolution.
     def library_path
       @library_path ||= nil
     end
-    
+
     # Override the the project folder where the library will be installed.
-    # 
+    #
     # By default, libraries are installed into Sprout::ProjectModel +lib_dir+.
     def project_lib
       if(library_path.index('.swc'))
@@ -68,18 +68,18 @@ module Sprout
         @project_lib ||= ProjectModel.instance.lib_dir
       end
     end
-    
-    # Unlike other rake tasks, Library tasks are actually 
+
+    # Unlike other rake tasks, Library tasks are actually
     # resolved at 'define' time. This allows the tool tasks
     # to build their own dependencies (like file deps)
-    #   (I'm sure there's a better way to do this, if you know how to fix this, 
+    #   (I'm sure there's a better way to do this, if you know how to fix this,
     # and would like to contribute to sprouts, this might be a good spot for it)
     def define
       @file_target = sprout(gem_name, version)
       @library_path = File.join(@file_target.installed_path, @file_target.archive_path)
       define_file_task(library_path, project_path)
     end
-    
+
     def execute(*args) # :nodoc:
       super
     end
@@ -94,13 +94,13 @@ module Sprout
         File.join(project_lib, File.basename(@file_target.archive_path))
       end
     end
-    
+
     private
-    
+
     def define_file_task(source, destination)
       file destination do |t|
         lib_path = library_path
-        FileUtils.makedirs(destination)
+        #FileUtils.makedirs(destination)
         if(File.directory?(lib_path))
           lib_path = "#{lib_path}/."
         end
@@ -108,7 +108,7 @@ module Sprout
       end
       prerequisites << destination
     end
-    
+
   end
 end
 

data/lib/sprout/version.rb

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

data/rakefile.rb

@@ -139,7 +139,7 @@ def fix_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)
+    File.move(name, new_name)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprout
 version: !ruby/object:Gem::Version 
-  version: 0.7.227
+  version: 0.7.228
 platform: mswin32
 authors: 
 - Luke Bayes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 -08:00
+date: 2010-02-25 00:00:00 -08:00
 default_executable: sprout
 dependencies: 
 - !ruby/object:Gem::Dependency