sprout-flashplayer-bundle 10.22.0 → 10.22.2

data/lib/clix_flash_player.rb

@@ -28,12 +28,22 @@ class CLIXFlashPlayer
     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)
+      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?
+        puts "after error"
+        # Process.wait(@player_pid)
+      rescue StandardError => e
+        kill
+        raise e
+      end
     }
   end
   
@@ -42,7 +52,9 @@ class CLIXFlashPlayer
   end
   
   def join
-    @thread.join
+    if(@thread.alive?)
+      @thread.join
+    end
   end
   
   def alive?

data/lib/clix_wrapper.rb

@@ -1,24 +1,22 @@
 #!/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
+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(swf.nil?)
-  raise "CLIXWrapper requires 'swf' 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)
 
 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 'You must install the rb-appscript gem to use the desktop debug Flash Player'
+  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
 

data/lib/sprout/flashplayer/version.rb

@@ -3,7 +3,7 @@ module Sprout
     module VERSION #:nodoc:
       MAJOR = 10
       MINOR = 22
-      TINY  = 0
+      TINY  = 2
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       MAJOR_MINOR = [MAJOR, MINOR].join('.')

data/lib/sprout/tasks/flashplayer_task.rb

@@ -271,7 +271,7 @@ module Sprout
       if(usr.is_a?(WinUser))
         Thread.kill(@thread)
       elsif(usr.is_a?(OSXUser))
-        @thread.kill
+        @clix_player.kill
       else
         Process.kill("SIGALRM", @player_pid)
       end

data/rakefile.rb

@@ -43,10 +43,6 @@ spec = Gem::Specification.new do |s|
 
   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: 10.22.0
+  version: 10.22.2
 platform: ruby
 authors: 
 - Pattern Park
@@ -32,16 +32,6 @@ dependencies:
       - !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: []