boojs 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df1e3ef0cab1f3a40d88ef059199d65a600550a9
-  data.tar.gz: 551424a6c0d8d2a61927616e34e0d334b865ff53
+  metadata.gz: e7fd9c711425ee30d94d93e2783416e5b20c0f5c
+  data.tar.gz: 0a56b113946a5b6adfb68c15c3094361e528df99
 SHA512:
-  metadata.gz: 689c720b9532fbae542155d9ca8b1a903fb67fab2f4265650c5d84a2f4fd93bfab5a7b64d1d246ff164391dda247710ccb2f51dffb5508a16dccf328ccf47357
-  data.tar.gz: 4d12b58e0a93162b8ce6f4e62615528c8a2faaea5587777096f6d93bd1073c8b793c474915507341e91468bbedb89df53bc23d4099256215aff9e392cdc6d80f
+  metadata.gz: 53fc0ef3f58d229db48ef8cb23d8bee35f7961fd403f1e0995ff4328e2cb9ba088bbab731581f88804461368fc4c7fecb7b0c3a214826445e03276205b9f2c0e
+  data.tar.gz: 06064c7b0fd99e359ee59eb2e2c419ea826b17b837d076e102190bba2a8d1fd49b6beca0087cd4bb4f7aeffbf3cdc328dbfa6f119028b0d74278e77ed74d026a

data/README.md

@@ -24,12 +24,13 @@ gem install boojs
 # Usage
 #### SYNOPSIS
 ```sh
-boojs [-e statement] [-v file] [file]
+boojs [-e statement] [-t timeout] [-v file] [file]
 ```
 
 #### DESCRIPTION
 The following options are available:
- * `-e` - Pass a javascript statement to execute after the file (if a file is provided) and then immediately terminate.
+ * `-e` - Pass a javascript statement to execute after the file (if a file is provided) and then immediately terminate unless `-t` is set.
+ * `-t` - Close the program after N seconds have passed, unless an exception is raised
  * `-v` - Verify that a file contains no javascript syntax errors. Returns 0 if there are no errors.
 
 #### EXAMPLES
@@ -48,6 +49,12 @@ Execute a javascript statement, and then immediately exit. Exceptions will retur
 (sh)>boojs -e "console.log(document);"
 ```
 
+Execute a javascript statement, and then wait 4 seconds before exiting. Exceptions will return 1 and end execution early.
+```sh
+(sh)>boojs -e "console.log(document); -t 4"
+```
+
+
 Verify that a file contains no javascript runtime initialization errors
 ```sh
 (sh)>boojs -v code.js

data/bin/boojs

@@ -2,6 +2,7 @@
 require 'boojs'
 require 'optparse'
 require 'phantomjs'
+require 'timeout'
 
 #Parse
 ##########################################
@@ -17,19 +18,42 @@ parser = OptionParser.new do |opts|
   opts.on "-e COMMAND" do |c|
     @c = c
   end
+
+  #Timeout
+  opts.on "-t TIMEOUT" do |t|
+    @t = t.to_i
+  end
 end
 parser.parse!
 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?
+  else
+    BooJS.pipe nil, @c, !@t.nil?
+  end
+end
+
+#This takes a long time
+$phantomjs_path = Phantomjs.path
+
 #Run verify or run stdin/stdout mode?
 if @vfile
   BooJS.verify File.read(@file)
 else
-  if file
-    BooJS.pipe File.read(file), @c
+  if @t
+    begin
+      Timeout::timeout(@t) do
+        pipe_proc.call
+      end
+    rescue Timeout::Error
+      exit 0
+    end
   else
-    BooJS.pipe nil, @c
+    pipe_proc.call
   end
 end

data/lib/boojs/version.rb

@@ -1,3 +1,3 @@
 module BooJS
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

data/lib/boojs.rb

@@ -30,7 +30,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)
+  def self.pipe(str=nil, cmd=nil, will_timeout=false)
     js = %{
       var system = require('system');
       function __spec_ping(str) {
@@ -56,15 +56,18 @@ module BooJS
     #Repl
     if cmd
       js += "\n#{cmd}"
-      js += "\nphantom.exit(1)"
+
+      js += "\nphantom.exit(1)" unless will_timeout
     else
       js += "\nwhile (true) { var line = system.stdin.readLine(); eval(line); }"
     end
 
-    phantom = Phantomjs.path
     tmp = Tempfile.new(SecureRandom.hex)
     tmp.puts js
     tmp.close
-    exit system("#{phantom} #{tmp.path}")
+    ret = system("#{$phantomjs_path} #{tmp.path}")
+
+    tmp.unlink
+    exit ret
   end
 end

data/spec/cli_spec.rb

@@ -5,7 +5,7 @@ require 'securerandom'
 describe "CLI" do
   before(:each) do
     #Laziness
-    `ps -ax | grep phantomjs | grep -v phantomjs | awk '{print $1}' | xargs kill -9`
+    `ps -ax | grep phantomjs | grep -v grep | awk '{print $1}' | xargs kill -9`
   end
 
   it "Will not exit in pipe mode" do
@@ -19,31 +19,45 @@ describe "CLI" do
     expect(@finished).to eq(false)
   end
 
-  #it "Will exit in pipe mode if -t is set" do
-    #@finished = false
-    #Thread.new do
-      #`ruby -I./lib ./bin/boojs -t 2`
-      #@finished = true
-    #end
-
-    #sleep 2
-    #expect(@finished).to eq(false)
-    #sleep 2
-    #expect(@finished).to eq(true)
-  #end
-
-  #it "Will exit in pipe mode if -t is set and evaluating script" do
-    #@finished = false
-    #Thread.new do
-      #`ruby -I./lib ./bin/boojs -t 2`
-      #@finished = true
-    #end
-
-    #sleep 2
-    #expect(@finished).to eq(false)
-    #sleep 2
-    #expect(@finished).to eq(true)
-  #end
+  it "Will exit in pipe mode if -t is set" do
+    @finished = false
+    Thread.new do
+      system("ruby -I./lib ./bin/boojs -t 2")
+      @finished = true
+    end
+
+    expect(@finished).to eq(false)
+    sleep 4
+    expect(@finished).to eq(true)
+  end
+
+  it "Will exit in execute mode if -t is set and return a 0 value" do
+    @finished = false
+    Thread.new do
+      @return = system %{ruby -I./lib ./bin/boojs -t 2 -e "console.log('hello');"}
+      @finished = true
+    end
+
+    expect(@finished).to eq(false)
+    sleep 4
+    expect(@finished).to eq(true)
+
+    expect(@return).to eq(true)
+  end
+
+  it "Will exit in execute mode if -t is set and return a 1 value for a bad command" do
+    @finished = false
+    Thread.new do
+      @return = system %{ruby -I./lib ./bin/boojs -t 2 -e "no_such_variable;"}
+      @finished = true
+    end
+
+    expect(@finished).to eq(false)
+    sleep 4
+    expect(@finished).to eq(true)
+
+    expect(@return).not_to eq(true)
+  end
 
   it "Replies with pong$KEY when given ping('$key')" do
     key = SecureRandom.hex

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boojs
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - seo