r10k 2.6.5 → 2.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e316da30e6d2243053c1dbcfd77b1035119a2dc
-  data.tar.gz: 1e7389b26a3ed22b5aad90d913fa56f5d015fe8e
+  metadata.gz: c37b475095ce21d823096d20d2e44f57842fda88
+  data.tar.gz: b1f1a320a079d235b672ab467883616fa550e42a
 SHA512:
-  metadata.gz: 19d33447cf4ea83af051fe1edda24b84631c3b03160c02594d857799825665f13edbb23727be187f2ae102e4fc57cdcf889e55e564c423306b3e3b45ac6e471e
-  data.tar.gz: a0b7bdb7c82df31ad3afe81ceff091e023137a17dfaec775cd6dad3d0ca29da449bc6d21197e442109519ce65e2dab5f63db2982df5da543c61efb7da2665852
+  metadata.gz: 5c3017e68a3c1a8f6f22d914d372421c57b834a98f5734e14b4d1fbb0da02be4ec928fc36a15a75c2a6db9709460f43ac6d42624a8ab308a5d0f8a3a89e5f7b5
+  data.tar.gz: 6c3070d06402a786fdf1f854b0c824cd5e5c9c3ac6a1dc5429609c44c98622f684141e19656043ab43e8298f4f3ec7bb0add0f99a1844f4414d4d1e895eb1957

data/.gitignore

@@ -4,7 +4,6 @@ Gemfile.lock
 .bundle
 bundle
 coverage
-locales/r10k.pot
 integration/log
 integration/junit
 integration/configs

data/.travis.yml

@@ -5,13 +5,20 @@ script: "bundle exec rspec --color --format documentation spec/unit"
 notifications:
   email: false
 sudo: false
-before_install: gem update bundler
-rvm:
-  - "2.3.0"
-  - "2.2.0"
-  - "2.1.0"
-  - "2.0.0"
-  - "1.9.3"
-  - "jruby-19mode"
 jdk:
-    - oraclejdk8
+  - oraclejdk8
+before_install: gem install bundler -v '< 2' --no-document
+matrix:
+  include:
+    - stage: r10k tests
+      rvm: 2.3.0
+    - stage: r10k tests
+      rvm: 2.2.0
+    - stage: r10k tests
+      rvm: 2.1.0
+    - stage: r10k tests
+      rvm: 2.0.0
+    - stage: r10k tests
+      rvm: 1.9.3
+    - stage: r10k tests
+      rvm: jruby-19mode

data/CHANGELOG.mkd

@@ -1,5 +1,15 @@
 CHANGELOG
 =========
+
+2.6.6
+----
+
+## Changes
+
+ - Flag for overriding default branch configuration in Puppetfile
+ - Plumbing for internationalization
+ - Numerous test fixes and legacy docker work
+
 2.6.5
 ----
 

data/doc/dynamic-environments/usage.mkd

@@ -60,6 +60,18 @@ Update a single environment and force an update of modules:
 This will update the given environment and update all contained modules. This is
 useful if you want to make sure that a given environment is fully up to date.
 
+- - -
+
+Update a single environment and specify a default branch override:
+
+    r10k deploy environment my_working_environment --puppetfile --default-branch-override default_branch_override
+
+This will update the given environment and update all contained modules, overrideing 
+the :default_branch entry in the Puppetfile of each module. This is used primarily to allow
+automated r10k solutions using the control_branch pattern with a temporary branch deployment to 
+ensure the deployment is pushed to the correct module repository branch. Note that the :default_branch
+is only ever utilized if the desired ref cannot be located.
+
 ### Deploying modules
 
 Update a single module across all environments:

data/integration/Gemfile

@@ -10,8 +10,8 @@ def location_for(place, fake_version = nil)
   end
 end
 
-gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 3.33')
-gem 'beaker-pe', '~> 1.22'
+gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 4.5')
+gem 'beaker-pe', '~> 2.0'
 gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 1.1')
 gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.4')
 gem 'rototiller', '= 0.1.0'

data/integration/Rakefile

@@ -24,7 +24,6 @@ pre-suite/00_pe_install.rb,
 component/pre-suite/05_install_dev_r10k.rb,
 pre-suite/10_git_config.rb,
 pre-suite/20_pe_r10k.rb,
-pre-suite/30_test_utils.rb,
 EOS
   common_setup.gsub!("\n", '')
 

data/integration/pre-suite/00_pe_install.rb

@@ -1,3 +1,5 @@
+require 'beaker-pe'
+
 test_name 'CODEMGMT-20 - C48 - Install Puppet Enterprise'
 
 step 'Install PE'

data/integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb

@@ -58,8 +58,8 @@ 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 'Download license file from int-resources'
-curl_on(master, 'http://int-resources.ops.puppetlabs.net/QA_resources/r10k/license.key -o /etc/puppetlabs/license.key')
+step 'Download license file from artifactory'
+curl_on(master, 'https://artifactory.delivery.puppetlabs.net/artifactory/generic/r10k_test_license.key -o /etc/puppetlabs/license.key')
 
 step 'Inject New "site.pp" to the "production" Environment'
 inject_site_pp(master, site_pp_path, site_pp)

data/integration/tests/basic_functionality/proxy_with_pe_only_module.rb

@@ -86,8 +86,8 @@ 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 'Download license file from int-resources'
-curl_on(master, 'http://int-resources.ops.puppetlabs.net/QA_resources/r10k/license.key -o /etc/puppetlabs/license.key')
+step 'Download license file from artifactory'
+curl_on(master, 'https://artifactory.delivery.puppetlabs.net/artifactory/generic/r10k_test_license.key -o /etc/puppetlabs/license.key')
 
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)

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

