r10k 2.2.2 → 2.3.0

data/spec/unit/settings/list_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+require 'r10k/settings/list'
+require 'r10k/settings/collection'
+require 'r10k/settings/definition'
+require 'r10k/settings/uri_definition'
+
+describe R10K::Settings::List do
+  let(:item_proc) do
+    lambda { R10K::Settings::URIDefinition.new(nil, { :desc => "A URI in a list" }) }
+  end
+
+  subject do
+    described_class.new(:test_list, item_proc, { :desc => "A test setting list" })
+  end
+
+  it_behaves_like "a setting with ancestors"
+
+  describe '#assign' do
+    it "calls item_proc for each item assigned" do
+      expect(R10K::Settings::URIDefinition).to receive(:new).and_call_original.exactly(3).times
+
+      subject.assign([ "uri_1", "uri_2", "uri_3"])
+    end
+
+    it "claims ownership of newly added items" do
+      subject.assign([ "uri_1", "uri_2", "uri_3"])
+
+      item_parents = subject.instance_variable_get(:@items).collect { |i| i.parent }
+      expect(item_parents).to all(eq subject)
+    end
+
+    it "assigns value to each item" do
+      new_values = [ "uri_1", "uri_2", "uri_3"]
+      subject.assign(new_values)
+
+      item_values = subject.instance_variable_get(:@items).collect { |i| i.value }
+      expect(item_values).to eq new_values
+    end
+
+    it "silently ignores attempts to assign nil" do
+      subject.assign(nil)
+    end
+  end
+
+  describe '#validate' do
+    it "raises an error containing a list of every item with validation errors" do
+      subject.assign([ "uri 1", "uri 2", "http://www.example.com"])
+
+      expect { subject.validate }.to raise_error do |error|
+        expect(error).to be_a_kind_of(R10K::Settings::List::ValidationError)
+        errors = error.errors.collect { |key, val| val }
+        expect(errors.size).to eq 2
+        expect(errors).to all(be_a_kind_of(ArgumentError))
+        expect(errors.collect { |e| e.message }).to all(match /requires a URL.*could not be parsed/i)
+      end
+    end
+
+    it "it does not raise an error if no errors were found" do
+      subject.assign([ "http://www.example.com" ])
+      expect(subject.validate).to be_nil
+    end
+  end
+
+  describe '#resolve' do
+    it "returns a frozen list of all items" do
+      subject.assign([ "uri_1", "uri_2" ])
+
+      rv = subject.resolve
+
+      expect(rv).to be_frozen
+      expect(rv).to eq([ "uri_1", "uri_2" ])
+    end
+  end
+end
+
+describe R10K::Settings::List::ValidationError do
+  subject do
+    described_class.new("Sample List Validation Errors", errors: {
+      2 => ArgumentError.new("Sample List Item Error"),
+    })
+  end
+
+  it "generates a human readable error message for the invalid item" do
+    message = subject.format
+
+    expect(message).to match /sample list validation errors.*item 2.*sample list item error/im
+  end
+end

data/spec/unit/settings_spec.rb

@@ -32,6 +32,24 @@ describe R10K::Settings do
         expect(output[:private_key]).to eq("/etc/puppetlabs/r10k/id_rsa")
       end
     end
+
+    describe "proxy" do
+      it "accepts valid URIs" do
+        output = subject.evaluate("proxy" => "http://proxy.tessier-ashpool.freeside:3128")
+        expect(output[:proxy]).to eq "http://proxy.tessier-ashpool.freeside:3128"
+      end
+
+      it "rejects invalid URIs" do
+        expect {
+          subject.evaluate("proxy" => "that's no proxy!")
+        }.to raise_error do |err|
+          expect(err.message).to match(/Validation failed for 'git' settings group/)
+          expect(err.errors.size).to eq 1
+          expect(err.errors[:proxy]).to be_a_kind_of(ArgumentError)
+          expect(err.errors[:proxy].message).to match(/could not be parsed as a URL/)
+        end
+      end
+    end
   end
 
   describe "forge settings" do
@@ -47,23 +65,12 @@ describe R10K::Settings do
         expect {
           subject.evaluate("proxy" => "that's no proxy!")
         }.to raise_error do |err|
