r10k 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e4eadf9d07ce0163d2ec4a20c748956fda46c7c
-  data.tar.gz: c89ec234651cb578c26df88d02ee0196406abf0a
+  metadata.gz: 975a72d1fc4846986b4cb47f8f3a1b2e1a74d69e
+  data.tar.gz: 2ff84a7c70d6282b83b48400299507532f57c520
 SHA512:
-  metadata.gz: 5be4326a9c9fddc77c1c84daa5deb557059b2f876beb278c97d7f8c36e3c742ec39aeeed6231b3087490b696b7655de39569524b18acf0103c29f3ab41ba17a1
-  data.tar.gz: 7ee4a185142460a472ceb7f7b09c66bf3bbe03abf5de5a99e66a6cf62476b18ffc870e4fafb020c8146a8f854330979baee3b9b4e1da56237e028cd995a6bfef
+  metadata.gz: 64e6faee87cc61490d08d197c2f96b5c2f700027e83de9383c628b2fe77fa12fc2717d6b9dfa8c1e239c89ad2530d88e675bb421efaff308f384a499fb11cb28
+  data.tar.gz: a74bc080bfe5e61eb0f36ee5da57937fd667ef909a35f582bab5d101ae1b252abf1241d0f23957690277ec7200b037f27f2de72800ee26eb0ee08c47a7bb8c01

data/.travis.yml

@@ -1,14 +1,12 @@
 ---
 language: ruby
-services:
-  - docker
 bundler_args: "--without system"
 script: "bundle exec rspec --color --format documentation spec/unit"
 notifications:
   email: false
 sudo: false
 jdk:
-    - oraclejdk8
+  - openjdk8
 before_install: gem install bundler -v '< 2' --no-document
 matrix:
   include:
@@ -20,7 +18,3 @@ matrix:
       rvm: 2.3.0
     - stage: r10k tests
       rvm: jruby
-    - stage: r10k container tests
-      language: generic
-      script:
-        - cd docker && make lint && make build && make test

data/CHANGELOG.mkd

@@ -1,86 +1,101 @@
 CHANGELOG
 =========
 
+3.2.1
+----
+
+### Changes
+ - Flag for overriding default branch configuration in Puppetfile
+ - Plumbing for internationalization
+ - Numerous test fixes and legacy docker work
+
 3.2.0
 -----
 
-## New Feature
+### Changes
 
-Add support for running `puppet generate types`
+  - Add support for running `puppet generate types`
 
 3.1.1
 -----
 
-## Bug Fixes
+### Changes
 
-(RK-335) Postrun `modifiedenvs` doesn't include environment prefixes
+  - (RK-335) Postrun `modifiedenvs` doesn't include environment prefixes
 
 3.1.0
 -----
 
-## New Feature
+### Changes
 
-Substitute environments acted on in postrun command.
+  - Substitute environments acted on in postrun command.
 
-Now post run commands that contain the string "$modifiedenvs"
-(eg. ["/usr/local/bin/my-postrun-cmd", "--verbose", "$modifiedenvs"])
-will have the string substituted with a space separated list
-of environments acted upon (either a single environment if
-specified on the command line or all environments).
+    Now post run commands that contain the string "$modifiedenvs"
+    (eg. ["/usr/local/bin/my-postrun-cmd", "--verbose", "$modifiedenvs"])
+    will have the string substituted with a space separated list
+    of environments acted upon (either a single environment if
+    specified on the command line or all environments).
 
-Specifically this should allow users to easily wrap
-`puppet generate types` and matches the terminology used
-in g10k.
+    Specifically this should allow users to easily wrap
+    `puppet generate types` and matches the terminology used
+    in g10k.
 
-Many thanks to @raphink for the contribution.
+    Many thanks to @raphink for the contribution.
 
+3.0.4
+----
+
+### Changes
+ - Flag for overriding default branch configuration in Puppetfile
+ - Plumbing for internationalization
+ - Numerous test fixes and legacy docker work
 
 3.0.3
 ----
 
