sprout 1.1.10.pre → 1.1.11.pre

data/VERSION

@@ -1 +1 @@
-1.1.10.pre
+1.1.11.pre

data/lib/sprout/executable/base.rb

@@ -378,14 +378,14 @@ module Sprout
       # @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.
+      # @return [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.
+      # @return [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

data/lib/sprout/executable/session.rb

@@ -99,21 +99,22 @@ module Sprout::Executable
       # already exists.
       def create_action_method options
         name = options[:name]
-        accessor_can_be_defined_at name
-
-        define_method(name) do |*params|
-          action = name.to_s
-          action = "y" if name == :confirm # Convert affirmation
-          action << " #{params.join(' ')}" unless params.nil?
-          action_stack << action
-          execute_actions if process_launched?
+        if accessor_can_be_defined_at? name
+          define_method(name) do |*params|
+            action = name.to_s
+            action = "y" if name == :confirm # Convert confirmation
+            action << " #{params.join(' ')}" unless params.nil?
+            action_stack << action
+            execute_actions if process_launched?
+          end
         end
       end
 
       ##
-      # TODO: Raise an exception if the name is 
+      # TODO: Raise an exception and/or return false if the name is 
       # already taken?
-      def accessor_can_be_defined_at name
+      def accessor_can_be_defined_at? name
+        true
       end
 
     end
@@ -280,6 +281,7 @@ module Sprout::Executable
       # solution.
       #params = "#{params} " + '2>&1'
       @process_thread = Sprout.current_system.execute_thread binary, params, prompt do |message|
+        yield message if block_given?
         Sprout.stdout.printf message
         @prompted = true if prompt.match message
       end

data/lib/sprout/system/base_system.rb

@@ -121,6 +121,10 @@ module Sprout::System
         sleep(0.1)
       end
 
+      if !t.alive?
+        raise Sprout::Errors::UsageError.new(t['runner'].read_err)
+      end
+
       t
     end
 

data/script/google_analytics_footer.rb

@@ -0,0 +1,3 @@
+
+YARD::Templates::Engine.register_template_path File.join('sprout', 'script', 'templates')
+

data/script/templates/default/layout/html/footer.erb

@@ -0,0 +1,17 @@
+<div id="footer">
+  Generated on <%= Time.now.strftime("%c") %> by 
+  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  <%= YARD::VERSION %> (ruby-<%= RUBY_VERSION %>).
+</div>
+
+<!-- Google Analytics for projectsprouts.org --> 
+<script type="text/javascript"> 
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script> 
+<script type="text/javascript"> 
+var pageTracker = _gat._getTracker("UA-1619511-4");
+pageTracker._initData();
+pageTracker._trackPageview();
+</script> 
+

data/test/fixtures/executable/fdb.rb

@@ -3,6 +3,43 @@ module Sprout
 
   class FDB < Executable::Session
 
+    ##
+    # Path to the file where test results should be written.
+    #
+    # @default 'TestResults.xml'
+    # @see :test_result_prefix
+    # @see :test_result_suffix
+    attr_accessor :test_result_file
+
+    ##
+    # Regular expression that will match the preamble that is sent
+    # by your test framework to indicate the beginning of structured
+    # test output.
+    #
+    # @default /<TestResults>/
+    # @see :test_result_file
+    # @see :test_result_suffix
+    attr_accessor :test_result_prefix
+
+    ##
+    # Regular expression that will match the suffix that is sent
+    # by your test framework to indicate the end of structured
+    # test output.
+    #
+    # @default /<\/TestResults>/
+    # @see :test_result_file
+    # @see :test_result_prefix
+    attr_accessor :test_result_suffix
+
+    def initialize
+      super
+      @test_result = ''
+      @inside_test_result = false
+      @test_result_file = 'TestResults.xml'
+      @test_result_prefix = /<TestResults>/
+      @test_result_suffix = /<\/TestResults>/
+    end
+
     set :default_prefix, '-'
 
     ##
@@ -737,6 +774,30 @@ module Sprout
     add_action :what
     add_action_alias :wh, :what
 
+    def system_execute binary, params
+      super do |message|
+        if message.match test_result_suffix
+          write_test_result
+        end
+        if @inside_test_result
+          @test_result << message
+        end
+        if message.match test_result_prefix
+          @inside_test_result = true
+        end
+      end
+    end
+
+    private
+
+    def write_test_result
+      File.open test_result_file, 'w+' do |f|
+        f.write @test_result
+      end
+      @test_result = ''
+      @inside_test_result = false
+    end
+
   end
 end
 

data/test/fixtures/executable/flex3sdk_gem/fdb

@@ -3,6 +3,7 @@
 class FakeFDB
 
   def initialize
+    validate_argv
     str = "Adobe fdb (Flash Player Debugger) [build 16076]\n"
     str << "Copyright (c) 2004-2007 Adobe, Inc. All rights reserved.\n"
     str << "(fdb) "
@@ -39,6 +40,12 @@ class FakeFDB
     gather_input
   end
 
+  def validate_argv
+    if ARGV.size > 0
+      raise "FAKE FDB doesn't expect any params, but received, #{ARGV}"
+    end
+  end
+
   def handle_run args
     str = "Waiting for Player to connect\n"
     str << "Player connected; session starting.\n"
@@ -57,6 +64,9 @@ class FakeFDB
 
   def handle_continue args
     str = "Continuing now\n"
+    str << "<TestResults>\n"
+    str << "Fake Content\n"
+    str << "</TestResults>\n"
     str << "(fdb) "
     printf str
   end
@@ -88,3 +98,4 @@ end
 
 fake_fdb = FakeFDB.new
 
+

data/test/unit/executable_session_test.rb

@@ -10,12 +10,18 @@ class ExecutableSessionTest < Test::Unit::TestCase
       # Uncomment the following to see interactive sessions:
       #Sprout.stdout = $stdout
       #Sprout.stderr = $stderr
+      @test_result_file = File.join fixtures, 'executable', 'Result.xml'
+    end
+
+    teardown do
+      remove_file @test_result_file
     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.test_result_file = @test_result_file
 
       @fdb.execute false
       @fdb.run
@@ -28,10 +34,14 @@ class ExecutableSessionTest < Test::Unit::TestCase
       @fdb.break "AsUnitRunner:12"
 
       @fdb.continue
-      @fdb.continue
+      #@fdb.continue
 
       #@fdb.handle_user_input
       @fdb.quit
+
+      assert_file @test_result_file do |content|
+        assert_match content, /Fake Content/
+      end
     end
 
   end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 10
+  - 11
   - pre
-  version: 1.1.10.pre
+  version: 1.1.11.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 -08:00
+date: 2011-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -289,6 +289,8 @@ files:
 - script/console
 - script/destroy
 - script/generate
+- script/google_analytics_footer.rb
+- script/templates/default/layout/html/footer.erb
 - sprout.gemspec
 - test/fixtures/archive_unpacker/copyable/some_file.exe
 - test/fixtures/archive_unpacker/copyable/some_file.rb