Skip to content

Commit

Permalink
Add Travis CI support
Browse files Browse the repository at this point in the history
 - ./bin/bootstrap changed to use a string comparison as it
   seems that the `test` provided by Linux is more strict
   than Mac OS X
 - Gemfile changed to use public git:// urls
 - configuration in .travis.yml
  • Loading branch information
prognostikos committed Nov 15, 2012
1 parent b086fa3 commit e2af834
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 22 deletions.
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
language: ruby

rvm:
- 1.9.3

script:
- cp config/database-example.yml config/database.yml
- ./bin/bootstrap
- bundle exec rake db:test:prepare VERBOSE=false
- bundle exec rspec --backtrace --fail-fast --order random spec
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ gem 'omniauth-facebook', '~> 1.2.0'
gem 'omniauth-contrib', '~> 1.0.0', :git => 'git://github.com/intridea/omniauth-contrib.git'
gem 'omniauth-oauth', '~> 1.0.0', :git => 'git://github.com/intridea/omniauth-oauth.git'
gem 'omniauth-origo', '~> 1.0.0.rc3', :git => 'git://github.com/bengler/omniauth-origo.git'
gem 'omniauth-vanilla', :git => 'git@github.com:bengler/omniauth-vanilla.git'
gem 'omniauth-vanilla', :git => 'git://github.com/bengler/omniauth-vanilla.git'
gem 'omniauth-google-oauth2', '~> 0.1.10'
gem 'pebblebed'
gem 'pebbles-uid'
gem 'pebbles-cors', :git => 'git@github.com:bengler/pebbles-cors.git'
gem 'pebbles-cors', :git => 'git://github.com/bengler/pebbles-cors.git'
gem 'yajl-ruby', :require => 'yajl'
gem 'dalli', '~> 2.1.0'
gem 'thor'
Expand Down
38 changes: 19 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,25 @@ GIT
omniauth (>= 1.0.0)
omniauth-oauth2 (>= 1.0.0)

GIT
remote: git://github.com/bengler/omniauth-vanilla.git
revision: cad8db780a3391253d8369ba0c2b6b207582e4da
specs:
omniauth-vanilla (0.0.7)
multi_json
oauth
omniauth (>= 1.0.0)
omniauth-oauth2 (>= 1.0.0)

GIT
remote: git://github.com/bengler/pebbles-cors.git
revision: d51dc16e96bb7534da7e4dae2e311c8a31b7429a
specs:
pebbles-cors (0.0.1)
dalli
pebblebed
rack

GIT
remote: git://github.com/intridea/omniauth-contrib.git
revision: 027be2e65077eaa123992d64cff0190f634394e8
Expand Down Expand Up @@ -51,25 +70,6 @@ GIT
rack-protection (1.2.0)
rack

GIT
remote: [email protected]:bengler/omniauth-vanilla.git
revision: cad8db780a3391253d8369ba0c2b6b207582e4da
specs:
omniauth-vanilla (0.0.7)
multi_json
oauth
omniauth (>= 1.0.0)
omniauth-oauth2 (>= 1.0.0)

GIT
remote: [email protected]:bengler/pebbles-cors.git
revision: 6672a5b23d2b283e3feebf6de4a9b991dd0b262a
specs:
pebbles-cors (0.0.1)
dalli
pebblebed
rack

GEM
remote: http://rubygems.org/
specs:
Expand Down
2 changes: 1 addition & 1 deletion bin/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ postgresql_requirements() {
postgresql_setup() {

EXISTS=`psql postgres -tAc "SELECT 1 FROM pg_roles WHERE rolname='$NAME'"`
if [ $EXISTS -eq 1 ]
if [[ $EXISTS == 1 ]]
then
echo " (x) $NAME user"
echo
Expand Down

0 comments on commit e2af834

Please sign in to comment.