r10k 3.0.3 → 3.0.4

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 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
@@ -187,13 +187,15 @@ files:
 - doc/git/providers.mkd
 - doc/puppetfile.mkd
 - doc/updating-your-puppetfile.mkd
+- docker/.gitignore
 - docker/.rspec
 - docker/Gemfile
-- docker/ci/build
+- docker/Makefile
 - docker/ci/build.ps1
 - docker/distelli-manifest.yml
 - docker/r10k/Dockerfile
 - docker/r10k/spec/dockerfile_spec.rb
+- docker/r10k/spec/fixtures/Puppetfile
 - integration/Gemfile
 - integration/README.mkd
 - integration/Rakefile
@@ -215,7 +217,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
@@ -402,6 +403,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/duplicate-module-error/Puppetfile
 - spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile
 - spec/fixtures/unit/puppetfile/load-error/Puppetfile

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"
-  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"
-}
-
-: ===
-: === 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/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")