sprout 1.1.7.pre → 1.1.10.pre

data/VERSION

@@ -1 +1 @@
-1.1.7.pre
+1.1.10.pre

data/lib/sprout.rb

@@ -42,7 +42,6 @@ require 'sprout/remote_file_target'
 require 'sprout/rdoc_parser'
 require 'sprout/specification'
 require 'sprout/executable'
-require 'sprout/daemon'
 require 'sprout/command_line'
 
 # Generators

data/lib/sprout/executable.rb

@@ -13,6 +13,7 @@ require 'sprout/executable/urls'
 require 'sprout/executable/parameter_factory'
 require 'rake/clean'
 require 'sprout/executable/base'
+require 'sprout/executable/session'
 
 module Sprout
 

data/lib/sprout/executable/base.rb

@@ -236,6 +236,22 @@ module Sprout
         initialize_parameters
       end
 
+      def stdout=(io)
+        @stdout = io
+      end
+
+      def stdout
+        @stdout ||= Sprout.stdout
+      end
+
+      def stderr=(io)
+        @stderr = io
+      end
+
+      def stderr
+        @stderr ||= Sprout.stderr
+      end
+
       def parse! commandline_options
         begin
           option_parser.parse! commandline_options
@@ -333,6 +349,47 @@ module Sprout
         @default_file_expression ||= Sprout::Executable::DEFAULT_FILE_EXPRESSION
       end
 
+      ##
+      # Replace the binary that will be executed with a path to one of your 
+      # choosing. This work is usually performed on the yielded instance from
+      # Rake like:
+      #
+      #   mxmlc 'bin/SomeProject.swf' do |t|
+      #     t.input = 'src/SomeProject.as'
+      #     t.binary_path = 'vendor/sdks/4.1.0/bin/mxmlc'
+      #   end
+      #
+      # It's important to note that Windows systems will check
+      # the provided path for binaries of the same name that end with .exe
+      # and .bat and will use those in place of the provided name if they
+      # exist.
+      #
+      # For example, if you set +binary_path+ to:
+      #
+      #   t.binary_path = 'vendor/sdks/4.0.1/bin/mxmlc'
+      #
+      # And there is a similarly-named file in the same directory, but named:
+      #
+      #   vendor/sdks/4.0.1/bin/mxmlc.bat
+      #
+      # Windows systems will execute this .bat file.
+      #
+      # 
+      # @param path [File] Path to the executable binary that should be executed instead 
+      #   of whatever Sprout.load would have provided. If a value is set here, Sprout.load 
+      #   will not be called.
+      # @returns [File] Path to the executable binary that should be executed.
+      #
+      def binary_path=(path)
+        @binary_path = path
+      end
+
+      ##
+      # @returns [File] Path to the executable binary that should be executed.
+      def binary_path
+        @binary_path ||= Sprout::Executable.load(executable, pkg_name, pkg_version).path
+      end
+
       protected
 
       ##
@@ -417,10 +474,6 @@ module Sprout
 
       private
 
-      def binary_path
-        Sprout::Executable.load(executable, pkg_name, pkg_version).path
-      end
-
       def handle_library_prerequisites items
         items.each do |task_name|
           t = Rake.application[task_name]

data/lib/sprout/{daemon.rb → executable/session.rb}

@@ -1,5 +1,5 @@
 
-module Sprout
+module Sprout::Executable
 
   ##
   # The Sprout::Daemon class exposes the Domain Specific Language
@@ -43,7 +43,7 @@ module Sprout
   #     t.do_something_else
   #   end
   #
-  class Daemon < Executable::Base
+  class Session < Base
 
     class << self
 
@@ -146,12 +146,22 @@ module Sprout
     # via stdin, stdout and stderr.
     attr_reader :process_runner
 
+    ##
+    # The Thread that contains the forked running process.
+    attr_reader :process_thread
+
     ##
     # @return [Array<Hash>] Return or create a new array.
     def action_stack
       @action_stack ||= []
     end
 
+    ##
+    # @return [Boolean] If executable is awaiting input.
+    def prompted?
+      @prompted
+    end
+
     ##
     # Execute the Daemon executable, followed
     # by the collection of stored actions in 
@@ -187,8 +197,7 @@ module Sprout
       @process_launched = true
       wait_for_prompt
       execute_actions
-      handle_user_session if should_wait
-      wait if should_wait
+      handle_user_input if should_wait
     end
 
     def wait
@@ -201,75 +210,32 @@ module Sprout
     # an input prompt, so that another action
     # can be submitted, or user input can be
     # collected.
-    def wait_for_prompt expected_prompt=nil
-      expected_prompt = expected_prompt || prompt
-
-      fake_stderr = Sprout::OutputBuffer.new
-      fake_stdout = Sprout::OutputBuffer.new
-      stderr = read_from process_runner.e, fake_stderr
-      stdout = read_from process_runner.r, fake_stdout, expected_prompt
-      stdout.join && stderr.kill
-
-      stdout_str = fake_stdout.read
-      stderr_str = fake_stderr.read
-
-      Sprout.stderr.printf(stderr_str)
-      Sprout.stdout.printf(stdout_str)
+    def wait_for_prompt
+      while process_thread.alive? && !prompted?
+        sleep 0.2
+      end
+      process_thread.alive?
     end
 
     ##
     # Expose the running process to manual
     # input on the terminal, and write stdout
     # back to the user.
-    def handle_user_session
-      while !process_runner.r.eof?
-        input = $stdin.gets.chomp!
-        execute_action input, true
-        wait_for_prompt
+    def handle_user_input
+      while true
+        begin
+          break if !wait_for_prompt
+          input = $stdin.gets.chomp!
+          execute_action(input, true)
+        rescue SignalException => e
+          return false
+        end
       end
+      wait
     end
 
     protected
 
-    ##
-    # This is the ass-hattery that we need to go
-    # through in order to read from stderr and
-    # stdout from a long-running process without
-    # eternally blocking the parent - and providing
-    # the ability to asynchronously write into the
-    # input stream.
-    #
-    # If you know how to better do this accross
-    # platforms (mac, win and nix) without losing
-    # information (i.e. combining stderr and stdout
-    # into a single stream), I'm all ears!
-    def read_from pipe, to, until_prompt=nil
-      line = ''
-      lines = ''
-      Thread.new do
-        Thread.current.abort_on_exception = true
-        while true do
-          break if pipe.eof?
-          char = pipe.readpartial 1
-          line << char
-          if char == "\n"
-            to.puts line
-            to.flush
-            lines << line
-            line = ''
-          end
-          if !until_prompt.nil? && line.match(until_prompt)
-            lines << line
-            to.printf line
-            to.flush
-            line = ''
-            break
-          end
-        end
-        lines
-      end
-    end
-
     def process_launched?
       @process_launched
     end
@@ -305,7 +271,19 @@ module Sprout
     #
     # @return [Thread]
     def system_execute binary, params
-      Sprout.current_system.execute_thread binary, params
+      # Combine the stderr and stdout for long-lived
+      # processes so that they are both written to
+      # stdout, this allows us to collect these streams
+      # without threads or blocking eternally.
+      #
+      # Thanks to https://github.com/apinstein for this
+      # solution.
+      #params = "#{params} " + '2>&1'
+      @process_thread = Sprout.current_system.execute_thread binary, params, prompt do |message|
+        Sprout.stdout.printf message
+        @prompted = true if prompt.match message
+      end
+      @process_runner = process_thread['runner']
     end
 
     private
@@ -314,7 +292,7 @@ module Sprout
     # Execute the collection of provided actions.
     def execute_actions
       action_stack.each do |action|
-        break unless execute_action(action)
+        execute_action(action)
       end
       @action_stack = []
     end
@@ -323,9 +301,11 @@ module Sprout
     # Execute a single action.
     def execute_action action, silence=false
       action = action.strip
-      Sprout.stdout.puts("#{action}\n") unless silence
-      process_runner.puts action
-      wait_for_prompt
+      if wait_for_prompt
+        stdout.puts(action) unless silence
+        @prompted = false
+        process_runner.puts action
+      end
     end
 
   end

data/lib/sprout/process_runner.rb

@@ -77,21 +77,23 @@ module Sprout
     ##
     # Kill the process.
     def kill
-      Process.kill(9, pid)
+      update_status 9
     end
     
     ##
     # Close the process
     def close
-      update_status
+      w.close_write
     end
     
     ##
     # Send an update signal to the process.
-    def update_status
+    #
+    # @param sig [Integer] The signal to send, default 0 (or no action requested)
+    def update_status sig=0
       pid_int = Integer("#{ @pid }")
       begin
-        Process::kill 0, pid_int
+        Process::kill sig, pid_int
         true
       rescue Errno::ESRCH
         false

data/lib/sprout/system/base_system.rb

@@ -95,21 +95,60 @@ module Sprout::System
     end
 
     ##
-    # Execute a new process in a separate thread.
+    # Execute a new process in a separate thread and yield whatever output
+    # is written to its stderr and stdout.
     #
-    def execute_thread(tool, options='')
-      runner = nil
-      Thread.new do
+    # @return [Sprout::ProcessRunner]
+    # @param tool [File] Path to the executable.
+    # @param options [String] The command line options that the executable accepts.
+    # @param prompt [Regex] The prompt that will trigger the listener block to be called.
+    # @yield [String] Message that was received from the process, called when #prompt is encountered.
+    #
+    def execute_thread tool, options='', prompt=nil, &block
+      t = Thread.new do
         Thread.current.abort_on_exception = true
         runner = execute_silent(tool, options)
+        Thread.current['runner'] = runner
+        out = read_from runner.r, prompt, &block
+        err = read_from runner.e, prompt, &block
+        out.join && err.kill
       end
+
       # Wait for the runner to be created
       # before returning a nil reference
       # that never gets populated...
-      while runner.nil? do
+      while t['runner'].nil? do
         sleep(0.1)
       end
-      runner
+
+      t
+    end
+
+    def read_from pipe, prompt, &block
+      Thread.new do
+        Thread.current.abort_on_exception = true
+        lines = ''
+        line = ''
+        pipe.sync = true
+        pipe.each_char do |char|
+          break if pipe.closed?
+          line << char
+
+          if line.match prompt
+            yield line if block_given?
+            lines << line
+            lines = ''
+            line = ''
+            next
+          end
+
+          if char == "\n"
+            lines << line
+            yield line if block_given?
+            line = ''
+          end
+        end
+      end
     end
 
     ##

data/lib/sprout/test_helper.rb

@@ -233,25 +233,6 @@ module Sprout::TestHelper
     end
   end
 
-  ##
-  # Update the Sprout::Executable registry so that subsequent
-  # requests for an executable return a fake one instead of
-  # the real one.
-  #
-  # @param exe [Symbol] The executable that will be sent to the load request (e.g. :fdb, :mxmlc, etc.).
-  # @param fake_name [String] The path to the fake executable that should be used.
-  #
-  # Note: Calling this method will set a mocha expectation
-  # that the Sprout::Executable.load method will be called during
-  # the test method run.
-  #
-  def insert_fake_executable fake
-    # Comment the following and install the flashsdk gem
-    # to run test against actual executables instead of fakes:
-    path_response = OpenStruct.new(:path => fake)
-    Sprout::Executable.expects(:load).returns path_response
-  end
-
   ##
   # Create and/or return sprout/cache directory relative to the
   # fixtures folder nearest the file that calls this method.

data/test/fixtures/executable/fdb.rb

@@ -1,25 +1,21 @@
 
 module Sprout
 
-  class FDB < Daemon
+  class FDB < Executable::Session
 
     set :default_prefix, '-'
 
     ##
-    # The default gem name
-    set :pkg_name, 'flex4'
+    # Set the binary_path explicitly since we 
+    # don't need pkg_name or pkg_version for test environment.
+    #set :binary_path, 'test/fixtures/executable/flex3sdk_gem/fdb'
+    #Toggle comments to use the real exe:
+    set :binary_path, '~/Library/Sprouts/1.1/cache/flex4/4.1.0.16076/bin/fdb'
 
-    ##
-    # The default gem version
-    set :pkg_version, '>= 4.1.0.pre'
-
-    ##
-    # The default executable target
-    set :executable, :fdb
 
     ##
     # The regex for when input can be accepted again.
-    set :prompt, /^\(fdb\) |\(y or n\) /
+    set :prompt, /^\(fdb\) |\(y or n\) |^Waiting for Player to connect/
 
     ##
     # Force the fake to write to stderr:

data/test/fixtures/executable/flex3sdk_gem/flex3sdk.rb

@@ -1,11 +1,11 @@
-
-exe = OpenStruct.new({
-                      :name => :mxmlc, 
-                      :pkg_name => 'flex3sdk', 
-                      :pkg_version => '3.0.0', 
-                      :platform => :universal,
-                      :path => File.join(File.dirname(__FILE__), 'mxmlc')
-                     })
-
-Sprout::Executable.register exe
-
+
+exe = OpenStruct.new({
+                      :name => :mxmlc, 
+                      :pkg_name => 'flex3sdk', 
+                      :pkg_version => '3.0.0', 
+                      :platform => :universal,
+                      :path => File.join(File.dirname(__FILE__), 'mxmlc')
+                     })
+
+Sprout::Executable.register exe
+

data/test/unit/executable_session_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+require 'fixtures/executable/fdb'
+
+class ExecutableSessionTest < Test::Unit::TestCase
+  include Sprout::TestHelper
+
+  context "a new executable session" do
+
+    setup do
+      # Uncomment the following to see interactive sessions:
+      #Sprout.stdout = $stdout
+      #Sprout.stderr = $stderr
+    end
+
+    should "execute without shell params" do
+      @fdb = Sprout::FDB.new
+      # Comment to hit real FDB:
+      @fdb.binary_path = File.join fixtures, 'executable', 'flex3sdk_gem', 'fdb'
+
+      @fdb.execute false
+      @fdb.run
+ 
+      # Uncomment if you are on OSX and want to 
+      # test the real FDB while running a real SWF:
+      #Kernel.system 'open ~/Projects/Sprouts/flashsdk/test/fixtures/flashplayer/AsUnit\ Runner.swf'
+      #@fdb.wait_for_prompt
+      
+      @fdb.break "AsUnitRunner:12"
+
+      @fdb.continue
+      @fdb.continue
+
+      #@fdb.handle_user_input
+      @fdb.quit
+    end
+
+  end
+
+end
+

data/test/unit/executable_test.rb

@@ -44,6 +44,26 @@ class ExecutableTest < Test::Unit::TestCase
       assert_equal "---string-param=string1", @tool.to_shell
     end
 
+    should "create default stdout" do
+      assert_equal Sprout.stdout, @tool.stdout
+    end
+
+    should "accept custom stdout" do
+      out = StringIO.new
+      @tool.stdout = out
+      assert_equal out, @tool.stdout
+    end
+
+    should "create default stderr" do
+      assert_equal Sprout.stderr, @tool.stderr
+    end
+
+    should "accept custom stderr" do
+      err = StringIO.new
+      @tool.stderr = err
+      assert_equal err, @tool.stderr
+    end
+
     should "not share parameter values across instances" do
       first = FakeOtherExecutableTask.new
       second = FakeOtherExecutableTask.new
@@ -172,6 +192,11 @@ class ExecutableTest < Test::Unit::TestCase
       end
     end
 
+    should "accept custom binary_path" do
+      @tool.binary_path = @mxmlc_executable
+      assert_equal @mxmlc_executable, @tool.binary_path
+    end
+
     should "accept default gem name" do
       assert_equal 'flex4sdk', @tool.pkg_name
     end

data/test/unit/sprout_test.rb

@@ -1,198 +1,198 @@
-require 'test_helper'
-
-class SproutTest < Test::Unit::TestCase
-  include Sprout::TestHelper
-
-  context "The Sprout::TestHelper" do
-
-    context "find_fixtures" do
-
-      setup do
-        @from = File.join(fixtures, 'sprout_test_case', 'test', 'other')
-        @expected_fixtures = File.join(fixtures, 'sprout_test_case', 'test', 'fixtures')
-        FileUtils.makedirs @from
-      end
-
-      teardown do
-        remove_file File.join(fixtures, 'sprout_test_case')
-      end
-
-      should "find_fixtures within a test folder" do
-        result = find_fixtures @from
-        assert_equal @expected_fixtures, result
-      end
-
-      should "throw if reaches system root" do
-        assert_raises Sprout::Errors::UsageError do
-          find_fixtures File.dirname(File.dirname(File.dirname(__FILE__)))
-        end
-      end
-    end
-
-  end
-
-  context "Errors" do
-    include Sprout::Errors
-
-    [
-      ArchiveUnpackerError,
-      DestinationExistsError,
-      ExecutionError, 
-      ExecutableRegistrationError,
-      MissingExecutableError,
-      ProcessRunnerError,
-      SproutError, 
-      ExecutableError,
-      UnknownArchiveType,
-      UsageError,
-      VersionRequirementNotMetError
-    ].each do |error|
-
-      should "be available to instantiate a #{error.to_s}" do
-        error.new
-      end
-    end
-  end
-
-  context "cache" do
-    setup do
-      @library = File.join(fixtures, 'sprout')
-    end
-
-    should "find library from system" do
-      user = Sprout::System::OSXSystem.new
-      user.stubs(:library).returns @library
-      Sprout.stubs(:current_system).returns user
-
-      expected_cache = File.join(@library, 'Sprouts', Sprout::VERSION::MAJOR_MINOR, 'cache')
-      assert_equal expected_cache, Sprout.cache
-    end
-
-    should "find library for unix system" do
-      user = Sprout::System::UnixSystem.new
-      user.stubs(:library).returns @library
-      Sprout.stubs(:current_system).returns user
-
-      expected_cache = File.join(@library, '.sprouts', Sprout::VERSION::MAJOR_MINOR, 'cache')
-      assert_equal expected_cache, Sprout.cache
-    end
-  end
-
-  context "A new sprout test case" do
-
-    should "be able to work as a particular user but then revert when done" do
-      original_class = Sprout.current_system.class
-
-      block_called = false
-
-      systems = [
-                 Sprout::System::VistaSystem,
-                 Sprout::System::WinNixSystem,
-                 Sprout::System::WinSystem,
-                 Sprout::System::JavaSystem,
-                 Sprout::System::OSXSystem,
-                 Sprout::System::UnixSystem
-                ]
-      incr = 0
-
-      as_each_system do |sys|
-        block_called = true
-        assert_equal systems[incr], Sprout.current_system.class, "Requests for the current system should yield a UNIX system"
-        incr += 1
-      end
-
-      assert_equal original_class, Sprout.current_system.class
-      assert block_called, "Ensure the block was yielded to..."
-    end
-  end
-
-  context "Executables" do
-
-    context "with a sandboxed load path" do
-
-      setup do
-        path = File.join fixtures, "executable", "flex3sdk_gem"
-        $:.unshift path
-      end
-
-      teardown do
-        $:.shift
-      end
-
-      should "find requested executables" do
-        path = Sprout::Executable.load(:mxmlc, 'flex3sdk', '>= 3.0.0').path
-        assert_not_nil path
-      end
-    end
-    
-    context "with a stubbed load path" do
-
-      setup do
-        Sprout::Executable.stubs(:require_ruby_package).returns true
-        @path = 'test/fixtures/process_runner/chmod_script.sh'
-      end
-
-      should "work when registered with different gem names" do
-        register_executable :mxmlc, 'flex3sdk', '1.0.pre', @path
-        register_executable :mxmlc, 'flex4sdk', '1.0.pre', @path
-      end
-
-      should "work when registered with different exe names" do
-        register_executable :mxmlc, 'flex3sdk', '1.0.pre', @path
-        register_executable :compc, 'flex3sdk', '1.0.pre', @path
-      end
-
-      context "that are registered" do
-        should "work the first time" do
-          register_executable :mxmlc, 'flex3sdk', '1.0.pre', @path
-        end
-
-        context "and then requested" do
-          setup do
-            register_executable :mxmlc, 'flex3sdk', '1.0.pre', @path
-          end
-
-          should "succeed if the executable is available and no version specified" do
-            assert_equal @path, Sprout::Executable.load(:mxmlc, 'flex3sdk').path
-          end
-
-          should "succeed if version requirement is met" do
-            assert_equal @path, Sprout::Executable.load(:mxmlc, 'flex3sdk', '>= 1.0.pre').path
-          end
-
-          should "fail if version requirement is not met" do
-            assert_raises Sprout::Errors::LoadError do
-              Sprout::Executable.load :mxmlc, 'flex3sdk', '>= 1.1.0'
-            end
-          end
-
-        end
-      end
-
-      context "that are not registered" do
-        should "fail when requested" do
-          assert_raises Sprout::Errors::LoadError do
-            Sprout::Executable.load :mxmlc, 'flex3sdk'
-          end
-        end
-      end
-
-    end
-  end
-
-  private
-
-  def register_executable name, pkg_name, pkg_version, path, platform=:universal
-    exe = OpenStruct.new({
-      :name => name,
-      :path => path,
-      :pkg_name => pkg_name,
-      :pkg_version => pkg_version,
-      :platform => platform
-    })
-    Sprout::Executable.register exe
-  end
-
-end
-
-
+require 'test_helper'
+
+class SproutTest < Test::Unit::TestCase
+  include Sprout::TestHelper
+
+  context "The Sprout::TestHelper" do
+
+    context "find_fixtures" do
+
+      setup do
+        @from = File.join(fixtures, 'sprout_test_case', 'test', 'other')
+        @expected_fixtures = File.join(fixtures, 'sprout_test_case', 'test', 'fixtures')
+        FileUtils.makedirs @from
+      end
+
+      teardown do
+        remove_file File.join(fixtures, 'sprout_test_case')
+      end
+
+      should "find_fixtures within a test folder" do
+        result = find_fixtures @from
+        assert_equal @expected_fixtures, result
+      end
+
+      should "throw if reaches system root" do
+        assert_raises Sprout::Errors::UsageError do
+          find_fixtures File.dirname(File.dirname(File.dirname(__FILE__)))
+        end
+      end
+    end
+
+  end
+
+  context "Errors" do
+    include Sprout::Errors
+
+    [
+      ArchiveUnpackerError,
+      DestinationExistsError,
+      ExecutionError, 
+      ExecutableRegistrationError,
+      MissingExecutableError,
+      ProcessRunnerError,
+      SproutError, 
+      ExecutableError,
+      UnknownArchiveType,
+      UsageError,
+      VersionRequirementNotMetError
+    ].each do |error|
+
+      should "be available to instantiate a #{error.to_s}" do
+        error.new
+      end
+    end
+  end
+
+  context "cache" do
+    setup do
+      @library = File.join(fixtures, 'sprout')
+    end
+
+    should "find library from system" do
+      user = Sprout::System::OSXSystem.new
+      user.stubs(:library).returns @library
+      Sprout.stubs(:current_system).returns user
+
+      expected_cache = File.join(@library, 'Sprouts', Sprout::VERSION::MAJOR_MINOR, 'cache')
+      assert_equal expected_cache, Sprout.cache
+    end
+
+    should "find library for unix system" do
+      user = Sprout::System::UnixSystem.new
+      user.stubs(:library).returns @library
+      Sprout.stubs(:current_system).returns user
+
+      expected_cache = File.join(@library, '.sprouts', Sprout::VERSION::MAJOR_MINOR, 'cache')
+      assert_equal expected_cache, Sprout.cache
+    end
+  end
+
+  context "A new sprout test case" do
+
+    should "be able to work as a particular user but then revert when done" do
+      original_class = Sprout.current_system.class
+
+      block_called = false
+
+      systems = [
+                 Sprout::System::VistaSystem,
+                 Sprout::System::WinNixSystem,
+                 Sprout::System::WinSystem,
+                 Sprout::System::JavaSystem,
+                 Sprout::System::OSXSystem,
+                 Sprout::System::UnixSystem
+                ]
+      incr = 0
+
+      as_each_system do |sys|
+        block_called = true
+        assert_equal systems[incr], Sprout.current_system.class, "Requests for the current system should yield a UNIX system"
+        incr += 1
+      end
+
+      assert_equal original_class, Sprout.current_system.class
+      assert block_called, "Ensure the block was yielded to..."
+    end
+  end
+
+  context "Executables" do
+
+    context "with a sandboxed load path" do
+
+      setup do
+        path = File.join fixtures, "executable", "flex3sdk_gem"
+        $:.unshift path
+      end
+
+      teardown do
+        $:.shift
+      end
+
+      should "find requested executables" do
+        path = Sprout::Executable.load(:mxmlc, 'flex3sdk', '>= 3.0.0').path
+        assert_not_nil path
+      end
+    end
+    
+    context "with a stubbed load path" do
+
+      setup do
+        Sprout::Executable.stubs(:require_ruby_package).returns true
+        @path = 'test/fixtures/process_runner/chmod_script.sh'
+      end
+
+      should "work when registered with different gem names" do
+        register_executable :mxmlc, 'flex3sdk', '1.0.pre', @path
+        register_executable :mxmlc, 'flex4sdk', '1.0.pre', @path
+      end
+
+      should "work when registered with different exe names" do
+        register_executable :mxmlc, 'flex3sdk', '1.0.pre', @path
+        register_executable :compc, 'flex3sdk', '1.0.pre', @path
+      end
+
+      context "that are registered" do
+        should "work the first time" do
+          register_executable :mxmlc, 'flex3sdk', '1.0.pre', @path
+        end
+
+        context "and then requested" do
+          setup do
+            register_executable :mxmlc, 'flex3sdk', '1.0.pre', @path
+          end
+
+          should "succeed if the executable is available and no version specified" do
+            assert_equal @path, Sprout::Executable.load(:mxmlc, 'flex3sdk').path
+          end
+
+          should "succeed if version requirement is met" do
+            assert_equal @path, Sprout::Executable.load(:mxmlc, 'flex3sdk', '>= 1.0.pre').path
+          end
+
+          should "fail if version requirement is not met" do
+            assert_raises Sprout::Errors::LoadError do
+              Sprout::Executable.load :mxmlc, 'flex3sdk', '>= 1.1.0'
+            end
+          end
+
+        end
+      end
+
+      context "that are not registered" do
+        should "fail when requested" do
+          assert_raises Sprout::Errors::LoadError do
+            Sprout::Executable.load :mxmlc, 'flex3sdk'
+          end
+        end
+      end
+
+    end
+  end
+
+  private
+
+  def register_executable name, pkg_name, pkg_version, path, platform=:universal
+    exe = OpenStruct.new({
+      :name => name,
+      :path => path,
+      :pkg_name => pkg_name,
+      :pkg_version => pkg_version,
+      :platform => platform
+    })
+    Sprout::Executable.register exe
+  end
+
+end
+
+

data/test/unit/unix_system_test.rb

@@ -33,9 +33,11 @@ class UnixSystemTest < Test::Unit::TestCase
     context "when fed an application with windows line endings" do
 
       setup do
-        @source = File.join fixtures, 'executable', 'windows_line_endings'
+        exe_with_crlf = "#!/bin/sh\r\n\r\n################################################################################\r\n##\r\n##  ADOBE SYSTEMS INCORPORATED\r\n##  Copyright 2007 Adobe Systems Incorporated\r\n##  All Rights Reserved.\r\n##\r\n##  NOTICE: Adobe permits you to use, modify, and distribute this file\r\n##  in accordance with the terms of the license agreement accompanying it.\r\n##\r\n################################################################################\r\n\r\n#\r\n# mxmlc launch script for unix.  On windows, mxmlc.exe is used and\r\n# java settings are managed in jvm.config in this directory.\r\n#\r\n\r\ncase `uname` in\r\n		CYGWIN*)\r\n			OS=\"Windows\"\r\n		;;\r\n		*)\r\n			OS=Unix\r\nesac\r\n\r\nif [ $OS = \"Windows\" ]; then\r\n	# set FLEX_HOME relative to mxmlc if not set\r\n	test \"$FLEX_HOME\" = \"\" && {\r\n	FLEX_HOME=`dirname $0`/..\r\n    	FLEX_HOME=`cygpath -m $FLEX_HOME`\r\n	}\r\n\r\nelif [ $OS = \"Unix\" ]; then\r\n\r\n	# set FLEX_HOME relative to mxmlc if not set\r\n	test \"$FLEX_HOME\" = \"\" && {\r\n	FLEX_HOME=`dirname \"$0\"`/..\r\n	}\r\n\r\nfi\r\n\r\n# don't use $FLEX_HOME in this variable because it may contain spaces,\r\n# instead put it on the java args directly, with double-quotes around it\r\nVMARGS=\"-Xmx384m -Dsun.io.useCanonCaches=false\"\r\n\r\njava $VMARGS -jar \"$FLEX_HOME/lib/mxmlc.jar\" +flexlib=\"$FLEX_HOME/frameworks\" \"$@\"\r\n"
         @target = File.join fixtures, 'executable', 'windows_line_endings.tmp'
-        FileUtils.cp @source, @target
+        File.open(@target, 'wb+') do |f|
+          f.write exe_with_crlf
+        end
       end
 
       teardown do
@@ -50,3 +52,4 @@ class UnixSystemTest < Test::Unit::TestCase
   end
 end
 
+

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 7
+  - 10
   - pre
-  version: 1.1.7.pre
+  version: 1.1.10.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 -08:00
+date: 2011-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -211,7 +211,6 @@ files:
 - lib/sprout/archive_unpacker.rb
 - lib/sprout/command_line.rb
 - lib/sprout/concern.rb
-- lib/sprout/daemon.rb
 - lib/sprout/dir.rb
 - lib/sprout/errors.rb
 - lib/sprout/executable/base.rb
@@ -224,6 +223,7 @@ files:
 - lib/sprout/executable/parameter_factory.rb
 - lib/sprout/executable/path.rb
 - lib/sprout/executable/paths.rb
+- lib/sprout/executable/session.rb
 - lib/sprout/executable/string_param.rb
 - lib/sprout/executable/strings.rb
 - lib/sprout/executable/url.rb
@@ -325,7 +325,6 @@ files:
 - test/fixtures/executable/src/Main.as
 - test/fixtures/executable/subclass/executable_subclass.rb
 - test/fixtures/executable/subclass/executable_superclass.rb
-- test/fixtures/executable/windows_line_endings
 - test/fixtures/generators/song_generator.rb
 - test/fixtures/generators/song_subclass/least_favorite.rb
 - test/fixtures/generators/song_subclass/templates/Song.txt
@@ -357,13 +356,12 @@ files:
 - test/fixtures/specification/flexunit4.sproutspec
 - test/fixtures/specification/lib/as3reflection/Reflection.as
 - test/fixtures/specification/src/AsUnit.as
-- test/fixtures/user/mxmlc_crlf
 - test/unit/archive_unpacker_test.rb
 - test/unit/boolean_param_test.rb
 - test/unit/command_line_test.rb
-- test/unit/daemon_test.rb
 - test/unit/executable_option_parser_test.rb
 - test/unit/executable_param_test.rb
+- test/unit/executable_session_test.rb
 - test/unit/executable_test.rb
 - test/unit/fake_executable_task.rb
 - test/unit/fake_other_executable.rb

data/test/fixtures/executable/windows_line_endings

@@ -1,47 +0,0 @@
-#!/bin/sh
-
-################################################################################
-##
-##  ADOBE SYSTEMS INCORPORATED
-##  Copyright 2007 Adobe Systems Incorporated
-##  All Rights Reserved.
-##
-##  NOTICE: Adobe permits you to use, modify, and distribute this file
-##  in accordance with the terms of the license agreement accompanying it.
-##
-################################################################################
-
-#
-# mxmlc launch script for unix.  On windows, mxmlc.exe is used and
-# java settings are managed in jvm.config in this directory.
-#
-
-case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
-esac
-
-if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to mxmlc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
-
-elif [ $OS = "Unix" ]; then
-
-	# set FLEX_HOME relative to mxmlc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname "$0"`/..
-	}
-
-fi
-
-# don't use $FLEX_HOME in this variable because it may contain spaces,
-# instead put it on the java args directly, with double-quotes around it
-VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false"
-
-java $VMARGS -jar "$FLEX_HOME/lib/mxmlc.jar" +flexlib="$FLEX_HOME/frameworks" "$@"

data/test/fixtures/user/mxmlc_crlf

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo "success"

data/test/unit/daemon_test.rb

@@ -1,93 +0,0 @@
-require 'test_helper'
-require 'fixtures/executable/fdb'
-
-class DaemonTest < Test::Unit::TestCase
-  include Sprout::TestHelper
-
-  context "a new daemon delegate" do
-
-    setup do
-      # Uncomment the following to see interactive sessions:
-      #Sprout.stdout = $stdout
-      #Sprout.stderr = $stderr
-
-      # Comment the following and install the flashsdk
-      # to run test against actual fdb:
-      insert_fake_executable File.join(fixtures, 'executable', 'flex3sdk_gem', 'fdb')
-    end
-
-    should "execute without shell params" do
-      @fdb = Sprout::FDB.new
-      # For some reason, using mocha expectations are 
-      # actually stubbing the methods and breaking this
-      # test. Not sure what I'm doing wrong here...
-      #@fdb.expects(:execute_action).at_least(6)
-      @fdb.run
-      @fdb.break "AsUnitRunner:12"
-      @fdb.continue
-      @fdb.kill
-      @fdb.confirm
-      @fdb.quit
-      @fdb.execute
-    end
-
-    should "open and wait for real-time interactions" do
-      @fdb = Sprout::FDB.new
-      # For some reason, using mocha expectations are 
-      # actually stubbing the methods and breaking this
-      # test. Not sure what I'm doing wrong here...
-      #@fdb.expects(:execute_action).at_least(6)
-      @fdb.execute false
-      @fdb.run
-      @fdb.break "AsUnitRunner:12"
-      @fdb.continue
-      @fdb.kill
-      @fdb.confirm
-      @fdb.quit
-      @fdb.wait # wait for actions to finish.
-    end
-
-    should "print errors" do
-      ##
-      # Collect the messages sent to stderr:
-      
-      @fdb = Sprout::FDB.new
-      # For some reason, using mocha expectations are 
-      # actually stubbing the methods and breaking this
-      # test. Not sure what I'm doing wrong here...
-      #@fdb.expects(:execute_action).at_least(6)
-      @fdb.execute false
-      @fdb.run_with_error
-      @fdb.quit
-      @fdb.wait # wait for actions to finish.
-
-      assert_matches /This is an error!/, Sprout.stderr.read
-    end
-
-    should "execute from rake task" do
-      f = fdb :fdb_debug do |t|
-        t.run
-        t.break "AsUnitRunner:12"
-        t.continue
-        t.kill
-        t.confirm
-        t.quit
-      end
-
-      f.execute
-
-      # NOTE: If this call raises, then the 
-      # Executable.update_rake_task_name method 
-      # must have changed, and the Daemon override 
-      # is no longer preventing non-File tasks 
-      # from being added to the CLEAN collection.
-      #
-      # Adding this as a message to the error would
-      # not display for some reason...
-      assert_equal 0, CLEAN.size
-    end
-
-  end
-
-end
-