r10k 3.5.0 → 3.8.0

data/spec/unit/settings_spec.rb

@@ -129,6 +129,18 @@ describe R10K::Settings do
         expect { subject.evaluate('puppet_path' => '/nonexistent') }.to raise_error(R10K::Settings::Collection::ValidationError)
       end
     end
+
+    describe 'puppet_conf' do
+      it 'when file raises no error' do
+        allow(File).to receive(:readable?).with('/nonexistent').and_return(true)
+        expect { subject.evaluate('puppet_conf' => '/nonexistent') }.not_to raise_error
+      end
+
+      it 'when not file raises error' do
+        allow(File).to receive(:readable?).with('/nonexistent').and_return(false)
+        expect { subject.evaluate('puppet_conf' => '/nonexistent') }.to raise_error(R10K::Settings::Collection::ValidationError)
+      end
+    end
   end
 
   describe "global settings" do

data/spec/unit/source/git_spec.rb

@@ -93,9 +93,57 @@ describe R10K::Source::Git do
     let(:ignore_prefixes) { ['dev', 'test'] }
 
     it "filters branches" do
-      expect(subject.filter_branches(branches, ignore_prefixes)).to eq(['master', 'production', 'not_dev_test_me'])
+      expect(subject.filter_branches_by_regexp(branches, ignore_prefixes)).to eq(['master', 'production', 'not_dev_test_me'])
     end
   end
+
+  describe "filtering branches with command" do
+    let(:branches) { ['master', 'development', 'production'] }
+    if R10K::Util::Platform.windows?
+      let(:filter_command) { 'powershell.exe if ($env:R10K_BRANCH.equals(\"development\")) {exit 1} else {exit 0}' }
+    else
+      let(:filter_command) { 'sh -c "[ $R10K_BRANCH != development ]"' }
+    end
+
+    it "filters branches" do
+      expect(subject.filter_branches_by_command(branches, filter_command)).to eq(['master', 'production'])
+    end
+  end
+
+  describe "generate_environments respects filter_command setting" do
+    before do
+      allow(subject.cache).to receive(:branches).and_return ['master', 'development', 'production']
+      if R10K::Util::Platform.windows?
+        subject.instance_variable_set(:@filter_command, 'powershell.exe if ($env:R10K_BRANCH.equals(\"master\")) {exit 1} else {exit 0}')
+      else
+        subject.instance_variable_set(:@filter_command, '[ $R10K_BRANCH != master ]')
+      end
+    end
+
+    let(:environments) { subject.generate_environments }
+
+    it "creates an environment for each branch not filtered by filter_command" do
+      expect(subject.generate_environments.size).to eq(2)
+    end
+  end
+
+  describe "generate_environments respects filter_command setting and name" do
+    before do
+      allow(subject.cache).to receive(:branches).and_return ['master', 'development', 'production']
+      if R10K::Util::Platform.windows?
+        subject.instance_variable_set(:@filter_command, 'powershell.exe if ($env:R10K_NAME.equals(\"mysource\")) {exit 0} else {exit 1}')
+      else
+        subject.instance_variable_set(:@filter_command, '[ $R10K_NAME = mysource ]')
+      end
+    end
+
+    let(:environments) { subject.generate_environments }
+
+    it "creates an environment for each branch not filtered by filter_command" do
+      expect(subject.generate_environments.size).to eq(3)
+    end
+  end
+
 end
 
 describe R10K::Source::Git, "handling invalid branch names" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -204,6 +204,7 @@ files:
 - ".github/pull_request_template.md"
 - ".github/workflows/docker.yml"
 - ".github/workflows/release.yml"
+- ".github/workflows/rspec_tests.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.mkd
@@ -282,6 +283,7 @@ files:
 - integration/tests/command_line/negative/neg_invalid_cmd_line_arg.rb
 - integration/tests/git_source/HTTP_proxy_and_git_source.rb
 - integration/tests/git_source/git_source_git.rb
+- integration/tests/git_source/git_source_repeated_remote.rb
 - integration/tests/git_source/git_source_ssh.rb
 - integration/tests/git_source/git_source_submodule.rb
 - integration/tests/git_source/negative/neg_git_broken_remote.rb
@@ -446,6 +448,7 @@ files:
 - spec/fixtures/module/forge/eight_hundred/metadata.json
 - spec/fixtures/unit/action/r10k.yaml
 - spec/fixtures/unit/action/r10k_cachedir.yaml
+- spec/fixtures/unit/action/r10k_creds.yaml
 - spec/fixtures/unit/action/r10k_generate_types.yaml
 - spec/fixtures/unit/action/r10k_puppet_path.yaml
 - spec/fixtures/unit/puppetfile/argument-error/Puppetfile
@@ -504,6 +507,7 @@ files:
 - spec/unit/environment/git_spec.rb
 - spec/unit/environment/name_spec.rb
 - spec/unit/environment/svn_spec.rb
+- spec/unit/environment/with_modules_spec.rb
 - spec/unit/errors/formatting_spec.rb
 - spec/unit/feature_spec.rb
 - spec/unit/forge/module_release_spec.rb