r10k 3.14.0 → 3.15.0

data/spec/unit/module/forge_spec.rb

@@ -33,21 +33,17 @@ describe R10K::Module::Forge do
 
   describe "implementing the Puppetfile spec" do
     it "should implement 'branan/eight_hundred', '8.0.0'" do
-      expect(described_class).to be_implement('branan/eight_hundred', { version: '8.0.0' })
+      expect(described_class).to be_implement('branan/eight_hundred', { type: 'forge', version: '8.0.0' })
     end
 
     it "should implement 'branan-eight_hundred', '8.0.0'" do
-      expect(described_class).to be_implement('branan-eight_hundred', { version: '8.0.0' })
-    end
-
-    it "should fail with an invalid title" do
-      expect(described_class).to_not be_implement('branan!eight_hundred', { version: '8.0.0' })
+      expect(described_class).to be_implement('branan-eight_hundred', { type: 'forge', version: '8.0.0' })
     end
   end
 
   describe "implementing the standard options interface" do
     it "should implement {type: forge}" do
-      expect(described_class).to be_implement('branan-eight_hundred', {type: 'forge', version: '8.0.0', source: 'not implemented'})
+      expect(described_class).to be_implement('branan-eight_hundred', { type: 'forge', version: '8.0.0', source: 'not implemented' })
     end
   end
 
@@ -71,6 +67,12 @@ describe R10K::Module::Forge do
     end
   end
 
+  describe "invalid attributes" do
+    it "errors on invalid versions" do
+      expect { described_class.new('branan/eight_hundred', '/moduledir', { version: '_8.0.0_' }) }.to raise_error ArgumentError, /version/
+    end
+  end
+
   describe "properties" do
     subject { described_class.new('branan/eight_hundred', fixture_modulepath, { version: '8.0.0' }) }
 

data/spec/unit/module/git_spec.rb

@@ -44,7 +44,7 @@ describe R10K::Module::Git do
         described_class.new(
           'branan/eight_hundred',
           '/moduledir',
-          { :git => 'git://git-server.site/branan/puppet-eight_hundred' }
+          { :git => 'https://git-server.site/branan/puppet-eight_hundred' }
         )
       end
 
@@ -66,7 +66,7 @@ describe R10K::Module::Git do
         described_class.new(
           'eight_hundred',
           '/moduledir',
-          { :git => 'git://git-server.site/branan/puppet-eight_hundred' }
+          { :git => 'https://git-server.site/branan/puppet-eight_hundred' }
         )
       end
 
@@ -86,7 +86,7 @@ describe R10K::Module::Git do
 
   describe "properties" do
     subject do
-      described_class.new('boolean', '/moduledir', {:git => 'git://git.example.com/adrienthebo/puppet-boolean'})
+      described_class.new('boolean', '/moduledir', {:git => 'https://git.example.com/adrienthebo/puppet-boolean'})
     end
 
     before(:each) do
@@ -154,7 +154,7 @@ describe R10K::Module::Git do
       described_class.new(
         'boolean',
         '/moduledir',
-        { :git => 'git://git.example.com/adrienthebo/puppet-boolean' }
+        { :git => 'https://git.example.com/adrienthebo/puppet-boolean' }
       )
     end
 
@@ -171,7 +171,7 @@ describe R10K::Module::Git do
       described_class.new('boolean', '/moduledir', base_opts.merge(extra_opts), env)
     end
 
-    let(:base_opts) { { git: 'git://git.example.com/adrienthebo/puppet-boolean' } }
+    let(:base_opts) { { git: 'https://git.example.com/adrienthebo/puppet-boolean' } }
 
     before(:each) do
       allow(mock_repo).to receive(:head).and_return('abc123')

data/spec/unit/module_loader/puppetfile_spec.rb

@@ -12,7 +12,7 @@ describe R10K::ModuleLoader::Puppetfile do
           environment: R10K::Environment::Git.new('env',
                                                   '/test/basedir/',
                                                   'env',
-                                                  { remote: 'git://foo/remote',
+                                                  { remote: 'https://foo/remote',
                                                     ref: 'env' })
         }
       end
@@ -80,7 +80,8 @@ describe R10K::ModuleLoader::Puppetfile do
   describe 'adding modules' do
     let(:basedir) { '/test/basedir' }
 
-    subject { R10K::ModuleLoader::Puppetfile.new(basedir: basedir) }
+    subject { R10K::ModuleLoader::Puppetfile.new(basedir: basedir,
+                                                 overrides: {modules: {exclude_spec: true}}) }
 
     it 'should transform Forge modules with a string arg to have a version key' do
       expect(R10K::Module).to receive(:from_metadata).with('puppet/test_module', subject.moduledir, hash_including(version: '1.2.3'), anything).and_call_original
