From 648ed63a20c839739b120df1d9799751e2552959 Mon Sep 17 00:00:00 2001 From: Elle Yoko Suzuki Date: Sun, 27 Jan 2013 22:14:54 -0800 Subject: [PATCH] set up heroku + 'about' --- .gitignore | 3 +++ Gemfile | 1 + Gemfile.lock | 6 ++++++ Procfile | 1 + theweb.rb | 4 ++++ views/about.erb | 7 +++++++ views/layout.erb | 2 +- 7 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 Procfile create mode 100644 views/about.erb diff --git a/.gitignore b/.gitignore index 61a293a..423cba2 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ doc/ config/database.yml TODO + +.DS_Store +.idea diff --git a/Gemfile b/Gemfile index 416fe44..03faf66 100644 --- a/Gemfile +++ b/Gemfile @@ -4,3 +4,4 @@ gem 'rake' gem 'activesupport' gem 'sinatra' gem 'sinatra-contrib' +gem 'thin' diff --git a/Gemfile.lock b/Gemfile.lock index 3d79568..0a4a670 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,6 +5,7 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) backports (2.5.3) + daemons (1.1.8) eventmachine (0.12.10) i18n (0.6.0) multi_json (1.3.5) @@ -25,6 +26,10 @@ GEM rack-test sinatra (~> 1.3.0) tilt (~> 1.3) + thin (1.3.1) + daemons (>= 1.0.9) + eventmachine (>= 0.12.6) + rack (>= 1.0.0) tilt (1.3.3) PLATFORMS @@ -35,3 +40,4 @@ DEPENDENCIES rake sinatra sinatra-contrib + thin diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..6d12873 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: bundle exec ruby theweb.rb -p $PORT \ No newline at end of file diff --git a/theweb.rb b/theweb.rb index a531ce4..fe5304d 100644 --- a/theweb.rb +++ b/theweb.rb @@ -16,3 +16,7 @@ @the_number = rand(number_as_string) erb :number end + +get '/about' do + erb :about +end diff --git a/views/about.erb b/views/about.erb new file mode 100644 index 0000000..4514f26 --- /dev/null +++ b/views/about.erb @@ -0,0 +1,7 @@ +

About Me

+ +

+ Web programmer by day,
+ Knitter by night,
+ Motorcyclist elsewhere in between +

\ No newline at end of file diff --git a/views/layout.erb b/views/layout.erb index 8797f75..ff7313a 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -46,7 +46,7 @@