r10k 3.0.4 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cc458f9c6f5fc825c4a915db8ba1f4c62d9f9e3
-  data.tar.gz: f1bcb084a79e0fc0bcf17352a98b2cd162fc1fa5
+  metadata.gz: a60c1ccc9338827361ca4116b58d3619f6ff755b
+  data.tar.gz: 7e473d21e8fa5a96e64787191d721790d7403bbf
 SHA512:
-  metadata.gz: aa362d85081c4378839c4027f9feffd8411606d55c88f4101c6fe334eb872b0a470bac76a90ec070532f802310588fd3ff66a63b7164f3e986fd7af0ba1dddc7
-  data.tar.gz: 77b14cd6661fcf9c70d73aec1ad11faccf65ac30479872b08e86055436b0f64fb40ec764e5b5d9174d0ea036ac9430052555057de769d475cee6d07b1f6596f9
+  metadata.gz: a48693802bbc801288990cebc451d088b70807dbb1b4e9eb3e9e83594ad096a0233c5f903f2cf454bb0873fa08e3aba51cdb54609b47bbfb1e981444ac14e6d4
+  data.tar.gz: 875ce9e183d4f5191b36d0ef45a271b308d891b88a27f994c10c6bd57a66486448b68c96704e1769a87717754505d8d6fdefa43bd52de007449e5e4152766806

data/.travis.yml

@@ -1,26 +1,15 @@
 ---
 language: ruby
-services:
-  - docker
 bundler_args: "--without system"
 script: "bundle exec rspec --color --format documentation spec/unit"
 notifications:
   email: false
 sudo: false
+before_install: gem update bundler
+rvm:
+  - "2.5"
+  - "2.4"
+  - "2.3"
+  - "jruby"
 jdk:
     - oraclejdk8
-before_install: gem install bundler -v '< 2' --no-document
-matrix:
-  include:
-    - stage: r10k tests
-      rvm: 2.5.0
-    - stage: r10k tests
-      rvm: 2.4.0
-    - stage: r10k tests
-      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,60 +1,72 @@
 CHANGELOG
 =========
 
-3.0.4
-----
+3.1.0
+-----
+
+## New Feature
+
+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).
+
+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.
 
-### Changes
- - Flag for overriding default branch configuration in Puppetfile
- - Plumbing for internationalization
- - Numerous test fixes and legacy docker work
 
 3.0.3
 ----
 
-### Changes
+## Bug Fixes
 
