r10k 2.6.4 → 2.6.9

data/r10k.gemspec

@@ -28,16 +28,20 @@ Gem::Specification.new do |s|
   s.add_dependency 'log4r',     '1.1.10'
   s.add_dependency 'multi_json', '~> 1.10'
 
-  s.add_dependency 'puppet_forge', '~> 2.2.8'
+  s.add_dependency 'puppet_forge', '~> 2.3.0'
 
-  s.add_dependency 'gettext-setup', '~> 0.5'
+  s.add_dependency 'gettext-setup', '~>0.24'
+  # These two pins narrow what is allowed by gettext-setup,
+  # to preserver compatability with Ruby 2.4
+  s.add_dependency 'fast_gettext', '~> 1.1.0'
+  s.add_dependency 'gettext', ['>= 3.0.2', '< 3.3.0']
 
   s.add_development_dependency 'rspec', '~> 3.1'
 
   s.add_development_dependency 'rake'
 
   s.add_development_dependency 'yard', '~> 0.9.11'
-  s.add_development_dependency 'minitar', '~> 0.6.1'
+  s.add_development_dependency 'minitar', '~> 0.9.0'
 
   s.files        = %x[git ls-files].split($/)
   s.require_path = 'lib'

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
@@ -123,4 +127,63 @@ 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

@@ -128,6 +128,26 @@ describe R10K::Puppetfile do
     end
   end
 
+  describe '#managed_directories' do
+    it 'returns an array of paths that can be purged' do
+      allow(R10K::Module).to receive(:new).with('puppet/test_module', subject.moduledir, '1.2.3', anything).and_call_original
+
+      subject.add_module('puppet/test_module', '1.2.3')
+      expect(subject.managed_directories).to match_array(["/some/nonexistent/basedir/modules"])
+    end
+
+    context 'with a module with install_path == \'\'' do
+      it 'basedir isn\'t in the list of paths to purge' do
+        module_opts = { install_path: '', git: 'git@example.com:puppet/test_module.git' }
+
+        allow(R10K::Module).to receive(:new).with('puppet/test_module', subject.basedir, module_opts, anything).and_call_original
+
+        subject.add_module('puppet/test_module', module_opts)
+        expect(subject.managed_directories).to be_empty
+      end
+    end
+  end
+
   describe "evaluating a Puppetfile" do
     def expect_wrapped_error(orig, pf_path, wrapped_error)
       expect(orig).to be_a_kind_of(R10K::Error)
@@ -181,6 +201,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.4
+  version: 2.6.9
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -72,28 +72,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.8
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.8
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: gettext-setup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.24'
+- !ruby/object:Gem::Dependency
+  name: fast_gettext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: gettext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.9.0
 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
@@ -160,13 +194,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/pull_request_template.md"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.mkd
+- CODEOWNERS
 - CONTRIBUTING.mkd
 - Gemfile
 - LICENSE
-- MAINTAINERS
 - README.mkd
 - Rakefile
 - bin/r10k
@@ -206,22 +242,11 @@ 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
-- integration/scripts/setup_r10k_env_centos6.sh
-- integration/scripts/setup_r10k_env_rhel7.sh
-- integration/scripts/setup_r10k_env_sles11.sh
-- integration/scripts/setup_r10k_env_sles12.sh
-- integration/scripts/setup_r10k_env_ubuntu1004.sh
-- integration/scripts/setup_r10k_env_ubuntu1204.sh
-- integration/scripts/setup_r10k_env_ubuntu1404.sh
 - integration/tests/Puppetfile/HTTP_PROXY_affects_forge_source.rb
 - 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
@@ -383,6 +408,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
@@ -391,6 +417,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
@@ -511,8 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Puppet environment and module deployment

data/MAINTAINERS

@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "file_format": "This MAINTAINERS file format is described at https://github.com/puppetlabs/maintainers",
-  "issues": "https://tickets.puppet.com/browse/RK",
-  "internal_list": "https://groups.google.com/a/puppet.com/forum/?hl=en#!forum/discuss-code-manager-maintainers", 
-  "people": [
-    {
-      "github": "andersonmills",
-      "email": "anderson@puppet.com",
-      "name": "Anderson Mills"
-    },
-    {
-      "github": "scotje",
-      "email": "jesse@puppet.com",
-      "name": "Jesse Scott"
-    }
-  ]
-}

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

data/integration/scripts/README.mkd

@@ -1,86 +0,0 @@
-Scripts
-=======
-
-This folder contains helper scripts for setting up manual testing environments
-using [Beaker](https://github.com/puppetlabs/beaker) configuration files. The
-environments created by these scripts have "r10k" fully configured along with
-a Git repository with a valid "production" environment.
-
-These scripts are specific to the Puppet Labs environment and will not work in
-other environments without alteration!
-
-## Prerequisites
-
-To utilize this test scripts you will need to have Ruby 1.9.3 or greater
-installed on your system along with Bundler. Also, the scripts utilize the
-"vmpooler" for virtual machine creation. Access to the "vmpooler" machines
-require having valid SSH private keys located on your local computer. Speak
-with a QA team member for more information on where to find the necessary
-SSH keys.
-
-## Usage
-
-The scripts are written in Bash and should run on any Linux or Mac system as
-long as the prerequisites mentioned above are satisfied.
-
-### Cloning
-
-First you will need to clone the "[r10k](https://github.com/puppetlabs/r10k)" repository on your local machine:
-
-```bash
-git clone git@github.com:puppetlabs/r10k.git
-```
-
-### Executing Script
-
-Navigate to the integration tests "scripts" folder of the "r10k" repository
-clone:
-
-```bash
-cd r10k/integration/scripts
-```
-
-There are separate scripts for each supported platform. Select a desired
-platform and execute the script:
-
-```bash
-bash setup_r10k_env_centos6.sh
-```
-
-## Connecting to Machines
-
-The setup process takes about 10 minutes to complete. Once finished Beaker
-will report that all tests have been run successfully. The output log will
-list the machines created. The Puppet master will have a name ending with
-"-master" which you can scrape from the Beaker console output. Example:
-
-```
-a9lrs93vnujsrrg.delivery.puppetlabs.net (centos-6-x86_64-master) executed in 1.26 seconds
-```
-
-The FQDN of the Puppet master ("a9lrs93vnujsrrg.delivery.puppetlabs.net" in the
-above example) will be printed to the left of the machine tag. The machine tag
-is a combination of the platform and role of the virtual machine.
-
-Now that you have the FQDN you can connect to the machine using SSH:
-
-```bash
-ssh -i private_key root@a9lrs93vnujsrrg.delivery.puppetlabs.net
-```
-
-*Note:* The correct SSH private key needs to be installed on your local machine
-first. Speak with a QA representative to get the correct key for "vmpooler"
-machines.
-
-## Configuration Details
-
-Now that you have successfully connected to the Puppet master you can begin
-manual testing. The script has configured Git on the Puppet master to provide
-a working "production" environment for "r10k" testing. The Git repository
-serving the Puppet environments is located at "/git_repos/environments.git".
-There is a Git clone of the remote repository located at "/root/environments".
-
-When performing manual "r10k" testing you should utilize the Git clone
-repository located at "/root/environments". The "r10k" configuration file
-"/etc/puppetlabs/r10k/r10k.yaml" is already configured to use the remote Git
-repository for deployments.

data/integration/scripts/setup_r10k_env_centos5.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/4.0/ci-ready/
-export GIT_PROVIDER=shellgit
-
-bundle install --path .bundle/gems
-
-bundle exec beaker \
-  --preserve-hosts always \
-  --config configs/pe/centos-5-64mda \
-  --debug \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib
-
-rm -rf .bundle