execjs-xtrn 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c121f6027c69f2d3109081cfd4e5234ea86167f0
-  data.tar.gz: 1bb4b7e1866c93cb106be86ac6f5dc6b75994917
+  metadata.gz: 7006a7dbaff18583232a21dec541ac5aabbe990c
+  data.tar.gz: 87fa10ad61fb6be63aca1f564c31d6bbad3de260
 SHA512:
-  metadata.gz: d412ec4742fbb3b70a892fc89647b3538e87db6223d2ffc75fb9d80549c20baf091bf5bbaddd42e756daef613403ea6c784b0e157e98fb93eb63e9c9996eb877
-  data.tar.gz: 98294762eb590e6503383e02cf0ac288c14a9e0e60b2a793c717628853d1dbde3ef2433bb079fde4735bd1ae347469491ee0ae2110a18d0ef9f46676729208a0
+  metadata.gz: a69efc3cf4ac48d7dbd419fc11e36d456edb08f314c826b23890d0fa31e155f5167fa712b9517d6b66f74f6c095e1d6f0b2292b45978bcebda58382bf034cdca
+  data.tar.gz: bbd08a8d11fcd3f8e6c341f8488ce31f8b791247ecf0ba8345f71b52acf3cd7f7d2cf00234345440d37b42ede81e67b2e36bc9cd03e1444acdcff5d195eb4df9

data/.travis.yml

@@ -1,12 +1,19 @@
+sudo: false
+
 language: ruby
+
 rvm:
   - '2.2'
   - '2.1'
   - '2.0'
   - 1.9.3
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y npm
+
+env:
+  - NODEV=node
+  - NODEV=0
+
 install:
+  - nvm install $NODEV
+  - gem install bundler
   - bundle install
   - bundle exec rake npm

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in execjs-xtrn.gemspec
 gemspec
+
+gem 'json', "#{/^1[.]/.match(RUBY_VERSION)? '~>' : '>='} 1.8"

data/README.md

@@ -1,6 +1,7 @@
 # ExecJS::Xtrn
 
 [![Build Status](https://travis-ci.org/ukoloff/execjs-xtrn.svg?branch=master)](https://travis-ci.org/ukoloff/execjs-xtrn)
+[![Build status](https://ci.appveyor.com/api/projects/status/tw7av89nj591fg8w?svg=true)](https://ci.appveyor.com/project/ukoloff/execjs-xtrn)
 [![Gem Version](https://badge.fury.io/rb/execjs-xtrn.svg)](http://badge.fury.io/rb/execjs-xtrn)
 
 Drop-in replacement for ExecJS. The latter spawns separate process for every JavaScript compilation
@@ -198,12 +199,15 @@ The following packages have been tested to run under ExecJS::Xtrn out-of-box:
 CoffeeScript since v1.9.0 introduces new incompatibility:
 it uses `Object.create` that is missing from WSH.
 To fix it, `Object.create` was manually defined in ExecJS::Xtrn::Wsh
-(sort of [ExecJS::Xtrn::Wsh::Preload](#preloading))
+(sort of [ExecJS::Xtrn::Wsh::Preload](#preloading)).
+Path to this polyfill is available as `ExecJS::Xtrn::Wsh::ES5` constant.
 
 Gem [coffee-script](https://rubygems.org/gems/coffee-script) since v2.4.0 introduces another incompatibility:
 it silently creates global function. This approach works in regular ExecJS but fails in ExecJS::Xtrn.
 As a workaround pin `coffee-script` gem version to 2.3.0.
 
+Later [uglifier](https://github.com/lautis/uglifier) from v3 started to use globals either. Pin it to '~> 2'.
+
 ## Testing
 
 After git checkout, required NPM modules must be installed. Simply run:
@@ -227,3 +231,5 @@ And `bundle exec` may be ommited in most cases.
   * [therubyracer](https://github.com/cowboyd/therubyracer)
   * [Node.js](http://nodejs.org/)
   * [Windows Script Host](http://en.wikipedia.org/wiki/Windows_Script_Host)
+  * [Travis CI](https://travis-ci.org/)
+  * [AppVeyor](http://www.appveyor.com/)

data/appveyor.yml

@@ -0,0 +1,36 @@
+version: 1.0.{build}-{branch}
+
+cache:
+  - vendor/bundle
+
+environment:
+  matrix:
+    - RUBY_VERSION: 23
+    - RUBY_VERSION: 22
+    - RUBY_VERSION: 21
+    - RUBY_VERSION: 200
+    - RUBY_VERSION: 193
+
+install:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - bundle config --local path vendor/bundle
+  - bundle install
+  - bundle exec rake npm
+
+build: off
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+  - node -v
+
+test_script:
+  - bundle exec rake
+
+after_test:
+  - bundle exec rake build
+
+artifacts:
+  - path: pkg/*.gem
+    name: Gem

data/execjs-xtrn.gemspec

@@ -19,9 +19,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "json"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "coffee-script", '2.3.0'
-  spec.add_development_dependency "uglifier"
+  spec.add_development_dependency "uglifier", '~> 2'
+  spec.add_development_dependency "appveyor-worker"
 end

data/lib/execjs/node/package.json

@@ -1,4 +1,5 @@
 {
+  "private": true,
   "dependencies": {
     "split": "^0.3.0",
     "through": "^2.3.6"

data/lib/execjs/wsh/es5.js

@@ -0,0 +1,13 @@
+//
+// Missing methods for Windows Script Host
+//
++function (){
+
+if(!Object.create)
+  Object.create = function(proto){
+    function fn(){}
+    fn.prototype=proto
+    return new fn
+  }
+
+}()

data/lib/execjs/wsh/repl.js

@@ -1,12 +1,14 @@
-!function(){
+//
+// Communicate with cscript via stdin/stderr
+//
++function(){
 
 var
   w = WScript,
   i = w.StdIn,
   o = w.StdErr
 
-json2()
-oCreate()
+loadShivs('json2 es5')
 
 while(!i.AtEndOfStream)
   o.WriteLine(wrap(i.ReadLine()))
@@ -42,16 +44,19 @@ function json2()
   new Function(fso.OpenTextFile(j2).ReadAll())()
 }
 
-// Fix for CoffeeScript 1.9+
-function oCreate()
+function loadJS(name)
 {
-  if(Object.create) return
-  Object.create=function(proto)
-  {
-    function f(){}
-    f.prototype=proto
-    return new f
-  }
+  var
+    fso = new ActiveXObject("Scripting.FileSystemObject")
+  name = fso.GetParentFolderName(w.ScriptFullName)+"/"+name+".js"
+  new Function(fso.OpenTextFile(name).ReadAll())()
+}
+
+function loadShivs(names)
+{
+  names = names.split(' ')
+  for(var i in names)
+    loadJS(names[i])
 }
 
 }()

data/lib/execjs/xtrn.rb

@@ -14,8 +14,14 @@ module ExecJS::Xtrn
   # Install into ExecJS
   def self.init
     slf=self
-    sc=(class<<ExecJS;self;end)
-    Engine.methods(false).each{|m| sc.instance_eval{define_method(m){|*args| slf.engine.send m, *args }}}
+    sc=(class << ExecJS; self ;end)
+    Engine.methods(false).each do |m|
+      sc.instance_eval do
+        define_method(m) do |*args|
+          slf.engine.send m, *args
+        end
+      end
+    end
   end
 
   init

data/lib/execjs/xtrn/child.rb

@@ -14,6 +14,7 @@ class ExecJS::Xtrn::Child
     }
     @stdin.puts delta[:o]=JSON.generate([obj])[1...-1]
     i=@stdout.gets
+    i.force_encoding 'UTF-8'
 
     delta[:t]=Time.now-delta[:t]
     delta[:i]=i.length

data/lib/execjs/xtrn/version.rb

@@ -1,5 +1,5 @@
 module ExecJS
   module Xtrn
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

data/lib/execjs/xtrn/wsh.rb

@@ -8,6 +8,8 @@ class ExecJS::Xtrn::Wsh < ExecJS::Xtrn::Engine
     encoding: 'UTF-16LE:UTF-8',
   }
 
+  ES5 = File.expand_path('../../wsh/es5.js', __FILE__)
+
   Valid=Gem.win_platform?
 
   exec '//' rescue nil if Valid # Warm up

data/test/child.rb

@@ -18,7 +18,7 @@ class TestChild < Shagi
     ancestors[1].instance_methods(false).grep(/^shag_/).each do |m|
       Children.each_with_index  do |klass, idx|
         (1..Spawn).each do |n|
-          define_method("test_#{m.to_s.sub /.*?_/, ''}_#{klass.name.split(/\W+/).last}_#{n}")do
+          define_method("test_#{m.to_s.sub(/.*?_/, '')}_#{klass.name.split(/\W+/).last}_#{n}")do
             skip unless @child=(@@children||=children)[n-1][idx]
             send m
           end

data/test/engine.rb

@@ -103,7 +103,7 @@ class TestEngine < Minitest::Test
     instance_methods(false).grep(/^shag_/).each do |m|
       Engines.each_with_index  do |klass, idx|
         (1..Spawn).each do |n|
-          define_method("test_#{m.to_s.sub /.*?_/, ''}_#{klass.name.split(/\W+/).last}_#{n}")do
+          define_method("test_#{m.to_s.sub(/.*?_/, '')}_#{klass.name.split(/\W+/).last}_#{n}")do
             skip unless @engine=(@@engines||=engines)[n-1][idx]
             send m
           end
@@ -113,7 +113,7 @@ class TestEngine < Minitest::Test
 
     instance_methods(false).grep(/^klas_/).each do |m|
       Engines.each do |klass|
-          define_method("test_#{m.to_s.sub /.*?_/, ''}_#{klass.name.split(/\W+/).last}_class")do
+          define_method("test_#{m.to_s.sub(/.*?_/, '')}_#{klass.name.split(/\W+/).last}_class")do
             skip unless klass::Valid
             @class=klass
             send m
@@ -124,11 +124,4 @@ class TestEngine < Minitest::Test
 
   build
 
-  ObjectSpace.define_finalizer(M)do
-    puts "Statistics:"
-    s=M.stats
-    len=s.keys.map(&:length).max+1
-    s.each{|k, v| puts "#{' '*(len-k.length)}#{k}: "+v.map{|k, v| "#{k}=#{v.round(3).to_s.sub /[.]?0*$/, ''}"}*', ' }
-  end
-
 end

data/test/nvm.rb

@@ -5,10 +5,7 @@ class TestNvm < Shagi
   Child=M::Nvm
 
   def say(code)
-    # puts "s: child=#{@child} vm=#{@vm}, code=#{code}"
-    r=@child.say vm: @vm, js: code
-    # puts "r: #{r}"
-    r
+    @child.say vm: @vm, js: code
   end
 
   def buildVMs
@@ -21,7 +18,7 @@ class TestNvm < Shagi
   def self.build
     ancestors[1].instance_methods(false).grep(/^shag_/).each do |m|
       (1..Spawn).each do |n|
-        define_method("test_#{m.to_s.sub /.*?_/, ''}_#{n}")do
+        define_method("test_#{m.to_s.sub(/.*?_/, '')}_#{n}")do
           skip unless Child::Valid
           @vm=(@@vms||=buildVMs)[n-1]
           @child=@@child

data/test/top.rb

@@ -1,5 +1,6 @@
 require 'coffee-script'
 require 'uglifier'
+
 ExecJS::Xtrn.init
 
 class TestTop < Minitest::Test
@@ -70,6 +71,22 @@ class TestTop < Minitest::Test
     assert_equal 42, ExecJS.eval('21*2')
   end
 
+  def test_info
+    at_exit do
+      puts "Statistics:"
+      s=ExecJS::Xtrn.stats
+      len=s.keys.map(&:length).max+1
+      z = s.map do |k, v|
+        "#{' '*(len-k.length)}#{k}: "+
+        v.map do |kx, vx|
+          "#{kx}=#{vx.round(3).to_s.sub(/[.]?0*$/, '')}"
+        end * ', '
+      end * "\n"
+      puts z
+      AppVeyor::Worker.message "Compilations: #{s['Engine'][:n]}", z
+    end
+  end
+
 end
 
 class FakeEngine < ExecJS::Xtrn::Engine

metadata

@@ -1,55 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: execjs-xtrn
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Stas Ukolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -70,14 +84,28 @@ dependencies:
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: appveyor-worker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Drop-in replacement for ExecJS with persistent external runtime
@@ -87,18 +115,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - FarMenu.ini
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - execjs-xtrn.gemspec
 - lib/execjs/node/index.js
 - lib/execjs/node/node_modules/split/index.js
 - lib/execjs/node/node_modules/through/index.js
 - lib/execjs/node/package.json
+- lib/execjs/wsh/es5.js
 - lib/execjs/wsh/json2.js
 - lib/execjs/wsh/repl.js
 - lib/execjs/xtrn.rb
@@ -127,17 +157,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: 'Proof-of-concept: make ExecJS fast even without therubyracer'