diff --git a/Capfile b/Capfile index d533c44..3206f78 100644 --- a/Capfile +++ b/Capfile @@ -1,6 +1,9 @@ # Load DSL and set up stages require 'capistrano/setup' +require "capistrano/scm/git" +install_plugin Capistrano::SCM::Git + # Include default deployment tasks require 'capistrano/deploy' diff --git a/Gemfile b/Gemfile index d23ec91..469b4bf 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source 'https://rubygems.org' + gem 'rails', '4.2.6' gem 'sass-rails', '~> 5.0' gem 'uglifier', '>= 1.3.0' @@ -31,7 +32,7 @@ group :development do gem 'web-console', '~> 2.0' gem 'spring' gem 'better_errors' - gem 'capistrano', "3.4.1" + gem 'capistrano', "3.8.1" gem 'capistrano-bundler' gem 'capistrano-rails' gem 'capistrano-rails-console' diff --git a/Gemfile.lock b/Gemfile.lock index d84fede..ea4d659 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,6 +55,8 @@ GEM rails (~> 4.2) sass-rails (~> 5.0) selectize-rails (~> 0.6) + airbrussh (1.2.0) + sshkit (>= 1.6.1, != 1.7.0) arel (6.0.3) autoprefixer-rails (6.3.6.1) execjs @@ -76,20 +78,22 @@ GEM thor (~> 0.19) builder (3.2.2) byebug (8.2.2) - capistrano (3.4.1) + capistrano (3.8.1) + airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) - sshkit (~> 1.3) - capistrano-bundler (1.1.4) + 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.1.6) + capistrano-rails (1.2.3) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capistrano-rails-console (1.0.2) - capistrano (>= 3.1.0, < 4.0.0) + capistrano-rails-console (2.2.0) + capistrano (>= 3.5.0, < 4.0.0) + sshkit-interactive (~> 0.2.0) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -178,7 +182,7 @@ GEM nokogiri (~> 1.6.0) ruby_parser (~> 3.5) hub (1.12.4) - i18n (0.7.0) + i18n (0.8.1) jbuilder (2.4.1) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) @@ -217,7 +221,7 @@ GEM nenv (0.3.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.2.0) + net-ssh (4.1.0) newrelic_rpm (3.15.2.317) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) @@ -270,7 +274,7 @@ GEM activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.3.0) + rake (12.0.0) rb-fchange (0.0.6) ffi rb-fsevent (0.9.7) @@ -336,9 +340,11 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.11) - sshkit (1.11.4) + sshkit (1.13.1) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) + sshkit-interactive (0.2.1) + sshkit (~> 1.12) sucker_punch (2.0.2) concurrent-ruby (~> 1.0.0) susy (2.2.12) @@ -380,7 +386,7 @@ DEPENDENCIES better_errors bootstrap byebug - capistrano (= 3.4.1) + capistrano (= 3.8.1) capistrano-bundler capistrano-passenger capistrano-rails @@ -433,4 +439,4 @@ DEPENDENCIES web-console (~> 2.0) BUNDLED WITH - 1.13.5 + 1.14.6