-          expect(err.message).to match(/Validation failed for forge settings group/)
+          expect(err.message).to match(/Validation failed for 'forge' settings group/)
           expect(err.errors.size).to eq 1
           expect(err.errors[:proxy]).to be_a_kind_of(ArgumentError)
           expect(err.errors[:proxy].message).to match(/could not be parsed as a URL/)
         end
       end
-
-      describe "setting a default value" do
-        %w[HTTPS_PROXY https_proxy HTTP_PROXY http_proxy].each do |env_var|
-          it "respects the #{env_var} environment variable" do
-            R10K::Util::ExecEnv.withenv(env_var => "http://proxy.value/#{env_var}") do
-              output = subject.evaluate({})
-              expect(output[:proxy]).to eq("http://proxy.value/#{env_var}")
-            end
-          end
-        end
-      end
     end
 
     describe "baseurl" do
@@ -76,7 +83,7 @@ describe R10K::Settings do
         expect {
           subject.evaluate("baseurl" => "that's no forge!")
         }.to raise_error do |err|
-          expect(err.message).to match(/Validation failed for forge settings group/)
+          expect(err.message).to match(/Validation failed for 'forge' settings group/)
           expect(err.errors.size).to eq 1
           expect(err.errors[:baseurl]).to be_a_kind_of(ArgumentError)
           expect(err.errors[:baseurl].message).to match(/could not be parsed as a URL/)
@@ -103,7 +110,7 @@ describe R10K::Settings do
         expect {
           subject.evaluate("write_lock" => %w[list of reasons why deploys are locked])
         }.to raise_error do |err|
-          expect(err.message).to match(/Validation failed for deploy settings group/)
+          expect(err.message).to match(/Validation failed for 'deploy' settings group/)
           expect(err.errors.size).to eq 1
           expect(err.errors[:write_lock]).to be_a_kind_of(ArgumentError)
           expect(err.errors[:write_lock].message).to match(/should be a string containing the reason/)
@@ -138,7 +145,7 @@ describe R10K::Settings do
         expect {
           subject.evaluate("postrun" => "curl -F 'deploy=done' https://reporting.tessier-ashpool.freeside/r10k")
         }.to raise_error do |err|
-          expect(err.message).to match(/Validation failed for global settings group/)
+          expect(err.message).to match(/Validation failed for 'global' settings group/)
           expect(err.errors.size).to eq 1
           expect(err.errors[:postrun]).to be_a_kind_of(ArgumentError)
           expect(err.errors[:postrun].message).to eq("The postrun setting should be an array of strings, not a String")
@@ -146,17 +153,39 @@ describe R10K::Settings do
       end
     end
 
+    describe "proxy" do
+      it "accepts valid URIs" do
+        output = subject.evaluate("proxy" => "http://proxy.tessier-ashpool.freeside:3128")
+        expect(output[:proxy]).to eq "http://proxy.tessier-ashpool.freeside:3128"
+      end
+
+      it "rejects invalid URIs" do
+        expect {
+          subject.evaluate("proxy" => "that's no proxy!")
+        }.to raise_error do |err|
+          expect(err.message).to match(/Validation failed for 'global' settings group/)
+          expect(err.errors.size).to eq 1
+          expect(err.errors[:proxy]).to be_a_kind_of(ArgumentError)
+          expect(err.errors[:proxy].message).to match(/could not be parsed as a URL/)
+        end
+      end
+
+      describe "setting a default value" do
+        %w[HTTPS_PROXY https_proxy HTTP_PROXY http_proxy].each do |env_var|
+          it "respects the #{env_var} environment variable" do
+            R10K::Util::ExecEnv.withenv(env_var => "http://proxy.value/#{env_var}") do
+              output = subject.evaluate({})
+              expect(output[:proxy]).to eq("http://proxy.value/#{env_var}")
+            end
+          end
+        end
+      end
+    end
+
     describe "git settings" do
       it "passes settings through to the git settings" do
         output = subject.evaluate("git" => {"provider" => "shellgit", "username" => "git"})
-        expect(output[:git]).to eq(:provider => :shellgit, :username => "git", :private_key => nil, :repositories => [])
-      end
-
-      it "handles keywords in repository settings" do
-        output = subject.evaluate("git" => {"provider" => "shellgit",
-                                  "username" => "git",
-                                  "repositories" => [ {"remote" => "foo"} ]})
-        expect(output[:git]).to eq(:provider => :shellgit, :username => "git", :private_key => nil, :repositories => [{remote: "foo"}])
+        expect(output[:git]).to include(:provider => :shellgit, :username => "git")
       end
     end
 

