capistrano 3.6.1 → 3.7.0.beta1

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

@@ -0,0 +1,104 @@
+require "spec_helper"
+
+require "capistrano/scm/hg"
+
+module Capistrano
+  describe SCM::Hg do
+    subject { Capistrano::SCM::Hg.new }
+
+    # This allows us to easily use `set`, `fetch`, etc. in the examples.
+    let(:env) { Capistrano::Configuration.env }
+
+    # Stub the SSHKit backend so we can set up expectations without the plugin
+    # actually executing any commands.
+    let(:backend) { stub }
+    before { SSHKit::Backend.stubs(:current).returns(backend) }
+
+    # Mimic the deploy flow tasks so that the plugin can register its hooks.
+    before do
+      Rake::Task.define_task("deploy:new_release_path")
+      Rake::Task.define_task("deploy:check")
+      Rake::Task.define_task("deploy:set_current_revision")
+    end
+
+    # Clean up any tasks or variables that the plugin defined.
+    after do
+      Rake::Task.clear
+      Capistrano::Configuration.reset!
+    end
+
+    describe "#hg" do
+      it "should call execute hg in the context, with arguments" do
+        backend.expects(:execute).with(:hg, :init)
+        subject.hg(:init)
+      end
+    end
+
+    describe "#repo_mirror_exists?" do
+      it "should call test for repo HEAD" do
+        env.set(:repo_path, "/path/to/repo")
+        backend.expects(:test).with " [ -d /path/to/repo/.hg ] "
+
+        subject.repo_mirror_exists?
+      end
+    end
+
+    describe "#check_repo_is_reachable" do
+      it "should test the repo url" do
+        env.set(:repo_url, :url)
+        backend.expects(:execute).with(:hg, "id", :url)
+
+        subject.check_repo_is_reachable
+      end
+    end
+
+    describe "#clone_repo" do
+      it "should run hg clone" do
+        env.set(:repo_url, :url)
+        env.set(:repo_path, "path")
+
+        backend.expects(:execute).with(:hg, "clone", "--noupdate", :url, "path")
+
+        subject.clone_repo
+      end
+    end
+
+    describe "#update_mirror" do
+      it "should run hg update" do
+        backend.expects(:execute).with(:hg, "pull")
+
+        subject.update_mirror
+      end
+    end
+
+    describe "#archive_to_release_path" do
+      it "should run hg archive without a subtree" do
+        env.set(:branch, :branch)
+        env.set(:release_path, "path")
+
+        backend.expects(:execute).with(:hg, "archive", "path", "--rev", :branch)
+
+        subject.archive_to_release_path
+      end
+
+      it "should run hg archive with a subtree" do
+        env.set(:repo_tree, "tree")
+        env.set(:branch, :branch)
+        env.set(:release_path, "path")
+
+        backend.expects(:execute).with(:hg, "archive --type tgz -p . -I", "tree", "--rev", :branch, "| tar -x --strip-components 1 -f - -C", "path")
+
+        subject.archive_to_release_path
+      end
+    end
+
+    describe "#fetch_revision" do
+      it "should capture hg log" do
+        env.set(:branch, :branch)
+        backend.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/scm/svn_spec.rb

@@ -0,0 +1,116 @@
+require "spec_helper"
+
+require "capistrano/scm/svn"
+
+module Capistrano
+  describe SCM::Svn do
+    subject { Capistrano::SCM::Svn.new }
+
+    # This allows us to easily use `set`, `fetch`, etc. in the examples.
+    let(:env) { Capistrano::Configuration.env }
+
+    # Stub the SSHKit backend so we can set up expectations without the plugin
+    # actually executing any commands.
+    let(:backend) { stub }
+    before { SSHKit::Backend.stubs(:current).returns(backend) }
+
+    # Mimic the deploy flow tasks so that the plugin can register its hooks.
+    before do
+      Rake::Task.define_task("deploy:new_release_path")
+      Rake::Task.define_task("deploy:check")
+      Rake::Task.define_task("deploy:set_current_revision")
+    end
+
+    # Clean up any tasks or variables that the plugin defined.
+    after do
+      Rake::Task.clear
+      Capistrano::Configuration.reset!
+    end
+
+    describe "#svn" do
+      it "should call execute svn in the context, with arguments" do
+        env.set(:svn_username, "someuser")
+        env.set(:svn_password, "somepassword")
+        backend.expects(:execute).with(:svn, :init, "--username someuser", "--password somepassword")
+        subject.svn(:init)
+      end
+    end
+
+    describe "#repo_mirror_exists?" do
+      it "should call test for repo HEAD" do
+        env.set(:repo_path, "/path/to/repo")
+        backend.expects(:test).with " [ -d /path/to/repo/.svn ] "
+
+        subject.repo_mirror_exists?
+      end
+    end
+
+    describe "#check_repo_is_reachable" do
+      it "should test the repo url" do
+        env.set(:repo_url, :url)
+        env.set(:svn_username, "someuser")
+        env.set(:svn_password, "somepassword")
+        backend.expects(:test).with(:svn, :info, :url, "--username someuser", "--password somepassword").returns(true)
+
+        subject.check_repo_is_reachable
+      end
+    end
+
+    describe "#clone_repo" do
+      it "should run svn checkout" do
+        env.set(:repo_url, :url)
+        env.set(:repo_path, "path")
+        env.set(:svn_username, "someuser")
+        env.set(:svn_password, "somepassword")
+
+        backend.expects(:execute).with(:svn, :checkout, :url, "path", "--username someuser", "--password somepassword")
+
+        subject.clone_repo
+      end
+    end
+
+    describe "#update_mirror" do
+      it "should run svn update" do
+        env.set(:svn_username, "someuser")
+        env.set(:svn_password, "somepassword")
+        backend.expects(:execute).with(:svn, :update, "--username someuser", "--password somepassword")
+
+        subject.update_mirror
+      end
+
+      context "for specific revision" do
+        it "should run svn update" do
+          env.set(:svn_username, "someuser")
+          env.set(:svn_password, "somepassword")
+          env.set(:svn_revision, "12345")
+          backend.expects(:execute).with(:svn, :update, "--username someuser", "--password somepassword", "--revision 12345")
+
+          subject.update_mirror
+        end
+      end
+    end
+
+    describe "#archive_to_release_path" do
+      it "should run svn export" do
+        env.set(:release_path, "path")
+        env.set(:svn_username, "someuser")
+        env.set(:svn_password, "somepassword")
+
+        backend.expects(:execute).with(:svn, :export, "--force", ".", "path", "--username someuser", "--password somepassword")
+
+        subject.archive_to_release_path
+      end
+    end
+
+    describe "#fetch_revision" do
+      it "should capture svn version" do
+        env.set(:repo_path, "path")
+
+        backend.expects(:capture).with(:svnversion, "path").returns("12345")
+
+        revision = subject.fetch_revision
+        expect(revision).to eq("12345")
+      end
+    end
+  end
+end

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.1
+  version: 3.7.0.beta1
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh
@@ -134,6 +134,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/issue_template.md"
+- ".github/pull_request_template.md"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -154,7 +156,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 +164,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 +176,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 +197,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 +229,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 +243,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
@@ -274,12 +277,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
@@ -289,7 +292,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 +307,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 +321,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