From a7d716da69eda5368cd8e50d81a1e21587021d19 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Fri, 11 Oct 2013 10:43:32 +0200
Subject: [PATCH] Travis CI configuration

---
 .travis.yml                                   | 13 ++---
 ...edmine20_install.sh => redmine_install.sh} | 58 +++++++++----------
 2 files changed, 34 insertions(+), 37 deletions(-)
 rename test/ci/{redmine20_install.sh => redmine_install.sh} (59%)

diff --git a/.travis.yml b/.travis.yml
index c918f2bc..f357a3cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,6 @@
 language: ruby
 
-rvm:
-  - 1.8.7
-  - jruby-18mode
-  - 1.9.2
+rvm:  
   - 1.9.3
   - 2.0.0
   
@@ -16,7 +13,7 @@ script:
   - export PATH_TO_REDMINE=$WORKSPACE/redmine
   - mkdir $WORKSPACE
   - cp config/database.yml.travis $WORKSPACE/database.yml
-  - bash -x ./test/ci/redmine20_install.sh -r
-  - bash -x ./test/ci/redmine20_install.sh -i
-  - bash -x ./test/ci/redmine20_install.sh -t
-  - bash -x ./test/ci/redmine20_install.sh -u
+  - bash -x ./test/ci/redmine_install.sh -r
+  - bash -x ./test/ci/redmine_install.sh -i
+  - bash -x ./test/ci/redmine_install.sh -t
+  - bash -x ./test/ci/redmine_install.sh -u
diff --git a/test/ci/redmine20_install.sh b/test/ci/redmine_install.sh
similarity index 59%
rename from test/ci/redmine20_install.sh
rename to test/ci/redmine_install.sh
index b84b0162..14873c2f 100644
--- a/test/ci/redmine20_install.sh
+++ b/test/ci/redmine_install.sh
@@ -61,49 +61,49 @@ uninstall()
   cd $PATH_TO_REDMINE
   # clean up database
   bundle exec rake $MIGRATE_PLUGINS NAME=redmine_dmsf VERSION=0 RAILS_ENV=test
-bundle exec rake $MIGRATE_PLUGINS NAME=redmine_dmsf VERSION=0 RAILS_ENV=development
+  bundle exec rake $MIGRATE_PLUGINS NAME=redmine_dmsf VERSION=0 RAILS_ENV=development
 }
 
 run_install()
 {
-# exit if install fails
-set -e
+  # exit if install fails
+  set -e
 
-# cd to redmine folder
-cd $PATH_TO_REDMINE
-echo current directory is `pwd`
+  # cd to redmine folder
+  cd $PATH_TO_REDMINE
+  echo current directory is `pwd`
 
-# create a link to the dmsf plugin
-ln -sf $PATH_TO_DMSF $PATH_TO_PLUGINS/redmine_dmsf
+  # create a link to the dmsf plugin
+  ln -sf $PATH_TO_DMSF $PATH_TO_PLUGINS/redmine_dmsf
 
-#ignore redmine-master's test-unit dependency, we need 1.2.3
-#sed -i -e 's=.*gem ["'\'']test-unit["'\''].*==g' ${PATH_TO_REDMINE}/Gemfile
-# install gems
-mkdir -p vendor/bundle
+  #ignore redmine-master's test-unit dependency, we need 1.2.3
+  #sed -i -e 's=.*gem ["'\'']test-unit["'\''].*==g' ${PATH_TO_REDMINE}/Gemfile
+  # install gems
+  mkdir -p vendor/bundle
 
-# copy database.yml
-cp $WORKSPACE/database.yml config/
+  # copy database.yml
+  cp $WORKSPACE/database.yml config/
 
-#Not ideal, but at present Travis-CI will not install with xapian enabled.
-#02-04-2013 bundle install needs to happen AFTER database configuration
-bundle install --path vendor/bundle --without xapian
+  #Not ideal, but at present Travis-CI will not install with xapian enabled.
+  #02-04-2013 bundle install needs to happen AFTER database configuration
+  bundle install --path vendor/bundle --without xapian
 
-# run redmine database migrations
-bundle exec rake db:migrate RAILS_ENV=test --trace
-bundle exec rake db:migrate RAILS_ENV=development --trace
+  # run redmine database migrations
+  bundle exec rake db:migrate RAILS_ENV=test --trace
+  bundle exec rake db:migrate RAILS_ENV=development --trace
 
-# install redmine database
-bundle exec rake redmine:load_default_data REDMINE_LANG=en RAILS_ENV=development
+  # install redmine database
+  bundle exec rake redmine:load_default_data REDMINE_LANG=en RAILS_ENV=development
 
-# generate session store/secret token
-bundle exec rake $GENERATE_SECRET
+  # generate session store/secret token
+  bundle exec rake $GENERATE_SECRET
 
-# enable development features
-touch dmsf.dev
+  # enable development features
+  touch dmsf.dev
 
-# run dmsf database migrations
-bundle exec rake $MIGRATE_PLUGINS RAILS_ENV=test
-bundle exec rake $MIGRATE_PLUGINS RAILS_ENV=development
+  # run dmsf database migrations
+  bundle exec rake $MIGRATE_PLUGINS RAILS_ENV=test
+  bundle exec rake $MIGRATE_PLUGINS RAILS_ENV=development
 }
 
 while getopts :irtu opt