r10k 3.2.3 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 469f2e9b11b47308ab7db4315070fbd65b7d1ed1
-  data.tar.gz: 24a53e3495eb9a71b72817f753193559987006ef
+  metadata.gz: 32980c97963f0d5bb6515fcdd0482f19607bb7dd
+  data.tar.gz: a6797080cc3652fbcddf7a4b8433a9d8443d6fdd
 SHA512:
-  metadata.gz: f71876396b64988ba115940dea265b5469f8cd13ae37d34bd7cbbca218aa7392966289c226266d23600e02e2c3fdfb745c9648cd0ccb5cf57e7053070db12bf2
-  data.tar.gz: f3182e61bab12374beec84a535fa2c4d55299d7cc46357bad637a252b50f29f28bd6dfde2af7630d9d5a00273f96b66c6f387963471a017e9795527979a5c835
+  metadata.gz: 65f2fd216db51e69dcbd799b707f25b96329de64679f598bdfdb35fa25762b65d35ee1e891086366f383a78174ec0e0c06ff2b1f30502dace98d923613bcfe86
+  data.tar.gz: c2ff647aa4e140eef64e49256a2812aee64a5293e8ed0a4bf40341d0efb109c4ab5a5382cce824e05fe2a8d65f2a5de97d6a08341855897eb59975c0136f1172

data/.travis.yml

@@ -1,12 +1,14 @@
 ---
 language: ruby
+services:
+  - docker
 bundler_args: "--without system"
 script: "bundle exec rspec --color --format documentation spec/unit"
 notifications:
   email: false
 sudo: false
 jdk:
-  - openjdk8
+    - oraclejdk8
 before_install: gem install bundler -v '< 2' --no-document
 matrix:
   include:
@@ -18,3 +20,20 @@ matrix:
       rvm: 2.3.0
     - stage: r10k tests
       rvm: jruby
+    - stage: r10k container tests
+      language: ruby
+      rvm: 2.5.5
+      env:
+        - DOCKER_COMPOSE_VERSION=1.24.0
+      script:
+        - |
+          set -ex
+          sudo rm /usr/local/bin/docker-compose
+          curl --location https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname --kernel-name`-`uname --machine` > docker-compose 
+          chmod +x docker-compose
+          sudo mv docker-compose /usr/local/bin
+          cd docker
+          make lint
+          make build
+          make test
+          set +x

data/CHANGELOG.mkd

@@ -1,101 +1,98 @@
 CHANGELOG
 =========
 
-3.2.1
-----
+3.3.0
+-----
 
-### Changes
- - Flag for overriding default branch configuration in Puppetfile
- - Plumbing for internationalization
- - Numerous test fixes and legacy docker work
+## New Feature
+
+Adds support for installing modules concurrently
+
+## Bug Fixes
+
+(RK-343) Pins CRI dependency to 2.15.6 to resolve regression in options
+parsing.
 
 3.2.0
 -----
 
-### Changes
+## New Feature
 
-  - Add support for running `puppet generate types`
+Add support for running `puppet generate types`
 
 3.1.1
 -----
 
-### Changes
+## Bug Fixes
 
-  - (RK-335) Postrun `modifiedenvs` doesn't include environment prefixes
+(RK-335) Postrun `modifiedenvs` doesn't include environment prefixes
 
 3.1.0
 -----
 
-### Changes
-
-  - Substitute environments acted on in postrun command.
+## New Feature
 
-    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).
+Substitute environments acted on in postrun command.
 
-    Specifically this should allow users to easily wrap
-    `puppet generate types` and matches the terminology used
-    in g10k.
+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).
 
-    Many thanks to @raphink for the contribution.
+Specifically this should allow users to easily wrap
+`puppet generate types` and matches the terminology used
+in g10k.
 
-3.0.4
-----
+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
@@ -103,32 +100,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.
 
@@ -137,7 +126,6 @@ when a release is made on that branch.
 
 2.6.2
 -----
-
 ### Changes
 
 (RK-311) Yard dependency updated for security fix.

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/docker/.rspec

@@ -1,4 +1,4 @@
---require ./r10k/spec/spec_helper
+--require pupperware/spec_helper
 --format RspecJunitFormatter
 --out TEST-rspec.xml
 --format documentation

data/docker/Gemfile

@@ -12,3 +12,7 @@ end
 
 gem 'rspec'
 gem 'rspec_junit_formatter'
+gem 'pupperware',
+  :git => 'https://github.com/puppetlabs/pupperware.git',
+  :ref => 'master',
+  :glob => 'gem/*.gemspec'

data/docker/Makefile

@@ -6,21 +6,17 @@ build_date := $(shell date -u +%FT%T)
 hadolint_available := $(shell hadolint --help > /dev/null 2>&1; echo $$?)
 hadolint_command := hadolint --ignore DL3008 --ignore DL3018 --ignore DL4000 --ignore DL4001
 hadolint_container := hadolint/hadolint:latest
+pwd := $(shell pwd)
+export BUNDLE_PATH = $(pwd)/.bundle/gems
+export BUNDLE_BIN = $(pwd)/.bundle/bin
+export GEMFILE = $(pwd)/Gemfile
 
-ifeq ($(IS_NIGHTLY),true)
-	dockerfile := Dockerfile.nightly
-	version := puppet6-nightly
-else
-	version = $(shell echo $(git_describe) | sed 's/-.*//')
-	dockerfile := Dockerfile
-endif
-
+version = $(shell echo $(git_describe) | sed 's/-.*//')
+dockerfile := Dockerfile
 
 prep:
-ifneq ($(IS_NIGHTLY),true)
 	@git fetch --unshallow ||:
 	@git fetch origin 'refs/tags/*:refs/tags/*'
-endif
 
 lint:
 ifeq ($(hadolint_available),0)
@@ -45,8 +41,10 @@ ifeq ($(IS_LATEST),true)
 endif
 
 test: prep
-	@bundle install --path .bundle/gems
-	@PUPPET_TEST_DOCKER_IMAGE=$(NAMESPACE)/r10k:$(version) bundle exec rspec r10k/spec
+	@bundle install --path $$BUNDLE_PATH --gemfile $$GEMFILE
+	@PUPPET_TEST_DOCKER_IMAGE=$(NAMESPACE)/r10k:$(version) \
+		bundle exec --gemfile $$GEMFILE \
+		rspec r10k/spec
 
 push-image: prep
 	@docker push $(NAMESPACE)/r10k:$(version)

data/docker/r10k/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.8
+FROM alpine:3.9
 
 ARG vcs_ref
 ARG build_date

data/docker/r10k/spec/dockerfile_spec.rb

@@ -5,10 +5,9 @@ require 'open3'
 SPEC_DIRECTORY = File.dirname(__FILE__)
 
 describe 'r10k container' do
-  include Helpers
-
+  include Pupperware::SpecHelpers
   def run_r10k(command)
-    run_command("docker run --rm \
+    run_command("docker run --detach \
                    --volume #{File.join(SPEC_DIRECTORY, 'fixtures')}:/test \
                    #{@image} #{command} \
                    --puppetfile /test/Puppetfile")
@@ -33,12 +32,20 @@ describe 'r10k container' do
 
   it 'should validate the Puppetfile' do
     result = run_r10k('puppetfile check')
-    expect(result[:status].exitstatus).to eq(0)
+    container = result[:stdout].chomp
+    wait_on_container_exit(container)
+    expect(get_container_exit_code(container)).to eq(0)
+    emit_log(container)
+    teardown_container(container)
   end
 
   it 'should install the Puppetfile' do
     result = run_r10k('puppetfile install')
-    expect(result[:status].exitstatus).to eq(0)
+    container = result[:stdout].chomp
+    wait_on_container_exit(container)
+    expect(get_container_exit_code(container)).to eq(0)
     expect(Dir.exist?(File.join(SPEC_DIRECTORY, 'fixtures', 'modules', 'ntp'))).to eq(true)
+    emit_log(container)
+    teardown_container(container)
   end
 end

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

@@ -0,0 +1,71 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'RK-158 - C92361 - Attempt to install a PE-only module with no license file'
+
+#Init
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
+
+git_repo_path = '/git_repos'
+git_repo_name = 'environments'
+git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
+
+r10k_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+
+#In-line files
+r10k_conf = <<-CONF
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+sources:
+  control:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+CONF
+
+#Manifest
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp = create_site_pp(master_certname, '  include peonly')
+
+# Verification
+error_message_regex = /You must have a valid Puppet Enterprise® license on this node in order to download ztr-peonly/
+
+#Teardown
+teardown do
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  step 'cleanup r10k'
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+#Setup
+step 'Stub the forge'
+stub_forge_on(master)
+
+step 'Backup a Valid "r10k" Config'
+on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
+
+step 'Update the "r10k" Config'
+create_remote_file(master, r10k_config_path, r10k_conf)
+
+step 'Inject New "site.pp" to the "production" Environment'
+inject_site_pp(master, site_pp_path, site_pp)
+
+step 'Copy Puppetfile to "production" Environment Git Repo'
+create_remote_file(master, "#{git_environments_path}/Puppetfile", 'mod "ztr-peonly"')
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)
+
+#Test
+step 'Deploy "production" Environment via r10k'
+on(master, "#{r10k_fqp} deploy environment -p", :acceptable_exit_codes => [0,1]) do |result|
+  assert_match(error_message_regex, result.stderr, 'Expected error message was not observed!')
+end

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

@@ -129,7 +129,7 @@ module R10K
         end
 
         def visit_puppetfile(puppetfile)
-          puppetfile.load(@opts[:'default-branch-override'])
+          puppetfile.load
 
           yield
 
@@ -145,24 +145,11 @@ module R10K
         end
 
         def write_environment_info!(environment, started_at, success)
-          module_deploys = []
-          begin
-            environment.puppetfile.modules.each do |mod|
-              name = mod.name
-              version = mod.version
-              sha = mod.repo.head rescue nil
-              module_deploys.push({:name => name, :version => version, :sha => sha})
-            end
-          rescue
-            logger.debug("Unable to get environment module deploy data for .r10k-deploy.json at #{environment.path}")
-          end
-
           File.open("#{environment.path}/.r10k-deploy.json", 'w') do |f|
             deploy_info = environment.info.merge({
               :started_at => started_at,
               :finished_at => Time.new,
               :deploy_success => success,
-              :module_deploys => module_deploys,
             })
 
             f.puts(JSON.pretty_generate(deploy_info))
@@ -179,12 +166,7 @@ module R10K
         end
 
         def allowed_initialize_opts
-          super.merge(puppetfile: :self,
-                      cachedir: :self,
-                      'no-force': :self,
-                      'generate-types': :self,
-                      'puppet-path': :self,
-                      'default-branch-override': :self)
+          super.merge(puppetfile: :self, cachedir: :self, 'no-force': :self, 'generate-types': :self, 'puppet-path': :self)
         end
       end
     end

data/lib/r10k/cli/deploy.rb

@@ -61,7 +61,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

@@ -63,20 +63,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
@@ -121,10 +118,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.2.3'
+  VERSION = '3.3.0'
 end

data/r10k.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.license  = 'Apache-2.0'
 
   s.add_dependency 'colored',   '1.2'
-  s.add_dependency 'cri',       '~> 2.15.1'
+  s.add_dependency 'cri',       '2.15.6'
 
   s.add_dependency 'log4r',     '1.1.10'
   s.add_dependency 'multi_json', '~> 1.10'
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
 
   s.add_development_dependency 'yard', '~> 0.9.11'
-  s.add_development_dependency 'minitar', '~> 0.9.0'
+  s.add_development_dependency 'minitar', '~> 0.6.1'
 
   s.files        = %x[git ls-files].split($/)
   s.require_path = 'lib'

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
@@ -332,63 +328,4 @@ describe R10K::Action::Deploy::Environment do
       end
     end
   end
-
-  describe "write_environment_info!" do
-
-    class Fake_Environment
-      attr_accessor :path
-      attr_accessor :puppetfile
-      attr_accessor :info
-
-      def initialize(path, info)
-        @path = path
-        @info = info
-        @puppetfile = R10K::Puppetfile.new
-      end
-    end
-
-    let(:mock_stateful_repo_1) { instance_double("R10K::Git::StatefulRepository", :head => "123456") }
-    let(:mock_stateful_repo_2) { instance_double("R10K::Git::StatefulRepository", :head => "654321") }
-    let(:mock_git_module_1) { instance_double("R10K::Module::Git", :name => "my_cool_module", :version => "1.0", :repo => mock_stateful_repo_1) }
-    let(:mock_git_module_2) { instance_double("R10K::Module::Git", :name => "my_lame_module", :version => "0.0.1", :repo => mock_stateful_repo_2) }
-    let(:mock_forge_module_1) { double(:name => "their_shiny_module", :version => "2.0.0") }
-    let(:mock_puppetfile) { instance_double("R10K::Puppetfile", :modules => [mock_git_module_1, mock_git_module_2, mock_forge_module_1]) }
-
-    before(:all) do
-      @tmp_path = "./tmp-r10k-test-dir/"
-      Dir.mkdir(@tmp_path) unless File.exists?(@tmp_path)
-    end
-
-    after(:all) do
-      File.delete("#{@tmp_path}/.r10k-deploy.json")
-      Dir.delete(@tmp_path)
-    end
-
-    it "writes the .r10k-deploy file correctly" do
-      allow(R10K::Puppetfile).to receive(:new).and_return(mock_puppetfile)
-      allow(mock_forge_module_1).to receive(:repo).and_raise(NoMethodError)
-
-      fake_env = Fake_Environment.new(@tmp_path, {:name => "my_cool_environment", :signature => "pablo picasso"})
-      subject.send(:write_environment_info!, fake_env, "2019-01-01 23:23:22 +0000", true)
-
-      file_contents = File.read("#{@tmp_path}/.r10k-deploy.json")
-      r10k_deploy = JSON.parse(file_contents)
-
-      expect(r10k_deploy['name']).to eq("my_cool_environment")
-      expect(r10k_deploy['signature']).to eq("pablo picasso")
-      expect(r10k_deploy['started_at']).to eq("2019-01-01 23:23:22 +0000")
-      expect(r10k_deploy['deploy_success']).to eq(true)
-      expect(r10k_deploy['module_deploys'].length).to eq(3)
-      expect(r10k_deploy['module_deploys'][0]['name']).to eq("my_cool_module")
-      expect(r10k_deploy['module_deploys'][0]['version']).to eq("1.0")
-      expect(r10k_deploy['module_deploys'][0]['sha']).to eq("123456")
-      expect(r10k_deploy['module_deploys'][1]['name']).to eq("my_lame_module")
-      expect(r10k_deploy['module_deploys'][1]['version']).to eq("0.0.1")
-      expect(r10k_deploy['module_deploys'][1]['sha']).to eq("654321")
-      expect(r10k_deploy['module_deploys'][2]['name']).to eq("their_shiny_module")
-      expect(r10k_deploy['module_deploys'][2]['version']).to eq("2.0.0")
-      expect(r10k_deploy['module_deploys'][2]['sha']).to eq(nil)
-
-    end
-  end
 end

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.2.3
+  version: 3.3.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -28,16 +28,16 @@ dependencies:
   name: cri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.15.1
+        version: 2.15.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.15.1
+        version: 2.15.6
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.6.1
 description: |2
       R10K provides a general purpose toolset for deploying Puppet environments and modules.
       It implements the Puppetfile format and provides a native implementation of Puppet
@@ -199,7 +199,6 @@ files:
 - docker/r10k/docker-entrypoint.sh
 - docker/r10k/spec/dockerfile_spec.rb
 - docker/r10k/spec/fixtures/Puppetfile
-- docker/r10k/spec/spec_helper.rb
 - integration/Gemfile
 - integration/README.mkd
 - integration/Rakefile
@@ -235,6 +234,7 @@ files:
 - integration/tests/Puppetfile/HTTP_PROXY_affects_git_source.rb
 - integration/tests/README.mkd
 - integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb
+- integration/tests/basic_functionality/negative/attempt_to_install_peonly_module_without_license.rb
 - integration/tests/basic_functionality/negative/neg_deploy_with_invalid_r10k_yaml.rb
 - integration/tests/basic_functionality/negative/neg_deploy_with_missing_r10k_yaml.rb
 - integration/tests/basic_functionality/negative/neg_invalid_git_provider.rb
@@ -410,7 +410,6 @@ 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/docker/r10k/spec/spec_helper.rb

@@ -1,22 +0,0 @@
-require 'open3'
-
-module Helpers
-  def run_command(command)
-    stdout_string = ''
-    status = nil
-
-    Open3.popen3(command) do |stdin, stdout, stderr, wait_thread|
-      Thread.new do
-        stdout.each { |l| stdout_string << l; STDOUT.puts l }
-      end
-      Thread.new do
-        stderr.each { |l| STDOUT.puts l }
-      end
-
-      stdin.close
-      status = wait_thread.value
-    end
-
-    { status: status, stdout: stdout_string }
-  end
-end

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