@@ -20,17 +20,6 @@ r10k_config_bak_path = "#{r10k_config_path}.bak"
 
 tmpfs_path = '/mnt/tmpfs'
 
-if on(master, 'which python', :acceptable_exit_codes => [0, 1]).exit_code == 1
-    python_bin = 'python3'
-else
-    python_bin = 'python'
-end
-
-file_bucket_path = '/opt/filebucket'
-file_bucket_command_path = File.join(file_bucket_path, 'filebucketapp.py')
-file_bucket_command = "#{python_bin} #{file_bucket_command_path}"
-pattern_file_path = File.join(file_bucket_path, 'psuedo_random_128k.pat')
-
 test_files_path = File.join(git_environments_path, 'test_files')
 
 #In-line files
@@ -73,7 +62,8 @@ on(master, "mount -osize=10m tmpfs #{tmpfs_path} -t tmpfs")
 step 'Create Large Binary File'
 create_remote_file(master, File.join(git_environments_path, '.gitattributes'), '*.file binary')
 on(master, "mkdir -p #{test_files_path}")
-on(master, "#{file_bucket_command} -s 11 -f #{test_files_path}/test.file -d #{pattern_file_path}")
+# create a 11 mb file to fill the mount
+on(master, "dd if=/dev/urandom of=#{test_files_path}.test.file bs=1048576 count=11")
 
 step 'Push Changes'
 git_add_commit_push(master, 'production', 'Add large file.', git_environments_path)

data/integration/tests/user_scenario/basic_workflow/single_env_10000_files.rb

@@ -21,16 +21,6 @@ helloworld_module_path = File.join(local_files_root_path, 'modules', 'helloworld
 test_files = 'test_files'
 test_files_path = File.join(git_environments_path, test_files)
 
-if on(master, 'which python', :acceptable_exit_codes => [0, 1]).exit_code == 1
-  python_bin = 'python3'
-else
-  python_bin = 'python'
-end
-
-file_bucket_path = '/opt/filebucket'
-file_bucket_command_path = File.join(file_bucket_path, 'filebucketapp.py')
-file_bucket_command = "#{python_bin} #{file_bucket_command_path}"
-
 #Manifest
 site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
 site_pp = create_site_pp(master_certname, '  include helloworld')
@@ -60,7 +50,8 @@ inject_site_pp(master, site_pp_path, site_pp)
 step 'Create 10,000 Files'
 create_remote_file(master, File.join(git_environments_path, '.gitattributes'), '*.file binary')
 on(master, "mkdir -p #{test_files_path}")
-on(master, "#{file_bucket_command} -k -c 10000 -p #{test_files_path}/test -u .file")
+# create 10000 1k files with random text
+on(master, "for n in {1..10000}; do dd if=/dev/urandom of=#{test_files_path}/test$( printf %03d \"$n\" ).file bs=1024 count=1; done")
 
 step 'Create MD5 Checksum of Files'
 on(master, "cd #{test_files_path};md5sum *.file > #{checksum_file_name}")

data/integration/tests/user_scenario/basic_workflow/single_env_large_files.rb

@@ -21,17 +21,6 @@ helloworld_module_path = File.join(local_files_root_path, 'modules', 'helloworld
 test_files = 'test_files'
 test_files_path = File.join(git_environments_path, 'test_files')
 
-if on(master, 'which python', :acceptable_exit_codes => [0, 1]).exit_code == 1
-  python_bin = 'python3'
-else
-  python_bin = 'python'
-end
-
-file_bucket_path = '/opt/filebucket'
-file_bucket_command_path = File.join(file_bucket_path, 'filebucketapp.py')
-pattern_file_path = File.join(file_bucket_path, 'psuedo_random_128k.pat')
-file_bucket_command = "#{python_bin} #{file_bucket_command_path}"
-
 #Manifest
 site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
 site_pp = create_site_pp(master_certname, '  include helloworld')
@@ -61,7 +50,8 @@ inject_site_pp(master, site_pp_path, site_pp)
 step 'Create Large Binary Files'
 create_remote_file(master, File.join(git_environments_path, '.gitattributes'), '*.file binary')
 on(master, "mkdir -p #{test_files_path}")
-on(master, "#{file_bucket_command} -c 10 -s 25 -p #{test_files_path}/test -u .file -d #{pattern_file_path}")
+# create 10 25 MB files with random characters
+on(master, "for n in {1..10}; do dd if=/dev/urandom of=#{test_files_path}/test$( printf %03d \"$n\" ).file bs=1048576 count=25; done")
 
 step 'Create MD5 Checksum of Files'
 on(master, "cd #{test_files_path};md5sum *.file > #{checksum_file_name}")

data/lib/r10k/action/deploy/environment.rb

@@ -109,7 +109,7 @@ module R10K
         end
 
         def visit_puppetfile(puppetfile)
-          puppetfile.load
+          puppetfile.load(@opts[:'default-branch-override'])
 
           yield
 
@@ -146,7 +146,7 @@ module R10K
         end
 
         def allowed_initialize_opts
-          super.merge(puppetfile: :self, cachedir: :self, :'no-force' => :self)
+          super.merge(puppetfile: :self, cachedir: :self, :'no-force' => :self, :'default-branch-override' => :self)
         end
       end
     end

data/lib/r10k/cli/deploy.rb

@@ -53,6 +53,7 @@ scheduled. On subsequent deployments, Puppetfile deployment will default to off.
           DESCRIPTION
 
           flag :p, :puppetfile, 'Deploy modules from a puppetfile'
+          required nil, :'default-branch-override', 'Specify a branchname to override the default branch in the puppetfile'
 
           runner R10K::Action::CriRunner.wrap(R10K::Action::Deploy::Environment)
         end

data/lib/r10k/module/git.rb

@@ -23,6 +23,11 @@ class R10K::Module::Git < R10K::Module::Base
   #   @return [String]
   attr_reader :desired_ref
 
+  # @!attribute [r] default_ref
+  #   @api private
+  #   @return [String]
+  attr_reader :default_ref
+
   def initialize(title, dirname, args, environment=nil)
     super
 

data/lib/r10k/puppetfile.rb

@@ -55,17 +55,20 @@ class Puppetfile
     @loaded = false
   end
 
-  def load
+  def load(default_branch_override = nil)
     if File.readable? @puppetfile_path
-      self.load!
+      self.load!(default_branch_override)
     else
       logger.debug _("Puppetfile %{path} missing or unreadable") % {path: @puppetfile_path.inspect}
     end
   end
 
-  def load!
+  def load!(default_branch_override = nil)
+    @default_branch_override = default_branch_override
+
     dsl = R10K::Puppetfile::DSL.new(self)
     dsl.instance_eval(puppetfile_contents, @puppetfile_path)
+    
     validate_no_duplicate_names(@modules)
     @loaded = true
   rescue SyntaxError, LoadError, ArgumentError => e
@@ -107,6 +110,10 @@ class Puppetfile
       install_path = @moduledir
     end
 
+    if args.is_a?(Hash) && @default_branch_override != nil
+      args[:default_branch] = @default_branch_override
+    end
+
     # Keep track of all the content this Puppetfile is managing to enable purging.
     @managed_content[install_path] = Array.new unless @managed_content.has_key?(install_path)
 

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '2.6.5'
+  VERSION = '2.6.6'
 end

data/locales/r10k.pot

@@ -0,0 +1,486 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2018 Puppet, Inc.
+# This file is distributed under the same license as the r10k package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: r10k 2.6.5-10-g5854775\n"
+"\n"
+"Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
+"POT-Creation-Date: 2018-11-29 09:11-0800\n"
+"PO-Revision-Date: 2018-11-29 09:11-0800\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: ../lib/r10k/action/deploy/deploy_helpers.rb:12 ../lib/r10k/settings/loader.rb:63
+msgid "No configuration file given, no config file found in current directory, and no global config present"
+msgstr ""
+
+#: ../lib/r10k/action/deploy/deploy_helpers.rb:26
+msgid "Making changes to deployed environments has been administratively disabled."
+msgstr ""
+
+#: ../lib/r10k/action/deploy/deploy_helpers.rb:27
+msgid "Reason: %{write_lock}"
+msgstr ""
+
+#: ../lib/r10k/action/deploy/environment.rb:56
+msgid "Environment(s) \\'%{environments}\\' cannot be found in any source and will not be deployed."
+msgstr ""
+
+#: ../lib/r10k/action/deploy/environment.rb:79
+msgid "Environment %{env_dir} does not match environment name filter, skipping"
+msgstr ""
+
+#: ../lib/r10k/action/deploy/environment.rb:86
+msgid "Deploying environment %{env_path}"
+msgstr ""
+
+#: ../lib/r10k/action/deploy/environment.rb:89
+msgid "Environment %{env_dir} is now at %{env_signature}"
+msgstr ""
+
+#: ../lib/r10k/action/deploy/environment.rb:93
+msgid "Environment %{env_dir} is new, updating all modules"
+msgstr ""
+
+#: ../lib/r10k/action/deploy/environment.rb:123
+msgid "Deploying Puppetfile content %{mod_path}"
+msgstr ""
+
+#: ../lib/r10k/action/deploy/module.rb:49
+msgid "Only updating modules in environment %{opt_env} skipping environment %{env_path}"
+msgstr ""
+
+#: ../lib/r10k/action/deploy/module.rb:51
+msgid "Updating modules %{modules} in environment %{env_path}"
+msgstr ""
+
+#: ../lib/r10k/action/deploy/module.rb:63
+msgid "Deploying module %{mod_path}"
+msgstr ""
+
+#: ../lib/r10k/action/deploy/module.rb:66
+msgid "Only updating modules %{modules}, skipping module %{mod_name}"
+msgstr ""
+
+#: ../lib/r10k/action/puppetfile/check.rb:14
+msgid "Syntax OK"
+msgstr ""
+
+#: ../lib/r10k/action/puppetfile/cri_runner.rb:19
+msgid "The use of the PUPPETFILE and PUPPETFILE_DIR environment variables is deprecated."
+msgstr ""
+
+#: ../lib/r10k/action/puppetfile/install.rb:30
+msgid "Updating module %{mod_path}"
+msgstr ""
+
+#: ../lib/r10k/action/puppetfile/install.rb:33
+msgid "Cannot track control repo branch for content '%{name}' when not part of a 'deploy' action, will use default if available."
+msgstr ""
+
+#: ../lib/r10k/action/runner.rb:49 ../lib/r10k/deployment/config.rb:42
+msgid "Overriding config file setting '%{key}': '%{old_val}' -> '%{new_val}'"
+msgstr ""
+
+#: ../lib/r10k/action/runner.rb:82
+msgid "Reading configuration from %{config_path}"
+msgstr ""
+
+#: ../lib/r10k/action/runner.rb:85
+msgid "No config file explicitly given and no default config file could be found, default settings will be used."
+msgstr ""
+
+#: ../lib/r10k/deployment.rb:90
+msgid "Environment collision at %{env_path} between %{source}:%{env_name} and %{osource}:%{oenv_name}"
+msgstr ""
+
+#: ../lib/r10k/deployment.rb:118
+msgid "Unable to load sources; the supplied configuration does not define the 'sources' key"
+msgstr ""
+
+#: ../lib/r10k/environment/base.rb:53 ../lib/r10k/environment/base.rb:69 ../lib/r10k/environment/base.rb:78 ../lib/r10k/source/base.rb:58
+msgid "%{class} has not implemented method %{method}"
+msgstr ""
+
+#: ../lib/r10k/feature.rb:27
+msgid "Testing to see if feature %{name} is available."
+msgstr ""
+
+#: ../lib/r10k/feature.rb:30
+msgid "Feature %{name} %{message} available."
+msgstr ""
+
+#: ../lib/r10k/feature.rb:37
+msgid "Attempting to load library '%{lib}' for feature %{name}"
+msgstr ""
+
+#: ../lib/r10k/feature.rb:41
+msgid "Error while loading library %{lib} for feature %{name}: %{error_msg}"
+msgstr ""
+
+#: ../lib/r10k/feature.rb:47
+msgid "Evaluating proc %{block} to test for feature %{name}"
+msgstr ""
+
+#: ../lib/r10k/feature.rb:49
+msgid "Proc %{block} for feature %{name} returned %{output}"
+msgstr ""
+
+#: ../lib/r10k/forge/module_release.rb:164
+msgid "Unpacking %{tarball_cache_path} to %{target_dir} (with tmpdir %{tmp_path})"
+msgstr ""
+
+#: ../lib/r10k/forge/module_release.rb:166
+msgid "Valid files unpacked: %{valid_files}"
+msgstr ""
+
+#: ../lib/r10k/forge/module_release.rb:168
+msgid "These files existed in the module's tar file, but are invalid filetypes and were not unpacked: %{invalid_files}"
+msgstr ""
+
+#: ../lib/r10k/forge/module_release.rb:171
+msgid "Symlinks are unsupported and were not unpacked from the module tarball. %{release_slug} contained these ignored symlinks: %{symlinks}"
+msgstr ""
+
+#: ../lib/r10k/git.rb:32
+msgid "Rugged has been compiled without support for %{transport}; Git repositories will not be reachable via %{transport}."
+msgstr ""
+
+#: ../lib/r10k/git.rb:68
+msgid "No Git providers are functional."
+msgstr ""
+
+#: ../lib/r10k/git.rb:85
+msgid "No Git provider named '%{name}'."
+msgstr ""
+
+#: ../lib/r10k/git.rb:89
+msgid "Git provider '%{name}' is not functional."
+msgstr ""
+
+#: ../lib/r10k/git.rb:96
+msgid "Setting Git provider to %{provider}"
+msgstr ""
+
+#: ../lib/r10k/git.rb:104
+msgid "No Git provider set."
+msgstr ""
+
+#: ../lib/r10k/git.rb:107
+msgid "Setting Git provider to default provider %{name}"
+msgstr ""
+
+#: ../lib/r10k/git/alternates.rb:46
+msgid "Cannot write %{file}; parent directory does not exist"
+msgstr ""
+
+#: ../lib/r10k/git/cache.rb:55
+msgid "%{class}#path is deprecated; use #git_dir"
+msgstr ""
+
+#: ../lib/r10k/git/cache.rb:84
+msgid "Creating new git cache for %{remote}"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/bare_repository.rb:34 ../lib/r10k/git/rugged/working_repository.rb:28
+msgid "Cloning '%{remote}' into %{path}"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/bare_repository.rb:52
+msgid "Fetching remote '%{remote_name}' at %{path}"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/bare_repository.rb:56
+msgid "Rugged versions prior to 0.24.0 do not support pruning stale branches during fetch, please upgrade your \\'rugged\\' gem. (Current version is: %{version})"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/credentials.rb:24
+msgid "Authentication failed for Git remote %{url}."
+msgstr ""
+
+#: ../lib/r10k/git/rugged/credentials.rb:48
+msgid "Using per-repository private key %{key} for URL %{url}"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/credentials.rb:51
+msgid "URL %{url} has no per-repository private key using '%{key}'."
+msgstr ""
+
+#: ../lib/r10k/git/rugged/credentials.rb:53
+msgid "Git remote %{url} uses the SSH protocol but no private key was given"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/credentials.rb:57
+msgid "Unable to use SSH key auth for %{url}: private key %{private_key} is missing or unreadable"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/credentials.rb:80
+msgid "URL %{url} includes the username %{username}, using that user for authentication."
+msgstr ""
+
+#: ../lib/r10k/git/rugged/credentials.rb:83
+msgid "URL %{url} did not specify a user, using %{user} from configuration"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/credentials.rb:86
+msgid "URL %{url} did not specify a user, using current user %{user}"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/thin_repository.rb:85 ../lib/r10k/git/shellgit/thin_repository.rb:65
+msgid "Updated repo %{path} to include alternate object db path %{objects_dir}"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/working_repository.rb:67
+msgid "Checking out ref '%{ref}' (resolved to SHA '%{sha}') in repository %{path}"
+msgstr ""
+
+#: ../lib/r10k/git/rugged/working_repository.rb:87
+msgid "Fetching remote '%{remote}' at %{path}"
+msgstr ""
+
+#: ../lib/r10k/git/stateful_repository.rb:40
+msgid "Unable to sync repo to unresolvable ref '%{ref}'"
+msgstr ""
+
+#: ../lib/r10k/git/stateful_repository.rb:47
+msgid "Cloning %{repo_path} and checking out %{ref}"
+msgstr ""
+
+#: ../lib/r10k/git/stateful_repository.rb:50
+msgid "Replacing %{repo_path} and checking out %{ref}"
+msgstr ""
+
+#: ../lib/r10k/git/stateful_repository.rb:54 ../lib/r10k/git/stateful_repository.rb:59
+msgid "Updating %{repo_path} to %{ref}"
+msgstr ""
+
+#: ../lib/r10k/git/stateful_repository.rb:58
+msgid "Overwriting local modifications to %{repo_path}"
+msgstr ""
+
+#: ../lib/r10k/git/stateful_repository.rb:62
+msgid "Skipping %{repo_path} due to local modifications"
+msgstr ""
+
+#: ../lib/r10k/git/stateful_repository.rb:65
+msgid "%{repo_path} is already at Git ref %{ref}"
+msgstr ""
+
+#: ../lib/r10k/initializers.rb:30
+msgid "the purgedirs key in r10k.yaml is deprecated. it is currently ignored."
+msgstr ""
+
+#: ../lib/r10k/keyed_factory.rb:18
+msgid "Class already registered for %{key}"
+msgstr ""
+
+#: ../lib/r10k/keyed_factory.rb:32
+msgid "No class registered for %{key}"
+msgstr ""
+
+#: ../lib/r10k/logging.rb:60
+msgid "Invalid log level '%{val}'. Valid levels are %{log_levels}"
+msgstr ""
+
+#: ../lib/r10k/module.rb:29
+msgid "Module %{name} with args %{args} doesn't have an implementation. (Are you using the right arguments?)"
+msgstr ""
+
+#: ../lib/r10k/module/base.rb:101
+msgid "Module name (%{title}) must match either 'modulename' or 'owner/modulename'"
+msgstr ""
+
+#: ../lib/r10k/module/forge.rb:70 ../lib/r10k/module/forge.rb:95
+msgid "The module %{title} does not exist on %{url}."
+msgstr ""
+
+#: ../lib/r10k/module/forge.rb:170
+msgid "Forge module names must match 'owner/modulename'"
+msgstr ""
+
+#: ../lib/r10k/module/git.rb:92
+msgid "Unhandled options %{unhandled} specified for %{class}"
+msgstr ""
+
+#: ../lib/r10k/module/local.rb:34
+msgid "Module %{title} is a local module, always indicating synced."
+msgstr ""
+
+#: ../lib/r10k/module/metadata_file.rb:25
+msgid "Could not read metadata.json"
+msgstr ""
+
+#: ../lib/r10k/puppetfile.rb:62
+msgid "Puppetfile %{path} missing or unreadable"
+msgstr ""
+
+#: ../lib/r10k/puppetfile.rb:72
+msgid "Failed to evaluate %{path}"
+msgstr ""
+
+#: ../lib/r10k/puppetfile.rb:86
+msgid "Puppetfiles should not contain duplicate module names and will result in an error in r10k v3.x."
+msgstr ""
+
+#: ../lib/r10k/puppetfile.rb:87
+msgid "Remove the duplicates of the following modules: %{dupes}"
+msgstr ""
+
+#: ../lib/r10k/puppetfile.rb:207
+msgid "unrecognized declaration '%{method}'"
+msgstr ""
+
+#: ../lib/r10k/settings/collection.rb:77
+msgid "Validation failed for '%{name}' settings group"
+msgstr ""
+
+#: ../lib/r10k/settings/collection.rb:79
+msgid "Validation failed for settings group"
+msgstr ""
+
+#: ../lib/r10k/settings/container.rb:87
+msgid "Key %{key} is not a valid key"
+msgstr ""
+
+#: ../lib/r10k/settings/enum_definition.rb:13
+msgid "Setting %{name} may only contain %{enums}; the disallowed values %{invalid} were present"
+msgstr ""
+
+#: ../lib/r10k/settings/enum_definition.rb:17
+msgid "Setting %{name} should be one of %{enums}, not '%{value}'"
+msgstr ""
+
+#: ../lib/r10k/settings/helpers.rb:19
+msgid "%{class} instances cannot be reassigned to a new parent."
+msgstr ""
+
+#: ../lib/r10k/settings/helpers.rb:23
+msgid "%{class} instances may only belong to a settings collection or list."
+msgstr ""
+
+#: ../lib/r10k/settings/list.rb:66
+msgid "Validation failed for '%{name}' settings list"
+msgstr ""
+
+#: ../lib/r10k/settings/loader.rb:45
+msgid "Both %{default_path} and %{old_default_path} configuration files exist."
+msgstr ""
+
+#: ../lib/r10k/settings/loader.rb:46
+msgid "%{default_path} will be used."
+msgstr ""
+
+#: ../lib/r10k/settings/loader.rb:52
+msgid "The r10k configuration file at %{old_default_path} is deprecated."
+msgstr ""
+
+#: ../lib/r10k/settings/loader.rb:53
+msgid "Please move your r10k configuration to %{default_path}."
+msgstr ""
+
+#: ../lib/r10k/settings/loader.rb:69
+msgid "Couldn't load config file: %{error_msg}"
+msgstr ""
+
+#: ../lib/r10k/settings/loader.rb:73
+msgid "File exists at #{path} but doesn't contain any YAML"
+msgstr ""
+
+#: ../lib/r10k/settings/uri_definition.rb:12
+msgid "Setting %{name} requires a URL but '%{value}' could not be parsed as a URL"
+msgstr ""
+
+#: ../lib/r10k/source/git.rb:72
+msgid "Fetching '%{remote}' to determine current branches."
+msgstr ""
+
+#: ../lib/r10k/source/git.rb:75
+msgid "Unable to determine current branches for Git source '%{name}' (%{basedir})"
+msgstr ""
+
+#: ../lib/r10k/source/git.rb:100
+msgid "Environment %{env_name} contained non-word characters, correcting name to %{corrected_env_name}"
+msgstr ""
+
+#: ../lib/r10k/source/git.rb:104
+msgid "Environment %{env_name} contained non-word characters, ignoring it."
+msgstr ""
+
+#: ../lib/r10k/source/git.rb:123 ../lib/r10k/source/svn.rb:111
+msgid "Branch %{branch} filtered out by ignore_branch_prefixes %{ibp}"
+msgstr ""
+
+#: ../lib/r10k/svn/working_dir.rb:43
+msgid "Both username and password must be specified"
+msgstr ""
+
+#: ../lib/r10k/util/basedir.rb:34
+msgid "Expected Array<#desired_contents>, got R10K::Deployment"
+msgstr ""
+
+#: ../lib/r10k/util/basedir.rb:58
+msgid "Source %{source_name} in %{path} manages contents %{contents}"
+msgstr ""
+
+#: ../lib/r10k/util/license.rb:11
+msgid "pe_license feature is available, loading PE license key"
+msgstr ""
+
+#: ../lib/r10k/util/license.rb:15
+msgid "Invalid PE license detected: %{error_msg}"
+msgstr ""
+
+#: ../lib/r10k/util/license.rb:18
+msgid "pe_license feature is not available, PE only Puppet modules will not be downloadable."
+msgstr ""
+
+#: ../lib/r10k/util/purgeable.rb:50
+msgid "Not purging %{item} due to internal exclusion match: %{exclusion_match}"
+msgstr ""
+
+#: ../lib/r10k/util/purgeable.rb:52
+msgid "Not purging %{item} due to whitelist match: %{whitelist_match}"
+msgstr ""
+
+#: ../lib/r10k/util/purgeable.rb:69
+msgid "No unmanaged contents in %{managed_dirs}, nothing to purge"
+msgstr ""
+
+#: ../lib/r10k/util/purgeable.rb:74
+msgid "Removing unmanaged path %{path}"
+msgstr ""
+
+#: ../lib/r10k/util/purgeable.rb:79
+msgid "Unable to remove unmanaged path: %{path}"
+msgstr ""
+
+#: ../lib/r10k/util/setopts.rb:49
+msgid "%{class_name} cannot handle option '%{key}'"
+msgstr ""
+
+#: ../lib/r10k/util/subprocess.rb:69
+msgid "Starting process: %{args}"
+msgstr ""
+
+#: ../lib/r10k/util/subprocess.rb:74
+msgid ""
+"Finished process:\n"
+"%{result}"
+msgstr ""
+
+#: ../lib/r10k/util/subprocess.rb:77
+msgid "Command exited with non-zero exit code"
+msgstr ""
+
+#: ../lib/r10k/util/symbolize_keys.rb:17
+msgid "An existing interned key for %{key} exists, cannot overwrite"
+msgstr ""

data/spec/fixtures/unit/puppetfile/default-branch-override/Puppetfile

@@ -0,0 +1,5 @@
+mod 'cd4pe',
+  :git => 'test@randomurl.com:something/some_module.git',
+  :ref => 'expected_ref',
+  :default_branch => 'here_lies_the_default_branch'
+

data/spec/unit/action/deploy/environment_spec.rb

@@ -19,6 +19,10 @@ describe R10K::Action::Deploy::Environment do
       described_class.new({puppetfile: true}, [])
     end
 
+    it "can accept a default_branch_override option" do
+      described_class.new({:'default-branch-override' => 'default_branch_override_name'}, [])
+    end
+
     it "can accept a no-force option" do
       described_class.new({:'no-force' => true}, [])
     end

data/spec/unit/puppetfile_spec.rb

@@ -181,6 +181,25 @@ describe R10K::Puppetfile do
       subject = described_class.new(path)
       expect { subject.load! }.not_to raise_error
     end
+
+    it "creates a git module and applies the default branch sepcified in the Puppetfile" do
+      path = File.join(PROJECT_ROOT, 'spec', 'fixtures', 'unit', 'puppetfile', 'default-branch-override')
+      pf_path = File.join(path, 'Puppetfile')
+      subject = described_class.new(path)
+      expect { subject.load! }.not_to raise_error
+      git_module = subject.modules[0]
+      expect(git_module.default_ref).to eq 'here_lies_the_default_branch'
+    end
+
+    it "creates a git module and applies the provided default_branch_override" do
+      path = File.join(PROJECT_ROOT, 'spec', 'fixtures', 'unit', 'puppetfile', 'default-branch-override')
+      pf_path = File.join(path, 'Puppetfile')
+      subject = described_class.new(path)
+      default_branch_override = 'default_branch_override_name'
+      expect { subject.load!(default_branch_override) }.not_to raise_error
+      git_module = subject.modules[0]
+      expect(git_module.default_ref).to eq default_branch_override
+    end
   end
 
   describe "accepting a visitor" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.6
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -160,7 +160,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitattributes"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.mkd
@@ -170,7 +169,6 @@ files:
 - MAINTAINERS
 - README.mkd
 - Rakefile
-- azure-pipelines.yml
 - bin/r10k
 - doc/common-patterns.mkd
 - doc/dynamic-environments.mkd
@@ -187,13 +185,6 @@ files:
 - doc/git/providers.mkd
 - doc/puppetfile.mkd
 - doc/updating-your-puppetfile.mkd
-- docker/.rspec
-- docker/Gemfile
-- docker/ci/build
-- docker/ci/build.ps1
-- docker/distelli-manifest.yml
-- docker/r10k/Dockerfile
-- docker/r10k/spec/dockerfile_spec.rb
 - integration/Gemfile
 - integration/README.mkd
 - integration/Rakefile
@@ -215,7 +206,6 @@ files:
 - integration/pre-suite/00_pe_install.rb
 - integration/pre-suite/10_git_config.rb
 - integration/pre-suite/20_pe_r10k.rb
-- integration/pre-suite/30_test_utils.rb
 - integration/pre-suite/README.mkd
 - integration/scripts/README.mkd
 - integration/scripts/setup_r10k_env_centos5.sh
@@ -392,6 +382,7 @@ files:
 - lib/r10k/util/symbolize_keys.rb
 - lib/r10k/version.rb
 - locales/config.yaml
+- locales/r10k.pot
 - r10k.gemspec
 - r10k.yaml.example
 - spec/fixtures/empty/.empty
@@ -400,6 +391,7 @@ files:
 - spec/fixtures/module/forge/eight_hundred/Modulefile
 - spec/fixtures/module/forge/eight_hundred/metadata.json
 - spec/fixtures/unit/puppetfile/argument-error/Puppetfile
+- spec/fixtures/unit/puppetfile/default-branch-override/Puppetfile
 - spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile
 - spec/fixtures/unit/puppetfile/load-error/Puppetfile
 - spec/fixtures/unit/puppetfile/valid-forge-with-version/Puppetfile

data/.gitattributes

@@ -1 +0,0 @@
-docker/r10k/*               text  eol=lf

data/azure-pipelines.yml

@@ -1,72 +0,0 @@
-pool:
-  # self-hosted agent on Windows 10 1709 environment
-  # includes newer Docker engine with LCOW enabled, new build of LCOW image
-  # includes Ruby 2.5, Go 1.10, Node.js 10.10, hadolint
-  name: Default
-
-variables:
-  BUILD_REPOSITORY: 127.0.0.1
-
-steps:
-- powershell: |
-    $line = '=' * 80
-    Write-Host "$line`nWindows`n$line`n"
-    Get-ComputerInfo |
-      select WindowsProductName, WindowsVersion, OsHardwareAbstractionLayer |
-      Out-String |
-      Write-Host
-    #
-    # Azure
-    #
-    Write-Host "`n`n$line`nAzure`n$line`n"
-    Invoke-RestMethod -Headers @{'Metadata'='true'} -URI http://169.254.169.254/metadata/instance?api-version=2017-12-01 -Method Get |
-      ConvertTo-Json -Depth 10 |
-      Write-Host
-    #
-    # Docker
-    #
-    Write-Host "`n`n$line`nDocker`n$line`n"
-    docker version
-    docker images
-    docker info
-    sc.exe qc docker
-    #
-    # Ruby
-    #
-    Write-Host "`n`n$line`nRuby`n$line`n"
-    ruby --version
-    gem --version
-    bundle --version
-    #
-    # Environment
-    #
-    Write-Host "`n`n$line`nEnvironment`n$line`n"
-    Get-ChildItem Env: | % { Write-Host "$($_.Key): $($_.Value)"  }
-  displayName: Diagnostic Host Information
-  name: hostinfo
-- powershell: |
-    . ./docker/ci/build.ps1
-    Invoke-ContainerBuildSetup
-  displayName: Prepare Build Environment
-  name: build_prepare
-- powershell: |
-    . ./docker/ci/build.ps1
-    Build-Container -Name r10k -Repository $ENV:BUILD_REPOSITORY
-  displayName: Build r10k
-  name: build_r10k
-- powershell: |
-    . ./docker/ci/build.ps1
-    Invoke-ContainerTest -Name r10k -Repository $ENV:BUILD_REPOSITORY
-  displayName: Test r10k
-  name: test_r10k
-- task: PublishTestResults@2
-  displayName: Publish r10k test results
-  inputs:
-    testResultsFormat: 'JUnit'
-    testResultsFiles: 'docker/**/TEST-*.xml'
-    testRunTitle: r10k Test Results
-- powershell: |
-    . ./docker/ci/build.ps1
-    Clear-ContainerBuilds
-  displayName: Container Cleanup
-  condition: always()

data/docker/.rspec

@@ -1,3 +0,0 @@
---format RspecJunitFormatter
---out TEST-rspec.xml
---format documentation

data/docker/Gemfile

@@ -1,14 +0,0 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-def location_for(place, fake_version = nil)
-  if place =~ /^((?:git|https?)[:@][^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
-  else
-    [place, { :require => false }]
-  end
-end
-
-gem 'puppet_docker_tools', *location_for(ENV['PUPPET_DOCKER_LOCATION'] || '~> 0.2')
-gem 'rspec_junit_formatter'

data/docker/ci/build

@@ -1,72 +0,0 @@
-#!/usr/bin/env bash
-
-set -eux
-
-PATH=$PATH:/usr/local/bin
-BUNDLER_PATH=.bundle/gems
-
-function build_and_test_image() {
-  container_name="$1"
-
-  : ===
-  : === run linter on the docker files
-  : ===
-   bundle exec puppet-docker local-lint "$container_name"
-
-  : ===
-  : === build and test $container_name
-  : ===
-  bundle exec puppet-docker build "$container_name" --no-cache --repository puppet --version "$version" --no-latest
-  bundle exec puppet-docker spec "$container_name" --image "puppet/$container_name:$version"
-}
-
-function push_image() {
-  container_name="$1"
-  container_version="$2"
-  : ===
-  : === push $container_name
-  : ===
-  bundle exec puppet-docker push "$container_name" --repository puppet --version "$container_version" --no-latest
-}
-
-: ===
-: === bundle install to get ready
-: ===
-bundle install --path "$BUNDLER_PATH"
-
-: ===
-: === If we do not git pull --unshallow we get really weird results with git describe
-: ===
-git pull --unshallow
-
-: ===
-: === make sure we fetch tags for versioning
-: ===
-git fetch origin 'refs/tags/*:refs/tags/*'
-git_describe=`git describe`
-version="${git_describe%%-*}"
-
-: ===
-: === pull updated base images
-: ===
-bundle exec puppet-docker update-base-images ubuntu:16.04
-
-container_list=(r10k)
-
-: ===
-: === build and test all the images before we push anything
-: ===
-for container in "${container_list[@]}"; do
-  build_and_test_image "$container"
-done
-
-: ===
-: === push all the images
-: ===
-for container in "${container_list[@]}"; do
-  push_image "$container" "$version"
-done
-
-: ===
-: === SUCCESS
-: ===

data/docker/ci/build.ps1

@@ -1,38 +0,0 @@
-$ErrorActionPreference = 'Stop'
-
-function Get-CurrentDirectory
-{
-  $thisName = $MyInvocation.MyCommand.Name
-  [IO.Path]::GetDirectoryName((Get-Content function:$thisName).File)
-}
-
-# installs gems for build and test and grabs base images
-function Invoke-ContainerBuildSetup
-{
-  Push-Location (Get-CurrentDirectory)
-  bundle install --path '.bundle/gems'
-  bundle exec puppet-docker update-base-images ubuntu:16.04
-  Pop-Location
-}
-
-function Build-Container($Name, $Repository = '127.0.0.1')
-{
-  Push-Location (Join-Path (Get-CurrentDirectory) '..')
-  bundle exec puppet-docker local-lint $Name
-  bundle exec puppet-docker build $Name --no-cache --repository $Repository --build-arg namespace=$Repository
-  Pop-Location
-}
-
-function Invoke-ContainerTest($Name, $Repository = '127.0.0.1')
-{
-  Push-Location (Join-Path (Get-CurrentDirectory) '..')
-  bundle exec puppet-docker spec $Name --image $Repository/$Name
-  Pop-Location
-}
-
-# removes any temporary containers / images used during builds
-function Clear-ContainerBuilds
-{
-  docker container prune --force
-  docker image prune --filter "dangling=true" --force
-}

data/docker/distelli-manifest.yml

@@ -1,4 +0,0 @@
-pe-and-platform/r10k:
-  Build:
-    - docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" "$DISTELLI_DOCKER_ENDPOINT"
-    - /bin/bash -x ./ci/build

data/docker/r10k/Dockerfile

@@ -1,41 +0,0 @@
-FROM ubuntu:16.04
-
-ARG vcs_ref
-ARG build_date
-ARG version="2.6.4"
-ENV R10K_VERSION="$version"
-ENV UBUNTU_CODENAME="xenial"
-
-LABEL org.label-schema.maintainer="Puppet Release Team <release@puppet.com>" \
-      org.label-schema.vendor="Puppet" \
-      org.label-schema.url="https://github.com/puppetlabs/r10k" \
-      org.label-schema.name="r10k" \
-      org.label-schema.license="Apache-2.0" \
-      org.label-schema.version="$R10K_VERSION" \
-      org.label-schema.vcs-url="https://github.com/puppetlabs/r10k" \
-      org.label-schema.vcs-ref="$vcs_ref" \
-      org.label-schema.build-date="$build_date" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.dockerfile="/Dockerfile"
-
-RUN apt-get update && \
-    apt-get install --no-install-recommends -y wget ca-certificates lsb-release && \
-    wget https://apt.puppetlabs.com/puppet5-release-"$UBUNTU_CODENAME".deb && \
-    dpkg -i puppet5-release-"$UBUNTU_CODENAME".deb && \
-    rm puppet5-release-"$UBUNTU_CODENAME".deb && \
-    apt-get update && \
-    apt-get install --no-install-recommends -y puppet-agent && \
-    apt-get install --no-install-recommends -y git openssh-client && \
-    apt-get remove --purge -y wget && \
-    apt-get autoremove -y && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN /opt/puppetlabs/puppet/bin/gem install r10k:"$R10K_VERSION"
-
-ENV PATH=/opt/puppetlabs/server/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:$PATH
-
-ENTRYPOINT ["/opt/puppetlabs/puppet/bin/r10k"]
-CMD ["help"]
-
-COPY Dockerfile /

data/docker/r10k/spec/dockerfile_spec.rb

@@ -1,24 +0,0 @@
-require 'puppet_docker_tools/spec_helper'
-
-CURRENT_DIRECTORY = File.dirname(File.dirname(__FILE__))
-
-describe 'Dockerfile' do
-  include_context 'with a docker image'
-  include_context 'with a docker container' do
-    def docker_run_options
-      '--entrypoint /bin/bash'
-    end
-  end
-
-  describe 'uses the correct version of Ubuntu' do
-    it_should_behave_like 'a running container', 'cat /etc/lsb-release', nil, 'Ubuntu 16.04'
-  end
-
-  describe 'has puppet-agent installed' do
-    it_should_behave_like 'a running container', 'dpkg -l puppet-agent', 0
-  end
-
-  describe 'has /opt/puppetlabs/puppet/bin/r10k' do
-    it_should_behave_like 'a running container', 'stat -L /opt/puppetlabs/puppet/bin/r10k', 0, 'Access: \(0755\/\-rwxr\-xr\-x\)'
-  end
-end

data/integration/pre-suite/30_test_utils.rb

@@ -1,17 +0,0 @@
-test_name 'CODEMGMT-62 - C63199 - Install Utilities for r10k Integration Testing'
-
-#Init
-filebucket_path = '/opt/filebucket'
-filebucket_script_path = '/etc/profile.d/filebucket_path.sh'
-
-filebucket_script = <<-SCRIPT
-#!/bin/bash
-export PATH="${PATH}:#{filebucket_path}"
-SCRIPT
-
-step 'Install "filebucket" File Generator'
-create_remote_file(master, filebucket_script_path, filebucket_script)
-on(master, "git clone git://github.com/puppetlabs/filebucket.git #{filebucket_path}")
-
-on(master, "chmod 755 #{filebucket_script_path}")
-on(master, "chmod 755 #{filebucket_path}/filebucketapp.py")