-  - (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
@@ -62,32 +74,24 @@ 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.
 
@@ -96,7 +100,6 @@ when a release is made on that branch.
 
 2.6.2
 -----
-
 ### Changes
 
 (RK-311) Yard dependency updated for security fix.

data/azure-pipelines.yml

@@ -5,15 +5,9 @@ pool:
   name: Default
 
 variables:
-  NAMESPACE: puppet
-
-# completely disables the pipeline
-trigger: none
-pr: none
+  BUILD_REPOSITORY: 127.0.0.1
 
 steps:
-- checkout: self
-  clean: true
 - powershell: |
     $line = '=' * 80
     Write-Host "$line`nWindows`n$line`n"
@@ -52,27 +46,27 @@ steps:
   name: hostinfo
 - powershell: |
     . ./docker/ci/build.ps1
-    Lint-Dockerfile -Path ./docker/r10k/Dockerfile
-  displayName: Lint r10k Dockerfile
-  name: lint_dockerfile
+    Invoke-ContainerBuildSetup
+  displayName: Prepare Build Environment
+  name: build_prepare
 - powershell: |
     . ./docker/ci/build.ps1
-    Build-Container -Namespace $ENV:NAMESPACE
-  displayName: Build r10k Container
-  name: build_r10k_container
+    Build-Container -Name r10k -Repository $ENV:BUILD_REPOSITORY
+  displayName: Build r10k
+  name: build_r10k
 - powershell: |
     . ./docker/ci/build.ps1
-    Invoke-ContainerTest -Namespace $ENV:NAMESPACE
+    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'
+    testResultsFiles: 'docker/**/TEST-*.xml'
     testRunTitle: r10k Test Results
 - powershell: |
     . ./docker/ci/build.ps1
-    Clear-ContainerBuilds -Name r10k
+    Clear-ContainerBuilds
   displayName: Container Cleanup
   condition: always()

data/doc/dynamic-environments/configuration.mkd

@@ -183,6 +183,9 @@ postrun: ['/usr/bin/curl', '-F', 'deploy=done', 'http://my-app.site/endpoint']
 
 The postrun setting can only be set once.
 
+Occurrences of the string `$modifiedenvs` in the postrun command will be
+replaced with the current environment(s) being deployed.
+
 ### sources
 
 The `sources` setting specifies what repositories should be used for creating

data/doc/dynamic-environments/usage.mkd

@@ -60,18 +60,6 @@ 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/doc/faq.mkd

@@ -1,6 +1,41 @@
 Frequently Asked Questions
 ==========================
 
+### How can run I `puppet generate types` for each changed environment during deployment?
+
+The command `puppet generate types` creates Puppet signatures for custom
+types circumventing the need to load their Ruby code during compilation.
+This prevents the type definitions from "leaking" across environments.
+
+Best practice currently is to run this command as part of your Puppet
+code deployment pipeline, and r10k's postrun command ability is a natural
+place to do so.
+
+The postrun command will have any occurance of "$modifiedenvs" replaced
+with a space-seperated list of environments the deploy was configured to
+modify. For example creating the script:
+
+```
+$ cat /usr/local/bin/generate-puppet-types.sh
+!#/bin/bash
+
+for environment in $1; do
+  /opt/puppetlabs/bin/puppet generate types --environment $environment
+done
+```
+
+And configuring r10k such:
+```
+$ tail -2 /etc/puppetlabs/r10k/r10k.yaml
+
+postrun: ["/usr/local/bin/generate-puppet-types.sh", "$modifiedenvs"]
+```
+
+Should provide you with the necessary generate type definitions for
+improved environment isolation.
+
+
+
 ### The default Git branch is 'master', while the default Puppet environment is 'production'. How do I reconcile this?
 
 The default Git branch name is 'master', but this is a somewhat arbitrary name

data/docker/Gemfile

@@ -10,5 +10,5 @@ def location_for(place, fake_version = nil)
   end
 end
 
-gem 'rspec'
+gem 'puppet_docker_tools', *location_for(ENV['PUPPET_DOCKER_LOCATION'] || '~> 0.2')
 gem 'rspec_junit_formatter'

data/docker/ci/build.ps1

@@ -19,88 +19,33 @@ function Get-ContainerVersion
   (git describe) -replace '-.*', ''
 }
 
-function Lint-Dockerfile($Path)
+# installs gems for build and test and grabs base images
+function Invoke-ContainerBuildSetup
 {
-  hadolint --ignore DL3008 --ignore DL3018 --ignore DL4000 --ignore DL4001 $Path
+  Push-Location (Get-CurrentDirectory)
+  bundle install --path '.bundle/gems'
+  bundle exec puppet-docker update-base-images ubuntu:16.04
+  Pop-Location
 }
 
-function Build-Container(
-  $Namespace = 'puppet',
-  $Version = (Get-ContainerVersion),
-  $Vcs_ref = $(git rev-parse HEAD))
+function Build-Container($Name, $Repository = '127.0.0.1', $Version = (Get-ContainerVersion))
 {
   Push-Location (Join-Path (Get-CurrentDirectory) '..')
-
-  $build_date = (Get-Date).ToUniversalTime().ToString('o')
-  $docker_args = @(
-    '--pull',
-    '--build-arg', "vcs_ref=$Vcs_ref",
-    '--build-arg', "build_date=$build_date",
-    '--build-arg', "version=$Version",
-    '--file', "r10k/Dockerfile",
-    '--tag', "$Namespace/r10k:$Version"
-  )
-
-  docker build $docker_args r10k
-
+  bundle exec puppet-docker local-lint $Name
+  bundle exec puppet-docker build $Name --no-cache --repository $Repository --version $Version --no-latest --build-arg namespace=$Repository
   Pop-Location
 }
 
-function Invoke-ContainerTest(
-  $Namespace = 'puppet',
-  $Version = (Get-ContainerVersion))
+function Invoke-ContainerTest($Name, $Repository = '127.0.0.1', $Version = (Get-ContainerVersion))
 {
   Push-Location (Join-Path (Get-CurrentDirectory) '..')
-
-  bundle install --path .bundle/gems
-  $ENV:PUPPET_TEST_DOCKER_IMAGE = "$Namespace/r10k:$Version"
-  bundle exec rspec r10k/spec
-
+  bundle exec puppet-docker spec $Name --image "$Repository/${Name}:$Version"
   Pop-Location
 }
 
