r10k 3.10.0 → 3.11.0

data/spec/unit/module/git_spec.rb

@@ -89,6 +89,23 @@ describe R10K::Module::Git do
     end
   end
 
+  describe 'syncing the repo' do
+    let(:module_org) { "coolorg" }
+    let(:module_name) { "coolmod" }
+    let(:title) { "#{module_org}-#{module_name}" }
+    let(:dirname) { Pathname.new(Dir.mktmpdir) }
+    let(:spec_path) { dirname + module_name + 'spec' }
+    subject { described_class.new(title, dirname, {}) }
+
+    it 'defaults to keeping the spec dir' do
+      FileUtils.mkdir_p(spec_path)
+      allow(mock_repo).to receive(:resolve).with('master').and_return('abc123')
+      allow(mock_repo).to receive(:sync)
+      subject.sync
+      expect(Dir.exist?(spec_path)).to eq true
+    end
+  end
+
   describe "determining the status" do
     subject do
       described_class.new(

data/spec/unit/module/svn_spec.rb

@@ -119,6 +119,24 @@ describe R10K::Module::SVN do
     end
   end
 
+  describe 'the default spec dir' do
+    let(:module_org) { "coolorg" }
+    let(:module_name) { "coolmod" }
+    let(:title) { "#{module_org}-#{module_name}" }
+    let(:dirname) { Pathname.new(Dir.mktmpdir) }
+    let(:spec_path) { dirname + module_name + 'spec' }
+    subject { described_class.new(title, dirname, {}) }
+
+    it 'is kept by default' do
+
+      FileUtils.mkdir_p(spec_path)
+      expect(subject).to receive(:status).and_return(:absent)
+      expect(subject).to receive(:install).and_return(nil)
+      subject.sync
+      expect(Dir.exist?(spec_path)).to eq true
+    end
+  end
+
   describe "synchronizing" do
 
     subject { described_class.new('foo', '/moduledir', :svn => 'https://github.com/adrienthebo/r10k-fixture-repo', :rev => 123) }

data/spec/unit/module_loader/puppetfile_spec.rb

@@ -37,13 +37,13 @@ describe R10K::ModuleLoader::Puppetfile do
         it 'respects absolute paths' do
           absolute_options = options.merge({puppetfile: '/opt/puppetlabs/special/Puppetfile'})
           puppetfile = R10K::ModuleLoader::Puppetfile.new(**absolute_options)
-          expect(puppetfile.instance_variable_get(:@puppetfile)).to eq('/opt/puppetlabs/special/Puppetfile')
+          expect(puppetfile.instance_variable_get(:@puppetfile_path)).to eq('/opt/puppetlabs/special/Puppetfile')
         end
 
         it 'roots the Puppetfile in the basepath if a relative path is specified' do
           relative_options = options.merge({puppetfile: 'Puppetfile.global'})
           puppetfile = R10K::ModuleLoader::Puppetfile.new(**relative_options)
-          expect(puppetfile.instance_variable_get(:@puppetfile)).to eq('/test/basedir/env/Puppetfile.global')
+          expect(puppetfile.instance_variable_get(:@puppetfile_path)).to eq('/test/basedir/env/Puppetfile.global')
         end
       end
 
@@ -68,7 +68,7 @@ describe R10K::ModuleLoader::Puppetfile do
       end
 
       it 'has a Puppetfile rooted in the basedir' do
-        expect(subject.instance_variable_get(:@puppetfile)).to eq('/test/basedir/Puppetfile')
+        expect(subject.instance_variable_get(:@puppetfile_path)).to eq('/test/basedir/Puppetfile')
       end
 
       it 'uses the public forge' do
@@ -107,6 +107,18 @@ describe R10K::ModuleLoader::Puppetfile do
       expect(subject.modules.collect(&:name)).not_to include('test_module')
     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)
+      expect(subject.modules[0].spec_deletable).to be true
+    end
+
+    it 'should set :spec_deletable to false for modules outside the basedir' do
+      module_opts = { git: 'git@example.com:puppet/test_module.git', install_path: 'some/path' }
+      subject.add_module('puppet/test_module', module_opts)
+      expect(subject.modules[0].spec_deletable).to be false
+    end
+
     it 'should accept non-Forge modules with a hash arg' do
       module_opts = { git: 'git@example.com:puppet/test_module.git' }
 
@@ -165,6 +177,7 @@ describe R10K::ModuleLoader::Puppetfile do
       mod = instance_double('R10K::Module::Base', name: 'conflict', origin: :puppetfile, 'origin=': nil)
       loader = R10K::ModuleLoader::Puppetfile.new(basedir: basedir, environment: env)
       allow(env).to receive(:'module_conflicts?').with(mod).and_return(true)
+      allow(mod).to receive(:spec_deletable=)
 
       expect(R10K::Module).to receive(:new).with('conflict', anything, anything, anything).and_return(mod)
       expect { loader.add_module('conflict', {}) }.not_to change { loader.modules }

data/spec/unit/module_spec.rb

@@ -77,7 +77,7 @@ describe R10K::Module do
     }.to raise_error RuntimeError, /doesn't have an implementation/
   end
 
-  describe 'when a user passes a `default_branch_override`' do
+  describe 'Given a set of initialization parameters for R10K::Module' do
     [ ['name', {git: 'git url'}],
       ['name', {type: 'git', source: 'git url'}],
       ['name', {svn: 'svn url'}],
@@ -91,6 +91,17 @@ describe R10K::Module do
           expect(obj).to be_a_kind_of(R10K::Module::Base)
         }.not_to raise_error
       end
+      describe 'the exclude_spec setting' do
+        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}}})
+          obj = R10K::Module.new(name, '/modulepath', options)
+          expect(obj.instance_variable_get("@exclude_spec")).to eq(true)
+        end
+      end
     end
   end
 end

data/spec/unit/puppetfile_spec.rb

@@ -10,7 +10,7 @@ describe R10K::Puppetfile do
     )
   end
 
-  describe "a custom puppetfile Puppetfile.r10k" do
+  describe "a custom puppetfile_name" do
     it "is the basedir joined with '/Puppetfile.r10k' path" do
       expect(subject.puppetfile_path).to eq '/some/nonexistent/basedir/Puppetfile.r10k'
     end
@@ -18,6 +18,25 @@ describe R10K::Puppetfile do
 
 end
 
+describe R10K::Puppetfile do
+
+  describe "a custom relative puppetfile_path" do
+    it "is the basedir joined with the puppetfile_path" do
+      relative_subject = described_class.new('/some/nonexistent/basedir',
+                                             {puppetfile_path: 'relative/Puppetfile'})
+      expect(relative_subject.puppetfile_path).to eq '/some/nonexistent/basedir/relative/Puppetfile'
+    end
+  end
+
+  describe "a custom absolute puppetfile_path" do
+    it "is the puppetfile_path as given" do
+      absolute_subject = described_class.new('/some/nonexistent/basedir',
+                                             {puppetfile_path: '/some/absolute/custom/Puppetfile'})
+      expect(absolute_subject.puppetfile_path).to eq '/some/absolute/custom/Puppetfile'
+    end
+  end
+end
+
 describe R10K::Puppetfile do
 
   subject do
@@ -80,6 +99,17 @@ describe R10K::Puppetfile do
         expect(has_some_data).to be true
       end
 
+      it "handles a relative basedir" do
+        path = File.join('spec', 'fixtures', 'unit', 'puppetfile', 'valid-forge-with-version')
+        subject = described_class.new(path, {})
+
+        loaded_content = subject.load
+        expect(loaded_content).to be_an_instance_of(Hash)
+
+        has_some_data = loaded_content.values.none?(&:empty?)
+        expect(has_some_data).to be true
+      end
+
       it "is idempotent" do
         path = File.join(PROJECT_ROOT, 'spec', 'fixtures', 'unit', 'puppetfile', 'valid-forge-with-version')
         subject = described_class.new(path, {})

data/spec/unit/settings_spec.rb

@@ -95,6 +95,24 @@ describe R10K::Settings do
   describe "deploy settings" do
     subject { described_class.deploy_settings }
 
+    describe 'exclude_spec' do
+      it 'is false by default' do
+        expect(subject.evaluate({})[:exclude_spec]).to eq(false)
+      end
+      it 'can be set to true' do
+        expect(subject.evaluate({"exclude_spec" => true})[:exclude_spec]).to eq(true)
+      end
+      it "raises an error for non-boolean values" do
+        expect {
+          subject.evaluate({"exclude_spec" => 'invalid_string'})
+        }.to raise_error do |err|
+          expect(err.message).to match(/Validation failed for 'deploy' settings group/)
+          expect(err.errors.size).to eq 1
+          expect(err.errors[:exclude_spec]).to be_a_kind_of(ArgumentError)
+          expect(err.errors[:exclude_spec].message).to match(/`exclude_spec` can only be a boolean value, not 'invalid_string'/)
+        end
+      end
+    end
     describe "write_lock" do
       it "accepts a string with a reason for the write lock" do
         output = subject.evaluate("write_lock" => "No maintenance window active, code freeze till 2038-01-19")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.11.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -128,6 +128,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement