r10k 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79a29967cc56c3178634ae325404b4b201aa9841
-  data.tar.gz: 5ddfd39f4a437e52ed87adc06f08945a8c2eef07
+  metadata.gz: e63992636be8dd543768f160bad72b447b3fd892
+  data.tar.gz: 8929577087203a2d4a72a63b0ff6d5da96ff1312
 SHA512:
-  metadata.gz: 1da246a1e621b9b47f9a5baca4641160c8a71a0ba66f86849f28bac73a1341b586987b154e5e4b97aca66f074fae813c4a153119f2ccc508f34b8fe2ea4c1241
-  data.tar.gz: 64f55efe4f54dae8da9d6ff5c8d5ed28201dd80ca1202e73c9af22c9867e309cb009d3c4bc6454b3b88870656bb751bed68866816d711ad47c64c0dc295d83db
+  metadata.gz: 32f6becccbae5df50626fd9133cb6f210a2d95fffce5ad69a5d534c19eceb59bee6b936f4783f4be0c3451adf3613557a4eca608255f5bff61e2c55f34282817
+  data.tar.gz: 67885326574423b9d78386e4f3045f87ba922efcf284bd2959d49a4c89ae01ba3d884055fdcbd0b121c14f1f387d2b53b49899c7ff7a609ec8206b5a47a64de7

data/CHANGELOG.mkd

@@ -1,6 +1,25 @@
 CHANGELOG
 =========
 
+2.3.1
+-----
+
+2016/11/30
+
+(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.3.0
 -----
 

data/integration/configs/pe/ubuntu-1604-64mda

@@ -0,0 +1,25 @@
+HOSTS:
+  ubuntu-1604-amd64-master:
+    roles:
+      - master
+      - dashboard
+      - database
+      - agent
+    platform: ubuntu-16.04-amd64
+    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1604-x86_64
+    hypervisor: vcloud
+  ubuntu-1604-agent:
+    roles:
+      - agent
+      - frictionless
+    platform: ubuntu-16.04-amd64
+    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1604-x86_64
+    hypervisor: vcloud
+CONFIG:
+  nfs_server: none
+  consoleport: 443
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vmpooler.delivery.puppetlabs.net/
+  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/tests/Puppetfile/HTTPS_PROXY_effects_git_source.rb

@@ -0,0 +1,70 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-730 - C97982 - HTTPS_PROXY effects git source in puppetfile'
+
+#Init
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+
+git_repo_path = '/git_repos'
+git_repo_name = 'environments'
+git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+git_provider = ENV['GIT_PROVIDER']
+
+r10k_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+
+puppetfile =<<-EOS
+mod 'motd',
+  :git    => 'https://github.com/puppetlabs/puppetlabs-motd'
+EOS
+
+proxy_env_value = 'https://ferritsarebest.net:3219'
+
+#In-line files
+r10k_conf = <<-CONF
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+sources:
+  control:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+CONF
+
+teardown do
+  master.clear_env_var('HTTPS_PROXY')
+
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  step 'cleanup r10k'
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+master.add_env_var('HTTPS_PROXY', proxy_env_value)
+
+step 'Backup Current "r10k" Config'
+on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
+
+step 'Update the "r10k" Config'
+create_remote_file(master, r10k_config_path, r10k_conf)
+
+step 'Checkout "production" Branch'
+git_on(master, 'checkout production', git_environments_path)
+
+step 'Copy Puppetfile to "production" Environment Git Repo'
+create_remote_file(master, "#{git_environments_path}/Puppetfile", puppetfile)
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)
+
+#test
+on(master, "#{r10k_fqp} deploy environment -p", :accept_all_exit_codes => true) do |r|
+  regex = /(Couldn't|Could not) resolve proxy.*ferritsarebest\.net/i
+  assert(r.exit_code == 1, 'expected error code was not observed')
+  assert_match(regex, r.stderr, 'The expected error message was not observed' )
+end

data/integration/tests/Puppetfile/HTTP_PROXY_effects_forge_source.rb

@@ -0,0 +1,72 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-730 - C97981 - HTTP_PROXY effects git source in puppetfile'
+
+#Init
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+
+git_repo_path = '/git_repos'
+git_repo_name = 'environments'
+git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+git_provider = ENV['GIT_PROVIDER']
+
+r10k_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+
+puppetfile =<<-EOS
+mod 'puppetlabs/apache', '0.10.0'
+EOS
+
+proxy_env_value = 'http://iloveferrits.net:3219'
+
+#In-line files
+r10k_conf = <<-CONF
+proxy: 'http://ilovedogs.com:3128'
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+sources:
+  control:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+forge:
+  proxy: "http://ilovecats.net:3128"
+CONF
+
+teardown do
+  master.clear_env_var('HTTP_PROXY')
+
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  step 'cleanup r10k'
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+master.add_env_var('HTTP_PROXY', proxy_env_value)
+
+step 'Backup Current "r10k" Config'
+on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
+
+step 'Update the "r10k" Config'
+create_remote_file(master, r10k_config_path, r10k_conf)
+
+step 'Checkout "production" Branch'
+git_on(master, 'checkout production', git_environments_path)
+
+step 'Copy Puppetfile to "production" Environment Git Repo'
+create_remote_file(master, "#{git_environments_path}/Puppetfile", puppetfile)
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)
+
+#test
+on(master, "#{r10k_fqp} deploy environment -p", :accept_all_exit_codes => true) do |r|
+  regex = /using proxy http:\/\/ilovecats\.net:3128/i
+  assert(r.exit_code == 1, 'expected error code was not observed')
+  assert_match(regex, r.stderr, 'The expected error message was not observed' )
+end

data/integration/tests/basic_functionality/negative/negative_bad_proxy.rb