@@ -94,11 +95,23 @@ describe R10K::ModuleLoader::Puppetfile do
 
       expect {
         subject.add_module('puppet/test_module', '< 1.2.0')
-      }.to raise_error(RuntimeError, /module puppet\/test_module.*doesn't have an implementation/i)
+      }.to raise_error(ArgumentError, /module version .* is not a valid forge module version/i)
 
       expect(subject.modules.collect(&:name)).not_to include('test_module')
     end
 
+    it 'should not modify the overrides when adding modules' do
+      module_opts = { git: 'git@example.com:puppet/test_module.git' }
+      subject.add_module('puppet/test_module', module_opts)
+      expect(subject.instance_variable_get("@overrides")[:modules]).to eq({exclude_spec: true})
+    end
+
+    it 'should read the `exclude_spec` setting in the module definition and override the overrides' do
+      module_opts = { git: 'git@example.com:puppet/test_module.git', exclude_spec: false }
+      subject.add_module('puppet/test_module', module_opts)
+      expect(subject.modules[0].instance_variable_get("@exclude_spec")).to be false
+    end
+
     it 'should set :spec_deletable to true for modules in the basedir' do
       module_opts = { git: 'git@example.com:puppet/test_module.git' }
       subject.add_module('puppet/test_module', module_opts)
@@ -372,7 +385,7 @@ describe R10K::ModuleLoader::Puppetfile do
         expect(metadata['canary']).to eq('0.0.0')
       end
 
-      it 'does not load module implementations for static versioned' do
+      it 'does not load module implementations for static versions unless the module install path does not exist on disk' do
         @path = File.join(PROJECT_ROOT, 'spec', 'fixtures', 'unit', 'puppetfile', 'various-modules')
         subject.load_metadata
         modules = subject.load[:modules].map { |mod| [ mod.name, mod ] }.to_h
@@ -381,7 +394,7 @@ describe R10K::ModuleLoader::Puppetfile do
         expect(modules['concat']).to be_a_kind_of(R10K::Module::Forge)
         expect(modules['rpm']).to be_a_kind_of(R10K::Module::Definition)
         expect(modules['foo']).to be_a_kind_of(R10K::Module::Git)
-        expect(modules['bar']).to be_a_kind_of(R10K::Module::Definition)
+        expect(modules['bar']).to be_a_kind_of(R10K::Module::Git)
         expect(modules['baz']).to be_a_kind_of(R10K::Module::Definition)
         expect(modules['fizz']).to be_a_kind_of(R10K::Module::Definition)
         expect(modules['buzz']).to be_a_kind_of(R10K::Module::Git)

data/spec/unit/module_spec.rb

@@ -31,12 +31,11 @@ describe R10K::Module do
       'bar-quux',
     ].each do |scenario|
       it "accepts a name matching #{scenario} and version nil" do
-        obj = R10K::Module.new(scenario, '/modulepath', { version: nil })
+        obj = R10K::Module.new(scenario, '/modulepath', { type: 'forge', version: nil })
         expect(obj).to be_a_kind_of(R10K::Module::Forge)
       end
     end
-    [ {version: '8.0.0'},
-      {type: 'forge', version: '8.0.0'},
+    [ {type: 'forge', version: '8.0.0'},
     ].each do |scenario|
       it "accepts a name matching bar-quux and args #{scenario.inspect}" do
         obj = R10K::Module.new('bar-quux', '/modulepath', scenario)
@@ -65,7 +64,7 @@ describe R10K::Module do
       end
 
       it 'sets the expected version to what is found in the metadata' do
-        obj = R10K::Module.new(@title, @dirname, {version: nil})
+        obj = R10K::Module.new(@title, @dirname, {type: 'forge', version: nil})
         expect(obj.send(:instance_variable_get, :'@expected_version')).to eq('1.2.0')
       end
     end
@@ -82,7 +81,6 @@ describe R10K::Module do
       ['name', {type: 'git', source: 'git url'}],
       ['name', {svn: 'svn url'}],
       ['name', {type: 'svn', source: 'svn url'}],
-      ['namespace-name', {version: '8.0.0'}],
       ['namespace-name', {type: 'forge', version: '8.0.0'}]
     ].each do |(name, options)|
       it 'can handle the default_branch_override option' do
@@ -92,12 +90,21 @@ describe R10K::Module do
         }.not_to raise_error
       end
       describe 'the exclude_spec setting' do
+        it 'sets the exclude_spec instance variable to false by default' do
+          obj = R10K::Module.new(name, '/modulepath', options)
+          expect(obj.instance_variable_get("@exclude_spec")).to eq(false)
+        end
         it 'sets the exclude_spec instance variable' do
           obj = R10K::Module.new(name, '/modulepath', options.merge({exclude_spec: true}))
           expect(obj.instance_variable_get("@exclude_spec")).to eq(true)
         end
-        it 'can be overridden by the overrides map' do
-          options = options.merge({exclude_spec: false, overrides: {modules: {exclude_spec: true}}})
+        it 'cannot be overridden by the settings from the cli, r10k.yaml, or settings default' do
+          options = options.merge({exclude_spec: true, overrides: {modules: {exclude_spec: false}}})
+          obj = R10K::Module.new(name, '/modulepath', options)
+          expect(obj.instance_variable_get("@exclude_spec")).to eq(true)
+        end
+        it 'reads the setting from the cli, r10k.yaml, or settings default when not provided directly' do
+          options = options.merge({overrides: {modules: {exclude_spec: true}}})
           obj = R10K::Module.new(name, '/modulepath', options)
           expect(obj.instance_variable_get("@exclude_spec")).to eq(true)
         end

data/spec/unit/util/cacheable_spec.rb

@@ -6,10 +6,10 @@ RSpec.describe R10K::Util::Cacheable do
   subject { Object.new.extend(R10K::Util::Cacheable) }
 
   describe "dirname sanitization" do
-    let(:input) { 'git://some/git/remote' }
+    let(:input) { 'https://some/git/remote' }
 
     it 'sanitizes URL to directory name' do
-      expect(subject.sanitized_dirname(input)).to eq('git---some-git-remote')
+      expect(subject.sanitized_dirname(input)).to eq('https---some-git-remote')
     end
 
     context 'with username and password' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.15.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -28,14 +28,14 @@ dependencies:
   name: cri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.15.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.15.10
 - !ruby/object:Gem::Dependency
@@ -70,14 +70,14 @@ dependencies:
   name: puppet_forge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
@@ -98,16 +98,22 @@ dependencies:
   name: fast_gettext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: gettext
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +123,7 @@ dependencies:
         version: 3.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -127,7 +133,7 @@ dependencies:
         version: 3.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +154,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +221,6 @@ files:
 - ".github/workflows/rspec_tests.yml"
 - ".github/workflows/stale.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.mkd
 - CODEOWNERS
 - CONTRIBUTING.mkd
@@ -487,6 +492,12 @@ files:
 - spec/fixtures/unit/puppetfile/valid-forge-without-version/Puppetfile
 - spec/fixtures/unit/puppetfile/various-modules/Puppetfile
 - spec/fixtures/unit/puppetfile/various-modules/Puppetfile.new
+- spec/fixtures/unit/puppetfile/various-modules/modules/apt/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/baz/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/buzz/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/canary/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/fizz/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/rpm/.gitkeep
 - spec/fixtures/unit/util/purgeable/managed_one/expected_1
 - spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/managed_symlink_file
 - spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_allowlisted_2/ignored_1

data/.travis.yml

@@ -1,42 +0,0 @@
----
-language: ruby
-bundler_args: "--without system"
-script: "bundle exec rspec --color --format documentation spec"
-notifications:
-  email: false
-sudo: false
-jdk:
-  - openjdk11
-before_install: gem install bundler -v '< 2' --no-document
-matrix:
-  include:
-    - stage: r10k tests
-      rvm: 2.3.0
-    - stage: r10k container tests
-      dist: focal
-      language: ruby
-      services:
-        - docker
-      rvm: 2.6.6
-      env:
-        - DOCKER_COMPOSE_VERSION=1.28.6
-        - DOCKER_BUILDX_VERSION=0.5.1
-        # necessary to prevent overwhelming TravisCI build output limits
-        - DOCKER_BUILD_FLAGS="--progress plain"
-      before_install:
-        - 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
-        - mkdir -vp ~/.docker/cli-plugins
-        - curl --location https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 > ~/.docker/cli-plugins/docker-buildx
-        - chmod +x ~/.docker/cli-plugins/docker-buildx
-        - docker buildx create --name travis_builder --use
-      script:
-        - set -e
-        - cd docker
-        - make lint
-        - make build
-        - make test
-      after_script:
-        - docker buildx rm travis_builder