From 79d9cd3c5e3764db9d3506e1702042a7a7a4aea3 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 2 Jul 2017 21:39:57 -0400 Subject: Set up Capistrano --- .gitignore | 1 + Capfile | 19 +++++++ Gemfile | 11 ++-- Gemfile.lock | 31 +++++++++++ config/database.yml | 25 --------- config/deploy.rb | 43 +++++++++++++++ config/deploy/production.rb | 62 ++++++++++++++++++++++ config/deploy/staging.rb | 61 +++++++++++++++++++++ config/initializers/mysql_utf8mb4_fix.rb | 9 ++++ .../20170703013609_convert_to_real_unicode.rb | 8 +++ db/schema.rb | 11 ++-- 11 files changed, 247 insertions(+), 34 deletions(-) create mode 100644 Capfile delete mode 100644 config/database.yml create mode 100644 config/deploy.rb create mode 100644 config/deploy/production.rb create mode 100644 config/deploy/staging.rb create mode 100644 config/initializers/mysql_utf8mb4_fix.rb create mode 100644 db/migrate/20170703013609_convert_to_real_unicode.rb diff --git a/.gitignore b/.gitignore index dad415a..09230f9 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ tags .DS_Store *.swo /public/uploads +config/database.yml diff --git a/Capfile b/Capfile new file mode 100644 index 0000000..1ace4ce --- /dev/null +++ b/Capfile @@ -0,0 +1,19 @@ +# Load DSL and set up stages +require "capistrano/setup" + +# Include default deployment tasks +require "capistrano/deploy" + +# Load the SCM plugin appropriate to your project: +require "capistrano/scm/git" +install_plugin Capistrano::SCM::Git + +# Include tasks from other gems included in your Gemfile +require "capistrano/rvm" +require "capistrano/bundler" +require "capistrano/rails/assets" +require "capistrano/rails/migrations" +require "capistrano/passenger" + +# Load custom tasks from `lib/capistrano/tasks` if you have any defined +Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r } diff --git a/Gemfile b/Gemfile index 69deff3..878e00c 100644 --- a/Gemfile +++ b/Gemfile @@ -30,9 +30,6 @@ gem 'jbuilder', '~> 2.5' # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' -# Use Capistrano for deployment -# gem 'capistrano-rails', group: :development - group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] @@ -48,6 +45,14 @@ group :development do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' gem 'spring-watcher-listen', '~> 2.0.0' + + # Use Capistrano for deployment + gem 'capistrano', '~> 3.0', require: false + gem 'capistrano-rvm', require: false + gem 'capistrano-rails', require: false + gem 'capistrano-bundler', require: false + gem 'capistrano-passenger', require: false + gem 'highline', require: false end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index 857547f..6058aa8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,11 +40,29 @@ GEM tzinfo (~> 1.1) addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) + airbrussh (1.2.0) + sshkit (>= 1.6.1, != 1.7.0) arel (8.0.0) bcrypt (3.1.11) bindex (0.5.0) builder (3.2.3) byebug (9.0.6) + capistrano (3.8.1) + airbrussh (>= 1.0.0) + i18n + rake (>= 10.0.0) + sshkit (>= 1.9.0) + capistrano-bundler (1.2.0) + capistrano (~> 3.1) + sshkit (~> 1.2) + capistrano-passenger (0.2.0) + capistrano (~> 3.0) + capistrano-rails (1.2.3) + capistrano (~> 3.1) + capistrano-bundler (~> 1.1) + capistrano-rvm (0.1.2) + capistrano (~> 3.0) + sshkit (~> 1.2) capybara (2.14.3) addressable mime-types (>= 1.16) @@ -82,6 +100,7 @@ GEM haml (5.0.1) temple (>= 0.8.0) tilt + highline (1.7.8) i18n (0.8.4) jbuilder (2.7.0) activesupport (>= 4.2.0) @@ -106,6 +125,9 @@ GEM mini_portile2 (2.2.0) minitest (5.10.2) multi_json (1.12.1) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-ssh (4.1.0) nio4r (2.1.0) nokogiri (1.8.0) mini_portile2 (~> 2.2.0) @@ -177,6 +199,9 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) + sshkit (1.13.1) + net-scp (>= 1.1.2) + net-ssh (>= 2.8.0) temple (0.8.0) thor (0.19.4) thread_safe (0.3.6) @@ -206,11 +231,17 @@ PLATFORMS DEPENDENCIES byebug + capistrano (~> 3.0) + capistrano-bundler + capistrano-passenger + capistrano-rails + capistrano-rvm capybara (~> 2.13) ckeditor coffee-rails (~> 4.2) devise haml + highline jbuilder (~> 2.5) jquery-rails listen (>= 3.0.5, < 3.2) diff --git a/config/database.yml b/config/database.yml deleted file mode 100644 index 0d02f24..0000000 --- a/config/database.yml +++ /dev/null @@ -1,25 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -# -default: &default - adapter: sqlite3 - pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - timeout: 5000 - -development: - <<: *default - database: db/development.sqlite3 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - <<: *default - database: db/test.sqlite3 - -production: - <<: *default - database: db/production.sqlite3 diff --git a/config/deploy.rb b/config/deploy.rb new file mode 100644 index 0000000..16c6257 --- /dev/null +++ b/config/deploy.rb @@ -0,0 +1,43 @@ +# config valid only for current version of Capistrano +lock "3.8.1" + +set :application, "thoughts" +set :repo_url, "git@github.com:hatkirby/thoughts.git" + +# Default branch is :master +# ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp + +# Default deploy_to directory is /var/www/my_app_name +set :deploy_to, "/srv/www/thoughts" + +# Default value for :format is :airbrussh. +# set :format, :airbrussh + +# You can configure the Airbrussh format using :format_options. +# These are the defaults. +# set :format_options, command_output: true, log_file: "log/capistrano.log", color: :auto, truncate: :auto + +# Default value for :pty is false +# set :pty, true + +# Default value for :linked_files is [] +append :linked_files, "config/database.yml" + +# Default value for linked_dirs is [] +append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "public/uploads" + +# Default value for default_env is {} +# set :default_env, { path: "/opt/ruby/bin:$PATH" } + +# Default value for keep_releases is 5 +# set :keep_releases, 5 + +# rvm +set :rvm_type, :system +set :rvm_custom_path, '/usr/local/rvm' + +# rails +set :rails_env, 'production' +set :conditionally_migrate, true +set :migration_role, :app +set :assets_roles, [:app] diff --git a/config/deploy/production.rb b/config/deploy/production.rb new file mode 100644 index 0000000..6475c07 --- /dev/null +++ b/config/deploy/production.rb @@ -0,0 +1,62 @@ +# server-based syntax +# ====================== +# Defines a single server with a list of roles and multiple properties. +# You can define all roles on a single server, or split them: + +# server "example.com", user: "deploy", roles: %w{app db web}, my_property: :my_value +# server "example.com", user: "deploy", roles: %w{app web}, other_property: :other_value +# server "db.example.com", user: "deploy", roles: %w{db} +server "feffernoo.se", user: "thoughts", roles: %w{app db web} + + + +# role-based syntax +# ================== + +# Defines a role with one or multiple servers. The primary server in each +# group is considered to be the first unless any hosts have the primary +# property set. Specify the username and a domain or IP for the server. +# Don't use `:all`, it's a meta role. + +# role :app, %w{deploy@example.com}, my_property: :my_value +# role :web, %w{user1@primary.com user2@additional.com}, other_property: :other_value +# role :db, %w{deploy@example.com} + + + +# Configuration +# ============= +# You can set any configuration variable like in config/deploy.rb +# These variables are then only loaded and set in this stage. +# For available Capistrano configuration variables see the documentation page. +# http://capistranorb.com/documentation/getting-started/configuration/ +# Feel free to add new variables to customise your setup. + + + +# Custom SSH Options +# ================== +# You may pass any option but keep in mind that net/ssh understands a +# limited set of options, consult the Net::SSH documentation. +# http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start +# +# Global options +# -------------- +# set :ssh_options, { +# keys: %w(/home/rlisowski/.ssh/id_rsa), +# forward_agent: false, +# auth_methods: %w(password) +# } +# +# The server-based syntax can be used to override options: +# ------------------------------------ +# server "example.com", +# user: "user_name", +# roles: %w{web app}, +# ssh_options: { +# user: "user_name", # overrides user setting above +# keys: %w(/home/user_name/.ssh/id_rsa), +# forward_agent: false, +# auth_methods: %w(publickey password) +# # password: "please use keys" +# } diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb new file mode 100644 index 0000000..4bb7a71 --- /dev/null +++ b/config/deploy/staging.rb @@ -0,0 +1,61 @@ +# server-based syntax +# ====================== +# Defines a single server with a list of roles and multiple properties. +# You can define all roles on a single server, or split them: + +# server "example.com", user: "deploy", roles: %w{app db web}, my_property: :my_value +# server "example.com", user: "deploy", roles: %w{app web}, other_property: :other_value +# server "db.example.com", user: "deploy", roles: %w{db} + + + +# role-based syntax +# ================== + +# Defines a role with one or multiple servers. The primary server in each +# group is considered to be the first unless any hosts have the primary +# property set. Specify the username and a domain or IP for the server. +# Don't use `:all`, it's a meta role. + +# role :app, %w{deploy@example.com}, my_property: :my_value +# role :web, %w{user1@primary.com user2@additional.com}, other_property: :other_value +# role :db, %w{deploy@example.com} + + + +# Configuration +# ============= +# You can set any configuration variable like in config/deploy.rb +# These variables are then only loaded and set in this stage. +# For available Capistrano configuration variables see the documentation page. +# http://capistranorb.com/documentation/getting-started/configuration/ +# Feel free to add new variables to customise your setup. + + + +# Custom SSH Options +# ================== +# You may pass any option but keep in mind that net/ssh understands a +# limited set of options, consult the Net::SSH documentation. +# http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start +# +# Global options +# -------------- +# set :ssh_options, { +# keys: %w(/home/rlisowski/.ssh/id_rsa), +# forward_agent: false, +# auth_methods: %w(password) +# } +# +# The server-based syntax can be used to override options: +# ------------------------------------ +# server "example.com", +# user: "user_name", +# roles: %w{web app}, +# ssh_options: { +# user: "user_name", # overrides user setting above +# keys: %w(/home/user_name/.ssh/id_rsa), +# forward_agent: false, +# auth_methods: %w(publickey password) +# # password: "please use keys" +# } diff --git a/config/initializers/mysql_utf8mb4_fix.rb b/config/initializers/mysql_utf8mb4_fix.rb new file mode 100644 index 0000000..8388027 --- /dev/null +++ b/config/initializers/mysql_utf8mb4_fix.rb @@ -0,0 +1,9 @@ +require 'active_record/connection_adapters/abstract_mysql_adapter' + +module ActiveRecord + module ConnectionAdapters + class AbstractMysqlAdapter + NATIVE_DATABASE_TYPES[:string] = { :name => "varchar", :limit => 191 } + end + end +end diff --git a/db/migrate/20170703013609_convert_to_real_unicode.rb b/db/migrate/20170703013609_convert_to_real_unicode.rb new file mode 100644 index 0000000..9291c0c --- /dev/null +++ b/db/migrate/20170703013609_convert_to_real_unicode.rb @@ -0,0 +1,8 @@ +class ConvertToRealUnicode < ActiveRecord::Migration[5.1] + def change + change_column :records, :recordable_type, :string, limit: 191 + change_column :users, :login, :string, default: "", null: false, limit: 191 + change_column :users, :email, :string, default: "", null: false, limit: 191 + change_column :users, :reset_password_token, :string, limit: 191 + end +end diff --git a/db/schema.rb b/db/schema.rb index c7c82ac..fc6614a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170629184901) do +ActiveRecord::Schema.define(version: 20170703013609) do create_table "ckeditor_assets", force: :cascade do |t| t.string "data_file_name", null: false @@ -28,7 +28,6 @@ ActiveRecord::Schema.define(version: 20170629184901) do create_table "entries", force: :cascade do |t| t.string "title" t.text "body" - t.string "directory", null: false t.string "slug", null: false t.string "type", null: false t.datetime "created_at", null: false @@ -37,7 +36,7 @@ ActiveRecord::Schema.define(version: 20170629184901) do create_table "records", force: :cascade do |t| t.text "description" - t.string "recordable_type" + t.string "recordable_type", limit: 191 t.integer "recordable_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -45,10 +44,10 @@ ActiveRecord::Schema.define(version: 20170629184901) do end create_table "users", force: :cascade do |t| - t.string "login", default: "", null: false - t.string "email", default: "", null: false + t.string "login", limit: 191, default: "", null: false + t.string "email", limit: 191, default: "", null: false t.string "encrypted_password", default: "", null: false - t.string "reset_password_token" + t.string "reset_password_token", limit: 191 t.datetime "reset_password_sent_at" t.datetime "remember_created_at" t.integer "sign_in_count", default: 0, null: false -- cgit 1.4.1