I seriously think that this commit is going to fix CI. SRSLY.

This commit is contained in:
Raphael Sofaer 2011-06-29 15:34:45 -07:00
parent daf52eb21f
commit 3887144db6
5 changed files with 8 additions and 85 deletions

View file

@ -102,6 +102,7 @@ group :test do
gem 'database_cleaner', '0.6.0'
gem 'webmock', :require => false
gem 'mongrel', :require => false, :platforms => :ruby_18
gem 'sqlite3', :require => false
gem 'rspec-instafail', '>= 0.1.7', :require => false
gem 'fuubar'

View file

@ -399,6 +399,7 @@ GEM
sinatra (1.2.6)
rack (~> 1.1)
tilt (< 2.0, >= 1.2.2)
sqlite3 (1.3.3)
subexec (0.0.4)
systemu (2.2.0)
term-ansicolor (1.0.5)
@ -497,6 +498,7 @@ DEPENDENCIES
selenium-webdriver (= 0.2.2)
settingslogic (= 2.0.6)
sod!
sqlite3
thin (= 1.2.11)
twitter (= 1.5.0)
typhoeus

View file

@ -59,8 +59,7 @@ class Chubbies
def self.run
@pid = fork do
ensure_bundled
Process.exec "cd #{Rails.root}/spec/chubbies/ && BUNDLE_GEMFILE=Gemfile bundle exec rackup -p #{PORT} 2> /dev/null 1> /dev/null"
Process.exec "cd #{Rails.root}/spec/chubbies/ && bundle exec rackup -p #{PORT} #{nullify}"
end
at_exit do
@ -76,13 +75,8 @@ class Chubbies
`kill -9 #{get_pid}`
end
def self.ensure_bundled
if !(@bundled)
Bundler.with_clean_env do
`cd #{Rails.root}/spec/chubbies/ && BUNDLE_GEMFILE=Gemfile bundle install`#2> /dev/null 1> /dev/null`
end
@bundled = true
end
def self.nullify
ENV["CI"] ? '' : "2> /dev/null 1> /dev/null"
end
def self.ensure_killed

View file

@ -1,12 +0,0 @@
source 'http://rubygems.org'
gem 'sinatra'
gem 'haml'
gem 'json'
gem 'sqlite3'
gem 'activerecord', '3.0.3'
gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git'
gem 'jwt', :git => "git://github.com/zhitomirskiyi/ruby-jwt.git"

1
spec/chubbies/Gemfile Symbolic link
View file

@ -0,0 +1 @@
./../../Gemfile

View file

@ -1,64 +0,0 @@
GIT
remote: git://github.com/diaspora/diaspora-client.git
revision: cf3bc4ad714c57cc159dd253413363dd5829f4bb
specs:
diaspora-client (0.0.0)
activerecord
faraday
jwt (>= 0.1.3)
oauth2
sinatra
GIT
remote: git://github.com/zhitomirskiyi/ruby-jwt.git
revision: fa7f46b5ac3653e30cf60abc78de9ffb3319dc0c
specs:
jwt (0.1.3)
json (>= 1.2.4)
GEM
specs:
activemodel (3.0.3)
activesupport (= 3.0.3)
builder (~> 2.1.2)
i18n (~> 0.4)
activerecord (3.0.3)
activemodel (= 3.0.3)
activesupport (= 3.0.3)
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
activesupport (3.0.3)
addressable (2.2.6)
arel (2.0.10)
builder (2.1.2)
faraday (0.6.1)
addressable (~> 2.2.4)
multipart-post (~> 1.1.0)
rack (>= 1.1.0, < 2)
haml (3.1.2)
i18n (0.6.0)
json (1.4.6)
multi_json (1.0.3)
multipart-post (1.1.2)
oauth2 (0.4.1)
faraday (~> 0.6.1)
multi_json (>= 0.0.5)
rack (1.3.0)
sinatra (1.2.6)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
sqlite3 (1.3.3)
tilt (1.3.2)
tzinfo (0.3.28)
PLATFORMS
ruby
DEPENDENCIES
activerecord (= 3.0.3)
diaspora-client!
haml
json
jwt!
sinatra
sqlite3

1
spec/chubbies/Gemfile.lock Symbolic link
View file

@ -0,0 +1 @@
./../../Gemfile.lock