flashsdk 1.0.18.pre → 1.0.20.pre

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'sprout', '>= 1.1.4.pre'
+gem 'sprout', '>= 1.1.8.pre'
 
 group :development do
   gem "shoulda"

data/Gemfile.lock

@@ -2,13 +2,13 @@ GEM
   remote: http://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
-    mocha (0.9.8)
+    mocha (0.9.10)
       rake
     open4 (1.0.1)
     rake (0.8.7)
     rubyzip (0.9.4)
     shoulda (2.11.3)
-    sprout (1.1.4.pre)
+    sprout (1.1.10.pre)
       archive-tar-minitar (= 0.5.2)
       bundler (>= 0.9.19)
       open4 (>= 0.9.6)
@@ -21,4 +21,4 @@ PLATFORMS
 DEPENDENCIES
   mocha
   shoulda
-  sprout (>= 1.1.4.pre)
+  sprout (>= 1.1.8.pre)

data/POSTINSTALL.rdoc

@@ -35,6 +35,9 @@ Next Steps:
 ++++++++++++++++++++++++++++++++
 Issues or Questions? 
 
+  Troubleshooting at:
+  http://projectsprouts.org/troubleshooting.html
+
   Email us at:
   projectsprouts@googlegroups.com
 

data/VERSION

@@ -1 +1 @@
-1.0.18.pre
+1.0.20.pre

data/lib/flashplayer/system_mixins.rb

@@ -63,6 +63,7 @@ module Sprout
     class UnixSystem
 
       def open_flashplayer_with exe, swf
+        player_open = false
         trap("INT") { 
           close_flashplayer
           @player_thread.kill
@@ -71,8 +72,17 @@ module Sprout
         @player_thread = Thread.new {
           require 'open4'
           @player_pid, stdin, stdout, stderr = Open4.popen4("#{exe} #{swf}")
+          player_open = true
           stdout.read
         }
+
+        # Wait until the player process has actually
+        # openned...
+        while !player_open
+          sleep 0.1
+        end
+
+        @player_thread
       end
       
       private

data/lib/flashplayer/task.rb

@@ -7,17 +7,22 @@ module FlashPlayer
     attr_accessor :pkg_name
     attr_accessor :pkg_version
 
+    attr_accessor :stdout
+    attr_accessor :stderr
+
     ##
     # This is the Rake::Task constructor
     # signature...
     def initialize task_name, rake_application
       super
-      @logger       = $stdout
       @mm_config    = MMConfig.new
       @reader       = LogFile.new
       @trust_config = Trust.new
       @process      = nil
       @input        = task_name
+      @stdout       = $stdout
+      @stderr       = $stderr
+      @logger       = $stdout
 
       @pkg_name     = FlashPlayer::NAME
       @pkg_version  = FlashPlayer::VERSION
@@ -30,8 +35,13 @@ module FlashPlayer
         update_mm_config
         update_trust_config_with input
       end
-      player_thread = launch_player_with input
-      tail_flashlog player_thread
+
+      if use_fdb?
+        launch_fdb_and_player_with input
+      else
+        player_thread = launch_player_with input
+        tail_flashlog player_thread
+      end
     end
 
     def logger=(logger)
@@ -47,6 +57,46 @@ module FlashPlayer
 
     private
 
+    def use_fdb?
+      # Check as string b/c this is
+      # how the boolean value comes
+      # accross the command line input.
+      ENV['USE_FDB'].to_s == 'true'
+    end
+
+    def launch_fdb_and_player_with input
+      # Keep getting a fatal lock error which I believe
+      # is being caused by the FlashPlayer and FDB attempting
+      # to write to stdout simultaneously.
+      # Trying to give fdb a fake stream until after the
+      # player is launched...
+      fake_out = Sprout::OutputBuffer.new
+      fake_err = Sprout::OutputBuffer.new
+
+      fdb_instance = FlashSDK::FDB.new
+      fdb_instance.stdout = fake_out
+      fdb_instance.stderr = fake_err
+      fdb_instance.execute false
+      fdb_instance.run
+      player_thread = launch_player_with input
+
+      # Emit whatever messages have been passed:
+      stdout.puts fake_out.read
+      stdout.flush
+      stderr.puts fake_err.read
+      stdout.flush
+      # Replace the fdb instance streams with
+      # the real ones:
+      fdb_instance.stdout = stdout
+      fdb_instance.stderr = stderr
+
+      # Let the user interact with fdb:
+      fdb_instance.handle_user_input
+
+      fdb_instance.wait
+      player_thread.join if player_thread.alive?
+    end
+
     def execute_safely
       begin
         Thread.abort_on_exception = true

data/lib/flashsdk/fcsh.rb

@@ -1,7 +1,7 @@
 
 module FlashSDK
 
-  class FCSH < Sprout::Daemon
+  class FCSH < Sprout::Executable::Session
 
     ##
     # The the Ruby file that will load the expected
@@ -61,6 +61,16 @@ module FlashSDK
     # Exit FCSH
     add_action :quit
 
+
+    def system_execute binary, params
+      params ||= ''
+      ##
+      # Combine stdout and stderr for FCSH
+      # so that they both arrive on stdout
+      params << ' 2<&1'
+      super binary, params
+    end
+
   end
 end
 

data/lib/flashsdk/fcsh_socket.rb

@@ -41,7 +41,7 @@ module FlashSDK
       Sprout.stdout.puts "FCSH socket open with: #{fcsh.pkg_name} and #{fcsh.pkg_version}, waiting for connections on port #{port}"
       Sprout.stdout.puts ""
 
-      # Start up the FCSH Daemon:
+      # Start up the FCSH Session:
       fcsh.execute false
 
       # Create a readable IO pipe:
@@ -72,6 +72,8 @@ module FlashSDK
           fcsh.send method
         end
 
+        fcsh.wait_for_prompt
+
         if method == "clear"
           clear_requests
         end
@@ -111,7 +113,10 @@ module FlashSDK
           session.close
         end
       end
-      Sprout.stdout.puts "[FCSH] Compilation complete in #{(Time.now - start).seconds} seconds."
+
+      if command.match /^mxmlc|^compc/
+        Sprout.stdout.puts "[FCSH] complete in #{(Time.now - start).seconds} seconds."
+      end
     end
 
     private
@@ -137,7 +142,7 @@ module FlashSDK
       # indices.
 
       new_requests = {}
-      @requests.each_key do |key|
+      @requests.each do |item|
         new_requests["removed-item"] = "removed-item"
       end
       @requests = new_requests

data/lib/flashsdk/fdb.rb

@@ -12,7 +12,7 @@ module FlashSDK
   # SWF manually on the desktop or the browser - as long 
   # as you run it in a Debug Flash Player.
   #
-  class FDB < Sprout::Daemon
+  class FDB < Sprout::Executable::Session
 
     set :default_prefix, '-'
 
@@ -28,7 +28,7 @@ module FlashSDK
     # The default executable target
     set :executable, :fdb
 
-    set :prompt, /^\(fdb\) |\(y or n\) /
+    set :prompt, /^\(fdb\) |\(y or n\) |Waiting for Player to connect/
 
     ##
     # Print a backtrace of all stack frames
@@ -765,3 +765,8 @@ def fdb *args, &block
   fdb_tool
 end
 
+desc "Make subsequent FlashPlayer task(s) use FDB"
+task :fdb do
+  ENV['USE_FDB'] = 'true'
+end
+

data/lib/flashsdk/mxmlc.rb

@@ -76,6 +76,20 @@ module FlashSDK
     #
     set :executable, :mxmlc
 
+    def execute
+      start = Time.now
+      super
+      duration = (Time.now - start).seconds
+      Sprout.stdout.puts "[MXMLC] Compilation complete in #{duration} seconds." unless use_fcsh?
+    end
+
+    def use_fcsh?
+      # Check as string b/c this is
+      # how the boolean value comes
+      # accross the command line input.
+      ENV['USE_FCSH'].to_s == 'true'
+    end
+
   end
 end
 

data/test/unit/amxmlc_test.rb

@@ -25,10 +25,10 @@ class AMXMLCTest < Test::Unit::TestCase
     end
 
     should "compile a swf" do
-      insert_fake_executable File.join(fixtures, 'sdk', 'mxmlc')
       FileUtils.mkdir_p File.dirname(@expected_output)
 
       amxmlc        = FlashSDK::AMXMLC.new
+      amxmlc.binary_path = File.join fixtures, 'sdk', 'mxmlc'
       amxmlc.input  = @input
       amxmlc.output = @expected_output
       amxmlc.execute

data/test/unit/fcsh_socket_test.rb

@@ -6,28 +6,42 @@ class FCSHSocketTest < Test::Unit::TestCase
   context "a new fcsh server" do
 
     setup do
+      # Uncomment to see output:
       #Sprout.stdout = $stdout
       #Sprout.stderr = $stderr
+
       @input = File.join(fixtures, 'mxmlc', 'simple', 'SomeFile.as')
+      @test_port = 12543
     end
 
     should "be instantiable" do
+      service_ready = false
+      # Create the remote side of the connection:
       t = Thread.new do
         Thread.current.abort_on_exception = true
         server = FlashSDK::FCSHSocket.new
+        server.port = @test_port
+        service_ready = true
         server.listen
       end
 
-      sleep(3)
+      # Wait for the remote connection to exist
+      while !service_ready
+        sleep 0.1
+      end
+
+      sleep 2.0
 
       mxmlc = FlashSDK::MXMLC.new
       mxmlc.input = @input
 
       client = FlashSDK::FCSHSocket.new
+      client.port = @test_port
       client.execute "mxmlc #{mxmlc.to_shell}"
       FileUtils.touch @input
       client.execute "mxmlc #{mxmlc.to_shell}"
       client.execute "quit"
+
       t.join
     end
   end

data/test/unit/fcsh_test.rb

@@ -31,7 +31,7 @@ class FCSHTest < Test::Unit::TestCase
       fcsh.wait
 
       expected_error_message = '1 Error: Syntax error: expecting rightbrace before end of program'
-      assert_matches /#{expected_error_message}/, Sprout.stderr.read
+      assert_matches /#{expected_error_message}/, Sprout.stdout.read
     end
 
     should "spin up FCSH" do

data/test/unit/fdb_test.rb

@@ -6,9 +6,11 @@ class FDBTest < Test::Unit::TestCase
   context "a new fdb task" do
 
     setup do
+      path = File.join fixtures, 'sdk', 'fdb'
+      FlashSDK::FDB.any_instance.stubs(:binary_path).returns path
+
       #Sprout.stdout = $stdout
       #Sprout.stderr = $stderr
-      insert_fake_executable File.join(fixtures, 'sdk', 'fdb')
     end
 
     should "execute without shell params" do
@@ -37,7 +39,7 @@ class FDBTest < Test::Unit::TestCase
 
       # NOTE: If this call raises, then the 
       # Executable.update_rake_task_name method 
-      # must have changed, and the Daemon override 
+      # must have changed, and the Session override 
       # is no longer preventing non-File tasks 
       # from being added to the CLEAN collection.
       #

data/test/unit/flashplayer_task_test.rb

@@ -14,14 +14,18 @@ class TaskTest < Test::Unit::TestCase
       @swf          = File.join(fixtures, 'flashplayer', 'AsUnit Runner.swf')
       @missing_home = File.join(fixtures, 'missing_folder')
       @config_path  = File.join(@missing_home, 'fp_config', 'mm.cfg')
+
+      Sprout.stdout = $stdout
+      Sprout.stderr = $stderr
     end
 
     teardown do
       remove_file @missing_home
+      ENV['USE_FDB'] = 'false'
     end
 
-=begin
     ## THIS METHOD WAS COMMENTED OUT....
+=begin
     should "wait for SWF even if clean system" do
       # No creation of expected FlashPlayer folders...
 
@@ -30,6 +34,8 @@ class TaskTest < Test::Unit::TestCase
       FlashPlayer::MMConfig.any_instance.stubs(:config_path).returns @config_path
       FlashPlayer::MMConfig.any_instance.stubs(:user_confirmation?).returns false
 
+      ENV['USE_FDB'] = 'true'
+
       as_a_mac_system do
         t = flashplayer @swf
         t.invoke

data/test/unit/mxmlc_test.rb

@@ -27,8 +27,8 @@ class MXMLCTest < Test::Unit::TestCase
     end
 
     should "compile a swf" do
-      insert_fake_executable File.join(fixtures, 'sdk', 'mxmlc')
       mxmlc = FlashSDK::MXMLC.new
+      mxmlc.binary_path = File.join fixtures, 'sdk', 'mxmlc'
       mxmlc.input = @input
       mxmlc.execute
       assert_file @expected_output

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 18
+  - 20
   - pre
-  version: 1.0.18.pre
+  version: 1.0.20.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-31 00:00:00 -08:00
+date: 2011-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,9 +28,9 @@ dependencies:
         segments: 
         - 1
         - 1
-        - 4
+        - 8
         - pre
-        version: 1.1.4.pre
+        version: 1.1.8.pre
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -195,6 +195,9 @@ post_install_message: |+
   ++++++++++++++++++++++++++++++++
   Issues or Questions? 
   
+    Troubleshooting at:
+    http://projectsprouts.org/troubleshooting.html
+  
     Email us at:
     projectsprouts@googlegroups.com