From 031c712b48c78e1ce7b5cf067aabec538e19c8b6 Mon Sep 17 00:00:00 2001
From: William Wedler <wwedler@riseup.net>
Date: Sat, 6 Sep 2014 12:37:48 -0400
Subject: [PATCH 1/3] remove config/database.yml from repo since .gitignore
 does not ignore files already in the repo

---
 config/database.yml | 59 ---------------------------------------------
 1 file changed, 59 deletions(-)
 delete mode 100644 config/database.yml

diff --git a/config/database.yml b/config/database.yml
deleted file mode 100644
index 9d6ec7b..0000000
--- a/config/database.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-# PostgreSQL. Versions 8.2 and up are supported.
-#
-# Install the pg driver:
-#   gem install pg
-# On OS X with Homebrew:
-#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On OS X with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-#   gem install pg
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem 'pg'
-#
-development:
-  adapter: postgresql
-  encoding: unicode
-  database: bike_bike_dev
-  username: dylan
-  password: godwin
-  host: 127.0.0.1
-  port: 5432
-  pool: 5
-
-
-  # Minimum log levels, in increasing order:
-  #   debug5, debug4, debug3, debug2, debug1,
-  #   log, notice, warning, error, fatal, and panic
-  # Defaults to warning.
-  #min_messages: notice
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test: &test
-  adapter: postgresql
-  encoding: unicode
-  database: bike_bike_test
-  username: dylan
-  password: godwin
-  host: 127.0.0.1
-  port: 5432
-  pool: 5
-
-production:
-  adapter: postgresql
-  encoding: unicode
-  database: bike_bike
-  username: dylan
-  password: godwin
-  host: 127.0.0.1
-  port: 5432
-  pool: 5
-
-cucumber:
-  <<: *test
-

From 168d5d44e3c2aa86995c9a8c0840b91fecffc7a8 Mon Sep 17 00:00:00 2001
From: William Wedler <wwedler@riseup.net>
Date: Sat, 6 Sep 2014 12:39:10 -0400
Subject: [PATCH 2/3] db config for travis

---
 .travis.yml                | 1 +
 config/database.yml.travis | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 config/database.yml.travis

diff --git a/.travis.yml b/.travis.yml
index a28da33..da7aeb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,5 @@ before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 before_script:
+  - cp config/database.yml.travis config/database.yml
   - psql -c 'create database bike_bike_test;' -U postgres
diff --git a/config/database.yml.travis b/config/database.yml.travis
new file mode 100644
index 0000000..3e617ba
--- /dev/null
+++ b/config/database.yml.travis
@@ -0,0 +1,5 @@
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: travis_ci_test
+  username: postgres

From f4deeab7e88d641ec5868ee513e10c086e26618b Mon Sep 17 00:00:00 2001
From: William Wedler <wwedler@riseup.net>
Date: Sat, 6 Sep 2014 12:52:34 -0400
Subject: [PATCH 3/3] create the correct DB name for travis to match name in
 database.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index da7aeb5..d422fd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,4 +6,4 @@ before_install:
   - "sh -e /etc/init.d/xvfb start"
 before_script:
   - cp config/database.yml.travis config/database.yml
-  - psql -c 'create database bike_bike_test;' -U postgres
+  - psql -c 'create database travis_ci_test;' -U postgres