bullring 0.7.3 → 0.7.4

data/lib/bullring/version.rb

@@ -1,3 +1,3 @@
 module Bullring
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

data/lib/bullring/workers/racer_dev_worker.rb

@@ -0,0 +1,167 @@
+require 'bullring/util/drubied_process'
+
+module Bullring
+
+  class RacerDevWorker < Bullring::Worker
+    
+    attr_reader :libraries
+    
+    def discard
+    end
+    
+    def initialize
+      @libraries = {}
+    end    
+    
+    def add_library(name, script)
+      rescue_me do
+        Bullring.logger.debug { "Bullring: Adding library named '#{name}'" }
+        @libraries[name] = script
+      end
+    end
+
+    def add_library_file(name, filename)
+      raise NotYetImplemented
+    end
+
+    def check(script, options)
+      Bullring.logger.debug { "Bullring: Checking script with hash '#{script.hash}'" }
+      rescue_me do 
+        V8::Context.open do |context|
+          context_wrapper {context.load(File.expand_path("../../js/jslint.min.js", __FILE__))}
+
+          jslintCall = <<-RACER_CALL
+            JSLINT("#{prepare_source(script)}", {devel: false, 
+                                 bitwise: true, 
+                                 undef: true,
+                                 continue: true, 
+                                 unparam: true, 
+                                 debug: true, 
+                                 sloppy: true, 
+                                 eqeq: true, 
+                                 sub: true, 
+                                 es5: true, 
+                                 vars: true, 
+                                 evil: true, 
+                                 white: true, 
+                                 forin: true, 
+                                 passfail: false, 
+                                 newcap: true, 
+                                 nomen: true, 
+                                 plusplus: true, 
+                                 regexp: true, 
+                                 maxerr: 50, 
+                                 indent: 4});
+          RACER_CALL
+
+          duration, result = context_wrapper {context.eval(jslintCall + "JSLINT.errors")}
+
+          result = result.collect{|obj| obj.respond_to?(:to_h) ? obj.to_h : obj}
+        end
+      end
+    end
+
+    def run(script, options)
+      Bullring.logger.debug { "Bullring: Running script with hash '#{script.hash}'" }
+
+      V8::Context.open(:sealed => @options[:run_is_sealed], :restrictable => @options[:run_is_restrictable]) do |context|
+
+        (options['library_names'] || []).each do |library_name|
+          library = @libraries[library_name] || fetch_library_script!(library_name)
+          context_wrapper {context.eval(library)}      
+        end
+        
+        duration, result = context_wrapper {context.eval(script)}      
+        result.respond_to?(:to_h) ? result.to_h : result      
+      end    
+    end
+
+    def alive?
+      true
+    end
+    
+      protected
+
+      def context_wrapper
+        begin 
+          start_time = Time.now
+          result = yield
+          duration = Time.now - start_time
+
+          logger.debug {"#{logname}: Ran script (#{duration} secs); result: " + result.inspect}
+
+          return duration, result
+        rescue Rhino::JSError => e
+          logger.debug {"#{logname}: JSError! Cause: " + e.cause + "; Message: " + e.message}
+          raise Bullring::JSError, e.message.to_s, caller
+        rescue Rhino::RunawayScriptError, Rhino::ScriptTimeoutError => e
+          logger.debug {"#{logname}: Runaway Script: " + e.inspect}
+          raise Bullring::JSError, "Script took too long to run", caller
+        rescue NameError => e
+          logger.debug {"#{logname}: Name error: " + e.inspect}
+        rescue StandardError => e
+          logger.debug {"#{logname}: StandardError: " + e.inspect}
+          raise
+        end
+      end
+
+      ESCAPE_MAP = {
+        '\\' => '\\\\', 
+        "\r\n" => '\n', 
+        "\n" => '\n', 
+        "\r" => '\n', 
+        '"' => '\"', 
+        "'" => '\''
+      }
+
+      def prepare_source(source) 
+       # escape javascript characters (similar to Rails escape_javascript)
+       source.gsub!(/(\\|\r\n|[\n\r"'])/u) {|match| ESCAPE_MAP[match] }
+       source   
+      end
+
+      # Goes back to the setup provider to the get the named script or throws an
+      # exception if there is no such script to retrieve.
+      def fetch_library_script!(name)
+        logger.debug {"#{logname}: The script named #{name} was not available so trying to fetch from clients"}
+
+        while (provider = @setup_providers.last)
+          begin
+            library_script = provider.libraries[name]
+            break if !library_script.nil?
+          rescue DRb::DRbConnError => e
+            logger.debug {"#{logname}: Could not connect to setup provider (its process probably died): " + e.inspect}
+          rescue StandardError => e
+            logger.error {"#{logname}: Encountered an unknown error searching setup providers for a script named #{name}: " + e.inspect}
+          ensure
+            # Toss the last element so we can continue searching prior elements
+            setup_providers.pop
+          end
+        end
+
+        # If after looking through the providers we are still empty handed, raise an error
+        raise NameError, "Client doesn't have script named #{name}", caller if library_script.nil?
+
+        add_library(name, library_script)
+      end
+
+      def logname; "Bullring Server"; end
+
+    end
+
+    class JSError < StandardError; end
+  
+    def rescue_me
+      @times_rescued = 0
+      begin
+        yield
+      rescue Bullring::JSError => e
+        Bullring.logger.debug {"Bullring: Encountered a JSError: " + e.inspect}
+        raise e
+      end  
+    end
+
+  end
+  
+end
+

data/lib/bullring/workers/rhino_server.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Usage: bullring_server.sh GEM_ROOT_DIR ARGS_FOR_RUBY_CALL
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullring
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000Z
+date: 2012-05-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2164859160 !ruby/object:Gem::Requirement
+  requirement: &2153389400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164859160
+  version_requirements: *2153389400
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &2164858440 !ruby/object:Gem::Requirement
+  requirement: &2153388520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164858440
+  version_requirements: *2153388520
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2164857620 !ruby/object:Gem::Requirement
+  requirement: &2153387820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164857620
+  version_requirements: *2153387820
 - !ruby/object:Gem::Dependency
   name: therubyrhino
-  requirement: &2164856500 !ruby/object:Gem::Requirement
+  requirement: &2153387180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164856500
+  version_requirements: *2153387180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2164855740 !ruby/object:Gem::Requirement
+  requirement: &2153386180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164855740
+  version_requirements: *2153386180
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2164854700 !ruby/object:Gem::Requirement
+  requirement: &2153385360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.2.2
   type: :development
   prerelease: false
-  version_requirements: *2164854700
+  version_requirements: *2153385360
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2164853780 !ruby/object:Gem::Requirement
+  requirement: &2153384700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164853780
+  version_requirements: *2153384700
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2164853000 !ruby/object:Gem::Requirement
+  requirement: &2153383880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164853000
+  version_requirements: *2153383880
 description: Safely run untrusted Javascript from Ruby
 email:
 - jps@kindlinglabs.com
@@ -114,6 +114,7 @@ files:
 - lib/bullring/util/network.rb
 - lib/bullring/version.rb
 - lib/bullring/worker.rb
+- lib/bullring/workers/racer_dev_worker.rb
 - lib/bullring/workers/rhino_server.rb
 - lib/bullring/workers/rhino_server.sh
 - lib/bullring/workers/rhino_server_worker.rb
@@ -177,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1628339676195446552
+      hash: -2698416548869913159
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -186,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1628339676195446552
+      hash: -2698416548869913159
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6