commonjs 0.2.5 → 0.2.6

data/.travis.yml

@@ -2,6 +2,8 @@ rvm:
   - 1.9.3
   - 1.9.2
   - 1.8.7
+  - jruby-18mode
+  - jruby-19mode
 notifications:
   recipients:
     - cowboyd@thefrontside.net

data/Gemfile

@@ -2,3 +2,6 @@ source 'http://rubygems.org'
 
 # Specify your gem's dependencies in commonjs.gemspec
 gemspec
+
+gem "therubyracer", :platforms => :ruby
+gem "therubyrhino", "~> 1.73.3", :platforms => :jruby

data/README.md

@@ -36,9 +36,9 @@ access to the process information, you would say:
 ### Current
 
 * The Ruby Racer (V8) - [https://github.com/cowboyd/therubyracer]
+* The Ruby Rhino (JRuby) - [https://github.com/cowboyd/therubyrhino]
 
 ### Desired
 
-* The Ruby Rhino (JRuby) - [https://github.com/cowboyd/therubyrhino]
 * Johnson (TraceMonkey) - [https://github.com/jbarnette/johnson]
 * Lyndon (MacRuby) - [https://github.com/defunkt/lyndon]

data/Rakefile

@@ -2,6 +2,8 @@
 require "bundler/gem_tasks"
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new('spec')
+RSpec::Core::RakeTask.new('spec') do |spec|
+  spec.rspec_opts = ['--color', "--format documentation"]
+end
 
 task :default => :spec

data/commonjs.gemspec

@@ -17,5 +17,4 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
-  gem.add_development_dependency "therubyracer"
 end

data/lib/commonjs/environment.rb

@@ -13,7 +13,7 @@ module CommonJS
     def require(module_id)
       unless mod = @modules[module_id]
         filepath = find(module_id) or fail LoadError, "no such module '#{module_id}'"
-        load = @runtime.eval("(function(module, require, exports) {#{File.read(filepath)}})", filepath.expand_path)
+        load = @runtime.eval("(function(module, require, exports) {#{File.read(filepath)}})", filepath.expand_path.to_s)
         @modules[module_id] = mod = Module.new(module_id, self)
         load.call(mod, mod.require_function, mod.exports)
       end

data/lib/commonjs/version.rb

@@ -1,3 +1,3 @@
 module CommonJS
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/commonjs/modules_extensions_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'modules extensions' do
   before do
-    @env = CommonJS::Environment.new(V8::Context.new, :path => File.expand_path('../libjs', __FILE__))
+    @env = env_with_path_value File.expand_path('../libjs', __FILE__)
   end
   it "allows the exports object to be completely replaced" do
     @env.require('assign_module_exports').call().should eql "I am your exports"

data/spec/commonjs/modules_spec.rb

@@ -1,12 +1,11 @@
 # -*- encoding: utf-8 -*-
 require 'spec_helper'
-require 'v8'
 
 describe "modules 1.0" do
 
   def self.make_before(path)
     proc do
-      @env = CommonJS::Environment.new(V8::Context.new, :path => path)
+      @env = env_with_path_value(path)
       @env.native('system', QuietSystem.new)
     end
   end
@@ -28,8 +27,8 @@ describe "modules 1.0" do
     def stdio
       self
     end
-    def print(*args)
-      # puts args.join('')
+    def print
+      lambda {|*args|}
     end
   end
 end

data/spec/commonjs/path_spec.rb

@@ -26,12 +26,8 @@ describe "load paths: " do
     end
     
     it "respects the order in which paths were specified" do
-      @env.require('one').one.should eql 1
+      @env.require('one').one.to_i.should eql 1
     end
-  end
-  
-  def env_with_path_value(path)
-    CommonJS::Environment.new V8::Context.new, :path => path
-  end
+  end  
 end
 

data/spec/spec_helper.rb

@@ -1,4 +1,19 @@
 
 require 'commonjs'
 require 'pathname'
-require 'v8'
+
+def env_with_path_value(path)
+  CommonJS::Environment.new new_runtime, :path => path
+end
+
+if defined?(JRUBY_VERSION)
+  require 'rhino'
+  def new_runtime
+    Rhino::Context.new
+  end
+else
+  require 'v8'
+  def new_runtime
+    V8::Context.new
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonjs
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153067860 !ruby/object:Gem::Requirement
+  requirement: &2157025180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153067860
+  version_requirements: *2157025180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153067160 !ruby/object:Gem::Requirement
+  requirement: &2157024040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,18 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153067160
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: &2153066600 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153066600
+  version_requirements: *2157024040
 description: Host CommonJS JavaScript environments in Ruby
 email:
 - cowboyd@thefrontside.net