@@ -9,48 +9,26 @@ confine(:to, :platform => ['el', 'sles'])
 master_platform = fact_on(master, 'osfamily')
 r10k_fqp = get_r10k_fqp(master)
 
-case master_platform
-  when 'RedHat'
-    pkg_manager = 'yum'
-  when 'Suse'
-    pkg_manager = 'zypper'
-end
-
-install_squid = "#{pkg_manager} install -y squid"
-remove_squid = "#{pkg_manager} remove -y squid"
-
 #Verification
-error_regex = /Unable to connect to.*getaddrinfo: Name or service not known/i
+proxy_hostname = "http://notarealhostname:3128"
+error_regex = /Unable to connect to.*#{proxy_hostname}/i
 
 #Teardown
 teardown do
   step 'Remove puppetfile'
   on(master, 'rm -rf modules/')
   on(master, 'rm Puppetfile')
-
-  step 'Remove Squid'
-  on(master, puppet("apply -e 'service {'squid' : ensure => stopped}'"))
-  on(master, remove_squid)
-
-  step 'Remove proxy environment variable'
-  master.delete_env_var('http_proxy', 'http://notarealhostname:3128')
 end
 
-step 'Install and configure squid proxy'
-on(master, install_squid)
-master.add_env_var('http_proxy', "http://notarealhostname:3128")
-
 step 'turn off the firewall'
 on(master, puppet("apply -e 'service {'iptables' : ensure => stopped}'"))
 
-step 'start squid proxy'
-on(master, puppet("apply -e 'service {'squid' : ensure => running}'"))
-
 #Tests
 step 'make a puppetfile'
 create_remote_file(master, "Puppetfile", 'mod "puppetlabs/motd"')
 
 step 'Use a r10k puppetfile'
-on(master, "#{r10k_fqp} puppetfile install", {:acceptable_exit_codes => [0,1,2]}) do |result|
+on(master, "#{r10k_fqp} puppetfile install", {:acceptable_exit_codes => [0,1,2], :environment => {"http_proxy" => proxy_hostname}}) do |result|
+  assert(result.exit_code == 1, 'The expected exit code was not observed.')
   assert_match(error_regex, result.stderr, 'Did not see the expected error')
 end

data/integration/tests/git_source/HTTPS_proxy_and_git_source.rb

@@ -0,0 +1,72 @@
+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'
+
+#Init
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+git_provider = ENV['GIT_PROVIDER']
+
+r10k_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+
+puppetfile =<<-EOS
+mod 'motd',
+  :git    => 'https://github.com/puppetlabs/puppetlabs-motd'
+EOS
+
+proxy_env_value = 'https://cattastic.net:3219'
+
+#In-line files
+r10k_conf = <<-CONF
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+  repositories:
+    - remote: 'https://example.com/fake_git_source.git'
+      proxy: 'https://ilovecatvideos.com:3128'
+sources:
+  control:
+    basedir: "#{env_path}"
+    remote: "https://example.com/fake_git_source.git"
+CONF
+
+teardown do
+  master.clear_env_var('HTTPS_PROXY')
+
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  step 'cleanup r10k'
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+master.add_env_var('HTTPS_PROXY', proxy_env_value)
+
+step 'Backup Current "r10k" Config'
+on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
+
+step 'Update the "r10k" Config'
+create_remote_file(master, r10k_config_path, r10k_conf)
+
+step 'Checkout "production" Branch'
+git_on(master, 'checkout production', git_environments_path)
+
+step 'Copy Puppetfile to "production" Environment Git Repo'
+create_remote_file(master, "#{git_environments_path}/Puppetfile", puppetfile)
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)
+
+#test
+on(master, "#{r10k_fqp} deploy environment -p", :accept_all_exit_codes => true) do |r|
+  regex = /proxy.*ilovecatvideos\.com/
+  assert(r.exit_code == 1, 'expected error code was not observed')
+  expect_failure('Failure due to RK-262') do
+    assert_match(regex, r.stderr, 'The expected error message was not observed' )
+  end
+end

data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_basedir.rb

@@ -24,7 +24,7 @@ sources:
 CONF
 
 #Verification
-error_message_regex = /ERROR.*(Failed to make directory|could not create leading directories of.*File name too long)/m
+error_message_regex = /ERROR.*(Failed to make directory|File name too long)/m
 
 #Teardown
 teardown do

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}" }
-    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: #{Rugged::Version})" }
+    end
+
+    options = {:credentials => credentials, :prune => true}
     refspecs = ['+refs/*:refs/*']
 
     remote = remotes[remote_name]
@@ -64,37 +69,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)
   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.3.0'
+  VERSION = '2.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -184,6 +184,7 @@ files:
 - integration/configs/pe/ubuntu-1004-64mda
 - integration/configs/pe/ubuntu-1204-64mda
 - integration/configs/pe/ubuntu-1404-64mda
+- integration/configs/pe/ubuntu-1604-64mda
 - integration/files/README.mkd
 - integration/files/hiera.yaml
 - integration/files/modules/helloworld/manifests/init.pp
@@ -228,6 +229,8 @@ files:
 - integration/test_run_scripts/git_source/all_tests-pe-centos6.sh
 - integration/test_run_scripts/user_scenario/basic_workflow/all_tests-pe-centos6.sh
 - integration/test_run_scripts/user_scenario/complex_workflow/all_tests-pe-centos6.sh
+- integration/tests/Puppetfile/HTTPS_PROXY_effects_git_source.rb
+- integration/tests/Puppetfile/HTTP_PROXY_effects_forge_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
@@ -245,6 +248,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/git_source_git.rb
 - integration/tests/git_source/git_source_ssh.rb
 - integration/tests/git_source/git_source_submodule.rb
@@ -507,9 +511,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Puppet environment and module deployment
 test_files: []
-has_rdoc: