Skip to content

Commit

Permalink
travis doesn't support 1.9.1
Browse files Browse the repository at this point in the history
workaround for jbarnette/johnson#21
workaround for nu7hatch/mustang#18
fix for ruby 1.8 (Disabled)
  • Loading branch information
stereobooster committed May 15, 2012
1 parent 457c4f2 commit 9bf032c
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 12 deletions.
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 13 additions & 7 deletions execjs.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ["[email protected]", "[email protected]"]
Expand Down

0 comments on commit 9bf032c

Please sign in to comment.