xpcomcore-rubygem 0.6.0 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.2

data/ext/stub_runners/darwin/src/stub_runner.c

@@ -1,11 +1,18 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <string.h>
 
 int main (int argc, const char * argv[]) {
   char *executable = NULL;
+  char *tee_out_cmd;
+  char *tee_err_cmd;
+  char *hijacked_stdout = NULL;
+  char *hijacked_stderr = NULL;
   char *exec_args[argc + 1];
   int i;
+  FILE *hijacked_stdout_fd;
+  FILE *hijacked_stderr_fd;
   
   executable = getenv("REAL_EXECUTABLE");
   exec_args[0] = executable;
@@ -14,6 +21,23 @@ int main (int argc, const char * argv[]) {
     exec_args[i] = (char *) argv[i];
   }
   
+  if (getenv("HIJACK_OUTPUT") != NULL) {
+    hijacked_stdout = getenv("HIJACKED_STDOUT");
+    hijacked_stderr = getenv("HIJACKED_STDERR");
+
+    tee_out_cmd = (char *)malloc(strlen("tee ") + strlen(hijacked_stdout) + 1);
+    tee_err_cmd = (char *)malloc(strlen("tee ") + strlen(hijacked_stderr) + 1);
+    
+    sprintf(tee_out_cmd, "tee %s", hijacked_stdout);
+    sprintf(tee_err_cmd, "tee %s", hijacked_stderr);
+    
+    hijacked_stdout_fd = popen(tee_out_cmd, "w");
+    hijacked_stderr_fd = popen(tee_err_cmd, "w");
+    
+    dup2(fileno(hijacked_stdout_fd), STDOUT_FILENO);
+    dup2(fileno(hijacked_stderr_fd), STDERR_FILENO);
+  }
+  
   exec_args[argc] = NULL;
   return execv(executable, exec_args);
 }

data/lib/xpcomcore-rubygem/commands/launch.rb

@@ -3,6 +3,7 @@ require 'xpcomcore-rubygem/commands'
 require 'sys/uname'
 require 'pathname'
 require 'iniparse'
+require 'tempfile'
 
 module XPCOMCore
   class CommandParser
@@ -58,7 +59,21 @@ module XPCOMCore
         def launch_from_stub(xre_location, stub_location)
           ENV['REAL_EXECUTABLE'] = xre_location.to_s
           XPCOMCore::CommandParser.log("Launching XUL application using stub '#{stub_location}' and XULRunner '#{xre_location}' from '#{@options[:ini_path].expand_path}'")
-          exec("open", stub_location.to_s, "-W", "--args", *["-app", @options[:ini_path].expand_path.to_s, "-no-remote", *@options[:args]])
+          prepare_for_output_hijacking
+          system("open", stub_location.to_s, "--args", *["-app", @options[:ini_path].expand_path.to_s, "-no-remote", *@options[:args]])
+          puts "I helpfully hijacked stdout and stderr back from LaunchServices for you. What follows is coming from your application."
+          exec(%Q[cat "#{ENV['HIJACKED_STDOUT']}" & cat "#{ENV['HIJACKED_STDERR']}" >&2])
+        end
+        
+        def prepare_for_output_hijacking
+          ENV['HIJACK_OUTPUT'] = 'true'
+          output_file, error_file = Tempfile.new("stdout.pipe."), Tempfile.new("stdout.pipe.")
+          output_path, error_path = output_file.path, error_file.path
+          output_file.close!
+          error_file.close!
+          system("mkfifo", "-m", "600", output_path) && system("mkfifo", "-m", "600", error_path)
+          ENV['HIJACKED_STDOUT'] = output_path
+          ENV['HIJACKED_STDERR'] = error_path
         end
         
         def find_stub
@@ -85,6 +100,7 @@ module XPCOMCore
       class LinuxLauncher < BaseLauncher
         
         def launch
+          super
           xre_location = send(:"locate_#{@options[:runner_type]}")
           launch_xre(xre_location)
         end

data/xpcomcore-rubygem.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xpcomcore-rubygem}
-  s.version = "0.6.0"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ggironda"]
-  s.date = %q{2009-10-15}
+  s.date = %q{2009-10-16}
   s.default_executable = %q{xpcomcore}
   s.description = %q{Gem to allow for using XPCOMCore via RubyGems}
   s.email = %q{gabriel.gironda@gmail.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xpcomcore-rubygem
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors: 
 - ggironda
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 -05:00
+date: 2009-10-16 00:00:00 -05:00
 default_executable: xpcomcore
 dependencies: 
 - !ruby/object:Gem::Dependency