boojs 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db230cbf699816c58332b402c9323cc8a2247dbd
-  data.tar.gz: 832c8f6043bfc99893297a9d321d1d8ff27337f9
+  metadata.gz: 43c6680ba1e3ee1e6c2009cfd4ca7b2a5b8e9f93
+  data.tar.gz: d550cec2bb6aa2f7c32196720bcbeb1dc4aff732
 SHA512:
-  metadata.gz: ad5ca9aad30b0632ea9aed44e8ed5dfb09bbde16b570af4f08c0adecfe3389ea9b5355ace6a19aeb87061806f838b6a5149d647f81a44bfb2555c2e9ac9d1f48
-  data.tar.gz: ffcedb596fc53da6bf9d3a96e3a685226dd715d08cea17e93912efef2c89517705124328680a245c7e136f545019ceb83c898460628f28053a6314caa5ff69fa
+  metadata.gz: 1db9a67b86ac314f34fcf87968160bcc19a9a655b885149aec1e497b398201e0b44a8d07a54bb623b593d80f5d1b7be9125b3fb55079c2c8519388a30f8f5cf6
+  data.tar.gz: ef361b2ad6a036e7a8ac26f414628244be9feef46bb5dfb3fdebe0c998e76d66bc13512d7326980246db448fb8b84f6a38ade463c1a6c768f1ad8f3804dcea44

data/bin/boojs

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'boojs'
+require File.join(File.dirname(__FILE__), "../lib/boojs")
 require 'optparse'
 require 'phantomjs'
 require 'timeout'
@@ -23,6 +23,13 @@ parser = OptionParser.new do |opts|
   opts.on "-t TIMEOUT" do |t|
     @t = t.to_i
   end
+
+  #The first line of stdout will be the PID of the PhantomJS process
+  #This is for a spec that tests to make sure the PhanomJS process is
+  #correctly terminated when it is spawned
+  opts.on "-p" do
+    @output_phantomjs_pid = true
+  end
 end
 parser.parse!
 file = ARGV.pop
@@ -32,9 +39,9 @@ file = ARGV.pop
 #Pipe with with a optional file and optional execute command
 pipe_proc = Proc.new do
   if file
-    BooJS.pipe File.read(file), @c, !@t.nil?
+    BooJS.pipe File.read(file), @c, !@t.nil?, @output_phantomjs_pid
   else
-    BooJS.pipe nil, @c, !@t.nil?
+    BooJS.pipe nil, @c, !@t.nil?, @output_phantomjs_pid
   end
 end
 

data/lib/boojs/version.rb

@@ -1,3 +1,3 @@
 module BooJS
-  VERSION = '0.0.26'
+  VERSION = '0.0.27'
 end

data/lib/boojs.rb

@@ -1,3 +1,4 @@
+$stdout.sync = true
 require 'tempfile'
 require 'securerandom'
 require 'greenletters'
@@ -69,7 +70,7 @@ module BooJS
 
   #Optionally, accept code to inject and a command to run
   #If the command is nil, this is not executed as a oneshot
