r10k 2.6.9 → 3.0.0

data/spec/unit/puppetfile_spec.rb

@@ -1,6 +1,25 @@
 require 'spec_helper'
 require 'r10k/puppetfile'
 
+describe R10K::Puppetfile do
+
+  subject do
+    described_class.new(
+      '/some/nonexistent/basedir',
+      nil,
+      nil,
+      'Puppetfile.r10k'
+    )
+  end
+
+  describe "a custom puppetfile Puppetfile.r10k" do
+    it "is the basedir joined with '/Puppetfile.r10k' path" do
+      expect(subject.puppetfile_path).to eq '/some/nonexistent/basedir/Puppetfile.r10k'
+    end
+  end
+
+end
+
 describe R10K::Puppetfile do
 
   subject do
@@ -15,6 +34,13 @@ describe R10K::Puppetfile do
     end
   end
 
+  describe "the default puppetfile" do
+    it "is the basedir joined with '/Puppetfile' path" do
+      expect(subject.puppetfile_path).to eq '/some/nonexistent/basedir/Puppetfile'
+    end
+  end
+
+
   describe "setting moduledir" do
     it "changes to given moduledir if it is an absolute path" do
       subject.set_moduledir('/absolute/path/moduledir')
@@ -128,26 +154,6 @@ 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)
@@ -188,37 +194,38 @@ describe R10K::Puppetfile do
       end
     end
 
-    it "accepts a forge module with a version" do
-      path = File.join(PROJECT_ROOT, 'spec', 'fixtures', 'unit', 'puppetfile', 'valid-forge-with-version')
+    it "rejects Puppetfiles with duplicate module names" do
+      path = File.join(PROJECT_ROOT, 'spec', 'fixtures', 'unit', 'puppetfile', 'duplicate-module-error')
       pf_path = File.join(path, 'Puppetfile')
       subject = described_class.new(path)
-      expect { subject.load! }.not_to raise_error
+      expect {
+        subject.load!
+      }.to raise_error(R10K::Error, /Puppetfiles cannot contain duplicate module names/i)
     end
 
-    it "accepts a forge module without a version" do
-      path = File.join(PROJECT_ROOT, 'spec', 'fixtures', 'unit', 'puppetfile', 'valid-forge-without-version')
+    it "wraps and re-raises name errors" do
+      path = File.join(PROJECT_ROOT, 'spec', 'fixtures', 'unit', 'puppetfile', 'name-error')
       pf_path = File.join(path, 'Puppetfile')
       subject = described_class.new(path)
-      expect { subject.load! }.not_to raise_error
+      expect {
+        subject.load!
+      }.to raise_error do |e|
+        expect_wrapped_error(e, pf_path, NameError)
+      end
     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')
+    it "accepts a forge module with a version" do
+      path = File.join(PROJECT_ROOT, 'spec', 'fixtures', 'unit', 'puppetfile', 'valid-forge-with-version')
       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')
+    it "accepts a forge module without a version" do
+      path = File.join(PROJECT_ROOT, 'spec', 'fixtures', 'unit', 'puppetfile', 'valid-forge-without-version')
       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
+      expect { subject.load! }.not_to raise_error
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.6.9
+  version: 3.0.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.2.8
 - !ruby/object:Gem::Dependency
   name: gettext-setup
   requirement: !ruby/object:Gem::Requirement
@@ -94,40 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         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
@@ -176,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
@@ -194,15 +160,13 @@ 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
@@ -221,6 +185,11 @@ files:
 - doc/git/providers.mkd
 - doc/puppetfile.mkd
 - doc/updating-your-puppetfile.mkd
+- docker/Gemfile
+- docker/ci/build
+- docker/distelli-manifest.yml
+- docker/r10k/Dockerfile
+- docker/r10k/spec/dockerfile_spec.rb
 - integration/Gemfile
 - integration/README.mkd
 - integration/Rakefile
@@ -242,11 +211,22 @@ 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
@@ -269,8 +249,11 @@ files:
 - integration/tests/git_source/negative/neg_git_unauthorized_https.rb
 - integration/tests/git_source/negative/neg_git_unauthorized_ssh.rb
 - integration/tests/git_source/negative/neg_git_unicode_branch.rb
+- integration/tests/i18n/deploy_module_with_unicode_in_file_name.rb
 - integration/tests/purging/content_not_purged_at_root.rb
 - integration/tests/purging/default_purging.rb
+- integration/tests/purging/does_not_purge_files_on_white_list.rb
+- integration/tests/purging/invalid_whitelist_types.rb
 - integration/tests/user_scenario/basic_workflow/multi_env_1000_branches.rb
 - integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module.rb
 - integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module_static.rb
@@ -417,9 +400,10 @@ 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
+- spec/fixtures/unit/puppetfile/name-error/Puppetfile
 - spec/fixtures/unit/puppetfile/valid-forge-with-version/Puppetfile
 - spec/fixtures/unit/puppetfile/valid-forge-without-version/Puppetfile
 - spec/fixtures/unit/util/purgeable/managed_one/expected_1
@@ -531,14 +515,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubyforge_project: 
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Puppet environment and module deployment

data/.github/pull_request_template.md

@@ -1,4 +0,0 @@
-Please add all notable changes to the "Unreleased" section of the CHANGELOG in the format:
-```
-- (JIRA ticket) Summary of changes. [Issue or PR #](link to issue or PR)
-```

data/.github/workflows/release.yml

@@ -1,36 +0,0 @@
-name: Tag and release
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - 'lib/r10k/version.rb'
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: '0'
-      - name: Bump version and push tag
-        uses: anothrNick/github-tag-action@1.17.2
-        env:
-          GITHUB_TOKEN: ${{ secrets.PUPPET_RELEASE_GH_TOKEN }}
-          DEFAULT_BUMP: patch
-          WITH_V: false
-          # Uncomment this if the tag and version file become out-of-sync and
-          # you need to tag at a specific version.
-          # CUSTOM_TAG:
-      - name: Build gem
-        uses: scarhand/actions-ruby@master
-        with:
-          args: build *.gemspec
-      - name: Publish gem
-        uses: scarhand/actions-ruby@master
-        env:
-          RUBYGEMS_AUTH_TOKEN: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}
-        with:
-          args: push *.gem
-

data/CODEOWNERS

@@ -1 +0,0 @@
-* @puppetlabs/puppetserver-maintainers @adrienthebo @dhollinger

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