capistrano 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c06ca713a10918695c9a37ae1cb67c3cc567e6bc
-  data.tar.gz: 99aac73258a129add7dd88eabcc6d96740d796f0
+  metadata.gz: a9e2c0975c618c32c327228eb811012535f44223
+  data.tar.gz: 545d241645e8487733e8edb9d163ef92fa738e93
 SHA512:
-  metadata.gz: b21deea03c5a2b813e4e6fd078db5c43edf0e1482d94b46038a6e12e8a998bf5bd10e8460fdb438fa30405339b005674ef436516008a97acf7804125e8bf6886
-  data.tar.gz: a53999efd7cf1c188fe18b707ae01dff70dd2c30b39dff44a5b92a61177cfb0c1c82b2c000c4e98e5cf46f574ed594923fefb40caa379f82fcf9f3126f497a37
+  metadata.gz: d92ccd5bb651b77426b30e5acffe766178882a3dc97e0dfca0bbeed55a6e9fc9fd3d47d1e8c35fcee20fc62ec46d0815b09f5a7107fed4767859b465ce50ef83
+  data.tar.gz: a588aea0a342852d0f9836aeb1d10ea87485650743671343d59878b4291cd014f1bea122600583933377bdf0444be43d271fa302803109be5cc41d1a7bbbc1da

data/.rubocop.yml

@@ -3,6 +3,10 @@ AllCops:
   DisplayStyleGuide: true
   TargetRubyVersion: 2.0
 
+Metrics/BlockLength:
+  Exclude:
+    - "spec/**/*"
+    - "lib/**/*.rake"
 Style/BarePercentLiterals:
   EnforcedStyle: percent_q
 Style/ClassAndModuleChildren:

data/CHANGELOG.md

@@ -4,10 +4,23 @@ Reverse Chronological Order:
 
 ## master
 
-https://github.com/capistrano/capistrano/compare/v3.7.1...HEAD
+https://github.com/capistrano/capistrano/compare/v3.7.2...HEAD
 
 * Your contribution here!
 
+## `3.7.2` (2017-01-27)
+
+https://github.com/capistrano/capistrano/compare/v3.7.1...v3.7.2
+
+### Potentially breaking changes:
+
+* None
+
+### Other changes:
+
+* Suppress log messages of `git ls-remote` by filtering remote refs (@aeroastro)
+* The Git SCM now allows the repo_url to be changed without manually wiping out the mirror on each target host first (@javanthropus)
+
 ## `3.7.1` (2016-12-16)
 
 https://github.com/capistrano/capistrano/compare/v3.7.0...v3.7.1

data/UPGRADING-3.7.md

@@ -12,7 +12,7 @@ set :scm, :svn
 To avoid deprecation warnings:
 
 1. Remove `set :scm, ...` from your Capistrano configuration.
-2. Add *one* of the following SCM declarations to your `Capfile`:
+2. Add *one* of the following SCM declarations to your `Capfile` after `require "capistrano/deploy"`:
 
 ```ruby
 # To use Git

data/features/deploy.feature

@@ -7,7 +7,6 @@ Feature: Deploy
   Scenario: Creating the repo
     When I run cap "git:check"
     Then the task is successful
-    And references in the remote repo are listed
     And git wrapper permissions are 0700
 
   Scenario: Creating the directory structure

data/lib/capistrano/configuration/servers.rb

@@ -17,10 +17,12 @@ module Capistrano
         end
       end
 
+      # rubocop:disable Security/MarshalLoad
       def add_role(role, hosts, options={})
         options_deepcopy = Marshal.dump(options.merge(roles: role))
         Array(hosts).each { |host| add_host(host, Marshal.load(options_deepcopy)) }
       end
+      # rubocop:enable Security/MarshalLoad
 
       def roles_for(names)
         options = extract_options(names)

data/lib/capistrano/configuration/variables.rb

@@ -35,7 +35,7 @@ module Capistrano
       end
 
       def set(key, value=nil, &block)
-        @trusted_keys << key if trusted?
+        @trusted_keys << key if trusted? && !@trusted_keys.include?(key)
         remember_location(key)
         values[key] = block || value
         trace_set(key)
@@ -43,7 +43,7 @@ module Capistrano
       end
 
       def fetch(key, default=nil, &block)
-        fetched_keys << key
+        fetched_keys << key unless fetched_keys.include?(key)
         peek(key, default, &block)
       end
 

data/lib/capistrano/dsl.rb

@@ -59,10 +59,12 @@ module Capistrano
       VersionValidator.new(locked_version).verify
     end
 
+    # rubocop:disable Security/MarshalLoad
     def on(hosts, options={}, &block)
       subset_copy = Marshal.dump(Configuration.env.filter(hosts))
       SSHKit::Coordinator.new(Marshal.load(subset_copy)).each(options, &block)
     end
+    # rubocop:enable Security/MarshalLoad
 
     def run_locally(&block)
       SSHKit::Backend::Local.new(&block).run

data/lib/capistrano/scm/git.rb

@@ -32,7 +32,7 @@ class Capistrano::SCM::Git < Capistrano::SCM::Plugin
   end
 
   def check_repo_is_reachable
-    git :'ls-remote --heads', repo_url
+    git :'ls-remote', repo_url, "HEAD"
   end
 
   def clone_repo
@@ -44,6 +44,9 @@ class Capistrano::SCM::Git < Capistrano::SCM::Plugin
   end
 
   def update_mirror
+    # Update the origin URL if necessary.
+    git :remote, "set-url", "origin", repo_url
+
     # Note: Requires git version 1.9 or greater
     if (depth = fetch(:git_shallow_clone))
       git :fetch, "--depth", depth, "origin", fetch(:branch)

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.7.1".freeze
+  VERSION = "3.7.2".freeze
 end

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

@@ -46,7 +46,7 @@ module Capistrano
     describe "#check_repo_is_reachable" do
       it "should test the repo url" do
         env.set(:repo_url, "url")
-        backend.expects(:execute).with(:git, :'ls-remote --heads', "url").returns(true)
+        backend.expects(:execute).with(:git, :'ls-remote', "url", "HEAD").returns(true)
 
         subject.check_repo_is_reachable
       end
@@ -74,6 +74,9 @@ module Capistrano
 
     describe "#update_mirror" do
       it "should run git update" do
+        env.set(:repo_url, "url")
+
+        backend.expects(:execute).with(:git, :remote, "set-url", "origin", "url")
         backend.expects(:execute).with(:git, :remote, :update, "--prune")
 
         subject.update_mirror
@@ -82,6 +85,9 @@ module Capistrano
       it "should run git update in shallow mode" do
         env.set(:git_shallow_clone, "1")
         env.set(:branch, "branch")
+        env.set(:repo_url, "url")
+
+        backend.expects(:execute).with(:git, :remote, "set-url", "origin", "url")
         backend.expects(:execute).with(:git, :fetch, "--depth", "1", "origin", "branch")
 
         subject.update_mirror

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.2
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh
@@ -297,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH