sprout 1.0.5.pre → 1.0.8.pre

data/lib/sprout/archive_unpacker.rb

@@ -23,17 +23,41 @@ module Sprout
     end
 
     # Unpack zip archives on any platform.
+    #
+    # In case you're wondering... Ruby sucks...
+    # This code corrupts the FlashPlayer executable
+    # on OSX but if the file is manually unpacked,
+    # it works fine.
+    #
     def unpack_zip archive, destination, clobber=nil
       validate archive, destination
 
-      Zip::ZipFile.open archive do |zipfile|
-        zipfile.each do |entry|
-          next if entry.name =~ /__MACOSX/ or entry.name =~ /\.DS_Store/
-          unpack_zip_entry entry, destination, clobber
+      if is_darwin?
+        unpack_zip_on_darwin archive, destination, clobber
+      else
+        Zip::ZipFile.open archive do |zipfile|
+          zipfile.each do |entry|
+            next if entry.name =~ /__MACOSX/ or entry.name =~ /\.DS_Store/
+            unpack_zip_entry entry, destination, clobber
+          end
         end
       end
     end
 
+    def is_darwin?
+      Sprout.current_system == Sprout::System::OSXSystem
+    end
+
+    def unpack_zip_on_darwin archive, destination, clobber
+      # Unzipping on OS X
+      FileUtils.makedirs destination
+      zip_dir = File.expand_path File.dirname(archive)
+      zip_name = File.basename archive
+      output = File.expand_path destination
+      # puts ">> zip_dir: #{zip_dir} zip_name: #{zip_name} output: #{output}"
+      %x(cd #{zip_dir};unzip #{zip_name} -d #{output})
+    end
+
     # Unpack tar.gz or .tgz files on any platform.
     def unpack_tgz archive, destination, clobber=nil
       validate archive, destination

data/lib/sprout/system/base_system.rb

@@ -96,18 +96,10 @@ module Sprout::System
 
     ##
     # Execute a new process in a separate thread.
-    # This can be useful for processes that take
-    # an especially long time to execute.
-    #
-    # Threads are complicated - use with caution...
     #
     def execute_thread(tool, options='')
-      if(Log.debug)
-         return ThreadMock.new
-      else
-        return Thread.new do
-          execute(tool, options)
-        end
+      return Thread.new do
+        execute(tool, options)
       end
     end
 

data/lib/sprout/test/sprout_test_case.rb

@@ -182,7 +182,7 @@ module SproutTestCase # :nodoc:[all]
     # Return the fixtures folder if found:
     return fixture_path if File.directory? fixture_path
     # Move up one directory and try again:
-    return find_fixtures File.dirname(path)
+    return find_fixtures File.dirname(path) unless File.dirname(path) == path
   end
 
 end

data/lib/sprout/version.rb

@@ -6,7 +6,7 @@ module Sprout
     module VERSION #:nodoc:
       MAJOR = 1
       MINOR = 0
-      TINY  = 5
+      TINY  = 8
       RELEASE = 'pre'
 
       STRING = [MAJOR, MINOR, TINY, RELEASE].join('.')

data/test/unit/archive_unpacker_test.rb

@@ -40,6 +40,12 @@ class ArchiveUnpackerTest < Test::Unit::TestCase
       end
     end
 
+    should "unpack zip on darwin specially" do
+      @unpacker.stubs(:is_darwin?).returns true
+      @unpacker.expects(:unpack_zip_on_darwin)
+      @unpacker.unpack @zip_file, temp_path
+    end
+
     ['exe', 'swc', 'rb'].each do |format|
       should "copy #{format} files" do
         file = eval("@#{format}_file")

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 5
+  - 8
   - pre
-  version: 1.0.5.pre
+  version: 1.0.8.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-20 00:00:00 -07:00
+date: 2010-06-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency