lukebayes-clix_flash_player 0.2.0 → 0.3.0

data/clix_flash_player.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clix_flash_player}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Bayes"]

data/lib/clix_flash_player.rb

@@ -1,6 +1,8 @@
 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__)))
 
@@ -17,16 +19,30 @@ class CLIXFlashPlayer
   
   def execute(player, swf)
     cleanup
+    player = clean_path(player)
+    swf = clean_path(swf)
     validate(player, swf)
-    player = File.expand_path(File.join(player, 'Contents', 'MacOS', 'Flash Player'))
-    swf = File.expand_path(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]
-      wrapper = File.expand_path(File.dirname(__FILE__) + '/clix_wrapper.rb')
-      command = "ruby #{wrapper} '#{player}' '#{swf}'"
-      @activate_pid = open4.popen4(command)[0]
-      Process.wait(@player_pid)
+      begin
+        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, stdin, stdout, stderr = open4.popen4(command)
+        puts stdout.read
+        error = stderr.read
+        raise error if !error.nil? && error != ''
+        Process.wait(@player_pid)
+      rescue StandardError => e
+        kill
+        raise e
+      end
     }
   end
   
@@ -35,7 +51,9 @@ class CLIXFlashPlayer
   end
   
   def join
-    @thread.join
+    if(@thread.alive?)
+      @thread.join
+    end
   end
   
   def alive?
@@ -44,6 +62,10 @@ class CLIXFlashPlayer
   
   private
   
+  def clean_path(path)
+    File.expand_path(path.gsub("'", '').gsub("\\", ''))
+  end
+  
   def cleanup
     if(@thread && @thread.alive?)
       kill

data/lib/clix_wrapper.rb

@@ -1,39 +1,22 @@
 #!/usr/bin/ruby
 require 'rubygems'
-require 'appscript'
-
-# player9 = "/Users/lbayes/Projects/CLIXFlashPlayer/exploration/fixtures/9.0.151/Flash Player.app/Contents/MacOS/Flash Player"
-# player10 = "/Users/lbayes/Projects/CLIXFlashPlayer/exploration/fixtures/10.0.22.87/Flash Player.app/Contents/MacOS/Flash Player"
-
-# player = player10
-
-# good_swf = '/Users/lbayes/Projects/CLIXFlashPlayer/exploration/fixtures/SomeProject.swf'
-# bad_swf = '/Users/lbayes/Projects/CLIXFlashPlayer/exploration/fixtures/InstantRuntimeException.swf'
-
-# swf = good_swf
 
 player = ARGV[0]
 swf = ARGV[1]
 
-puts "argv 0: #{player}"
-puts "argv 1: #{swf}"
+raise "CLIXWrapper requires 'player' argument like:\nruby clix_wrapper [player] [swf]" if(player.nil?)
+raise "CLIXWrapper could not find player at '#{player}'" if !File.exists?(player)
 
-if(player.nil?)
-  raise "CLIXWrapper requires 'player' argument like:\nruby clix_wrapper [player] [swf]"
-end
+raise "CLIXWrapper requires 'swf' argument like:\nruby clix_wrapper [player] [swf]" if(swf.nil?)
+raise "CLIXWrapper could not find swf at '#{swf}'" if !File.exists?(swf)
 
-if(swf.nil?)
-  raise "CLIXWrapper requires 'swf' argument like:\nruby clix_wrapper [player] [swf]"
+begin
+  require 'appscript'
+  # Give the player focus:
+  Appscript.app(player).activate
+  # Open the SWF:
+  Appscript.app(player).open(MacTypes::Alias.path(swf))
+rescue LoadError => e
+  raise "\n\n[ERROR] You must install the rb-appscript gem to use the desktop debug Flash Player, you do this by running:\n\nsudo gem install rb-appscript"
 end
 
-# player = File.expand_path(player).split(' ').join('\ ')
-# swf = File.expand_path(swf).split(' ').join('\ ')
-
-
-# Give the player focus:
-Appscript.app(player).activate
-puts "activate succeeded"
-# Open the SWF:
-Appscript.app(player).open(MacTypes::Alias.path(swf))
-puts "open succeeded"
-

data/rakefile.rb

@@ -17,5 +17,31 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
+# Ugly hack stolen from Hoe to execute test cases...
+# need an internet connection to figure out how to 
+# get Jeweler to execute my tests.
+def make_test_cmd multi = false # :nodoc:
+  test_globs = ['test/*_test.rb']
+  tests = ["rubygems", 'test/unit'] +
+  test_globs.map { |g| Dir.glob(g) }.flatten
+  tests.map! {|f| %(require "#{f}")}
+
+  filter = ENV['FILTER'] || ENV['TESTOPTS']
+  cmd = "-e '#{tests.join("; ")}' #{filter}"
+
+  if multi then
+    ENV['EXCLUDED_VERSIONS'] = multiruby_skip.join ":"
+    cmd = "-S multiruby #{cmd}"
+  end
+
+  cmd
+end
+
+desc 'Run the test suite. Use FILTER or TESTOPTS to add flags/args.'
+task :test do
+  ruby make_test_cmd
+end
+
+
 # require 'newgem/tasks' # load /tasks/*.rake
 # Dir['tasks/**/*.rake'].each { |t| load t }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lukebayes-clix_flash_player
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Luke Bayes