diff --git a/Capfile b/Capfile index c9fcd2238..8bc169d9e 100644 --- a/Capfile +++ b/Capfile @@ -3,6 +3,10 @@ require "capistrano/setup" # Include default deployment tasks require "capistrano/deploy" +require "capistrano/scm/git" +install_plugin Capistrano::SCM::Git +require "capistrano/scm/git-with-submodules" +install_plugin Capistrano::SCM::Git::WithSubmodules # Include tasks from other gems included in your Gemfile # @@ -25,11 +29,6 @@ require 'capistrano/passenger' # require 'capistrano/sidekiq' # require "whenever/capistrano" # Update crontab on deploy -require "capistrano/scm/git" -install_plugin Capistrano::SCM::Git -require "capistrano/scm/git-with-submodules" -install_plugin Capistrano::SCM::Git::WithSubmodules - # 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.lock b/Gemfile.lock index c13f0eaf6..d70ec701e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,70 +41,72 @@ GEM airbrussh (1.3.0) sshkit (>= 1.6.1, != 1.7.0) arel (7.1.4) - binding_of_caller (0.7.2) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) bower-rails (0.10.0) - builder (3.2.2) - byebug (9.0.6) + builder (3.2.3) + byebug (10.0.0) capistrano (3.10.1) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.2.0) + capistrano-bundler (1.3.0) capistrano (~> 3.1) sshkit (~> 1.2) capistrano-git-with-submodules (2.0.3) capistrano (~> 3.7) capistrano-passenger (0.2.0) capistrano (~> 3.0) - capistrano-rails (1.2.0) + capistrano-rails (1.3.1) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capistrano-sidekiq (0.10.0) - capistrano + capistrano-sidekiq (1.0.0) + capistrano (>= 3.9.0) sidekiq (>= 3.4) - concurrent-ruby (1.0.2) + concurrent-ruby (1.0.5) connection_pool (2.2.1) - debug_inspector (0.0.2) - dotenv (2.1.1) - dotenv-rails (2.1.1) - dotenv (= 2.1.1) - railties (>= 4.0, < 5.1) + crass (1.0.3) + debug_inspector (0.0.3) + dotenv (2.1.2) + dotenv-rails (2.1.2) + dotenv (= 2.1.2) + railties (>= 3.2, < 5.1) erubis (2.7.0) execjs (2.7.0) - globalid (0.3.7) - activesupport (>= 4.1.0) - haml (4.0.7) + ffi (1.9.18) + globalid (0.4.1) + activesupport (>= 4.2.0) + haml (5.0.4) + temple (>= 0.8.0) tilt i18n (0.9.3) concurrent-ruby (~> 1.0) - json (1.8.3) - loofah (2.0.3) + json (1.8.6) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.1.0) - minitest (5.9.1) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (4.2.0) nio4r (1.2.1) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) non-stupid-digest-assets (1.0.9) sprockets (>= 2.0) - puma (3.6.2) - rack (2.0.1) - rack-cors (1.0.0) - rack-protection (1.5.3) + puma (3.11.2) + rack (2.0.3) + rack-cors (1.0.2) + rack-protection (2.0.0) rack rack-test (0.6.3) rack (>= 1.0) @@ -120,9 +122,9 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 5.0.0.1) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.1) - activesupport (>= 4.2.0, < 6.0) - nokogiri (~> 1.6.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) railties (5.0.0.1) @@ -132,49 +134,58 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) rdoc (4.3.0) - redis (3.3.2) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) - sass (3.4.22) + redis (4.0.1) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) + sass (3.5.5) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - secure_headers (3.6.7) - useragent - sidekiq (4.2.7) + secure_headers (5.0.4) + useragent (>= 0.15.0) + sidekiq (5.0.5) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) - redis (~> 3.2, >= 3.2.1) - spring (2.0.0) + redis (>= 3.3.4, < 5) + spring (2.0.2) activesupport (>= 4.2) - sprockets (3.7.0) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sshkit (1.15.1) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - thor (0.19.4) - thread_safe (0.3.5) - tilt (2.0.5) - tzinfo (1.2.2) + temple (0.8.0) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + tzinfo (1.2.4) thread_safe (~> 0.1) - uglifier (3.0.3) + uglifier (4.1.5) execjs (>= 0.3.0, < 3) - useragent (0.16.8) + useragent (0.16.9) web-console (2.3.0) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) - websocket-driver (0.6.4) + websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.3) PLATFORMS ruby @@ -204,4 +215,4 @@ DEPENDENCIES web-console (~> 2.0) BUNDLED WITH - 1.15.3 + 1.16.1 diff --git a/config/deploy.rb b/config/deploy.rb index 2c50e5b8a..572e17333 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,6 +1,4 @@ CAP_CONFIG = YAML.load_file("config/cap.yml") -# config valid only for current version of Capistrano -lock '3.6.1' set :application, 'neeto' set :repo_url, CAP_CONFIG["default"]["repo_url"] @@ -11,9 +9,6 @@ set :repo_url, CAP_CONFIG["default"]["repo_url"] # Default deploy_to directory is /var/www/my_app_name # set :deploy_to, '/var/www/my_app_name' -# Default value for :scm is :git -set :scm, :git - # Default value for :format is :airbrussh. # set :format, :airbrussh