sprout 0.7.182 → 0.7.183

data/lib/sprout/remote_file_loader.rb

@@ -73,11 +73,11 @@ module Sprout
           response = f.read
           progress.finish
         }
-      rescue SocketError => e
-        raise RemoteFileLoaderError.new("[ERROR] #{e.to_s}")
-      rescue OpenURI::HTTPError => e
-        raise RemoteFileLoaderError.new("[ERROR] Failed to load file from: '#{uri.to_s}'\n[REMOTE ERROR] #{e.io.read.strip}")
-      rescue Errno::ECONNREFUSED => e
+      rescue SocketError => sock_err
+        raise RemoteFileLoaderError.new("[ERROR] #{sock_err.to_s}")
+      rescue OpenURI::HTTPError => http_err
+        raise RemoteFileLoaderError.new("[ERROR] Failed to load file from: '#{uri.to_s}'\n[REMOTE ERROR] #{http_err.io.read.strip}")
+      rescue Errno::ECONNREFUSED => econ_err
         raise Errno::ECONNREFUSED.new("[ERROR] Connection refused at: '#{uri.to_s}'")
       end
 
@@ -133,24 +133,28 @@ module Sprout
               # If you're going to use this code, be sure you extract
               # into a new, empty directory as existing files will be 
               # clobbered...
-              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)
+              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 => e
+        rescue StandardError => err
+          FileUtils.rm_rf(dir)
           if(retries < 3)
             puts ">> [ZIP ERROR ENCOUNTERED] trying again with: #{dir}"
-            FileUtils.rm_rf(dir)
             FileUtils.makedirs(dir)
             retry
           end
-          raise e
+          raise err
         end
       end
     end

data/lib/sprout/tasks/library_task.rb

@@ -62,7 +62,11 @@ module Sprout
     # 
     # By default, libraries are installed into Sprout::ProjectModel +lib_dir+.
     def project_lib
-      @project_lib ||= ProjectModel.instance.lib_dir
+      if(library_path.index('.swc'))
+        @project_lib ||= ProjectModel.instance.swc_dir
+      else
+        @project_lib ||= ProjectModel.instance.lib_dir
+      end
     end
     
     # Unlike other rake tasks, Library tasks are actually 

data/lib/sprout/version.rb

@@ -2,7 +2,7 @@ module Sprout
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 7
-    TINY  = 182
+    TINY  = 183
 
     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.182
+  version: 0.7.183
 platform: ruby
 authors: 
 - Luke Bayes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-17 00:00:00 -07:00
+date: 2008-05-23 00:00:00 -07:00
 default_executable: sprout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,7 @@ files:
 - samples/gem_wrap
 - samples/gem_wrap/rakefile.rb
 - bin/sprout
+- lib/corelib.swc
 - lib/platform.rb
 - lib/progress_bar.rb
 - lib/sprout