r10k 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 487d95e761e476a0701e43c1a36a146b977a5ed5
-  data.tar.gz: a05e79eadd63370717d5c766b94868a732117889
+  metadata.gz: ecd41e7eceb75aa7e13de6984208f2c3a28767e7
+  data.tar.gz: b7e9f3e7cf6d453094cbb80a8206fd81093b7fd7
 SHA512:
-  metadata.gz: a4ae1bfa5022c9660acecf7953114c1d76e148283cc5d1a1048930a1c56be7b8492b9a07c16ac66ee8a056d69b4b1cdce9272e4485070ba738f16d59acb29ef7
-  data.tar.gz: 4e522d29f6cd877388748c871144763b258cee2afffe0ac2221c2cbbfdf3f1cb0f7bf415466a0b2725e8519787ef3abdc4e50f81906ab46ded0cd65853444807
+  metadata.gz: 23b7f184bf1bc705e5f2dc70f6c155d92a1294538bb71c021c34415cec108522f9ea3f102d2b67b3613b60a9603bf352aa37daf69f0c5057d72d40e82a81eff3
+  data.tar.gz: b5f79b0e99e783c553838b73354034f5fabfe204bf453c5f4dfe65c11e50634e88c514abd5c8907af7c73056edeef50a7dc5987de9fe786aff9ba22d90dede02

data/.travis.yml

@@ -6,6 +6,7 @@ notifications:
   email: false
 sudo: false
 rvm:
+  - "2.3.0"
   - "2.2.0"
   - "2.1.0"
   - "2.0.0"

data/CHANGELOG.mkd

@@ -1,6 +1,22 @@
 CHANGELOG
 =========
 
+2.4.4
+-----
+2016/11/16
+
+### 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.
+
+### 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.
+
 2.4.3
 -----
 
@@ -61,8 +77,8 @@ 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 
-behaviors. See the relevant [configration documentation](https://github.com/puppetlabs/r10k/blob/master/doc/dynamic-environments/configuration.mkd#purge_levels) for more details.
+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.
 
@@ -108,7 +124,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
@@ -129,9 +145,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/MAINTAINERS

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "file_format": "This MAINTAINERS file format is described at https://github.com/puppetlabs/maintainers",
+  "issues": "https://tickets.puppet.com/browse/RK",
+  "internal_list": "https://groups.google.com/a/puppet.com/forum/?hl=en#!forum/discuss-code-manager-maintainers", 
+  "people": [
+    {
+      "github": "andersonmills",
+      "email": "anderson@puppet.com",
+      "name": "Anderson Mills"
+    },
+    {
+      "github": "scotje",
+      "email": "jesse@puppet.com",
+      "name": "Jesse Scott"
+    }
+  ]
+}

data/README.mkd

@@ -122,9 +122,6 @@ Please see the CHANGELOG for a listing of the (very awesome) contributors.
 
 ## Maintenance
 
-Maintainers:
-
-* Jesse Scott, jesse@puppet.com
-* Anderson Mills, anderson@puppet.com
+See [MAINTAINERS](MAINTAINERS) (json file)
 
 Tickets: File at https://tickets.puppet.com/browse/RK

data/integration/tests/Puppetfile/{HTTPS_PROXY_effects_git_source.rb → HTTP_PROXY_effects_git_source.rb}

@@ -1,7 +1,7 @@
 require 'git_utils'
 require 'r10k_utils'
 require 'master_manipulator'
-test_name 'CODEMGMT-730 - C97982 - HTTPS_PROXY effects git source in puppetfile'
+test_name 'CODEMGMT-730 - C97982 - HTTP_PROXY effects git source in puppetfile'
 
 #Init
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
@@ -22,7 +22,7 @@ mod 'motd',
   :git    => 'https://github.com/puppetlabs/puppetlabs-motd'
 EOS
 
-proxy_env_value = 'https://ferritsarebest.net:3219'
+proxy_env_value = 'http://ferritsarebest.net:3219'
 
 #In-line files
 r10k_conf = <<-CONF
@@ -36,7 +36,7 @@ sources:
 CONF
 
 teardown do
-  master.clear_env_var('HTTPS_PROXY')
+  master.clear_env_var('HTTP_PROXY')
 
   step 'Restore Original "r10k" Config'
   on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
@@ -45,7 +45,7 @@ teardown do
   clean_up_r10k(master, last_commit, git_environments_path)
 end
 
-master.add_env_var('HTTPS_PROXY', proxy_env_value)
+master.add_env_var('HTTP_PROXY', proxy_env_value)
 
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")

data/integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb

@@ -4,6 +4,8 @@ require 'r10k_utils'
 require 'master_manipulator'
 test_name 'CODEMGMT-137 - C64160 - Use "rugged" Git Provider with Authentication'
 
+skip_test 'refactor to use shared private key internal to puppet'
+
 confine(:to, :platform => ['el', 'ubuntu', 'sles'])
 
 if ENV['GIT_PROVIDER'] == 'shellgit'

data/integration/tests/git_source/{HTTPS_proxy_and_git_source.rb → HTTP_proxy_and_git_source.rb}

@@ -1,7 +1,7 @@
 require 'git_utils'
 require 'r10k_utils'
 require 'master_manipulator'
-test_name 'CODEMGMT-730 - C97977 - Specify HTTPS_PROXY environment var and proxy for specific git source'
+test_name 'CODEMGMT-730 - C97977 - Specify HTTP_PROXY environment var and proxy for specific git source'
 
 #Init
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
@@ -19,7 +19,7 @@ mod 'motd',
   :git    => 'https://github.com/puppetlabs/puppetlabs-motd'
 EOS
 
-proxy_env_value = 'https://cattastic.net:3219'
+proxy_env_value = 'http://cattastic.net:3219'
 
 #In-line files
 r10k_conf = <<-CONF
@@ -27,16 +27,16 @@ cachedir: '/var/cache/r10k'
 git:
   provider: '#{git_provider}'
   repositories:
-    - remote: 'https://example.com/fake_git_source.git'
-      proxy: 'https://ilovecatvideos.com:3128'
+    - remote: 'http://example.com/fake_git_source.git'
+      proxy: 'http://ilovecatvideos.com:3128'
 sources:
   control:
     basedir: "#{env_path}"
-    remote: "https://example.com/fake_git_source.git"
+    remote: "http://example.com/fake_git_source.git"
 CONF
 
 teardown do
-  master.clear_env_var('HTTPS_PROXY')
+  master.clear_env_var('HTTP_PROXY')
 
   step 'Restore Original "r10k" Config'
   on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
@@ -45,7 +45,7 @@ teardown do
   clean_up_r10k(master, last_commit, git_environments_path)
 end
 
-master.add_env_var('HTTPS_PROXY', proxy_env_value)
+master.add_env_var('HTTP_PROXY', proxy_env_value)
 
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")

data/integration/tests/git_source/git_source_ssh.rb

@@ -3,6 +3,8 @@ require 'r10k_utils'
 require 'master_manipulator'
 test_name 'CODEMGMT-92 - C59234 - Single Git Source Using "SSH" Transport Protocol'
 
+skip_test 'refactor to use shared private key internal to puppet'
+
 #Init
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
 git_control_remote = 'git@github.com:puppetlabs/codemgmt-92.git'

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

@@ -65,7 +65,12 @@ class R10K::Git::Rugged::BareRepository < R10K::Git::Rugged::BaseRepository
     report_transfer(results, remote_name)
   rescue Rugged::SshError, Rugged::NetworkError => e
     restore_branches(backup_branches)
-    raise R10K::Git::GitError.new(e.message, :git_dir => git_dir, :backtrace => e.backtrace)
+    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
+      message = e.message
+    end
+    raise R10K::Git::GitError.new(message, :git_dir => git_dir, :backtrace => e.backtrace)
   rescue
     restore_branches(backup_branches)
     raise

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

@@ -73,8 +73,13 @@ class R10K::Git::Rugged::WorkingRepository < R10K::Git::Rugged::BaseRepository
     force = !opts.has_key?(:force) || opts[:force]
 
     with_repo do |repo|
-      repo.checkout(sha)
-      repo.reset(sha, :hard) if force
+      # rugged/libgit2 will not update (at least) the execute bit a file if the SHA is already at
+      # the value being reset to, so this is now changed to an if ... else
+      if force
+        repo.reset(sha, :hard)
+      else
+        repo.checkout(sha)
+      end
     end
   end
 

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '2.4.3'
+  VERSION = '2.4.4'
 end

data/spec/integration/git/rugged/working_repository_spec.rb

@@ -19,4 +19,30 @@ describe R10K::Git::Rugged::WorkingRepository, :if => R10K::Features.available?(
       }.to raise_error(R10K::Git::GitError, /Unable to check out unresolvable ref 'unresolvable'/)
     end
   end
+
+  context "checking out a specific SHA" do
+    let(:_rugged_repo) { double("Repository") }
+
+    before do
+      subject.clone(remote)
+      allow(subject).to receive(:with_repo).and_yield(_rugged_repo)
+      allow(subject).to receive(:resolve).and_return("157011a4eaa27f1202a9d94335ee4876b26d377e")
+    end
+
+    describe "with force" do
+      it "does not receive a checkout call" do
+        expect(_rugged_repo).to_not receive(:checkout)
+        expect(_rugged_repo).to receive(:reset)
+        subject.checkout("157011a4eaa27f1202a9d94335ee4876b26d377e", {:force => true})
+      end
+    end
+
+    describe "without force" do
+      it "does receive a checkout call" do
+        expect(_rugged_repo).to receive(:checkout)
+        expect(_rugged_repo).to_not receive(:reset)
+        subject.checkout("157011a4eaa27f1202a9d94335ee4876b26d377e", {:force => false})
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -180,6 +180,7 @@ files:
 - CONTRIBUTING.mkd
 - Gemfile
 - LICENSE
+- MAINTAINERS
 - README.mkd
 - Rakefile
 - bin/r10k
@@ -243,8 +244,8 @@ files:
 - integration/scripts/setup_r10k_env_ubuntu1004.sh
 - integration/scripts/setup_r10k_env_ubuntu1204.sh
 - integration/scripts/setup_r10k_env_ubuntu1404.sh
-- integration/tests/Puppetfile/HTTPS_PROXY_effects_git_source.rb
 - integration/tests/Puppetfile/HTTP_PROXY_effects_forge_source.rb
+- integration/tests/Puppetfile/HTTP_PROXY_effects_git_source.rb
 - integration/tests/README.mkd
 - integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb
 - integration/tests/basic_functionality/negative/attempt_to_install_peonly_module_without_license.rb
@@ -262,7 +263,7 @@ files:
 - integration/tests/command_line/negative/neg_invalid_cli_dep_flag.rb
 - integration/tests/command_line/negative/neg_invalid_cli_env_flag.rb
 - integration/tests/command_line/negative/neg_invalid_cmd_line_arg.rb
-- integration/tests/git_source/HTTPS_proxy_and_git_source.rb
+- integration/tests/git_source/HTTP_proxy_and_git_source.rb
 - integration/tests/git_source/git_source_git.rb
 - integration/tests/git_source/git_source_ssh.rb
 - integration/tests/git_source/git_source_submodule.rb
@@ -537,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