sprout 0.7.193-mswin32 → 0.7.196-mswin32

data/lib/sprout.rb

@@ -33,6 +33,7 @@ require 'sprout/builder'
 require 'sprout/version'
 require 'sprout/tasks/tool_task'
 require 'sprout/general_tasks'
+require 'sprout/generator'
 
 module Sprout
   SUDO_INSTALL_GEMS = 'false' == ENV['SUDO_INSTALL_GEMS'] ? false : true
@@ -138,11 +139,12 @@ module Sprout
       # For each sprout found, remove it!
       RubiGen::GemGeneratorSource.new().each_sprout do |sprout|
         count += 1
-        command = "#{get_gem_preamble} uninstall -x -a -i -q #{sprout.name}"
+        command = "#{get_gem_preamble} uninstall -x -a -q #{sprout.name}"
 
         if(!confirmation)
           break unless confirmation = remove_gems_confirmation
         end
+        puts "executing #{command}"
         raise ">> Exited with errors: #{$?}" unless system(command)
       end
       
@@ -251,7 +253,7 @@ EOF
         exe = target.archive_path
       end
       
-      if(File.exists?(exe) && !File.directory?(exe) && File.stat(exe).mode != 33261)
+      if(File.exists?(exe) && !File.directory?(exe) && File.stat(exe).executable?)
         File.chmod 0755, exe
       end
       
@@ -324,7 +326,7 @@ EOF
     # This method will actually download and install the provided gem by +name+ and +requirements+ if
     # it is not found locally on the system.
     def self.find_gem_spec(name, requirements=nil, recursed=false)
