capistrano 3.6.0 → 3.7.0

data/spec/lib/capistrano/scm_spec.rb

@@ -26,7 +26,7 @@ module BlindStrategy; end
 
 module Capistrano
   describe SCM do
-    let(:context) { Class.new.new }
+    let(:context) { mock }
 
     describe "#initialize" do
       subject { Capistrano::SCM.new(context, DummyStrategy) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: danger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !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
@@ -134,12 +148,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/issue_template.md"
+- ".github/pull_request_template.md"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - DEVELOPMENT.md
+- Dangerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -154,7 +171,6 @@ files:
 - features/deploy_failure.feature
 - features/doctor.feature
 - features/installation.feature
-- features/remote_file_task.feature
 - features/sshconnect.feature
 - features/stage_failure.feature
 - features/step_definitions/assertions.rb
@@ -163,7 +179,6 @@ files:
 - features/support/env.rb
 - features/support/remote_command_helpers.rb
 - features/support/vagrant_helpers.rb
-- issue_template.md
 - lib/Capfile
 - lib/capistrano.rb
 - lib/capistrano/all.rb
@@ -176,6 +191,7 @@ files:
 - lib/capistrano/configuration/plugin_installer.rb
 - lib/capistrano/configuration/question.rb
 - lib/capistrano/configuration/role_filter.rb
+- lib/capistrano/configuration/scm_resolver.rb
 - lib/capistrano/configuration/server.rb
 - lib/capistrano/configuration/servers.rb
 - lib/capistrano/configuration/validated_variables.rb
@@ -196,24 +212,25 @@ files:
 - lib/capistrano/dsl/stages.rb
 - lib/capistrano/dsl/task_enhancements.rb
 - lib/capistrano/framework.rb
-- lib/capistrano/git.rb
-- lib/capistrano/hg.rb
 - lib/capistrano/i18n.rb
 - lib/capistrano/immutable_task.rb
 - lib/capistrano/install.rb
 - lib/capistrano/plugin.rb
 - lib/capistrano/proc_helpers.rb
 - lib/capistrano/scm.rb
+- lib/capistrano/scm/git.rb
+- lib/capistrano/scm/hg.rb
+- lib/capistrano/scm/plugin.rb
+- lib/capistrano/scm/svn.rb
+- lib/capistrano/scm/tasks/git.rake
+- lib/capistrano/scm/tasks/hg.rake
+- lib/capistrano/scm/tasks/svn.rake
 - lib/capistrano/setup.rb
-- lib/capistrano/svn.rb
 - lib/capistrano/tasks/console.rake
 - lib/capistrano/tasks/deploy.rake
 - lib/capistrano/tasks/doctor.rake
 - lib/capistrano/tasks/framework.rake
-- lib/capistrano/tasks/git.rake
-- lib/capistrano/tasks/hg.rake
 - lib/capistrano/tasks/install.rake
-- lib/capistrano/tasks/svn.rake
 - lib/capistrano/templates/Capfile
 - lib/capistrano/templates/deploy.rb.erb
 - lib/capistrano/templates/stage.rb.erb
@@ -227,6 +244,7 @@ files:
 - spec/lib/capistrano/configuration/filter_spec.rb
 - spec/lib/capistrano/configuration/host_filter_spec.rb
 - spec/lib/capistrano/configuration/null_filter_spec.rb
+- spec/lib/capistrano/configuration/plugin_installer_spec.rb
 - spec/lib/capistrano/configuration/question_spec.rb
 - spec/lib/capistrano/configuration/role_filter_spec.rb
 - spec/lib/capistrano/configuration/server_spec.rb
@@ -240,12 +258,12 @@ files:
 - spec/lib/capistrano/dsl/paths_spec.rb
 - spec/lib/capistrano/dsl/task_enhancements_spec.rb
 - spec/lib/capistrano/dsl_spec.rb
-- spec/lib/capistrano/git_spec.rb
-- spec/lib/capistrano/hg_spec.rb
 - spec/lib/capistrano/immutable_task_spec.rb
 - spec/lib/capistrano/plugin_spec.rb
+- spec/lib/capistrano/scm/git_spec.rb
+- spec/lib/capistrano/scm/hg_spec.rb
+- spec/lib/capistrano/scm/svn_spec.rb
 - spec/lib/capistrano/scm_spec.rb
-- spec/lib/capistrano/svn_spec.rb
 - spec/lib/capistrano/upload_task_spec.rb
 - spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb
@@ -279,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
@@ -289,7 +307,6 @@ test_files:
 - features/deploy_failure.feature
 - features/doctor.feature
 - features/installation.feature
-- features/remote_file_task.feature
 - features/sshconnect.feature
 - features/stage_failure.feature
 - features/step_definitions/assertions.rb
@@ -305,6 +322,7 @@ test_files:
 - spec/lib/capistrano/configuration/filter_spec.rb
 - spec/lib/capistrano/configuration/host_filter_spec.rb
 - spec/lib/capistrano/configuration/null_filter_spec.rb
+- spec/lib/capistrano/configuration/plugin_installer_spec.rb
 - spec/lib/capistrano/configuration/question_spec.rb
 - spec/lib/capistrano/configuration/role_filter_spec.rb
 - spec/lib/capistrano/configuration/server_spec.rb
@@ -318,12 +336,12 @@ test_files:
 - spec/lib/capistrano/dsl/paths_spec.rb
 - spec/lib/capistrano/dsl/task_enhancements_spec.rb
 - spec/lib/capistrano/dsl_spec.rb
-- spec/lib/capistrano/git_spec.rb
-- spec/lib/capistrano/hg_spec.rb
 - spec/lib/capistrano/immutable_task_spec.rb
 - spec/lib/capistrano/plugin_spec.rb
+- spec/lib/capistrano/scm/git_spec.rb
+- spec/lib/capistrano/scm/hg_spec.rb
+- spec/lib/capistrano/scm/svn_spec.rb
 - spec/lib/capistrano/scm_spec.rb
-- spec/lib/capistrano/svn_spec.rb
 - spec/lib/capistrano/upload_task_spec.rb
 - spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb

data/features/remote_file_task.feature

@@ -1,14 +0,0 @@
-Feature: Remote file task
-
-  Background:
-    Given a test app with the default configuration
-    And a custom task to generate a file
-    And servers with the roles app and web
-
-  Scenario: Where the file does not exist
-    When I run cap "deploy:check:linked_files"
-    Then it creates the file with the remote_task prerequisite
-
-  Scenario: Where the file already exists
-    When I run cap "deploy:check:linked_files"
-    Then it will not recreate the file

data/issue_template.md

@@ -1,21 +0,0 @@
-**Important:** GitHub issues are for feature requests or bug reports. The Capistrano team recommends you use [Stack Overflow](http://stackoverflow.com/questions/tagged/capistrano) for general questions. For more details, please see our [contribution policy](https://github.com/capistrano/capistrano/blob/master/CONTRIBUTING.md).
-
----
-
-#### Steps to reproduce
-
-1. Lorem.
-2. Ipsum..
-3. Dolor...
-
-#### Expected behaviour
-
-Tell us what should happen
-
-#### Actual behaviour
-
-Tell us what happens instead
-
-#### Your configuration
-
-Paste Capistrano's `doctor` output here (`cap <stage> doctor`):

data/lib/capistrano/git.rb

@@ -1,54 +0,0 @@
-load File.expand_path("../tasks/git.rake", __FILE__)
-
-require "capistrano/scm"
-
-class Capistrano::Git < Capistrano::SCM
-  # execute git with argument in the context
-  #
-  def git(*args)
-    args.unshift :git
-    context.execute(*args)
-  end
-
-  # The Capistrano default strategy for git. You should want to use this.
-  module DefaultStrategy
-    def test
-      test! " [ -f #{repo_path}/HEAD ] "
-    end
-
-    def check
-      git :'ls-remote --heads', repo_url
-    end
-
-    def clone
-      if (depth = fetch(:git_shallow_clone))
-        git :clone, "--mirror", "--depth", depth, "--no-single-branch", repo_url, repo_path
-      else
-        git :clone, "--mirror", repo_url, repo_path
-      end
-    end
-
-    def update
-      # Note: Requires git version 1.9 or greater
-      if (depth = fetch(:git_shallow_clone))
-        git :fetch, "--depth", depth, "origin", fetch(:branch)
-      else
-        git :remote, :update, "--prune"
-      end
-    end
-
-    def release
-      if (tree = fetch(:repo_tree))
-        tree = tree.slice %r#^/?(.*?)/?$#, 1
-        components = tree.split("/").size
-        git :archive, fetch(:branch), tree, "| tar -x --strip-components #{components} -f - -C", release_path
-      else
-        git :archive, fetch(:branch), "| tar -x -f - -C", release_path
-      end
-    end
-
-    def fetch_revision
-      context.capture(:git, "rev-list --max-count=1 #{fetch(:branch)}")
-    end
-  end
-end

data/lib/capistrano/hg.rb

@@ -1,43 +0,0 @@
-load File.expand_path("../tasks/hg.rake", __FILE__)
-
-require "capistrano/scm"
-
-class Capistrano::Hg < Capistrano::SCM
-  # execute hg in context with arguments
-  def hg(*args)
-    args.unshift(:hg)
-    context.execute(*args)
-  end
-
-  module DefaultStrategy
-    def test
-      test! " [ -d #{repo_path}/.hg ] "
-    end
-
-    def check
-      hg "id", repo_url
-    end
-
-    def clone
-      hg "clone", "--noupdate", repo_url, repo_path
-    end
-
-    def update
-      hg "pull"
-    end
-
-    def release
-      if (tree = fetch(:repo_tree))
-        tree = tree.slice %r#^/?(.*?)/?$#, 1
-        components = tree.split("/").size
-        hg "archive --type tgz -p . -I", tree, "--rev", fetch(:branch), "| tar -x --strip-components #{components} -f - -C", release_path
-      else
-        hg "archive", release_path, "--rev", fetch(:branch)
-      end
-    end
-
-    def fetch_revision
-      context.capture(:hg, "log --rev #{fetch(:branch)} --template \"{node}\n\"")
-    end
-  end
-end

data/lib/capistrano/svn.rb

@@ -1,42 +0,0 @@
-load File.expand_path("../tasks/svn.rake", __FILE__)
-
-require "capistrano/scm"
-
-class Capistrano::Svn < Capistrano::SCM
-  # execute svn in context with arguments
-  def svn(*args)
-    args.unshift(:svn)
-    args.push "--username #{fetch(:svn_username)}" if fetch(:svn_username)
-    args.push "--password #{fetch(:svn_password)}" if fetch(:svn_password)
-    args.push "--revision #{fetch(:svn_revision)}" if fetch(:svn_revision)
-    context.execute(*args)
-  end
-
-  module DefaultStrategy
-    def test
-      test! " [ -d #{repo_path}/.svn ] "
-    end
-
-    def check
-      svn_username = fetch(:svn_username) ? "--username #{fetch(:svn_username)}" : ""
-      svn_password = fetch(:svn_password) ? "--password #{fetch(:svn_password)}" : ""
-      test! :svn, :info, repo_url, svn_username, svn_password
-    end
-
-    def clone
-      svn :checkout, repo_url, repo_path
-    end
-
-    def update
-      svn :update
-    end
-
-    def release
-      svn :export, "--force", ".", release_path
-    end
-
-    def fetch_revision
-      context.capture(:svnversion, repo_path)
-    end
-  end
-end

data/spec/lib/capistrano/git_spec.rb

@@ -1,109 +0,0 @@
-require "spec_helper"
-
-require "capistrano/git"
-
-module Capistrano
-  describe Git do
-    let(:context) { Class.new.new }
-    subject { Capistrano::Git.new(context, Capistrano::Git::DefaultStrategy) }
-
-    describe "#git" do
-      it "should call execute git in the context, with arguments" do
-        context.expects(:execute).with(:git, :init)
-        subject.git(:init)
-      end
-    end
-  end
-
-  describe Git::DefaultStrategy do
-    let(:context) { Class.new.new }
-    subject { Capistrano::Git.new(context, Capistrano::Git::DefaultStrategy) }
-
-    describe "#test" do
-      it "should call test for repo HEAD" do
-        context.expects(:repo_path).returns("/path/to/repo")
-        context.expects(:test).with " [ -f /path/to/repo/HEAD ] "
-
-        subject.test
-      end
-    end
-
-    describe "#check" do
-      it "should test the repo url" do
-        context.expects(:repo_url).returns(:url)
-        context.expects(:execute).with(:git, :'ls-remote --heads', :url).returns(true)
-
-        subject.check
-      end
-    end
-
-    describe "#clone" do
-      it "should run git clone" do
-        context.expects(:fetch).with(:git_shallow_clone).returns(nil)
-        context.expects(:repo_url).returns(:url)
-        context.expects(:repo_path).returns(:path)
-        context.expects(:execute).with(:git, :clone, "--mirror", :url, :path)
-
-        subject.clone
-      end
-
-      it "should run git clone in shallow mode" do
-        context.expects(:fetch).with(:git_shallow_clone).returns("1")
-        context.expects(:repo_url).returns(:url)
-        context.expects(:repo_path).returns(:path)
-
-        context.expects(:execute).with(:git, :clone, "--mirror", "--depth", "1", "--no-single-branch", :url, :path)
-
-        subject.clone
-      end
-    end
-
-    describe "#update" do
-      it "should run git update" do
-        context.expects(:fetch).with(:git_shallow_clone).returns(nil)
-        context.expects(:execute).with(:git, :remote, :update, "--prune")
-
-        subject.update
-      end
-
-      it "should run git update in shallow mode" do
-        context.expects(:fetch).with(:git_shallow_clone).returns("1")
-        context.expects(:fetch).with(:branch).returns(:branch)
-        context.expects(:execute).with(:git, :fetch, "--depth", "1", "origin", :branch)
-
-        subject.update
-      end
-    end
-
-    describe "#release" do
-      it "should run git archive without a subtree" do
-        context.expects(:fetch).with(:repo_tree).returns(nil)
-        context.expects(:fetch).with(:branch).returns(:branch)
-        context.expects(:release_path).returns(:path)
-
-        context.expects(:execute).with(:git, :archive, :branch, "| tar -x -f - -C", :path)
-
-        subject.release
-      end
-
-      it "should run git archive with a subtree" do
-        context.expects(:fetch).with(:repo_tree).returns("tree")
-        context.expects(:fetch).with(:branch).returns(:branch)
-        context.expects(:release_path).returns(:path)
-
-        context.expects(:execute).with(:git, :archive, :branch, "tree", "| tar -x --strip-components 1 -f - -C", :path)
-
-        subject.release
-      end
-    end
-
-    describe "#fetch_revision" do
-      it "should capture git rev-list" do
-        context.expects(:fetch).with(:branch).returns(:branch)
-        context.expects(:capture).with(:git, "rev-list --max-count=1 branch").returns("81cec13b777ff46348693d327fc8e7832f79bf43")
-        revision = subject.fetch_revision
-        expect(revision).to eq("81cec13b777ff46348693d327fc8e7832f79bf43")
-      end
-    end
-  end
-end

data/spec/lib/capistrano/hg_spec.rb

@@ -1,90 +0,0 @@
-require "spec_helper"
-
-require "capistrano/hg"
-
-module Capistrano
-  describe Hg do
-    let(:context) { Class.new.new }
-    subject { Capistrano::Hg.new(context, Capistrano::Hg::DefaultStrategy) }
-
-    describe "#hg" do
-      it "should call execute hg in the context, with arguments" do
-        context.expects(:execute).with(:hg, :init)
-        subject.hg(:init)
-      end
-    end
-  end
-
-  describe Hg::DefaultStrategy do
-    let(:context) { Class.new.new }
-    subject { Capistrano::Hg.new(context, Capistrano::Hg::DefaultStrategy) }
-
-    describe "#test" do
-      it "should call test for repo HEAD" do
-        context.expects(:repo_path).returns("/path/to/repo")
-        context.expects(:test).with " [ -d /path/to/repo/.hg ] "
-
-        subject.test
-      end
-    end
-
-    describe "#check" do
-      it "should test the repo url" do
-        context.expects(:repo_url).returns(:url)
-        context.expects(:execute).with(:hg, "id", :url)
-
-        subject.check
-      end
-    end
-
-    describe "#clone" do
-      it "should run hg clone" do
-        context.expects(:repo_url).returns(:url)
-        context.expects(:repo_path).returns(:path)
-
-        context.expects(:execute).with(:hg, "clone", "--noupdate", :url, :path)
-
-        subject.clone
-      end
-    end
-
-    describe "#update" do
-      it "should run hg update" do
-        context.expects(:execute).with(:hg, "pull")
-
-        subject.update
-      end
-    end
-
-    describe "#release" do
-      it "should run hg archive without a subtree" do
-        context.expects(:fetch).with(:repo_tree).returns(nil)
-        context.expects(:fetch).with(:branch).returns(:branch)
-        context.expects(:release_path).returns(:path)
-
-        context.expects(:execute).with(:hg, "archive", :path, "--rev", :branch)
-
-        subject.release
-      end
-
-      it "should run hg archive with a subtree" do
-        context.expects(:fetch).with(:repo_tree).returns("tree")
-        context.expects(:fetch).with(:branch).returns(:branch)
-        context.expects(:release_path).returns(:path)
-
-        context.expects(:execute).with(:hg, "archive --type tgz -p . -I", "tree", "--rev", :branch, "| tar -x --strip-components 1 -f - -C", :path)
-
-        subject.release
-      end
-    end
-
-    describe "#fetch_revision" do
-      it "should capture hg log" do
-        context.expects(:fetch).with(:branch).returns(:branch)
-        context.expects(:capture).with(:hg, "log --rev branch --template \"{node}\n\"").returns("01abcde")
-        revision = subject.fetch_revision
-        expect(revision).to eq("01abcde")
-      end
-    end
-  end
-end

data/spec/lib/capistrano/svn_spec.rb

@@ -1,105 +0,0 @@
-require "spec_helper"
-
-require "capistrano/svn"
-
-module Capistrano
-  describe Svn do
-    let(:context) { Class.new.new }
-    subject { Capistrano::Svn.new(context, Capistrano::Svn::DefaultStrategy) }
-
-    describe "#svn" do
-      it "should call execute svn in the context, with arguments" do
-        context.expects(:execute).with(:svn, :init, "--username someuser", "--password somepassword")
-        context.expects(:fetch).twice.with(:svn_username).returns("someuser")
-        context.expects(:fetch).twice.with(:svn_password).returns("somepassword")
-        context.expects(:fetch).once.with(:svn_revision).returns(nil)
-        subject.svn(:init)
-      end
-    end
-  end
-
-  describe Svn::DefaultStrategy do
-    let(:context) { Class.new.new }
-    subject { Capistrano::Svn.new(context, Capistrano::Svn::DefaultStrategy) }
-
-    describe "#test" do
-      it "should call test for repo HEAD" do
-        context.expects(:repo_path).returns("/path/to/repo")
-        context.expects(:test).with " [ -d /path/to/repo/.svn ] "
-
-        subject.test
-      end
-    end
-
-    describe "#check" do
-      it "should test the repo url" do
-        context.expects(:repo_url).returns(:url)
-        context.expects(:test).with(:svn, :info, :url, "--username someuser", "--password somepassword").returns(true)
-        context.expects(:fetch).twice.with(:svn_username).returns("someuser")
-        context.expects(:fetch).twice.with(:svn_password).returns("somepassword")
-
-        subject.check
-      end
-    end
-
-    describe "#clone" do
-      it "should run svn checkout" do
-        context.expects(:repo_url).returns(:url)
-        context.expects(:repo_path).returns(:path)
-        context.expects(:fetch).twice.with(:svn_username).returns("someuser")
-        context.expects(:fetch).twice.with(:svn_password).returns("somepassword")
-        context.expects(:fetch).once.with(:svn_revision).returns(nil)
-
-        context.expects(:execute).with(:svn, :checkout, :url, :path, "--username someuser", "--password somepassword")
-
-        subject.clone
-      end
-    end
-
-    describe "#update" do
-      it "should run svn update" do
-        context.expects(:execute).with(:svn, :update, "--username someuser", "--password somepassword")
-        context.expects(:fetch).twice.with(:svn_username).returns("someuser")
-        context.expects(:fetch).twice.with(:svn_password).returns("somepassword")
-        context.expects(:fetch).once.with(:svn_revision).returns(nil)
-
-        subject.update
-      end
-    end
-
-    describe "#update_specific_revision" do
-      it "should run svn update and update to a specific revision" do
-        context.expects(:execute).with(:svn, :update, "--username someuser", "--password somepassword", "--revision 12345")
-        context.expects(:fetch).twice.with(:svn_username).returns("someuser")
-        context.expects(:fetch).twice.with(:svn_password).returns("somepassword")
-        context.expects(:fetch).twice.with(:svn_revision).returns("12345")
-
-        subject.update
-      end
-    end
-
-    describe "#release" do
-      it "should run svn export" do
-        context.expects(:release_path).returns(:path)
-        context.expects(:fetch).twice.with(:svn_username).returns("someuser")
-        context.expects(:fetch).twice.with(:svn_password).returns("somepassword")
-        context.expects(:fetch).once.with(:svn_revision).returns(nil)
-
-        context.expects(:execute).with(:svn, :export, "--force", ".", :path, "--username someuser", "--password somepassword")
-
-        subject.release
-      end
-    end
-
-    describe "#fetch_revision" do
-      it "should capture svn version" do
-        context.expects(:repo_path).returns(:path)
-
-        context.expects(:capture).with(:svnversion, :path).returns("12345")
-
-        revision = subject.fetch_revision
-        expect(revision).to eq("12345")
-      end
-    end
-  end
-end