diff options
| -rw-r--r-- | Gemfile | 8 | ||||
| -rw-r--r-- | Gemfile.lock | 9 | ||||
| -rw-r--r-- | Procfile | 2 | ||||
| -rwxr-xr-x | bin/puma | 16 | ||||
| -rwxr-xr-x | bin/pumactl | 16 |
5 files changed, 48 insertions, 3 deletions
@@ -1,10 +1,8 @@ source 'https://rubygems.org' - +ruby "2.2.1" # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.1' -# Use sqlite3 as the database for Active Record -gem 'sqlite3' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets @@ -23,6 +21,8 @@ gem 'jbuilder', '~> 2.0' # bundle exec rake doc:rails generates the API under doc/api. gem 'sdoc', '~> 0.4.0', group: :doc gem 'scale' +gem 'rails_12factor', group: :production +gem 'puma' # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' @@ -42,5 +42,7 @@ group :development, :test do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' + # Use sqlite3 as the database for Active Record + gem 'sqlite3' end diff --git a/Gemfile.lock b/Gemfile.lock index 41b7a83..c021c8e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,6 +85,8 @@ GEM multi_json (1.11.0) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) + puma (2.11.1) + rack (>= 1.1, < 2.0) rack (1.6.0) rack-test (0.6.3) rack (>= 1.0) @@ -107,6 +109,11 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.2) loofah (~> 2.0) + rails_12factor (0.0.3) + rails_serve_static_assets + rails_stdout_logging + rails_serve_static_assets (0.0.4) + rails_stdout_logging (0.0.3) railties (4.2.1) actionpack (= 4.2.1) activesupport (= 4.2.1) @@ -167,7 +174,9 @@ DEPENDENCIES coffee-rails (~> 4.1.0) jbuilder (~> 2.0) jquery-rails + puma rails (= 4.2.1) + rails_12factor sass-rails (~> 5.0) scale sdoc (~> 0.4.0) diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..a8be967 --- /dev/null +++ b/Procfile @@ -0,0 +1,2 @@ +web: bundle exec puma -t 5:5 -p ${PORT:-3000} -e ${RACK_ENV:-development} + diff --git a/bin/puma b/bin/puma new file mode 100755 index 0000000..d24478b --- /dev/null +++ b/bin/puma @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# +# This file was generated by Bundler. +# +# The application 'puma' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require 'pathname' +ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('puma', 'puma') diff --git a/bin/pumactl b/bin/pumactl new file mode 100755 index 0000000..f3f7b2b --- /dev/null +++ b/bin/pumactl @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# +# This file was generated by Bundler. +# +# The application 'pumactl' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require 'pathname' +ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('puma', 'pumactl') |