-      specs = Gem::cache.search(/.*#{name}$/).reverse # Found specs are returned in order from oldest to newest!?
+      specs = Gem::cache.sprout_search(/.*#{name}$/).reverse # Found specs are returned in order from oldest to newest!?
       requirement = nil
       if(requirements)
         requirement = Gem::Requirement.new(requirements)
@@ -344,7 +346,7 @@ EOF
       else
         msg = ">> Loading gem [#{name}]"
         msg << " #{requirements}" if requirements
-        msg << " from #{gem_sources.join(', ')} with it's dependencies"
+        msg << " from #{gem_sources.join(', ')} with its dependencies"
         Log.puts msg
         parts = [ 'ins', '-r', name ]
         # This url should be removed once released, released gems should be hosted from the rubyforge

data/lib/sprout/generator/base_mixins.rb

@@ -1,3 +1,58 @@
+
+class Gem::SourceIndex
+  
+  # This feature seems to be getting deprecated from the latest
+  # gems releases (1.3.x). 
+  # We actually need it and don't want the nagging - so,
+  # copied sources from RubyGems SVN trunk, and mixing in...
+  # :-(
+  # There should be a more stable integration point with RubyGems
+  # Any ideas or contributions are welcome!
+  def sprout_search(gem_pattern, platform_only = false)
+    version_requirement = nil
+    only_platform = false
+
+    # unless Gem::Dependency === gem_pattern
+    #   warn "#{Gem.location_of_caller.join ':'}:Warning: Gem::SourceIndex#search support for #{gem_pattern.class} patterns is deprecated"
+    # end
+
+    case gem_pattern
+    when Regexp then
+      version_requirement = platform_only || Gem::Requirement.default
+    when Gem::Dependency then
+      only_platform = platform_only
+      version_requirement = gem_pattern.version_requirements
+      gem_pattern = if Regexp === gem_pattern.name then
+                      gem_pattern.name
+                    elsif gem_pattern.name.empty? then
+                      //
+                    else
+                      /^#{Regexp.escape gem_pattern.name}$/
+                    end
+    else
+      version_requirement = platform_only || Gem::Requirement.default
+      gem_pattern = /#{gem_pattern}/i
+    end
+
+    unless Gem::Requirement === version_requirement then
+      version_requirement = Gem::Requirement.create version_requirement
+    end
+
+    specs = @gems.values.select do |spec|
+      spec.name =~ gem_pattern and
+        version_requirement.satisfied_by? spec.version
+    end
+
+    if only_platform then
+      specs = specs.select do |spec|
+        Gem::Platform.match spec.platform
+      end
+    end
+
+    specs.sort_by { |s| s.sort_obj }
+  end
+end
+
 module RubiGen # :nodoc:[all]
 
   class Base # :nodoc:[all]
@@ -37,7 +92,7 @@ module RubiGen # :nodoc:[all]
 
     # Yield latest versions of generator gems.
     def each
-      Gem::cache.search(/sprout-*#{@sprout_name}-bundle$/).inject({}) { |latest, gem|
+      Gem::cache.sprout_search(/sprout-*#{@sprout_name}-bundle$/).inject({}) { |latest, gem|
         hem = latest[gem.name]
         latest[gem.name] = gem if hem.nil? or gem.version > hem.version
         latest
@@ -47,7 +102,7 @@ module RubiGen # :nodoc:[all]
     end
 
     def each_sprout
-      Gem::cache.search(/^sprout-.*/).inject({}) { |latest, gem|
+      Gem::cache.sprout_search(/^sprout-.*/).inject({}) { |latest, gem|
         hem = latest[gem.name]
         latest[gem.name] = gem if hem.nil? or gem.version > hem.version
         latest

data/lib/sprout/process_runner.rb

@@ -38,6 +38,10 @@ module Sprout #:nodoc:
       @alive = update_status
     end
     
+    def close
+      update_status
+    end
+    
     def update_status
       pid_int = Integer("#{ @pid }")
       begin

data/lib/sprout/project_model.rb

@@ -122,6 +122,8 @@ module Sprout
     attr_accessor :test_height
     # The test runner SWF width
     attr_accessor :test_width
+    # Tasks that can, will use the Flex Compiler SHell.
+    attr_accessor :use_fcsh
     # The default width of the SWF file
     # _(This value is overridden when embedded in an HTML page)_
     attr_accessor :width

data/lib/sprout/remote_file_loader.rb

@@ -183,7 +183,7 @@ module Sprout
     # the command works fine!?
     def unpack_dmg(dmg_file, dir)
       # 1) Mount the dmg in place
-      # 2) Recursively Copy it's contents to asproject_home
+      # 2) Recursively Copy its contents to asproject_home
       # 3) Unmount the dmg
       if(mounted_path.nil?)
         raise StandardError.new('DMG file downloaded, but the RemoteFileTask needs a mounted_path in order to mount it')

data/lib/sprout/remote_file_target.rb

@@ -16,7 +16,7 @@ module Sprout
     # be compared and if they differ, the installation process will break.
     attr_accessor :md5
 
-    # Used for dmg archives. Absolute path to the mounted dmg (essentially it's name)
+    # Used for dmg archives. Absolute path to the mounted dmg (essentially its name)
     attr_accessor :mount_path
 
     # Which platform will this RemoteFileTarget support.

data/lib/sprout/user.rb

@@ -196,31 +196,40 @@ module Sprout
         return Platform::IMPL
       end
     end
-    
+
     def get_process_runner(command)
       return ProcessRunner.new(command)
     end
 
+    # Creates a new process, executes the command
+    # and returns the result and throws if the process
+    # writes to stderr
     def execute(tool, options='')
       Log.puts(">> Execute: #{File.basename(tool)} #{options}")
       tool = clean_path(tool)
       runner = get_process_runner("#{tool} #{options}")
-    
+
       result = runner.read
       error = runner.read_err
+
       if(result.size > 0)
         Log.puts result
       end
+
       if(error.size > 0)
         raise ExecutionError.new("[ERROR] #{error}")
       end
     end
 
+    # Creates and returns the process without
+    # attempting to read or write to the stream.
+    # This is useful for interacting with
+    # long-lived CLI processes like FCSH or FDB.
     def execute_silent(tool, options='')
       tool = clean_path(tool)
       return get_process_runner("#{tool} #{options}")
     end
-    
+
     def execute_thread(tool, options='')
       return Thread.new {
         execute(tool, options)

data/lib/sprout/version.rb

@@ -2,7 +2,7 @@ module Sprout
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 7
-    TINY  = 193
+    TINY  = 196
 
     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.193
+  version: 0.7.196
 platform: mswin32
 authors: 
 - Luke Bayes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-20 00:00:00 -07:00
+date: 2009-01-06 00:00:00 -08:00
 default_executable: sprout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sprout
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Sprouts is an open-source, cross-platform project generation, configuration and build tool.