raygun 0.0.27 → 0.0.28

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.0.28 [2013-03-26]
+
+* Use unicorn by default instead of thin, as per heroku's recommendation.
+* Suppress schema dumping unless run in development mode to eliminate pg_dump errors on heroku during db:migrate.
+* Tweak mailcacher configuration so that it only sets smtp_settings when mailchacher is running.
+
 ## 0.0.27 [2013-02-27]
 
 * Make sure the target directory is empty, otherwise misfire.

data/README.md

@@ -75,11 +75,11 @@ covered (see above).
 
 ## Internal Mechanics
 
-Raygun simply copies the [app_prototype](app_prototype) tree and then runs a small set of commands to customize
-the copied project. So, what you get looks a lot like [app_prototype](app_prototype). Check out
+Raygun simply copies the [rails_32](rails_32) tree and then runs a small set of commands to customize
+the copied project. So, what you get looks a lot like [rails_32](rails_32). Check out
 [raygun](bin/raygun) to see how it's massaged after being copied.
 
-This approach is fast, simple, and makes raygun developement very easy. Make changes to [app_prototype](app_prototype),
+This approach is fast, simple, and makes raygun developement very easy. Make changes to [rails_32](rails_32),
 run its specs and fire up the server to see what happens.
 
 ## Contributing

data/bin/raygun

@@ -27,7 +27,7 @@ module Raygun
     def copy_prototype
       FileUtils.mkdir_p(app_dir)
 
-      Dir.glob(File.expand_path('../../app_prototype/*', __FILE__), File::FNM_DOTMATCH) do |f|
+      Dir.glob(File.expand_path("../../rails_32/*", __FILE__), File::FNM_DOTMATCH) do |f|
         next if %w{. ..}.include?(File.basename(f))
         FileUtils.cp_r(f, app_dir)
       end

data/cleanup.sh

@@ -3,11 +3,11 @@
 # All git ignored files: git ls-files --others -i --exclude-standard
 
 git clean -df
-git checkout app_prototype/config/routes.rb app_prototype/db/schema.rb
+git checkout rails_32/config/routes.rb app_prototype/db/schema.rb
 
 find . -name ".DS_Store" -exec rm -f {} \;
 
-rm -rfv app_prototype/.DS_Store
-rm -rfv app_prototype/log/*
-rm -rfv app_prototype/tmp/*
-rm -rfv app_prototype/coverage
+rm -rfv rails_32/.DS_Store
+rm -rfv rails_32/log/*
+rm -rfv rails_32/tmp/*
+rm -rfv rails_32/coverage

data/lib/raygun/version.rb

@@ -1,3 +1,3 @@
 module Raygun
-  VERSION = "0.0.27"
+  VERSION = "0.0.28"
 end

data/{app_prototype → rails_32}/.env

@@ -4,3 +4,5 @@
 # http://ddollar.github.com/foreman/#ENVIRONMENT
 
 PORT=3000
+UNICORN_WORKERS=3
+UNICORN_BACKLOG=16

data/{app_prototype → rails_32}/Gemfile

@@ -3,8 +3,8 @@ source 'https://rubygems.org'
 # Heroku uses the ruby version to configure your application's runtime.
 ruby '1.9.3'
 
-gem 'thin'
-gem 'rails', '~> 3.2.12'
+gem 'unicorn'
+gem 'rails', '~> 3.2.13'
 gem 'slim-rails'
 gem 'jquery-rails'
 gem 'sorcery'

data/rails_32/Procfile

@@ -0,0 +1,2 @@
+web:    bundle exec unicorn -c ./config/unicorn.rb
+#worker: bundle exec rake jobs:work

data/{app_prototype → rails_32}/Rakefile

@@ -6,5 +6,10 @@ require File.expand_path('../config/application', __FILE__)
 
 AppPrototype::Application.load_tasks
 
+# Disable schema.sql generation, unless we're in development.
+# http://stackoverflow.com/questions/12413306/error-when-doing-rake-dbmigrate-on-heroku
+Rake::Task['db:structure:dump'].clear unless Rails.env.development?
+
+# Spec is the default rake target.
 task(:default).clear
 task default: 'spec'

data/{app_prototype/config/initializers/email.rb → rails_32/config/initializers/mailcacher.rb}

@@ -5,9 +5,11 @@ mailcatcher_port = 1025
 begin
   sock = TCPSocket.new('localhost', mailcatcher_port)
   sock.close
-  catcher = true
+  mailcatcher = true
 rescue
-  catcher = false
+  mailcatcher = false
 end
 
-ActionMailer::Base.smtp_settings = (Rails.env.development? && catcher) ? { host: 'localhost', port: mailcatcher_port, } : {}
+if Rails.env.development? && mailcatcher
+  ActionMailer::Base.smtp_settings = { host: 'localhost', port: mailcatcher_port }
+end

data/rails_32/config/routes.rb

@@ -0,0 +1,21 @@
+AppPrototype::Application.routes.draw do
+
+  root to: 'pages#root'
+
+  match 'sign_in'  => 'user_sessions#new',     as: :sign_in
+  match 'sign_out' => 'user_sessions#destroy', as: :sign_out
+
+  resources :user_sessions, only: [:new, :create, :destroy]
+
+  match 'sign_up' => 'registrations#new',              via: :get,  as: :sign_up
+  match 'sign_up' => 'registrations#create',           via: :post, as: :sign_up
+  match 'activate/:token' => 'registrations#activate', via: :get,  as: :activation
+
+  match 'forgotten_password' => 'password_resets#new',     via: :get,  as: :forgotten_password
+  match 'forgotten_password' => 'password_resets#create',  via: :post, as: :forgotten_password
+  match 'reset_password/:token' => 'password_resets#edit', via: :get,  as: :reset_password
+  match 'reset_password/:id' => 'password_resets#update',  via: :put
+
+  resources :users
+
+end

data/rails_32/config/unicorn.rb

@@ -0,0 +1,27 @@
+# http://unicorn.bogomips.org/
+# https://blog.heroku.com/archives/2013/2/27/unicorn_rails
+# http://devblog.thinkthroughmath.com/blog/2013/02/27/managing-request-queuing-with-rails-on-heroku/
+
+listen           ENV['PORT'], backlog: Integer(ENV['UNICORN_BACKLOG'] || 16)
+worker_processes Integer(ENV['UNICORN_WORKERS'] || 3)
+timeout          30
+preload_app      true
+
+before_fork do |server, worker|
+  Signal.trap 'TERM' do
+    puts 'Unicorn master intercepting TERM and sending myself QUIT instead.'
+    Process.kill 'QUIT', Process.pid
+  end
+
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.connection.disconnect!
+end
+
+after_fork do |server, worker|
+  Signal.trap 'TERM' do
+    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT.'
+  end
+
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.establish_connection
+end

data/rails_32/db/schema.rb

@@ -0,0 +1,54 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20121128215337) do
+
+  create_table "authentications", :force => true do |t|
+    t.integer  "user_id",    :null => false
+    t.string   "provider",   :null => false
+    t.string   "uid",        :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "users", :force => true do |t|
+    t.string   "name"
+    t.string   "email"
+    t.string   "crypted_password"
+    t.string   "salt"
+    t.datetime "created_at",                                     :null => false
+    t.datetime "updated_at",                                     :null => false
+    t.integer  "failed_logins_count",             :default => 0
+    t.datetime "lock_expires_at"
+    t.string   "unlock_token"
+    t.datetime "last_login_at"
+    t.datetime "last_logout_at"
+    t.datetime "last_activity_at"
+    t.string   "activation_state"
+    t.string   "activation_token"
+    t.datetime "activation_token_expires_at"
+    t.string   "remember_me_token"
+    t.datetime "remember_me_token_expires_at"
+    t.string   "reset_password_token"
+    t.datetime "reset_password_token_expires_at"
+    t.datetime "reset_password_email_sent_at"
+    t.boolean  "admin"
+  end
+
+  add_index "users", ["activation_token"], :name => "index_users_on_activation_token"
+  add_index "users", ["email"], :name => "index_users_on_email", :unique => true
+  add_index "users", ["last_logout_at", "last_activity_at"], :name => "index_users_on_last_logout_at_and_last_activity_at"
+  add_index "users", ["remember_me_token"], :name => "index_users_on_remember_me_token"
+  add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token"
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies: []
 description: Carbon Five Rails application generator
 email:
@@ -30,138 +30,141 @@ files:
 - README.md
 - Rakefile
 - TODO.md
-- app_prototype/.env
-- app_prototype/.gitignore
-- app_prototype/.rspec
-- app_prototype/.ruby-version
-- app_prototype/.rvmrc
-- app_prototype/Gemfile
-- app_prototype/Guardfile
-- app_prototype/Procfile
-- app_prototype/README.md
-- app_prototype/Rakefile
-- app_prototype/app/assets/javascripts/application.js
-- app_prototype/app/assets/javascripts/users.js.coffee
-- app_prototype/app/assets/stylesheets/_footer.less
-- app_prototype/app/assets/stylesheets/_navbar.less
-- app_prototype/app/assets/stylesheets/application.css.less
-- app_prototype/app/controllers/application_controller.rb
-- app_prototype/app/controllers/pages_controller.rb
-- app_prototype/app/controllers/password_resets_controller.rb
-- app_prototype/app/controllers/registrations_controller.rb
-- app_prototype/app/controllers/user_sessions_controller.rb
-- app_prototype/app/controllers/users_controller.rb
-- app_prototype/app/helpers/application_helper.rb
-- app_prototype/app/helpers/users_helper.rb
-- app_prototype/app/mailers/.gitkeep
-- app_prototype/app/mailers/user_mailer.rb
-- app_prototype/app/models/.gitkeep
-- app_prototype/app/models/ability.rb
-- app_prototype/app/models/user.rb
-- app_prototype/app/models/user_session.rb
-- app_prototype/app/views/layouts/application.html.slim
-- app_prototype/app/views/pages/root.html.slim
-- app_prototype/app/views/password_resets/edit.html.slim
-- app_prototype/app/views/password_resets/new.html.slim
-- app_prototype/app/views/registrations/new.html.slim
-- app_prototype/app/views/user_mailer/activation_needed_email.html.erb
-- app_prototype/app/views/user_mailer/activation_needed_email.text.erb
-- app_prototype/app/views/user_mailer/activation_success_email.html.erb
-- app_prototype/app/views/user_mailer/activation_success_email.text.erb
-- app_prototype/app/views/user_mailer/reset_password_email.html.erb
-- app_prototype/app/views/user_mailer/reset_password_email.text.erb
-- app_prototype/app/views/user_sessions/new.html.slim
-- app_prototype/app/views/users/_form.html.slim
-- app_prototype/app/views/users/edit.html.slim
-- app_prototype/app/views/users/index.html.slim
-- app_prototype/app/views/users/new.html.slim
-- app_prototype/app/views/users/show.html.slim
-- app_prototype/config.ru
-- app_prototype/config/application.rb
-- app_prototype/config/boot.rb
-- app_prototype/config/database.yml
-- app_prototype/config/environment.rb
-- app_prototype/config/environments/acceptance.rb
-- app_prototype/config/environments/development.rb
-- app_prototype/config/environments/production.rb
-- app_prototype/config/environments/test.rb
-- app_prototype/config/initializers/backtrace_silencers.rb
-- app_prototype/config/initializers/email.rb
-- app_prototype/config/initializers/inflections.rb
-- app_prototype/config/initializers/mime_types.rb
-- app_prototype/config/initializers/secret_token.rb
-- app_prototype/config/initializers/session_store.rb
-- app_prototype/config/initializers/simple_form.rb
-- app_prototype/config/initializers/simple_form_bootstrap.rb
-- app_prototype/config/initializers/sorcery.rb
-- app_prototype/config/initializers/wrap_parameters.rb
-- app_prototype/config/locales/en.yml
-- app_prototype/config/locales/simple_form.en.yml
 - app_prototype/config/routes.rb
-- app_prototype/db/migrate/20121128215324_sorcery_core.rb
-- app_prototype/db/migrate/20121128215325_sorcery_brute_force_protection.rb
-- app_prototype/db/migrate/20121128215326_sorcery_activity_logging.rb
-- app_prototype/db/migrate/20121128215327_sorcery_user_activation.rb
-- app_prototype/db/migrate/20121128215328_sorcery_remember_me.rb
-- app_prototype/db/migrate/20121128215329_sorcery_reset_password.rb
-- app_prototype/db/migrate/20121128215330_sorcery_external.rb
-- app_prototype/db/migrate/20121128215337_add_admin_to_users.rb
-- app_prototype/db/sample_data.rb
 - app_prototype/db/schema.rb
-- app_prototype/db/seeds.rb
-- app_prototype/lib/assets/.gitkeep
-- app_prototype/lib/tasks/.gitkeep
-- app_prototype/lib/tasks/cane.rake
-- app_prototype/lib/tasks/coverage.rake
-- app_prototype/lib/tasks/db.rake
-- app_prototype/lib/tasks/spec.rake
-- app_prototype/lib/templates/rails/scaffold_controller/controller.rb
-- app_prototype/lib/templates/rspec/scaffold/controller_spec.rb
-- app_prototype/lib/templates/rspec/scaffold/edit_spec.rb
-- app_prototype/lib/templates/rspec/scaffold/index_spec.rb
-- app_prototype/lib/templates/rspec/scaffold/new_spec.rb
-- app_prototype/lib/templates/rspec/scaffold/show_spec.rb
-- app_prototype/lib/templates/slim/scaffold/_form.html.slim
-- app_prototype/lib/templates/slim/scaffold/edit.html.slim
-- app_prototype/lib/templates/slim/scaffold/index.html.slim
-- app_prototype/lib/templates/slim/scaffold/new.html.slim
-- app_prototype/lib/templates/slim/scaffold/show.html.slim
-- app_prototype/log/.gitkeep
-- app_prototype/public/404.html
-- app_prototype/public/422.html
-- app_prototype/public/500.html
-- app_prototype/public/favicon.ico
-- app_prototype/public/robots.txt
-- app_prototype/script/rails
-- app_prototype/spec/controllers/user_sessions_controller_spec.rb
-- app_prototype/spec/controllers/users_controller_spec.rb
-- app_prototype/spec/factories/users.rb
-- app_prototype/spec/features/activation_spec.rb
-- app_prototype/spec/features/password_reset_spec.rb
-- app_prototype/spec/features/registration_spec.rb
-- app_prototype/spec/features/sign_in_spec.rb
-- app_prototype/spec/javascripts/example_spec.js.coffee
-- app_prototype/spec/javascripts/spec.css
-- app_prototype/spec/javascripts/spec.js.coffee
-- app_prototype/spec/mailers/user_mailer_spec.rb
-- app_prototype/spec/models/ability_spec.rb
-- app_prototype/spec/models/user_spec.rb
-- app_prototype/spec/spec_helper.rb
-- app_prototype/spec/support/accept_values.rb
-- app_prototype/spec/support/factory_girl.rb
-- app_prototype/spec/support/sorcery.rb
-- app_prototype/spec/support/user_sessions_feature_helper.rb
-- app_prototype/spec/views/users/edit.html.slim_spec.rb
-- app_prototype/spec/views/users/index.html.slim_spec.rb
-- app_prototype/spec/views/users/new.html.slim_spec.rb
-- app_prototype/spec/views/users/show.html.slim_spec.rb
-- app_prototype/vendor/assets/javascripts/.gitkeep
-- app_prototype/vendor/assets/stylesheets/.gitkeep
-- app_prototype/vendor/plugins/.gitkeep
 - bin/raygun
 - cleanup.sh
 - lib/raygun/version.rb
 - marvin.jpg
+- rails_32/.env
+- rails_32/.gitignore
+- rails_32/.rspec
+- rails_32/.ruby-version
+- rails_32/.rvmrc
+- rails_32/Gemfile
+- rails_32/Guardfile
+- rails_32/Procfile
+- rails_32/README.md
+- rails_32/Rakefile
+- rails_32/app/assets/javascripts/application.js
+- rails_32/app/assets/javascripts/users.js.coffee
+- rails_32/app/assets/stylesheets/_footer.less
+- rails_32/app/assets/stylesheets/_navbar.less
+- rails_32/app/assets/stylesheets/application.css.less
+- rails_32/app/controllers/application_controller.rb
+- rails_32/app/controllers/pages_controller.rb
+- rails_32/app/controllers/password_resets_controller.rb
+- rails_32/app/controllers/registrations_controller.rb
+- rails_32/app/controllers/user_sessions_controller.rb
+- rails_32/app/controllers/users_controller.rb
+- rails_32/app/helpers/application_helper.rb
+- rails_32/app/helpers/users_helper.rb
+- rails_32/app/mailers/.gitkeep
+- rails_32/app/mailers/user_mailer.rb
+- rails_32/app/models/.gitkeep
+- rails_32/app/models/ability.rb
+- rails_32/app/models/user.rb
+- rails_32/app/models/user_session.rb
+- rails_32/app/views/layouts/application.html.slim
+- rails_32/app/views/pages/root.html.slim
+- rails_32/app/views/password_resets/edit.html.slim
+- rails_32/app/views/password_resets/new.html.slim
+- rails_32/app/views/registrations/new.html.slim
+- rails_32/app/views/user_mailer/activation_needed_email.html.erb
+- rails_32/app/views/user_mailer/activation_needed_email.text.erb
+- rails_32/app/views/user_mailer/activation_success_email.html.erb
+- rails_32/app/views/user_mailer/activation_success_email.text.erb
+- rails_32/app/views/user_mailer/reset_password_email.html.erb
+- rails_32/app/views/user_mailer/reset_password_email.text.erb
+- rails_32/app/views/user_sessions/new.html.slim
+- rails_32/app/views/users/_form.html.slim
+- rails_32/app/views/users/edit.html.slim
+- rails_32/app/views/users/index.html.slim
+- rails_32/app/views/users/new.html.slim
+- rails_32/app/views/users/show.html.slim
+- rails_32/config.ru
+- rails_32/config/application.rb
+- rails_32/config/boot.rb
+- rails_32/config/database.yml
+- rails_32/config/environment.rb
+- rails_32/config/environments/acceptance.rb
+- rails_32/config/environments/development.rb
+- rails_32/config/environments/production.rb
+- rails_32/config/environments/test.rb
+- rails_32/config/initializers/backtrace_silencers.rb
+- rails_32/config/initializers/inflections.rb
+- rails_32/config/initializers/mailcacher.rb
+- rails_32/config/initializers/mime_types.rb
+- rails_32/config/initializers/secret_token.rb
+- rails_32/config/initializers/session_store.rb
+- rails_32/config/initializers/simple_form.rb
+- rails_32/config/initializers/simple_form_bootstrap.rb
+- rails_32/config/initializers/sorcery.rb
+- rails_32/config/initializers/wrap_parameters.rb
+- rails_32/config/locales/en.yml
+- rails_32/config/locales/simple_form.en.yml
+- rails_32/config/routes.rb
+- rails_32/config/unicorn.rb
+- rails_32/db/migrate/20121128215324_sorcery_core.rb
+- rails_32/db/migrate/20121128215325_sorcery_brute_force_protection.rb
+- rails_32/db/migrate/20121128215326_sorcery_activity_logging.rb
+- rails_32/db/migrate/20121128215327_sorcery_user_activation.rb
+- rails_32/db/migrate/20121128215328_sorcery_remember_me.rb
+- rails_32/db/migrate/20121128215329_sorcery_reset_password.rb
+- rails_32/db/migrate/20121128215330_sorcery_external.rb
+- rails_32/db/migrate/20121128215337_add_admin_to_users.rb
+- rails_32/db/sample_data.rb
+- rails_32/db/schema.rb
+- rails_32/db/seeds.rb
+- rails_32/lib/assets/.gitkeep
+- rails_32/lib/tasks/.gitkeep
+- rails_32/lib/tasks/cane.rake
+- rails_32/lib/tasks/coverage.rake
+- rails_32/lib/tasks/db.rake
+- rails_32/lib/tasks/spec.rake
+- rails_32/lib/templates/rails/scaffold_controller/controller.rb
+- rails_32/lib/templates/rspec/scaffold/controller_spec.rb
+- rails_32/lib/templates/rspec/scaffold/edit_spec.rb
+- rails_32/lib/templates/rspec/scaffold/index_spec.rb
+- rails_32/lib/templates/rspec/scaffold/new_spec.rb
+- rails_32/lib/templates/rspec/scaffold/show_spec.rb
+- rails_32/lib/templates/slim/scaffold/_form.html.slim
+- rails_32/lib/templates/slim/scaffold/edit.html.slim
+- rails_32/lib/templates/slim/scaffold/index.html.slim
+- rails_32/lib/templates/slim/scaffold/new.html.slim
+- rails_32/lib/templates/slim/scaffold/show.html.slim
+- rails_32/log/.gitkeep
+- rails_32/public/404.html
+- rails_32/public/422.html
+- rails_32/public/500.html
+- rails_32/public/favicon.ico
+- rails_32/public/robots.txt
+- rails_32/script/rails
+- rails_32/spec/controllers/user_sessions_controller_spec.rb
+- rails_32/spec/controllers/users_controller_spec.rb
+- rails_32/spec/factories/users.rb
+- rails_32/spec/features/activation_spec.rb
+- rails_32/spec/features/password_reset_spec.rb
+- rails_32/spec/features/registration_spec.rb
+- rails_32/spec/features/sign_in_spec.rb
+- rails_32/spec/javascripts/example_spec.js.coffee
+- rails_32/spec/javascripts/spec.css
+- rails_32/spec/javascripts/spec.js.coffee
+- rails_32/spec/mailers/user_mailer_spec.rb
+- rails_32/spec/models/ability_spec.rb
+- rails_32/spec/models/user_spec.rb
+- rails_32/spec/spec_helper.rb
+- rails_32/spec/support/accept_values.rb
+- rails_32/spec/support/factory_girl.rb
+- rails_32/spec/support/sorcery.rb
+- rails_32/spec/support/user_sessions_feature_helper.rb
+- rails_32/spec/views/users/edit.html.slim_spec.rb
+- rails_32/spec/views/users/index.html.slim_spec.rb
+- rails_32/spec/views/users/new.html.slim_spec.rb
+- rails_32/spec/views/users/show.html.slim_spec.rb
+- rails_32/vendor/assets/javascripts/.gitkeep
+- rails_32/vendor/assets/stylesheets/.gitkeep
+- rails_32/vendor/plugins/.gitkeep
 - raygun.gemspec
 homepage: https://github.com/carbonfive/raygun
 licenses: []

data/app_prototype/Procfile

@@ -1,2 +0,0 @@
-web:    rails server -p $PORT
-#worker: bundle exec rake jobs:work