capistrano 3.15.0 → 3.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f0b8e22a26ba92d6cf7d062d7b1fd2571add774ff9522a8282080e25e0c885a
-  data.tar.gz: 822a124b873390bd677370e4194103c94e756e0422feb1de5f3bdd0553a85315
+  metadata.gz: d1c38f58d2aa91116526937329147c2a8800623bf11d3354f1d3c2582fad602d
+  data.tar.gz: 5595af026c2fc6deef47413bc5dd094436193a51bebb655109f6510f12ebd250
 SHA512:
-  metadata.gz: fa22266dc215f03041ba72b0b36a2dc88df951fea9426912c2aa34f8683daa622f0acffeb801768ed0cc82571eeebfd9bce11e0f6708b997f44d446d10d53ba4
-  data.tar.gz: 338e679cf1601854f6d5f2f692693550fbd7d46d94add967df47770f830926bf55c170e09b748076b330f53f305be1dec990139c49b8a0a4c43527e573d9a9da
+  metadata.gz: 2822f52ebf86408b876aeb4fd9f8bcc791d64c987661d7ad33b71fb36f3abf0c7b1ab782e59cddca65cd7816b963266b3964030fbe9bed327c8b300501e07e34
+  data.tar.gz: fd6f100932f0a35404c3d332c7a6f18c3d06bf968301f71f56b38ccd9455e45abad3da40901e8ec3c41a81c3316e01b3af17f21db5b49898a65168bbc4a14db7

data/.circleci/config.yml

@@ -0,0 +1,129 @@
+version: 2.1
+
+executors:
+  ruby:
+    parameters:
+      version:
+        description: "Ruby version number"
+        default: "3.1"
+        type: string
+    docker:
+      - image: ruby:<< parameters.version >>
+
+commands:
+  bundle_install:
+    description: Install Ruby dependencies with Bundler
+    parameters:
+      version:
+        description: "Ruby version number"
+        default: "3.1"
+        type: string
+    steps:
+      - restore_cache:
+          keys:
+            - bundle-v1-{{ arch }}-<< parameters.version >>
+      - run:
+          name: Install Ruby Dependencies
+          command: |
+            gem install bundler --conservative --no-document || gem install bundler -v '< 2' --no-document
+            bundle config --local path vendor/bundle
+            bundle check || (bundle install --jobs=4 --retry=3 && bundle clean)
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: bundle-v1-{{ arch }}-<< parameters.version >>-{{ checksum "Gemfile.lock" }}
+  update_ssh_client:
+    description: Install recent SSH client for compatibility with GitHub
+    steps:
+      - run:
+          name: Install OpenSSH 8.1p1 if necessary
+          command: |
+            if $(ssh -V 2>&1 | grep -q -v OpenSSH_8); then
+              apt-get update
+              apt-get install -y libssl-dev
+              mkdir ~/tempdownload
+              cd ~/tempdownload
+              wget https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-8.1p1.tar.gz
+              tar zxvf openssh-8.1p1.tar.gz
+              cd openssh-8.1p1 && ./configure --prefix=/usr && make ssh && make install
+            fi
+
+jobs:
+  danger:
+    executor: ruby
+    steps:
+      - checkout
+      - bundle_install
+      - run: bundle exec danger
+
+  rubocop:
+    executor: ruby
+    steps:
+      - checkout
+      - bundle_install
+      - run: bundle exec rubocop
+
+  spec:
+    parameters:
+      version:
+        description: "Ruby version number"
+        default: "3.1"
+        type: string
+    executor:
+      name: ruby
+      version: << parameters.version >>
+    steps:
+      - update_ssh_client
+      - checkout
+      - bundle_install:
+          version: << parameters.version >>
+      - run: bundle exec rake spec
+
+workflows:
+  version: 2
+  commit-workflow:
+    jobs:
+      - danger
+      - rubocop
+      - spec:
+          matrix:
+            parameters:
+              version:
+                [
+                  "2.0",
+                  "2.1",
+                  "2.2",
+                  "2.3",
+                  "2.4",
+                  "2.5",
+                  "2.6",
+                  "2.7",
+                  "3.0",
+                  "3.1",
+                ]
+  cron-workflow:
+    jobs:
+      - rubocop
+      - spec:
+          matrix:
+            parameters:
+              version:
+                [
+                  "2.0",
+                  "2.1",
+                  "2.2",
+                  "2.3",
+                  "2.4",
+                  "2.5",
+                  "2.6",
+                  "2.7",
+                  "3.0",
+                  "3.1",
+                ]
+    triggers:
+      - schedule:
+          cron: "0 13 * * 6"
+          filters:
+            branches:
+              only:
+                - master

data/DEVELOPMENT.md

@@ -53,7 +53,7 @@ $ bundle exec rake features KEEP_RUNNING=1
 
 ### Report failing Cucumber features!
 
-Currently, the Capistrano Travis build does *not* run the Cucumber suite. This means it is possible for a failing Cucumber feature to sneak in without being noticed by our continuous integration checks.
+Currently, the Capistrano CI build does *not* run the Cucumber suite. This means it is possible for a failing Cucumber feature to sneak in without being noticed by our continuous integration checks.
 
 **If you come across a failing Cucumber feature, this is a bug.** Please report it by opening a GitHub issue. Or even better: do your best to fix the feature and submit a pull request!
 
@@ -63,7 +63,7 @@ This project uses [RuboCop](https://github.com/bbatsov/rubocop) to enforce stand
 
 * Test that your contributions pass with `rake rubocop`
 * Rubocop is also run as part of the full test suite with `rake`
-* Note the Travis build will fail and your PR cannot be merged if Rubocop finds errors
+* Note the CI build will fail and your PR cannot be merged if Rubocop finds errors
 
 ## Submitting a pull request
 

data/Gemfile

@@ -3,6 +3,10 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in capistrano.gemspec
 gemspec
 
+gem "mocha"
+gem "rspec"
+gem "rspec-core", "~> 3.4.4"
+
 group :cucumber do
   # Latest versions of cucumber don't support Ruby < 2.1
   # rubocop:disable Bundler/DuplicatedGem
@@ -12,8 +16,6 @@ group :cucumber do
     gem "cucumber"
   end
   # rubocop:enable Bundler/DuplicatedGem
-  gem "rspec"
-  gem "rspec-core", "~> 3.4.4"
 end
 
 # Latest versions of net-ssh don't support Ruby < 2.2.6
@@ -36,7 +38,9 @@ if Gem::Requirement.new("< 2.2").satisfied_by?(Gem::Version.new(RUBY_VERSION))
   gem "rake", "< 13.0.0"
 end
 
-# We only run danger once on a new-ish ruby; no need to install it otherwise
+# We only run danger and rubocop on a new-ish ruby; no need to install them otherwise
 if Gem::Requirement.new("> 2.4").satisfied_by?(Gem::Version.new(RUBY_VERSION))
   gem "danger"
+  gem "psych", "< 4" # Ensures rubocop works on Ruby 3.1
+  gem "rubocop", "0.48.1"
 end

data/README.md

@@ -1,7 +1,7 @@
 
 # Capistrano: A deployment automation tool built on Ruby, Rake, and SSH.
 
-[![Gem Version](https://badge.fury.io/rb/capistrano.svg)](http://badge.fury.io/rb/capistrano) [![Build Status](https://travis-ci.org/capistrano/capistrano.svg?branch=master)](https://travis-ci.org/capistrano/capistrano) [![Code Climate](https://codeclimate.com/github/capistrano/capistrano/badges/gpa.svg)](https://codeclimate.com/github/capistrano/capistrano) [![CodersClan](https://img.shields.io/badge/get-support-blue.svg)](http://codersclan.net/?repo_id=325&source=small)
+[![Gem Version](https://badge.fury.io/rb/capistrano.svg)](http://badge.fury.io/rb/capistrano) [![Build Status](https://circleci.com/gh/capistrano/capistrano/tree/master.svg?style=shield)](https://app.circleci.com/pipelines/github/capistrano/capistrano?branch=master) [![Code Climate](https://codeclimate.com/github/capistrano/capistrano/badges/gpa.svg)](https://codeclimate.com/github/capistrano/capistrano) [![CodersClan](https://img.shields.io/badge/get-support-blue.svg)](http://codersclan.net/?repo_id=325&source=small)
 
 Capistrano is a framework for building automated deployment scripts. Although Capistrano itself is written in Ruby, it can easily be used to deploy projects of any language or framework, be it Rails, Java, or PHP.
 
@@ -107,7 +107,7 @@ Add Capistrano to your project's Gemfile using `require: false`:
 
 ``` ruby
 group :development do
-  gem "capistrano", "~> 3.14", require: false
+  gem "capistrano", "~> 3.17", require: false
 end
 ```
 

data/Rakefile

@@ -1,16 +1,19 @@
 require "bundler/gem_tasks"
 require "cucumber/rake/task"
 require "rspec/core/rake_task"
-require "rubocop/rake_task"
 
-task default: %i(spec rubocop)
-RSpec::Core::RakeTask.new
+begin
+  require "rubocop/rake_task"
+  desc "Run RuboCop checks"
+  RuboCop::RakeTask.new
+  task default: %i(spec rubocop)
+rescue LoadError
+  task default: :spec
+end
 
+RSpec::Core::RakeTask.new
 Cucumber::Rake::Task.new(:features)
 
-desc "Run RuboCop checks"
-RuboCop::RakeTask.new
-
 Rake::Task["release"].enhance do
   puts "Don't forget to publish the release on GitHub!"
   system "open https://github.com/capistrano/capistrano/releases"

data/capistrano.gemspec

@@ -31,8 +31,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency "i18n"
   gem.add_dependency "rake", ">= 10.0.0"
   gem.add_dependency "sshkit", ">= 1.9.0"
-
-  gem.add_development_dependency "mocha"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "rubocop", "0.48.1"
 end

data/features/support/vagrant_helpers.rb

@@ -30,6 +30,12 @@ module VagrantHelpers
     return [stdout, stderr] if status.success?
     raise VagrantSSHCommandError, status
   end
+
+  def puts(message)
+    # Attach log messages to the current cucumber feature (`log`),
+    # or simply puts to the console (`super`) if we are outside of cucumber.
+    respond_to?(:log) ? log(message) : super(message)
+  end
 end
 
 World(VagrantHelpers)

data/lib/capistrano/doctor/variables_doctor.rb

@@ -10,6 +10,8 @@ module Capistrano
       WHITELIST = %i(
         application
         current_directory
+        linked_dirs
+        linked_files
         releases_directory
         repo_url
         repo_tree

data/lib/capistrano/scm/git.rb

@@ -60,6 +60,10 @@ class Capistrano::SCM::Git < Capistrano::SCM::Plugin
     end
   end
 
+  def verify_commit
+    git :"verify-commit", fetch_revision
+  end
+
   def archive_to_release_path
     if (tree = fetch(:repo_tree))
       tree = tree.slice %r#^/?(.*?)/?$#, 1

data/lib/capistrano/scm/tasks/git.rake

@@ -42,6 +42,7 @@ namespace :git do
       within repo_path do
         with fetch(:git_environmental_variables) do
           git_plugin.update_mirror
+          git_plugin.verify_commit if fetch(:git_verify_commit)
         end
       end
     end

data/lib/capistrano/templates/deploy.rb.erb

@@ -21,10 +21,10 @@ set :repo_url, "git@example.com:me/my_repo.git"
 # set :pty, true
 
 # Default value for :linked_files is []
-# append :linked_files, "config/database.yml"
+# append :linked_files, "config/database.yml", 'config/master.key'
 
 # Default value for linked_dirs is []
-# append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "public/system"
+# append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "tmp/webpacker", "public/system", "vendor", "storage"
 
 # Default value for default_env is {}
 # set :default_env, { path: "/opt/ruby/bin:$PATH" }

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.15.0".freeze
+  VERSION = "3.17.1".freeze
 end

data/spec/lib/capistrano/scm/git_spec.rb

@@ -169,5 +169,16 @@ module Capistrano
         expect(revision).to eq("81cec13b777ff46348693d327fc8e7832f79bf43")
       end
     end
+
+    describe "#verify_commit" do
+      it "should run git verify-commit" do
+        env.set(:branch, "branch")
+
+        backend.expects(:capture).with(:git, "rev-list --max-count=1 branch").returns("81cec13b777ff46348693d327fc8e7832f79bf43")
+        backend.expects(:execute).with(:git, :"verify-commit", "81cec13b777ff46348693d327fc8e7832f79bf43")
+
+        subject.verify_commit
+      end
+    end
   end
 end

data/spec/support/Vagrantfile

@@ -6,7 +6,7 @@ Vagrant.configure("2") do |config|
   [:app].each_with_index do |role, i|
     config.vm.define(role, primary: true) do |primary|
       primary.vm.define role
-      primary.vm.box = "hashicorp/precise64"
+      primary.vm.box = "hashicorp/bionic64"
       primary.vm.network "forwarded_port", guest: 22, host: "222#{i}".to_i
       primary.vm.provision :shell, inline: "sudo apt-get -y install git-core"
 

data/spec/support/test_app.rb

@@ -12,7 +12,7 @@ module TestApp
   def default_config
     <<-CONFIG
       set :deploy_to, '#{deploy_to}'
-      set :repo_url, 'git://github.com/capistrano/capistrano.git'
+      set :repo_url, 'https://github.com/capistrano/capistrano.git'
       set :branch, 'master'
       set :ssh_options, { keys: "\#{ENV['HOME']}/.vagrant.d/insecure_private_key", auth_methods: ['publickey'] }
       server 'vagrant@localhost:2220', roles: %w{web app}
@@ -40,6 +40,7 @@ module TestApp
     FileUtils.mkdir(test_app_path)
 
     File.open(gemfile, "w+") do |file|
+      file.write "source 'https://rubygems.org'\n"
       file.write "gem 'capistrano', path: '#{path_to_cap}'"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.15.0
+  version: 3.17.1
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2022-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh
@@ -67,48 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.48.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.48.1
 description: Capistrano is a utility and framework for executing commands in parallel
   on multiple remote machines, via SSH.
 email:
@@ -120,13 +78,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".github/issue_template.md"
 - ".github/pull_request_template.md"
 - ".github/release-drafter.yml"
 - ".github/workflows/push.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - DEVELOPMENT.md
@@ -277,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.3.18
 signing_key:
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH

data/.travis.yml

@@ -1,30 +0,0 @@
-language: ruby
-rvm:
-  - 3.0
-  - 2.7
-  - 2.6
-  - 2.5
-  - 2.4
-  - 2.3
-  - 2.2
-  - 2.1
-  - 2.0
-matrix:
-  # Rubinius periodically fails in general, and it always segfaults for RuboCop
-  # in particular. Until we figure out how to make it work consistently, allow
-  # it to fail without breaking the build.
-  allow_failures:
-    - rvm: rbx-2
-  include:
-    - rvm: rbx-2
-      script: bundle exec rake spec
-    # Run Danger only once, on 2.5
-    - rvm: 2.5
-      before_script: bundle exec danger
-
-script: bundle exec rake spec rubocop
-install: bundle install --jobs=1
-cache: bundler
-branches:
-  only:
-    - master