Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

travis doesn't support 1.9.1

workaround for jbarnette/johnson#21
workaround for nu7hatch/mustang#18
fix for ruby 1.8 (Disabled)
  • Loading branch information...
commit 9bf032ca7918e17b85229b1d66dad00c463c4fa3 1 parent 457c4f2
@stereobooster authored
Showing with 23 additions and 12 deletions.
  1. +6 −3 .travis.yml
  2. +3 −1 Gemfile
  3. +1 −1  Rakefile
  4. +13 −7 execjs.gemspec
View
9 .travis.yml
@@ -2,12 +2,15 @@ env: CI=1
rvm:
- 1.8.7
- - 1.9.1
- 1.9.2
- - jruby
- - rbx
+ - 1.9.3
+ - jruby-18mode
+ - jruby-19mode
+ - rbx-18mode
+ - rbx-19mode
- ree
- ruby-head
+ - jruby-head
notifications:
disabled: true
View
4 Gemfile
@@ -5,7 +5,9 @@ gemspec
group :test do
gem 'johnson', :platform => :mri_18
gem 'json'
- gem 'mustang', :platform => :ruby
+ # see https://github.com/nu7hatch/mustang/issues/18
+ gem 'mustang', :platform => :ruby,
+ :git => "https://github.com/nu7hatch/mustang.git", :ref => "2a3bcfbd9fd0f34e9b004fcd92188f326b40ec2a"
gem 'therubyracer', :platform => :ruby
gem 'therubyrhino', :platform => :jruby
end
View
2  Rakefile
@@ -7,7 +7,7 @@ require "execjs/runtimes"
tests = namespace :test do |tests|
ExecJS::Runtimes.names.each do |name|
- next if name == :Disabled
+ next if (name == :Disabled || name == "Disabled")
task(name.downcase) do
ENV["EXECJS_RUNTIME"] = name.to_s
View
20 execjs.gemspec
@@ -7,18 +7,24 @@ Gem::Specification.new do |s|
s.homepage = "https://github.com/sstephenson/execjs"
s.summary = "Run JavaScript code from Ruby"
- s.description = <<-EOS
- ExecJS lets you run JavaScript code from Ruby.
- EOS
+ s.description = "ExecJS lets you run JavaScript code from Ruby."
s.files = Dir["README.md", "LICENSE", "lib/**/*"]
s.add_dependency "multi_json", "~>1.0"
- s.add_development_dependency "johnson"
- s.add_development_dependency "mustang"
s.add_development_dependency "rake"
- s.add_development_dependency "therubyracer"
- s.add_development_dependency "therubyrhino"
+
+ if RUBY_VERSION < "1.9" && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
+ # see https://github.com/jbarnette/johnson/issues/21
+ s.add_development_dependency "johnson"
+ end
+
+ if (!defined?(RUBY_ENGINE) || RUBY_ENGINE != "jruby")
+ s.add_development_dependency "mustang"
+ s.add_development_dependency "therubyracer"
+ else
+ s.add_development_dependency "therubyrhino"
+ end
s.authors = ["Sam Stephenson", "Josh Peek"]
s.email = ["sstephenson@gmail.com", "josh@joshpeek.com"]
Please sign in to comment.
Something went wrong with that request. Please try again.