-## Bug Fixes
+### Changes
 
-(RK-324) Fix Ruby pipe bug affecting Ubuntu
+  - (RK-324) Fix Ruby pipe bug affecting Ubuntu
 
 3.0.2
 ----
 
-## Changes
+### Changes
 
-Minor test fixes.
+  - Minor test fixes.
 
 3.0.1
 ----
 
-## Changes
+### Changes
 
 Because of dependency issues R10K 3.0.0 required Ruby >= 2.3
 rather than the reported 2.0. This release makes the requirement of
 Ruby >= 2.3 official and documented.
 
-(#853) ([RK-327](https://tickets.puppetlabs.com/browse/RK-327) Uninitialized Constant Cri::Error
-  When resolving the Cri dependency >= 2.13 R10K would fail with an
-  uninitialized constant error. Thanks to @ostavnaas for the bug report,
-  @ddfreyne for the fix, and @baurmatt for the review.
+  - (#853) ([RK-327](https://tickets.puppetlabs.com/browse/RK-327) Uninitialized Constant Cri::Error
+    When resolving the Cri dependency >= 2.13 R10K would fail with an
+    uninitialized constant error. Thanks to @ostavnaas for the bug report,
+    @ddfreyne for the fix, and @baurmatt for the review.
 
 
 3.0.0
 ----
 
-## Changes
+### Changes
 
-### Known issues
+#### Known issues
   - Child processes may die unexpectedly when deploying many environments
     on Ubuntu Bionic. See
     [RK-324](https://tickets.puppetlabs.com/browse/RK-324).
 
-### Backwards breaking changes
+#### Backwards breaking changes
   - Drop support for Ruby < 2.0
   - Remove support for PUPPETFILE and PUPPETFILE_DIR environment variables
     when running the `puppetfile` action, please use flags instead.
   - Fail when duplicate module definitions in Puppetfile
 
-### Bug fixes
+#### Bug fixes
   - More reliable pruning of refs on fetch
   - Improved error messaging when:
     - Unable to connect to a proxy
@@ -88,24 +103,32 @@ Ruby >= 2.3 official and documented.
     - Unable to parse Puppetfile
   - Various perfomance improvements
 
+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
 ----
 
-## Bug Fix
+### Bug Fix
 
 (RK-324) Fix Ruby pipe bug affecting Ubuntu
 
 2.6.4
 ----
 
-## Changes
+### Changes
 
 Numerous test fixes.
 
 2.6.3
 ----
-## Changes
+
+### Changes
 
 Update specs with new error string.
 
@@ -114,6 +137,7 @@ when a release is made on that branch.
 
 2.6.2
 -----
+
 ### Changes
 
 (RK-311) Yard dependency updated for security fix.

data/doc/dynamic-environments/configuration.mkd

@@ -73,6 +73,13 @@ proxy: 'http://user:password@proxy.example.com:3128'
 
 The proxy server being used will be logged at the "debug" level when r10k runs.
 
+### pool_size
+
+The pool_size setting is a number to determine how many threads should be spawn
+while updating modules. The default value is 1, which means the default behaviour
+is to update modules in a serial manner. Increasing this number should bring
+some performance gains.
+
 ### git
 
 The 'git' setting is a hash that contains Git specific settings.

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/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/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

@@ -129,7 +129,7 @@ module R10K
         end
 
         def visit_puppetfile(puppetfile)
-          puppetfile.load
+          puppetfile.load(@opts[:'default-branch-override'])
 
           yield
 
@@ -166,7 +166,12 @@ module R10K
         end
 
         def allowed_initialize_opts
-          super.merge(puppetfile: :self, cachedir: :self, 'no-force': :self, 'generate-types': :self, 'puppet-path': :self)
+          super.merge(puppetfile: :self,
+                      cachedir: :self,
+                      'no-force': :self,
+                      'generate-types': :self,
+                      'puppet-path': :self,
+                      'default-branch-override': :self)
         end
       end
     end

data/lib/r10k/cli/deploy.rb

@@ -61,6 +61,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/initializers.rb

@@ -34,6 +34,7 @@ module R10K
 
         with_setting(:cachedir) { |value| R10K::Git::Cache.settings[:cache_root] = value }
         with_setting(:cachedir) { |value| R10K::Forge::ModuleRelease.settings[:cache_root] = value }
+        with_setting(:pool_size) { |value| R10K::Puppetfile.settings[:pool_size] = value }
 
         with_setting(:git) { |value| GitInitializer.new(value).call }
         with_setting(:forge) { |value| ForgeInitializer.new(value).call }

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

@@ -1,3 +1,4 @@
+require 'thread'
 require 'pathname'
 require 'r10k/module'
 require 'r10k/util/purgeable'
@@ -7,6 +8,10 @@ module R10K
 class Puppetfile
   # Defines the data members of a Puppetfile
 
+  include R10K::Settings::Mixin
+
+  def_setting_attr :pool_size, 1
+
   include R10K::Logging
 
   # @!attribute [r] forge
@@ -58,17 +63,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, NameError => e
@@ -113,6 +121,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)
 
@@ -152,6 +164,17 @@ class Puppetfile
   end
 
   def accept(visitor)
+    pool_size = self.settings[:pool_size]
+    if pool_size > 1
+      concurrent_accept(visitor, pool_size)
+    else
+      serial_accept(visitor)
+    end
+  end
+
+  private
+
+  def serial_accept(visitor)
     visitor.visit(:puppetfile, self) do
       modules.each do |mod|
         mod.accept(visitor)
@@ -159,7 +182,31 @@ class Puppetfile
     end
   end
 
-  private
+  def concurrent_accept(visitor, pool_size)
+    logger.debug _("Updating modules with %{pool_size} threads") % {pool_size: pool_size}
+    mods_queue = modules_queue(visitor)
+    thread_pool = pool_size.times.map { visitor_thread(visitor, mods_queue) }
+    thread_pool.each(&:join)
+  end
+
+  def modules_queue(visitor)
+    Queue.new.tap do |queue|
+      visitor.visit(:puppetfile, self) do
+        modules.each { |mod| queue << mod }
+      end
+    end
+  end
+
+  def visitor_thread(visitor, mods_queue)
+    Thread.new do
+      begin
+        while mod = mods_queue.pop(true) do mod.accept(visitor) end
+      rescue ThreadError => e
+        logger.error _("Thread error during concurrent module deploy: %{message}") % {message: e.message}
+        Thread.exit
+      end
+    end
+  end
 
   def puppetfile_contents
     File.read(@puppetfile_path)

data/lib/r10k/settings.rb

@@ -158,6 +158,19 @@ module R10K
           end
         }),
 
+        Definition.new(:pool_size, {
+          :desc => "The amount of threads used to concurrently install modules. The default value is 1: install one module at a time.",
+          :default => 1,
+          :validate => lambda do |value|
+            if !value.is_a?(Integer)
+              raise ArgumentError, "The pool_size setting should be an integer, not a #{value.class}"
+            end
+            if !(value > 0)
+              raise ArgumentError, "The pool_size setting should be greater than zero."
+            end
+          end
+        }),
+
         URIDefinition.new(:proxy, {
           :desc => "Proxy to use for all r10k operations which occur over HTTP(S).",
           :default => lambda {

data/lib/r10k/settings/container.rb

@@ -32,7 +32,11 @@ class R10K::Settings::Container
     if @settings[key]
       @settings[key]
     elsif @parent && (pkey = @parent[key])
-      @settings[key] = pkey.dup
+      begin
+        @settings[key] = pkey.dup
+      rescue TypeError
+        @settings[key] = pkey
+      end
       @settings[key]
     end
   end

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '3.2.0'
+  VERSION = '3.2.1'
 end

data/locales/r10k.pot

@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2018 Puppet, Inc.
+# Copyright (C) 2019 Puppet, Inc.
 # This file is distributed under the same license as the r10k package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: r10k 3.0.3-15-gfa546f5\n"
+"Project-Id-Version: r10k 3.2.0-7-g213f14b\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
-"POT-Creation-Date: 2018-12-05 22:18+0000\n"
-"PO-Revision-Date: 2018-12-05 22:18+0000\n"
+"POT-Creation-Date: 2019-04-18 21:10+0000\n"
+"PO-Revision-Date: 2019-04-18 21:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -31,27 +31,27 @@ msgstr ""
 msgid "Reason: %{write_lock}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:56
+#: ../lib/r10k/action/deploy/environment.rb:57
 msgid "Environment(s) \\'%{environments}\\' cannot be found in any source and will not be deployed."
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:79
+#: ../lib/r10k/action/deploy/environment.rb:85
 msgid "Environment %{env_dir} does not match environment name filter, skipping"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:86
+#: ../lib/r10k/action/deploy/environment.rb:93
 msgid "Deploying environment %{env_path}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:89
+#: ../lib/r10k/action/deploy/environment.rb:96
 msgid "Environment %{env_dir} is now at %{env_signature}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:93
+#: ../lib/r10k/action/deploy/environment.rb:100
 msgid "Environment %{env_dir} is new, updating all modules"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:123
+#: ../lib/r10k/action/deploy/environment.rb:143
 msgid "Deploying Puppetfile content %{mod_path}"
 msgstr ""
 
@@ -67,7 +67,7 @@ msgstr ""
 msgid "Deploying module %{mod_path}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/module.rb:66
+#: ../lib/r10k/action/deploy/module.rb:70
 msgid "Only updating modules %{modules}, skipping module %{mod_name}"
 msgstr ""
 
@@ -83,15 +83,15 @@ msgstr ""
 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
+#: ../lib/r10k/action/runner.rb:53 ../lib/r10k/deployment/config.rb:42
 msgid "Overriding config file setting '%{key}': '%{old_val}' -> '%{new_val}'"
 msgstr ""
 
-#: ../lib/r10k/action/runner.rb:82
+#: ../lib/r10k/action/runner.rb:86
 msgid "Reading configuration from %{config_path}"
 msgstr ""
 
-#: ../lib/r10k/action/runner.rb:85
+#: ../lib/r10k/action/runner.rb:89
 msgid "No config file explicitly given and no default config file could be found, default settings will be used."
 msgstr ""
 
@@ -103,7 +103,7 @@ msgstr ""
 msgid "Unable to load sources; the supplied configuration does not define the 'sources' key"
 msgstr ""
 
-#: ../lib/r10k/environment/base.rb:59 ../lib/r10k/environment/base.rb:75 ../lib/r10k/environment/base.rb:84 ../lib/r10k/source/base.rb:64
+#: ../lib/r10k/environment/base.rb:61 ../lib/r10k/environment/base.rb:77 ../lib/r10k/environment/base.rb:86 ../lib/r10k/source/base.rb:64
 msgid "%{class} has not implemented method %{method}"
 msgstr ""
 
@@ -295,7 +295,7 @@ msgstr ""
 msgid "Module %{name} with args %{args} doesn't have an implementation. (Are you using the right arguments?)"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:101
+#: ../lib/r10k/module/base.rb:105
 msgid "Module name (%{title}) must match either 'modulename' or 'owner/modulename'"
 msgstr ""
 
@@ -319,27 +319,35 @@ msgstr ""
 msgid "Could not read metadata.json"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:52
+#: ../lib/r10k/puppetfile.rb:57
 msgid "Using Puppetfile '%{puppetfile}'"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:65
+#: ../lib/r10k/puppetfile.rb:70
 msgid "Puppetfile %{path} missing or unreadable"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:75
+#: ../lib/r10k/puppetfile.rb:80
 msgid "Failed to evaluate %{path}"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:85
+#: ../lib/r10k/puppetfile.rb:90
 msgid "Puppetfiles cannot contain duplicate module names."
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:87
+#: ../lib/r10k/puppetfile.rb:92
 msgid "Remove the duplicates of the following modules: %{dupes}"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:213
+#: ../lib/r10k/puppetfile.rb:179
+msgid "Updating modules with %{pool_size} threads"
+msgstr ""
+
+#: ../lib/r10k/puppetfile.rb:198
+msgid "Thread error during concurrent module deploy: %{message}"
+msgstr ""
+
+#: ../lib/r10k/puppetfile.rb:253
 msgid "unrecognized declaration '%{method}'"
 msgstr ""
 
@@ -351,7 +359,7 @@ msgstr ""
 msgid "Validation failed for settings group"
 msgstr ""
 
-#: ../lib/r10k/settings/container.rb:87
+#: ../lib/r10k/settings/container.rb:91
 msgid "Key %{key} is not a valid key"
 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

@@ -227,6 +227,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
@@ -252,5 +271,30 @@ describe R10K::Puppetfile do
       expect(subject).to receive(:modules).and_return([mod1, mod2])
       subject.accept(visitor)
     end
+
+    it "creates a thread pool to visit concurrently if pool_size setting is greater than one" do
+      pool_size = 3
+
+      subject.settings[:pool_size] = pool_size
+
+      visitor = spy('visitor')
+      expect(visitor).to receive(:visit) do |type, other, &block|
+        expect(type).to eq :puppetfile
+        expect(other).to eq subject
+        block.call
+      end
+
+      mod1 = spy('module')
+      expect(mod1).to receive(:accept).with(visitor)
+      mod2 = spy('module')
+      expect(mod2).to receive(:accept).with(visitor)
+
+      expect(subject).to receive(:modules).and_return([mod1, mod2])
+
+      expect(Thread).to receive(:new).exactly(pool_size).and_call_original
+      expect(Queue).to receive(:new).and_call_original
+
+      subject.accept(visitor)
+    end
   end
 end

data/spec/unit/settings_spec.rb

@@ -165,6 +165,41 @@ describe R10K::Settings do
       end
     end
 
+    describe "pool_size" do
+      it "accepts integers greater than zero" do
+        output = subject.evaluate("pool_size" => 5)
+        expect(output[:pool_size]).to eq 5
+      end
+
+      it "rejects non integer values" do
+        expect {
+          subject.evaluate("pool_size" => "5")
+        }.to raise_error do |err|
+          expect(err.errors.size).to eq 1
+          expect(err.errors[:pool_size]).to be_a_kind_of(ArgumentError)
+          expect(err.errors[:pool_size].message).to match(/The pool_size setting should be an integer/)
+        end
+      end
+
+      it "rejects integers smaller than one" do
+        expect {
+          subject.evaluate("pool_size" => 0)
+        }.to raise_error do |err|
+          expect(err.errors.size).to eq 1
+          expect(err.errors[:pool_size]).to be_a_kind_of(ArgumentError)
+          expect(err.errors[:pool_size].message).to match(/The pool_size setting should be greater than zero/)
+        end
+
+        expect {
+          subject.evaluate("pool_size" => -3)
+        }.to raise_error do |err|
+          expect(err.errors.size).to eq 1
+          expect(err.errors[:pool_size]).to be_a_kind_of(ArgumentError)
+          expect(err.errors[:pool_size].message).to match(/The pool_size setting should be greater than zero/)
+        end
+      end
+    end
+
     describe "proxy" do
       it "accepts valid URIs" do
         output = subject.evaluate("proxy" => "http://proxy.tessier-ashpool.freeside:3128")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -221,7 +221,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
@@ -412,6 +411,7 @@ files:
 - spec/fixtures/unit/action/r10k_generate_types.yaml
 - spec/fixtures/unit/action/r10k_puppet_path.yaml
 - spec/fixtures/unit/puppetfile/argument-error/Puppetfile
+- spec/fixtures/unit/puppetfile/default-branch-override/Puppetfile
 - spec/fixtures/unit/puppetfile/duplicate-module-error/Puppetfile
 - spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile
 - spec/fixtures/unit/puppetfile/load-error/Puppetfile

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")