README.md in jumpup-heroku-0.0.4 vs README.md in jumpup-heroku-0.0.5

- old
+ new

@@ -22,43 +22,10 @@ Jumpup::Heroku.configure do |config| config.app = 'myapp' end if Rails.env.development? ``` - If you use [Heroku Accounts](https://github.com/ddollar/heroku-accounts) - - ```ruby - # config/initializers/jumpup-heroku.rb - Jumpup::Heroku.configure do |config| - config.account(:name_of_account1) do |account1| - account1.app = 'myapp1' - end - config.account(:name_of_account2) do |account2| - account2.app = 'myapp2' - account2.run_database_tasks = false # Default: true - end - end if Rails.env.development? - ``` - - Have production and staging app? Do like this: - - ```ruby - Jumpup::Heroku.configure do |config| - config.staging_app = 'myapp-staging' - config.production_app = 'myapp' - end if Rails.env.development? - ``` - - If you need to disable remote database tasks (backup, migrate and seed): - - ```ruby - Jumpup::Heroku.configure do |config| - config.app = 'myapp' - config.run_database_tasks = false # Default: true - end if Rails.env.development? - ``` - 2. Add to the tasks on jumpup.rake the tasks to deploy on Heroku: ```ruby # lib/tasks/jumpup.rake @@ -72,14 +39,77 @@ jumpup:finish jumpup:heroku:finish ) ``` +### Production and staging apps + +Have production and staging app? Do like this: + +```ruby +Jumpup::Heroku.configure do |config| + config.staging_app = 'myapp-staging' + config.production_app = 'myapp' +end if Rails.env.development? +``` +The branch send to staging app is `master` and the branch send to production is the `production`. + +### Using heroku accounts + +If you use [Heroku Accounts](https://github.com/ddollar/heroku-accounts) + +```ruby +# config/initializers/jumpup-heroku.rb +Jumpup::Heroku.configure do |config| + + config.account(:name_of_account1) do |account1| + account1.app = 'myapp1' + end + + config.account(:name_of_account2) do |account2| + account2.app = 'myapp2' + account2.run_database_tasks = false # Default: true + end +end if Rails.env.development? +``` + +### Database tasks + +If you need to disable remote database tasks (backup, migrate and seed): + +```ruby +Jumpup::Heroku.configure do |config| +config.app = 'myapp' +config.run_database_tasks = false # Default: true +end if Rails.env.development? +``` + ### Deploy to production +#### When I have a single app + Run ```rake jumpup:heroku:deploy:production``` or as an alias ```rake integrate:production``` +#### When I have staging and production apps + +We have the following config + +| Branch | App Environment | +| ------------- |-----------------| +| master | staging | +| production | production | + +So to send to production we need to + +```bash +$ git checkout production +$ git merge master +$ git push -u origin production +``` + +And send to Heroku with ```rake jumpup:heroku:deploy:production``` or as an alias ```rake integrate:production``` + ## Versioning Jumpup-heroku follow the [Semantic Versioning](http://semver.org/). ## Issues @@ -87,9 +117,13 @@ If you have problems, please create a [Github Issue](https://github.com/Helabs/jumpup-heroku/issues). ## Contributing Please see [CONTRIBUTING.md](https://github.com/Helabs/jumpup-heroku/blob/master/CONTRIBUTING.md) for details. + +## Maintainers + +- [Thiago Belem](https://github.com/TiuTalk) ## Release Follow this steps to release a new version of the gem.