From 1a4c2ada5208d6544a8d5a6a4914ecbdcdd8f4cc Mon Sep 17 00:00:00 2001 From: Cesidio Di Landa Date: Fri, 19 Jul 2013 20:02:23 +0200 Subject: [PATCH 1/2] Updated CHANGELOG Bumped VERSION to 1.1.0 Support for Nitrous.IO --- CHANGELOG.md | 4 ++++ README.md | 24 ++++++++++++++++++++++++ VERSION | 2 +- config/database.yml | 18 ++++++++++-------- 4 files changed, 39 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b468de0..4cdb280 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +1.1.0 +----- +* Support for Nitrous.IO + 1.0.6 ----- * Updated gems diff --git a/README.md b/README.md index 405121d..e30f24d 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,27 @@ This is a starter web application based on the following technology stack: Starter App is deployable on [Heroku](http://www.heroku.com/). Demo: http://ruby2-rails4-bootstrap-heroku.herokuapp.com/ ```Gemfile``` also contains a set of useful gems for performance, security, api building... + +### Nitrous.IO + +Starter App supports online development on [Nitrous.IO](http://www.nitrous.io). + +You need: +* A Nitrous.IO box with **at least** 512MB of memory. +* Two "Dev Plan" heroku databases (one for development and one for test) +* The following environment variables on your Nitrous.IO box's `.bashrc`: + ```bash + export STARTER_APP_DEV_DB_DATABASE=YOUR_DEV_DB_DATABASE + export STARTER_APP_DEV_DB_USER=YOUR_DEV_DB_USER + export STARTER_APP_DEV_DB_PASSWORD=YOUR_DEV_DB_PASSWORD + export STARTER_APP_DEV_DB_HOST=YOUR_DEV_DB_HOST + export STARTER_APP_DEV_DB_PORT=YOUR_DEV_DB_PORT + + export STARTER_APP_TEST_DB_DATABASE=YOUR_TEST_DB_DATABASE + export STARTER_APP_TEST_DB_USER=YOUR_TEST_DB_USER + export STARTER_APP_TEST_DB_PASSWORD=YOUR_TEST_DB_PASSWORD + export STARTER_APP_TEST_DB_HOST=YOUR_TEST_DB_HOST + export STARTER_APP_TEST_DB_PORT=YOUR_TEST_DB_PORT + ``` + +A guide for creating heroku databases and edit `.bashrc` on Nitrous.IO is available here: http://help.nitrous.io/postgres/ diff --git a/VERSION b/VERSION index af0b7dd..9084fa2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.6 +1.1.0 diff --git a/config/database.yml b/config/database.yml index d058fd0..3ef9df2 100644 --- a/config/database.yml +++ b/config/database.yml @@ -17,19 +17,19 @@ development: adapter: postgresql encoding: unicode - database: starterapp_development + database: <%= ENV['STARTER_APP_DEV_DB_DATABASE'] || 'starterapp_development' %> pool: 5 - username: postgres - password: + username: <%= ENV['STARTER_APP_DEV_DB_USER'] || 'postgres' %> + password: <%= ENV['STARTER_APP_DEV_DB_PASSWORD'] %> # Connect on a TCP socket. Omitted by default since the client uses a # domain socket that doesn't need configuration. Windows does not have # domain sockets, so uncomment these lines. - #host: localhost + host: <%= ENV['STARTER_APP_DEV_DB_HOST'] || 'localhost' %> # The TCP port the server listens on. Defaults to 5432. # If your server runs on a different port number, change accordingly. - #port: 5432 + port: <%= ENV['STARTER_APP_DEV_DB_PORT'] || '5432' %> # Schema search path. The server defaults to $user,public #schema_search_path: myapp,sharedapp,public @@ -46,10 +46,12 @@ development: test: adapter: postgresql encoding: unicode - database: starterapp_test + database: <%= ENV['STARTER_APP_TEST_DB_DATABASE'] || 'starterapp_test' %> pool: 5 - username: postgres - password: + username: <%= ENV['STARTER_APP_TEST_DB_USER'] || 'postgres' %> + password: <%= ENV['STARTER_APP_TEST_DB_PASSWORD'] %> + host: <%= ENV['STARTER_APP_TEST_DB_HOST'] || 'localhost' %> + port: <%= ENV['STARTER_APP_TEST_DB_PORT'] || '5432' %> production: adapter: postgresql From 710b69802231f48f362688565e5b93b4cbbab61b Mon Sep 17 00:00:00 2001 From: Cesidio Di Landa Date: Fri, 19 Jul 2013 20:14:29 +0200 Subject: [PATCH 2/2] Updated gems Added .rspec to repository --- .gitignore | 1 - .rspec | 3 +++ Gemfile.lock | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 .rspec diff --git a/.gitignore b/.gitignore index f4c55e3..10daa69 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ Icon *.sassc .sass-cache capybara-*.html -.rspec .rvmrc /.bundle /vendor/bundle diff --git a/.rspec b/.rspec new file mode 100644 index 0000000..343805a --- /dev/null +++ b/.rspec @@ -0,0 +1,3 @@ +--color +--format documentation +--drb diff --git a/Gemfile.lock b/Gemfile.lock index 3ce9b74..efc8014 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,7 @@ GEM rest-client simplecov (>= 0.7) thor - crack (0.4.0) + crack (0.4.1) safe_yaml (~> 0.9.0) database_cleaner (1.0.1) debug_inspector (0.0.2)