Removed the database configuration file and moved to one sample

Rafael Manzo
1 parent 5dd4474c
Showing 4 changed files with 31 additions and 28 deletions Show diff stats
.gitignore
.travis.yml
config/database.yml
config/database.yml.sample
@@ -16,3 +16,5 @@
 /tmp
 coverage
+
+database.yml
@@ -3,6 +3,7 @@ rvm:
   - 2.0.0-p247
 before_script:
+  - "cp config/database.yml.sample config/database.yml"
   - "rake db:migrate RAILS_ENV=test"
 notifications:
@@ -1,28 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-# 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: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
-
-cucumber:
-  <<: *test
 \ No newline at end of file
@@ -0,0 +1,28 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# 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: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000
+
+cucumber:
+  <<: *test
 \ No newline at end of file
	@@ -16,3 +16,5 @@		@@ -16,3 +16,5 @@
16	/tmp	16	/tmp
17		17
18	coverage	18	coverage
		19	+
		20	+database.yml
	@@ -3,6 +3,7 @@ rvm:		@@ -3,6 +3,7 @@ rvm:
3	- 2.0.0-p247	3	- 2.0.0-p247
4		4
5	before_script:	5	before_script:
		6	+ - "cp config/database.yml.sample config/database.yml"
6	- "rake db:migrate RAILS_ENV=test"	7	- "rake db:migrate RAILS_ENV=test"
7		8
8	notifications:	9	notifications:
	@@ -1,28 +0,0 @@		@@ -1,28 +0,0 @@
1	-# SQLite version 3.x
2	-# gem install sqlite3
3	-#
4	-# Ensure the SQLite 3 gem is defined in your Gemfile
5	-# gem 'sqlite3'
6	-development:
7	- adapter: sqlite3
8	- database: db/development.sqlite3
9	- pool: 5
10	- timeout: 5000
11	-
12	-# Warning: The database defined as "test" will be erased and
13	-# re-generated from your development database when you run "rake".
14	-# Do not set this db to the same as development or production.
15	-test: &test
16	- adapter: sqlite3
17	- database: db/test.sqlite3
18	- pool: 5
19	- timeout: 5000
20	-
21	-production:
22	- adapter: sqlite3
23	- database: db/production.sqlite3
24	- pool: 5
25	- timeout: 5000
26	-
27	-cucumber:
28	- <<: *test
29	\ No newline at end of file	0	\ No newline at end of file
	@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
		1	+# SQLite version 3.x
		2	+# gem install sqlite3
		3	+#
		4	+# Ensure the SQLite 3 gem is defined in your Gemfile
		5	+# gem 'sqlite3'
		6	+development:
		7	+ adapter: sqlite3
		8	+ database: db/development.sqlite3
		9	+ pool: 5
		10	+ timeout: 5000
		11	+
		12	+# Warning: The database defined as "test" will be erased and
		13	+# re-generated from your development database when you run "rake".
		14	+# Do not set this db to the same as development or production.
		15	+test: &test
		16	+ adapter: sqlite3
		17	+ database: db/test.sqlite3
		18	+ pool: 5
		19	+ timeout: 5000
		20	+
		21	+production:
		22	+ adapter: sqlite3
		23	+ database: db/production.sqlite3
		24	+ pool: 5
		25	+ timeout: 5000
		26	+
		27	+cucumber:
		28	+ <<: *test
0	\ No newline at end of file	29	\ No newline at end of file