Permalink
Browse files

Get travis build to pass, exclude rubinius for now

  • Loading branch information...
gcao committed Jul 5, 2012
1 parent db7dc1e commit 35bc103ad61334bb552ce1dbbb62d33230ab80a0
Showing with 15 additions and 22 deletions.
  1. +1 −0 .gitignore
  2. +1 −3 .travis.yml
  3. +1 −1 Gemfile
  4. +11 −11 Gemfile.lock
  5. +0 −7 Gemfile.travis
  6. +1 −0 spec/spec_helper.rb
View
@@ -51,3 +51,4 @@ pkg
# For rubinius:
#*.rbc
+.rbx
View
@@ -5,9 +5,7 @@ rvm:
- 1.9.3
- jruby-18mode # JRuby in 1.8 mode
- jruby-19mode # JRuby in 1.9 mode
- - rbx-18mode
- - rbx-19mode
# uncomment this line if your project needs to run something other than `rake`:
script: bundle exec rspec spec
-gemfile: Gemfile.travis
+#gemfile: Gemfile.travis
View
@@ -4,7 +4,7 @@ group :development do
gem "rspec"
gem "jeweler", "~> 1.6.4"
- gem 'ruby-prof'
+ gem 'ruby-prof', :platforms => [:mri]
gem "guard", "~> 0.8.4"
gem "guard-bundler", "~> 0.1.3"
View
@@ -2,7 +2,7 @@ GEM
remote: http://rubygems.org/
specs:
awesome_print (1.0.2)
- coderay (1.0.5)
+ coderay (1.0.7)
diff-lcs (1.1.3)
git (1.2.5)
growl (1.0.3)
@@ -20,21 +20,21 @@ GEM
git (>= 1.2.5)
rake
method_source (0.7.1)
- pry (0.9.8.4)
+ pry (0.9.9.6)
coderay (~> 1.0.5)
method_source (~> 0.7.1)
slop (>= 2.4.4, < 3)
rake (0.9.2.2)
rb-fsevent (0.4.3.1)
- rspec (2.8.0)
- rspec-core (~> 2.8.0)
- rspec-expectations (~> 2.8.0)
- rspec-mocks (~> 2.8.0)
- rspec-core (2.8.0)
- rspec-expectations (2.8.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.8.0)
- ruby-prof (0.10.8)
+ rspec (2.10.0)
+ rspec-core (~> 2.10.0)
+ rspec-expectations (~> 2.10.0)
+ rspec-mocks (~> 2.10.0)
+ rspec-core (2.10.1)
+ rspec-expectations (2.10.0)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.10.1)
+ ruby-prof (0.11.2)
slop (2.4.4)
thor (0.14.6)
View
@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-group :development do
- gem "rspec"
- gem "jeweler", "~> 1.6.4"
-end
-
View
@@ -2,6 +2,7 @@
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rubygems'
require 'rspec'
require 'rspec/autorun'
require 'aspector'

0 comments on commit 35bc103

Please sign in to comment.