r10k 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecd41e7eceb75aa7e13de6984208f2c3a28767e7
-  data.tar.gz: b7e9f3e7cf6d453094cbb80a8206fd81093b7fd7
+  metadata.gz: f96ed480367c515d5ba72c0f735b0fd4b52390b1
+  data.tar.gz: c907603955fee6cdf92b90a60082dcbdf2b50803
 SHA512:
-  metadata.gz: 23b7f184bf1bc705e5f2dc70f6c155d92a1294538bb71c021c34415cec108522f9ea3f102d2b67b3613b60a9603bf352aa37daf69f0c5057d72d40e82a81eff3
-  data.tar.gz: b5f79b0e99e783c553838b73354034f5fabfe204bf453c5f4dfe65c11e50634e88c514abd5c8907af7c73056edeef50a7dc5987de9fe786aff9ba22d90dede02
+  metadata.gz: 7062fe22e3adda24a7cc2d94e1ac43d8816d0c532657e0a8fee0e8213012e41e7b7d7aa91a640f6c90fdbe66e55b0c7513e958801ea0bd9d2fb4113a59e218ba
+  data.tar.gz: 805585701d26d633d8e43c3d62acf7564eecce984209860edf98fc449938aaf1a9d356cc1d372ce2ca18a84aaee803c231883f43346ee88a45c29274988c5dd0

data/CHANGELOG.mkd

@@ -1,6 +1,25 @@
 CHANGELOG
 =========
 
+2.4.5
+-----
+
+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

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

@@ -49,9 +49,14 @@ 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 } }
-    options = {:credentials => credentials}
+
+    # 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}
     refspecs = ['+refs/*:refs/*']
 
     remote = remotes[remote_name]
@@ -64,7 +69,6 @@ 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
@@ -72,34 +76,10 @@ 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.4'
+  VERSION = '2.4.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-12-02 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.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Puppet environment and module deployment