-# removes temporary layers / containers / images used during builds
-# removes $Namespace/$Name images > 14 days old by default
-function Clear-ContainerBuilds(
-  $Namespace = 'puppet',
-  $Name,
-  $OlderThan = [DateTime]::Now.Subtract([TimeSpan]::FromDays(14))
-)
+# removes any temporary containers / images used during builds
+function Clear-ContainerBuilds
 {
-  Write-Output 'Pruning Containers'
   docker container prune --force
-
-  # this provides example data which ConvertFrom-String infers parsing structure with
-  $template = @'
-{Version*:1.2.3} {ID:5b84704c1d01} {[DateTime]Created:2019-02-07 18:24:51} +0000 GMT
-{Version*:latest} {ID:0123456789ab} {[DateTime]Created:2019-01-29 00:05:33} +0000 GMT
-'@
-  $output = docker images --filter=reference="$Namespace/${Name}" --format "{{.Tag}} {{.ID}} {{.CreatedAt}}"
-  Write-Output @"
-
-Found $Namespace/${Name} images:
-$($output | Out-String)
-
-"@
-
-  if ($output -eq $null) { return }
-
-  Write-Output "Filtering removal candidates..."
-  # docker image prune supports filter until= but not repository like 'puppetlabs/foo'
-  # must use label= style filtering which is a bit more inconvenient
-  # that output is also not user-friendly!
-  # engine doesn't maintain "last used" or "last pulled" metadata, which would be more useful
-  # https://github.com/moby/moby/issues/4237
-  $output |
-    ConvertFrom-String -TemplateContent $template |
-    ? { $_.Created -lt $OlderThan } |
-    # ensure 'latest' are listed first
-    Sort-Object -Property Version -Descending |
-    % {
-      Write-Output "Removing Old $Namespace/${Name} Image $($_.Version) ($($_.ID)) Created On $($_.Created)"
-      docker image rm $_.ID
-    }
-
-  Write-Output "`nPruning Dangling Images"
   docker image prune --filter "dangling=true" --force
 }

data/integration/Gemfile

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

data/integration/Rakefile

@@ -24,6 +24,7 @@ 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,5 +1,4 @@
 require 'beaker-pe'
-
 test_name 'CODEMGMT-20 - C48 - Install Puppet Enterprise'
 
 step 'Install PE'

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

@@ -0,0 +1,17 @@
+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")

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 artifactory'
-curl_on(master, 'https://artifactory.delivery.puppetlabs.net/artifactory/generic/r10k_test_license.key -o /etc/puppetlabs/license.key')
+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 '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 artifactory'
-curl_on(master, 'https://artifactory.delivery.puppetlabs.net/artifactory/generic/r10k_test_license.key -o /etc/puppetlabs/license.key')
+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 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)

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

@@ -20,6 +20,17 @@ 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
@@ -62,8 +73,7 @@ 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}")
-# 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")
+on(master, "#{file_bucket_command} -s 11 -f #{test_files_path}/test.file -d #{pattern_file_path}")
 
 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,6 +21,16 @@ 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')
@@ -50,8 +60,7 @@ 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}")
-# 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")
+on(master, "#{file_bucket_command} -k -c 10000 -p #{test_files_path}/test -u .file")
 
 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,6 +21,17 @@ 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')
@@ -50,8 +61,7 @@ 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}")
-# 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")
+on(master, "#{file_bucket_command} -c 10 -s 25 -p #{test_files_path}/test -u .file -d #{pattern_file_path}")
 
 step 'Create MD5 Checksum of Files'
 on(master, "cd #{test_files_path};md5sum *.file > #{checksum_file_name}")

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

@@ -64,6 +64,11 @@ module R10K
           end
         ensure
           if (postcmd = @settings[:postrun])
+            if postcmd.grep('$modifiedenvs').any?
+              envs = deployment.environments.map { |e| e.name }
+              envs.reject! { |e| !@argv.include?(e) } if @argv.any?
+              postcmd = postcmd.map { |e| e.gsub('$modifiedenvs', envs.join(' ')) }
+            end
             subproc = R10K::Util::Subprocess.new(postcmd)
             subproc.logger = logger
             subproc.execute
@@ -109,7 +114,7 @@ module R10K
         end
 
         def visit_puppetfile(puppetfile)
-          puppetfile.load(@opts[:'default-branch-override'])
+          puppetfile.load
 
           yield
 
@@ -146,7 +151,7 @@ module R10K
         end
 
         def allowed_initialize_opts
-          super.merge(puppetfile: :self, cachedir: :self, :'no-force' => :self, :'default-branch-override' => :self)
+          super.merge(puppetfile: :self, cachedir: :self, :'no-force' => :self)
         end
       end
     end

data/lib/r10k/cli/deploy.rb

@@ -53,7 +53,6 @@ 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,11 +23,6 @@ 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

@@ -58,20 +58,17 @@ class Puppetfile
     @loaded = false
   end
 
-  def load(default_branch_override = nil)
+  def load
     if File.readable? @puppetfile_path
-      self.load!(default_branch_override)
+      self.load!
     else
       logger.debug _("Puppetfile %{path} missing or unreadable") % {path: @puppetfile_path.inspect}
     end
   end
 
-  def load!(default_branch_override = nil)
-    @default_branch_override = default_branch_override
-
+  def load!
     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
@@ -116,10 +113,6 @@ 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 = '3.0.4'
+  VERSION = '3.1.0'
 end

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

@@ -19,10 +19,6 @@ 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
@@ -69,6 +65,90 @@ describe R10K::Action::Deploy::Environment do
       end
     end
 
+    describe "postrun" do
+      context "basic postrun hook" do
+        let(:settings) { { postrun: ["/path/to/executable", "arg1", "arg2"] } }
+        let(:deployment) { R10K::Deployment.new(mock_config.merge(settings)) }
+
+        before do
+          expect(R10K::Deployment).to receive(:new).and_return(deployment)
+        end
+
+        subject do
+          described_class.new( {config: "/some/nonexistent/path" },
+                               %w[first],
+                               settings                             )
+        end
+
+        it "is passed to Subprocess" do
+          mock_subprocess = double
+          allow(mock_subprocess).to receive(:logger=)
+          expect(mock_subprocess).to receive(:execute)
+
+          expect(R10K::Util::Subprocess).to receive(:new).
+            with(["/path/to/executable", "arg1", "arg2"]).
+            and_return(mock_subprocess)
+
+          subject.call
+        end
+      end
+
+      context "supports environments" do
+        context "when one environment" do
+          let(:settings) { { postrun: ["/generate/types/wrapper", "$modifiedenvs"] } }
+          let(:deployment) { R10K::Deployment.new(mock_config.merge(settings)) }
+
+          before do
+            expect(R10K::Deployment).to receive(:new).and_return(deployment)
+          end
+
+          subject do
+            described_class.new( {config: "/some/nonexistent/path" },
+                                 %w[first],
+                                 settings                             )
+          end
+
+          it "properly substitutes the environment" do
+            mock_subprocess = double
+            allow(mock_subprocess).to receive(:logger=)
+            expect(mock_subprocess).to receive(:execute)
+
+            expect(R10K::Util::Subprocess).to receive(:new).
+              with(["/generate/types/wrapper", "first"]).
+              and_return(mock_subprocess)
+
+            subject.call
+          end
+        end
+        context "when many environments" do
+          let(:settings) { { postrun: ["/generate/types/wrapper", "$modifiedenvs"] } }
+          let(:deployment) { R10K::Deployment.new(mock_config.merge(settings)) }
+
+          before do
+            expect(R10K::Deployment).to receive(:new).and_return(deployment)
+          end
+
+          subject do
+            described_class.new( {config: "/some/nonexistent/path" },
+                                 [],
+                                 settings                             )
+          end
+
+          it "properly substitutes the environment" do
+            mock_subprocess = double
+            allow(mock_subprocess).to receive(:logger=)
+            expect(mock_subprocess).to receive(:execute)
+
+            expect(R10K::Util::Subprocess).to receive(:new).
+              with(["/generate/types/wrapper", "first second third"]).
+              and_return(mock_subprocess)
+
+            subject.call
+          end
+        end
+      end
+    end
+
     describe "purge_levels" do
       let(:settings) { { deploy: { purge_levels: purge_levels } } }
 

data/spec/unit/puppetfile_spec.rb

@@ -227,25 +227,6 @@ 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: 3.0.4
+  version: 3.1.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -187,7 +187,6 @@ files:
 - doc/git/providers.mkd
 - doc/puppetfile.mkd
 - doc/updating-your-puppetfile.mkd
-- docker/.gitignore
 - docker/.rspec
 - docker/Gemfile
 - docker/Makefile
@@ -217,6 +216,7 @@ 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
@@ -403,7 +403,6 @@ 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/duplicate-module-error/Puppetfile
 - spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile
 - spec/fixtures/unit/puppetfile/load-error/Puppetfile

data/docker/.gitignore

@@ -1 +0,0 @@
-TEST-rspec.xml

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

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