r10k 2.4.5 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f96ed480367c515d5ba72c0f735b0fd4b52390b1
-  data.tar.gz: c907603955fee6cdf92b90a60082dcbdf2b50803
+  metadata.gz: 63ae184bd31860c410b82f60bdaba13629c4ae6e
+  data.tar.gz: 708bfd7a7f4ef35c41110b437d06bcbd87187dc6
 SHA512:
-  metadata.gz: 7062fe22e3adda24a7cc2d94e1ac43d8816d0c532657e0a8fee0e8213012e41e7b7d7aa91a640f6c90fdbe66e55b0c7513e958801ea0bd9d2fb4113a59e218ba
-  data.tar.gz: 805585701d26d633d8e43c3d62acf7564eecce984209860edf98fc449938aaf1a9d356cc1d372ce2ca18a84aaee803c231883f43346ee88a45c29274988c5dd0
+  metadata.gz: da91a8d786f1cfe7a6f403456c8c044d2e1801a918c8cf4f18fbb783f06a8ef108974795e94b652a3172d97876e13eea8a2beb7fc9bc75a09b3eed2aa8a58da1
+  data.tar.gz: 0ed3a7a5992a1cefbb6dd1dfd27df636fdc6c680757029892b4aa7101d20a8714b7f829ebdbe4fb10d546e07f3391f20ec1661869b3d6ef6838585826d0a52fa

data/CHANGELOG.mkd

@@ -1,40 +1,22 @@
 CHANGELOG
 =========
 
-2.4.5
+2.5.0
 -----
 
-2016/12/01
-
-(RK-78) Use :prune option for #fetch in Rugged::BareRepository
-
-Versions of the "rugged" gem prior to 0.24.0 lacked the ability to automatically
-"prune" branches from a local repo that no longer existed in the matching remote
-repo after a fetch. To work around this issue, r10k included code that would
-manually remove/recreate branches during a fetch. Since "rugged" 0.24.0 is now
-widely available, r10k has been updated to use the built-in "prune" option
-during a fetch and the workaround code has been removed.
-
-NOTE: If you use the "rugged" gem with r10k, you will need to manually upgrade
-it to a version >= 0.24.0 to take advantage of the new functionality. If you
-are using a "rugged" version less than 0.24.0, r10k will now issue a warning
-every time it fetches from a remote git repository.
-
-2.4.4
------
-2016/11/16
+2016/11/15
 
 ### Bug Fixes
 
-(#669) Backport from 2.5.0 - Updated the behavior of the rugged based git
-provider to handle unexpected behavior around checkout and resets regarding
-file permissions, specifically, when resetting to an already checked out SHA
-the executable bit on files would not update.
+(#669) Updated the behavior of the rugged based git provider to handle
+unexpected behavior around checkout and resets regarding file permissions,
+specifically, when resetting to an already checked out SHA the executable bit
+on files would not update.
 
 ### Changes
 
-(#664) Backport from 2.5.0 - Added to the proxy error message for changes made
-to libcurl which gave new, surprising errors about unsupported proxy schemes.
+(#664) Added to the proxy error message for changes made to libcurl which gave
+new, surprising errors about unsupported proxy schemes.
 
 2.4.3
 -----
@@ -96,7 +78,7 @@ Puppetfile should be installed to. See the [Puppetfile documentation](https://gi
 
 You can now configure how r10k purges unmanaged content after a deployment. The
 default behavior should be unchanged but there is a new "purge\_levels" configuration
-option that can be used to enable new behavior or de-activate certain existing
+option that can be used to enable new behavior or de-activate certain existing 
 behaviors. See the relevant [configuration documentation](https://github.com/puppetlabs/r10k/blob/master/doc/dynamic-environments/configuration.mkd#purge_levels) for more details.
 
 (RK-223) Ability to track control repo branch from content declarations.
@@ -143,7 +125,7 @@ fix.)
 Previously, r10k only supported the use of HTTP proxies for connecting to the Puppet
 Forge. With these changes, r10k can now be configured to use an HTTP proxy for both
 Forge and Git operations. Configuration can be specified globally, for Forge or Git
-only, or on a per-Git repository basis. See [configuration documentation](https://github.com/puppetlabs/r10k/blob/master/doc/dynamic-environments/configuration.mkd)
+only, or on a per-Git repository basis. See [configuration documentation](https://github.com/puppetlabs/r10k/blob/master/doc/dynamic-environments/configuration.mkd) 
 for more details.
 
 ### Bug Fixes
@@ -164,9 +146,9 @@ for SSH.
 (RK-241) "deploy display" action does not properly format wrapped exceptions
 
 The "deploy display" action was not capturing and logging exceptions in the same way as
-other related actions. This meant that in many cases, when an error occurred, the
+other related actions. This meant that in many cases, when an error occurred, the 
 underlying cause was not being shown. Specifically, the "deploy display" action was
-not benefitting from the improved error messaging for unreadable SSH keys which was
+not benefitting from the improved error messaging for unreadable SSH keys which was 
 added in r10k 2.2.0 as part of RK-220.
 
 2.2.1

data/lib/r10k/git/rugged/bare_repository.rb

@@ -49,14 +49,9 @@ class R10K::Git::Rugged::BareRepository < R10K::Git::Rugged::BaseRepository
   #
   # @return [void]
   def fetch(remote_name='origin')
+    backup_branches = wipe_branches
     logger.debug1 { _("Fetching remote '%{remote_name}' at %{path}") % {remote_name: remote_name, path: @path } }
-
-    # Check to see if we have a version of Rugged that supports "fetch --prune" and warn if not
-    if defined?(Rugged::Version) && !Gem::Dependency.new('rugged', '>= 0.24.0').match?('rugged', Rugged::Version)
-      logger.warn { _("Rugged versions prior to 0.24.0 do not support pruning stale branches during fetch, please upgrade your \'rugged\' gem. (Current version is: %{version})") % {version: Rugged::Version} }
-    end
-
-    options = {:credentials => credentials, :prune => true}
+    options = {:credentials => credentials}
     refspecs = ['+refs/*:refs/*']
 
     remote = remotes[remote_name]
@@ -69,6 +64,7 @@ class R10K::Git::Rugged::BareRepository < R10K::Git::Rugged::BaseRepository
 
     report_transfer(results, remote_name)
   rescue Rugged::SshError, Rugged::NetworkError => e
+    restore_branches(backup_branches)
     if e.message =~ /Unsupported proxy scheme for/
       message = e.message + "As of curl ver 7.50.2, unsupported proxy schemes no longer fall back to HTTP."
     else
@@ -76,10 +72,34 @@ class R10K::Git::Rugged::BareRepository < R10K::Git::Rugged::BaseRepository
     end
     raise R10K::Git::GitError.new(message, :git_dir => git_dir, :backtrace => e.backtrace)
   rescue
+    restore_branches(backup_branches)
     raise
   end
 
   def exist?
     @path.exist?
   end
+
+  def wipe_branches
+    backup_branches = {}
+    with_repo do |repo|
+      repo.branches.each do |branch|
+        if !branch.head?
+          backup_branches[branch.name] = branch.target_id
+          repo.branches.delete(branch)
+        end
+      end
+    end
+    backup_branches
+  end
+
+  def restore_branches(backup_branches)
+    with_repo do |repo|
+      backup_branches.each_pair do |name, ref|
+        if !repo.branches.exist?(name)
+          repo.create_branch(name, ref)
+        end
+      end
+    end
+  end
 end

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '2.4.5'
+  VERSION = '2.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.5.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -538,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Puppet environment and module deployment