Skip to content

Commit

Permalink
Merge pull request hotsh#813 from carols10cents/heroku-button
Browse files Browse the repository at this point in the history
Adds Heroku button for two-click, free deployment.

It's magic, as far as I can tell, but good magic. The kind that also makes unicorns possible and lets you walk on rainbows.
  • Loading branch information
wilkie committed Sep 29, 2014
2 parents 1034d2c + 6ce06ee commit 3bbaa10
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 46 deletions.
6 changes: 1 addition & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ group :assets do
gem 'coffee-rails', "~> 3.2.2"
gem 'uglifier', "~> 1.0.0"
gem 'jquery-ui-rails', "~> 2.0.0"

# Many Linux environments do not have a javascript environment which is
# required by the asset generators. However, windows and os x have one
# provided by the system.
gem "therubyracer", "~> 0.11.3" unless RUBY_PLATFORM.match(/darwin|mswin/)
gem "therubyracer", "~> 0.11.3"
end

gem "haml", "~> 3.1.4"
Expand Down
40 changes: 0 additions & 40 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -260,46 +260,6 @@ GEM
rake
rest-client (~> 1.6)
treetop (1.4.15)
polyglot
polyglot
polyglot
polyglot
polyglot
polyglot
polyglot
polyglot
polyglot
polyglot
polyglot
polyglot
polyglot
polyglot
polyglot
polyglot
polyglot
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
polyglot (>= 0.3.1)
twitter (5.11.0)
addressable (~> 2.3)
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@ everything you've put into rstat.us.

For heroku (free, $0):

Create an account on heroku.com and install their toolchain: https://toolbelt.heroku.com
Create an account on heroku.com. Then, either use this button:

[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)

or follow the manual steps here:

Install their toolchain: https://toolbelt.heroku.com

```
git clone https://github.com/hotsh/rstat.us
Expand Down
26 changes: 26 additions & 0 deletions app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"name": "Rstat.us",
"description": "The simple, open microblogging platform",
"keywords": [
"microblogging",
"social"
],
"website": "https://rstat.us/",
"repository": "https://github.com/hotsh/rstat.us",
"success_url": "/",
"env": {
"BUILDPACK_URL": "https://github.com/heroku/heroku-buildpack-ruby.git",
"SECRET_TOKEN": {
"description": "A secret key for verifying the integrity of signed cookies.",
"generator": "secret"
},
"WEB_CONCURRENCY": {
"description": "The number of processes to run.",
"value": "1"
}
},
"addons": [
"mongohq:sandbox",
"mandrill:starter"
]
}

0 comments on commit 3bbaa10

Please sign in to comment.