-  def self.pipe(str=nil, cmd=nil, will_timeout=false)
+  def self.pipe(str=nil, cmd=nil, will_timeout=false, output_phantomjs_pid=false)
     js = %{
       var system = require('system');
       function __spec_ping(str) {
@@ -120,26 +121,41 @@ module BooJS
     @input_sender_r, @input_sender_w = IO.pipe
     
     #Phantom JS Process
-    p = IO.popen("#{$phantomjs_path} #{tmp.path}")
-    loop do
-      rr, _ = select([p, STDIN]); e = rr[0]
-      #PhantomJS has written something
-      if e == p
-        res = e.readline
-
-        if res =~ /STDIN_PORT/
-          port = res.split(" ")[1].to_i
-          start_server(port, @input_sender_r)
-        else
-          puts res
-          $stdout.flush
-        end
+    begin
+      p = IO.popen("#{$phantomjs_path} #{tmp.path}")
+
+      #We are going to do a loop back (ready to rcv) to wait for the JS to respond before outputing the spec PID
+      #So that in the specs, we have a reliable way of testing the process execution as ending this process
+      #before the child process ends, will termiante the spawned process (PhantomJS) by default but not if it's
+      #kept alive for a while (which we handle via sending it an INT in the ensure)
+      if output_phantomjs_pid
+        @input_sender_w.puts "booPing();"
+        res = p.readline
+        puts p.pid
       end
 
-      #User has written to this program
-      if e == STDIN
-        @input_sender_w.puts e.readline
+      loop do
+        rr, _ = select([p, STDIN]); e = rr[0]
+        #PhantomJS has written something
+        if e == p
+          res = e.readline
+
+          if res =~ /STDIN_PORT/
+            port = res.split(" ")[1].to_i
+            start_server(port, @input_sender_r)
+          else
+            puts res
+            $stdout.flush
+          end
+        end
+
+        #User has written to this program
+        if e == STDIN
+          @input_sender_w.puts e.readline
+        end
       end
+    ensure
+      Process.kill :INT, p.pid
     end
 
     tmp.unlink

data/spec/termination.rb

@@ -0,0 +1,86 @@
+#Verify correct termination (full cleanup on any exit)
+require 'open3'
+require 'tempfile'
+require 'securerandom'
+
+BOOJS = File.join(File.dirname(__FILE__), "../bin/boojs")
+
+describe "CLI" do
+  before(:each) do
+    #Laziness
+  end
+
+  it "Will output a pid for the first stdout when given the -p flag via the command line" do
+    begin
+      p = IO.popen("#{BOOJS} -p", "r+")
+
+      Timeout.timeout(6) do
+        @line = p.readline
+      end
+
+      expect(@line).to match(/\d*/)
+    ensure
+      Process.kill(:INT, p.pid)
+    end
+  end
+
+  it "Will terminate the process it spawns after the main program is sent a SIGINT" do
+    begin
+      p = IO.popen("#{BOOJS} -p", "r+")
+
+      Timeout.timeout(6) do
+        @spawned_pid = p.readline.to_i
+      end
+
+      #Kill boojs process
+      Process.kill :INT, p.pid
+
+      sleep 1
+
+      #Make sure phantomJS process is not running
+      begin
+        res = Process.kill 0, @spawned_pid
+      rescue Errno::ESRCH
+        @phantomjs_did_not_exist = true
+      end
+
+      expect(@phantomjs_did_not_exist).to eq(true)
+    ensure
+      begin
+        #Process.kill(:INT, p.pid)
+        #Process.kill(:INT, @spawned_pid)
+      rescue Errno::ESRCH
+      end
+    end
+  end
+
+  it "Will terminate the process it spawns after the main program is sent a SIGTERM" do
+    begin
+      p = IO.popen("#{BOOJS} -p", "r+")
+
+      Timeout.timeout(6) do
+        @spawned_pid = p.readline.to_i
+      end
+
+      #Kill boojs process
+      Process.kill :TERM, p.pid
+
+      sleep 1
+
+      #Make sure phantomJS process is not running
+      begin
+        res = Process.kill 0, @spawned_pid
+      rescue Errno::ESRCH
+        @phantomjs_did_not_exist = true
+      end
+
+      expect(@phantomjs_did_not_exist).to eq(true)
+    ensure
+      begin
+        Process.kill(:INT, p.pid)
+        Process.kill(:INT, @spawned_pid)
+      rescue Errno::ESRCH
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boojs
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,7 @@ files:
 - spec/samples/set_a_stdin.js
 - spec/samples/syntax_problem.js
 - spec/speed_spec.rb
+- spec/termination.rb
 - spec/verify_spec.rb
 - usage.gif
 homepage: https://github.com/sotownsend/BooJS
@@ -186,4 +187,5 @@ test_files:
 - spec/samples/set_a_stdin.js
 - spec/samples/syntax_problem.js
 - spec/speed_spec.rb
+- spec/termination.rb
 - spec/verify_spec.rb