data/spec/unit/util/attempt_spec.rb

@@ -76,7 +76,7 @@ describe R10K::Util::Attempt do
 
     it "only rescues descendants of StandardError" do
       attempt.try { |_| raise Exception }
-      expect { attempt.run }.to raise_error
+      expect { attempt.run }.to raise_error(Exception)
     end
   end
 end

data/spec/unit/util/symbolize_keys_spec.rb

@@ -37,15 +37,31 @@ describe R10K::Util::SymbolizeKeys do
     expect(hash[key]).to eq 'bar'
   end
 
-  it "can recursively symbolize keys in nested hash values" do
-    hash = {'foo' => {'bar' => 'baz'}}
-    described_class.symbolize_keys!(hash, true)
-    expect(hash).to eq({:foo => {:bar => 'baz'}})
-  end
+  context "when symbolizing recursively" do
+    it "can recursively symbolize keys in nested hash values" do
+      hash = {'foo' => {'bar' => 'baz'}}
+      described_class.symbolize_keys!(hash, true)
+      expect(hash).to eq({:foo => {:bar => 'baz'}})
+    end
+
+    it "recurses into hash values that had symbol keys" do
+      hash = {:foo => {'bar' => {'baz' => 'quux'}}}
+      described_class.symbolize_keys!(hash, true)
+      expect(hash).to eq({:foo => {:bar => {:baz => 'quux'}}})
+    end
+
+    it "recurses into array values whose items are hashes" do
+      hash = {'foo' => [ {'item1_key' => 'val'}, {'item2_key' => 'val'} ]}
+
+      described_class.symbolize_keys!(hash, true)
+      expect(hash).to eq({:foo => [ {:item1_key => 'val'}, {:item2_key => 'val'} ]})
+    end
+
+    it "ignores nested array items that are not hashes" do
+      hash = {'foo' => [ {'item1_key' => 'val'}, 'banana' ]}
 
-  it "recurses into hash values that had symbol keys" do
-    hash = {:foo => {'bar' => {'baz' => 'quux'}}}
-    described_class.symbolize_keys!(hash, true)
-    expect(hash).to eq({:foo => {:bar => {:baz => 'quux'}}})
+      described_class.symbolize_keys!(hash, true)
+      expect(hash).to eq({:foo => [ {:item1_key => 'val'}, 'banana' ]})
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: semantic_puppet
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +236,7 @@ files:
 - integration/tests/basic_functionality/negative/neg_invalid_git_provider.rb
 - integration/tests/basic_functionality/negative/negative_bad_proxy.rb
 - integration/tests/basic_functionality/proxy_specified_in_configuration.rb
+- integration/tests/basic_functionality/proxy_with_pe_only_module.rb
 - integration/tests/basic_functionality/proxy_with_puppetfile.rb
 - integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb
 - integration/tests/basic_functionality/rugged_git_provider_without_ssh.rb
@@ -357,6 +358,8 @@ files:
 - lib/r10k/settings/container.rb
 - lib/r10k/settings/definition.rb
 - lib/r10k/settings/enum_definition.rb
+- lib/r10k/settings/helpers.rb
+- lib/r10k/settings/list.rb
 - lib/r10k/settings/loader.rb
 - lib/r10k/settings/mixin.rb
 - lib/r10k/settings/uri_definition.rb
@@ -416,6 +419,7 @@ files:
 - spec/shared-examples/git/thin_repository.rb
 - spec/shared-examples/git/working_repository.rb
 - spec/shared-examples/puppetfile-action.rb
+- spec/shared-examples/settings/ancestry.rb
 - spec/shared-examples/subprocess-runner.rb
 - spec/spec_helper.rb
 - spec/unit/action/cri_runner_spec.rb
@@ -461,6 +465,8 @@ files:
 - spec/unit/settings/container_spec.rb
 - spec/unit/settings/definition_spec.rb
 - spec/unit/settings/enum_definition_spec.rb
+- spec/unit/settings/inheritance_spec.rb
+- spec/unit/settings/list_spec.rb
 - spec/unit/settings/loader_spec.rb
 - spec/unit/settings/uri_definition_spec.rb
 - spec/unit/settings_spec.rb
@@ -506,3 +512,4 @@ signing_key:
 specification_version: 4
 summary: Puppet environment and module deployment
 test_files: []
+has_rdoc: