diff --git a/Capfile b/Capfile new file mode 100644 index 0000000..2aa4e13 --- /dev/null +++ b/Capfile @@ -0,0 +1,27 @@ +# Load DSL and set up stages +require 'capistrano/setup' + +# Include default deployment tasks +require 'capistrano/deploy' + +# Include tasks from other gems included in your Gemfile +# +# For documentation on these, see for example: +# +# https://github.com/capistrano/rvm +# https://github.com/capistrano/rbenv +# https://github.com/capistrano/chruby +# https://github.com/capistrano/bundler +# https://github.com/capistrano/rails +# https://github.com/capistrano/passenger +# +# require 'capistrano/rvm' +require 'capistrano/rbenv' +# require 'capistrano/chruby' +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 fb202eb..34b096c 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,10 @@ gem 'jquery-rails' # gem 'unicorn' # Deploy with Capistrano -# gem 'capistrano' +gem 'capistrano' +gem 'capistrano-rbenv' +gem 'capistrano-bundler' +gem 'capistrano-rails' # To use debugger # gem 'ruby-debug' diff --git a/Gemfile.lock b/Gemfile.lock index 8887b4d..011eb70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,6 +56,19 @@ GEM sass (~> 3.4) thor builder (3.2.2) + capistrano (3.4.0) + i18n + rake (>= 10.0.0) + sshkit (~> 1.3) + capistrano-bundler (1.1.4) + capistrano (~> 3.1) + sshkit (~> 1.2) + capistrano-rails (1.1.3) + capistrano (~> 3.1) + capistrano-bundler (~> 1.1) + capistrano-rbenv (2.0.3) + capistrano (~> 3.1) + sshkit (~> 1.3) capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -74,6 +87,7 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1) + colorize (0.7.7) database_cleaner (1.4.1) debug_inspector (0.0.2) devise (3.4.1) @@ -190,7 +204,6 @@ GEM haml (4.0.6) tilt highline (1.7.1) - hike (1.2.3) hpricot (0.8.6) i18n (0.7.0) inflecto (0.0.2) @@ -211,7 +224,7 @@ GEM mime-types (2.4.3) mini_portile (0.6.2) minitest (5.5.1) - multi_json (1.11.0) + multi_json (1.11.2) multi_xml (0.5.5) net-scp (1.2.1) net-ssh (>= 2.6.5) @@ -236,7 +249,7 @@ GEM slop (~> 3.4) puma (2.11.1) rack (>= 1.1, < 2.0) - rack (1.5.2) + rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) rails (4.1.9) @@ -282,7 +295,7 @@ GEM rspec-support (3.2.2) ruby_parser (3.6.5) sexp_processor (~> 4.1) - sass (3.4.13) + sass (3.4.16) sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -302,11 +315,8 @@ GEM simplecov-html (0.9.0) slop (3.6.0) slugtastic (1.2.1) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) + sprockets (3.3.1) rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) @@ -316,6 +326,10 @@ GEM activerecord (>= 3.0) activesupport (>= 3.0) polyamorous (~> 1.1.0) + sshkit (1.7.1) + colorize (>= 0.7.0) + net-scp (>= 1.1.2) + net-ssh (>= 2.8.0) thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) @@ -347,6 +361,10 @@ DEPENDENCIES better_errors binding_of_caller bourbon + capistrano + capistrano-bundler + capistrano-rails + capistrano-rbenv capybara-screenshot coffee-rails (~> 4.1.0) database_cleaner diff --git a/config/application.rb b/config/application.rb index 7d18e7f..b39ed7e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -48,9 +48,6 @@ module DanBarberPhoto # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' - # Prefer SASS syntax for stylesheets - config.sass.preferred_syntax = :sass - # Configure factories config.generators do |g| g.test_framework :rspec, fixture: true diff --git a/config/deploy.rb b/config/deploy.rb new file mode 100644 index 0000000..e21059b --- /dev/null +++ b/config/deploy.rb @@ -0,0 +1,51 @@ +# config valid only for current version of Capistrano +lock '3.4.0' + +set :application, 'danbarberphoto' +set :repo_url, 'git@github.com:danbee/danbarberphoto.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, '/var/apps/danbarberphoto' + +# Default value for :scm is :git +# set :scm, :git + +# Default value for :format is :pretty +# set :format, :pretty + +# Default value for :log_level is :debug +# set :log_level, :debug + +# Default value for :pty is false +# set :pty, true + +# Default value for :linked_files is [] +set :linked_files, fetch(:linked_files, []).push('config/database.yml', '.env') + +# Default value for linked_dirs is [] +set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'vendor/bundle', 'public/system') + +# 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 +# +set :rbenv_type, :user +set :rbenv_ruby, '2.2.1' + +namespace :deploy do + + after :restart, :clear_cache do + on roles(:web), in: :groups, limit: 3, wait: 10 do + # Here we can do anything such as: + # within release_path do + # execute :rake, 'cache:clear' + # end + end + end + +end diff --git a/config/deploy/production.rb b/config/deploy/production.rb new file mode 100644 index 0000000..b2a6f58 --- /dev/null +++ b/config/deploy/production.rb @@ -0,0 +1,63 @@ +# 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 'vps2.danbee.co.uk', user: 'danbarberphoto', 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..4fc06fa --- /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' +# }