sprout 0.7.211 → 0.7.212

data/lib/progress_bar.rb

@@ -174,10 +174,10 @@ class ProgressBarImpl # :nodoc:[all]
   end
 
   def show
-    arguments = @format_arguments.map {|method| 
+    arguments = @format_arguments.map do |method|
       method = sprintf("fmt_%s", method)
       send(method)
-    }
+    end
     line = sprintf(@format, *arguments)
 
     width = get_width

data/lib/sprout.rb

@@ -130,6 +130,9 @@ module Sprout
     # * +project_path+ Optional parameter. Will default to the nearest folder that contains a valid Rakefile.
     # This Rakefile will usually be loaded by the referenced Generator, and it should have a configured ProjectModel
     # defined in it.
+    
+    # TODO: This command should accept an array of sprout names to fall back on...
+    # for example: generate(['flex4', 'as3'], ...)
     def self.generate(sprout_name, generator_name, params, project_path=nil)
       # params.each_index do |index|
       #   params[index] = clean_project_name(params[index])

data/lib/sprout/generator/base_mixins.rb

@@ -97,23 +97,23 @@ module RubiGen # :nodoc:[all]
 
     # Yield latest versions of generator gems.
     def each
-      Gem::cache.sprout_search(/sprout-*#{@sprout_name}-bundle$/).inject({}) { |latest, gem|
+      Gem::cache.sprout_search(/sprout-*#{@sprout_name}-bundle$/).inject({}) do |latest, gem|
         hem = latest[gem.name]
         latest[gem.name] = gem if hem.nil? or gem.version > hem.version
         latest
-      }.values.each { |gem|
+      end.values.each do |gem|
         yield Spec.new(gem.name.sub(/sprout-*#{@sprout_name}-bundle$/, ''), gem.full_gem_path, label)
-      }
+      end
     end
 
     def each_sprout
-      Gem::cache.sprout_search(/^sprout-.*/).inject({}) { |latest, gem|
+      Gem::cache.sprout_search(/^sprout-.*/).inject({}) do |latest, gem|
         hem = latest[gem.name]
         latest[gem.name] = gem if hem.nil? or gem.version > hem.version
         latest
-      }.values.each { |gem|
+      end.values.each do |gem|
         yield Spec.new(gem.name, gem.full_gem_path, label)
-      }
+      end
     end
   end
 

data/lib/sprout/remote_file_loader.rb

@@ -52,10 +52,10 @@ module Sprout
         },
         :progress_proc => lambda {|s|
           progress.set s if progress
-        }) {|f|
+        }) do |f|
           response = f.read
           progress.finish
-        }
+        end
       rescue SocketError => sock_err
         raise RemoteFileLoaderError.new("[ERROR] #{sock_err.to_s}")
       rescue OpenURI::HTTPError => http_err

data/lib/sprout/remote_file_target.rb

@@ -70,7 +70,7 @@ module Sprout
         content = download(url, update)
         FileUtils.makedirs(File.dirname(downloaded_path))
         FileUtils.touch(downloaded_path)
-        File.open(downloaded_path, 'r+') do |file|
+        File.open(downloaded_path, 'rb+') do |file|
           file.write(content)
         end
       end

data/lib/sprout/tasks/gem_wrap_task.rb

@@ -109,9 +109,9 @@ module Sprout
             s.requirements << dep
           end
           
-          sprout_requirement = s.requirements.collect { |req|
+          sprout_requirement = s.requirements.collect do |req|
             (req[0] == 'sprout')
-          }
+          end
           
           if(!sprout_requirement)
             s.add_dependency('sprout', '>= 0.7.209')
@@ -175,9 +175,9 @@ module Sprout
           full = File.expand_path(ext)
           t = nil
 
-          zip full do |t|
-            t.input = full
-            t.output = File.join(gem_name, 'ext', File.basename(full) + '.zip')
+          zip full do |z|
+            z.input = full
+            z.output = File.join(gem_name, 'ext', File.basename(full) + '.zip')
           end
           puts "pwd: #{Dir.pwd} out #{t.output}"
           zipped_extensions << File.expand_path(t.output)

data/lib/sprout/tasks/sftp_task.rb

@@ -169,8 +169,8 @@ module Sprout
         while(part)
           begin
             sftp.stat(part)
-          rescue Net::SFTP::Operations::StatusException => e
-            raise unless e.code == 2
+          rescue Net::SFTP::Operations::StatusException => ne
+            raise unless ne.code == 2
             sftp.mkdir(part, :permissions => @dir_mode)
           end
           if(parts.size > 0)

data/lib/sprout/tasks/tool_task.rb

@@ -341,7 +341,7 @@ module Sprout
       name = name.to_s
       cleaned = clean_name(name)
       if(!respond_to?(cleaned))
-        raise NoMethodError.new("undefined method '#{name}' for #{self.class}")
+        raise NoMethodError.new("undefined method '#{name}' for #{self.class}", name)
       end
       param = param_hash[cleaned]
 
@@ -560,11 +560,11 @@ module Sprout
     end
     
     def text_file?(file_name)
-      [/\.as$/, /\.txt$/, /\.mxml$/, /\.xml$/, /\.js$/, /\.html$/, /\.htm$/].select { |regex|
-        if(file_name.match(regex))
+      [/\.as$/, /\.txt$/, /\.mxml$/, /\.xml$/, /\.js$/, /\.html$/, /\.htm$/].select do |regex|
+        if (file_name.match(regex))
           return true
         end
-      }.size > 0
+      end.size > 0
     end
     
     def setup_preprocessing_file_tasks(input_file, output_file)

data/lib/sprout/user.rb

@@ -231,9 +231,9 @@ module Sprout
     end
 
     def execute_thread(tool, options='')
-      return Thread.new {
+      return Thread.new do
         execute(tool, options)
-      }
+      end
     end
 
     def clean_path(path)

data/lib/sprout/version.rb

@@ -3,7 +3,7 @@ module Sprout
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 7
-      TINY  = 211
+      TINY  = 212
 
       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.211
+  version: 0.7.212
 platform: ruby
 authors: 
 - Luke Bayes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-15 00:00:00 -07:00
+date: 2009-08-22 00:00:00 -07:00
 default_executable: sprout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,7 +86,6 @@ files:
 - TODO
 - samples/gem_wrap/rakefile.rb
 - bin/sprout
-- lib/corelib.swc
 - lib/platform.rb
 - lib/progress_bar.rb
 - lib/sprout/archive_unpacker.rb
@@ -153,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sprout
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Sprouts is an open-source, cross-platform project generation, configuration and build tool.