sprout-flashplayer-bundle 9.151.1 → 10.22.0

data/lib/clix_flash_player.rb

@@ -0,0 +1,83 @@
+require 'rubygems'
+require 'open4'
+
+$CLIX_WRAPPER_TARGET = File.join(File.expand_path(File.dirname(__FILE__)), 'clix_wrapper.rb')
+
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+class CLIXFlashPlayerError < StandardError; end
+
+class CLIXFlashPlayer
+  VERSION = '0.1.0'
+  
+  def initialize
+    @activate_pid = nil
+    @player_pid = nil
+    @thread = nil
+  end
+  
+  def execute(player, swf)
+    cleanup
+    player = clean_path(player)
+    swf = clean_path(swf)
+    validate(player, swf)
+    
+    if(!player.match('Contents/MacOS'))
+      player = File.join(player, 'Contents', 'MacOS', 'Flash Player')
+    end
+
+    setup_trap
+    @thread = Thread.new {
+      @player_pid = open4.popen4("#{player.split(' ').join('\ ')}")[0]
+      raise "clix_wrapper.rb could not be found at: #{wrapper}" if !File.exists?($CLIX_WRAPPER_TARGET)
+      command = "ruby #{$CLIX_WRAPPER_TARGET} '#{player}' '#{swf}'"
+      @activate_pid = open4.popen4(command)[0]
+      Process.wait(@player_pid)
+    }
+  end
+  
+  def kill
+    system("kill -9 #{@player_pid}")
+  end
+  
+  def join
+    @thread.join
+  end
+  
+  def alive?
+    return @thread.alive?
+  end
+  
+  private
+  
+  def clean_path(path)
+    File.expand_path(path.gsub("'", '').gsub("\\", ''))
+  end
+  
+  def cleanup
+    if(@thread && @thread.alive?)
+      kill
+      @thread.join
+    end
+  end
+  
+  def validate(player, swf)
+    raise CLIXFlashPlayerError.new("Player must not be nil") if(player.nil? || player == '')
+    raise CLIXFlashPlayerError.new("Player cannot be found: '#{player}'") if(!File.exists?(player))
+    raise CLIXFlashPlayerError.new("SWF must not be nil") if(swf.nil? || swf == '')
+    raise CLIXFlashPlayerError.new("SWF cannot be found: '#{swf}'") if(!File.exists?(swf))
+  end
+  
+  def setup_trap
+    # Trap the CTRL+C Interrupt signal
+    # Which prevents nasty exception messages
+    Kernel.trap('INT') do
+      if(@thread.alive?)
+        @thread.kill
+      end
+    end
+  end
+  
+end
+

data/lib/clix_wrapper.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/ruby
+require 'rubygems'
+require 'appscript'
+
+player = ARGV[0]
+swf = ARGV[1]
+
+if(player.nil?)
+  raise "CLIXWrapper requires 'player' argument like:\nruby clix_wrapper [player] [swf]"
+end
+
+if(swf.nil?)
+  raise "CLIXWrapper requires 'swf' argument like:\nruby clix_wrapper [player] [swf]"
+end
+
+begin
+  # Give the player focus:
+  Appscript.app(player).activate
+  # Open the SWF:
+  Appscript.app(player).open(MacTypes::Alias.path(swf))
+rescue LoadError => e
+  raise 'You must install the rb-appscript gem to use the desktop debug Flash Player'
+end
+

data/lib/sprout/flashplayer/version.rb

@@ -1,9 +1,9 @@
 module Sprout
   class FlashPlayer #:nodoc:
     module VERSION #:nodoc:
-      MAJOR = 9
-      MINOR = 151
-      TINY  = 1
+      MAJOR = 10
+      MINOR = 22
+      TINY  = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       MAJOR_MINOR = [MAJOR, MINOR].join('.')

data/lib/sprout/tasks/flashplayer_task.rb

@@ -21,6 +21,8 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =end
 
+require 'clix_flash_player'
+
 module Sprout
   
   class FlashPlayerError < StandardError #:nodoc:
@@ -65,6 +67,7 @@ module Sprout
     def initialize(task_name, app)
       super(task_name, app)
       @default_gem_name = 'sprout-flashplayer-tool'
+      @default_gem_version = '10.22.0'
       @default_result_file = 'AsUnitResults.xml'
       @inside_test_result = false
     end
@@ -145,8 +148,11 @@ module Sprout
     # happen. This in turn can lead to multiple instances of the Player being instantiated.
     # In the case of running a test harness, this is absolutely not desirable, so we had
     # expose a parameter that allows us to prevent auto-focus of the player.
+    #
+    # This feature is deprecated in current versions of the FlashPlayerTask
     def do_not_focus=(focus)
       @do_not_focus = focus
+      puts "[WARNING] Thanks to fixes in the FlashPlayer task, do_not_focus is deprecated and no longer needs to be used"
     end
     
     def do_not_focus
@@ -221,10 +227,10 @@ module Sprout
             f.write('')
           end
         else
-          FileUtils.mkdir_p(File.dirname(log_file))
+          FileUtils.makedirs(File.dirname(log_file))
           FileUtils.touch(log_file)
         end
-      rescue
+      rescue StandardError => e
         puts '[WARNING] FlashPlayer encountered an error working with the mm.cfg log and/or editing the Trust file'
       end
       
@@ -233,14 +239,6 @@ module Sprout
       read_log(@thread, log_file)
       @thread.join
     end
-    
-    def close
-      if(User.new().is_a?(WinUser))
-        Thread.kill(@thread)
-      else
-        Process.kill("SIGALRM", @player_pid)
-      end
-    end
 
     def run(tool, gem_version, swf)
       path_to_exe = Sprout.get_executable(tool, nil, gem_version)
@@ -250,31 +248,35 @@ module Sprout
       thread_out = $stdout
       command = "#{target} #{User.clean_path(swf)}"
 
-      return Thread.new {
-        usr = User.new()
-        if(usr.is_a?(WinUser) && !usr.is_a?(CygwinUser))
-          system command
-        else
+      usr = User.new()
+      if(usr.is_a?(WinUser) && !usr.is_a?(CygwinUser))
+        return Thread.new {
+            system command
+        }
+      elsif usr.is_a?(OSXUser)
+        @clix_player = CLIXFlashPlayer.new
+        @clix_player.execute(target, swf)
+        return @clix_player
+      else
+        return Thread.new {
           require 'open4'
           @player_pid, stdin, stdout, stderr = Open4.popen4(command)
-          focus_player_on_mac(thread_out, path_to_exe)
           stdout.read
-        end
-      }
+        }
+      end
     end
     
-    def focus_player_on_mac(out, exe)
-      return if do_not_focus
-      begin
-        if(User.new.is_a?(OSXUser))
-          require 'appscript'
-          Appscript.app(exe).activate
-        end
-      rescue LoadError => e
-        puts "[WARNING] Cannot focus Flash Player without rb-appscript gem"
+    def close
+      usr = User.new
+      if(usr.is_a?(WinUser))
+        Thread.kill(@thread)
+      elsif(usr.is_a?(OSXUser))
+        @thread.kill
+      else
+        Process.kill("SIGALRM", @player_pid)
       end
     end
-
+    
     def read_log(thread, log_file)
       lines_put = 0
 

data/rakefile.rb

@@ -42,6 +42,11 @@ spec = Gem::Specification.new do |s|
   s.files               = PKG_LIST.to_a
 
   s.add_dependency('sprout', '>= 0.7.189')
+  s.add_dependency('sprout-flashplayer-tool', '>= 10.22.0')
+  
+  if RUBY_PLATFORM.match('darwin')
+    s.add_dependency('rb-appscript', '>= 0.5.1')
+  end
 end
 
 Rake::GemPackageTask.new(spec) do |p|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprout-flashplayer-bundle
 version: !ruby/object:Gem::Version 
-  version: 9.151.1
+  version: 10.22.0
 platform: ruby
 authors: 
 - Pattern Park
@@ -9,7 +9,7 @@ autorequire: sprout/flashplayer
 bindir: bin
 cert_chain: []
 
-date: 2009-01-07 00:00:00 -08:00
+date: 2009-05-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.7.189
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sprout-flashplayer-tool
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 10.22.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rb-appscript
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.1
+    version: 
 description: Shared Project to support the Flash Player task
 email: projectsprouts@googlegroups.com
 executables: []
@@ -31,19 +51,16 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib
-- pkg
 - rakefile.rb
-- samples
-- test
-- lib/sprout
-- lib/sprout/flashplayer
+- lib/clix_flash_player.rb
+- lib/clix_wrapper.rb
 - lib/sprout/flashplayer/version.rb
 - lib/sprout/flashplayer.rb
-- lib/sprout/tasks
 - lib/sprout/tasks/flashplayer_task.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://www.projectsprouts.org
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -64,9 +81,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sprout
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Supporting tasks for Flash Player Rake integration
 test_files: []