puppet 5.3.3-x64-mingw32 → 5.3.4-x64-mingw32

data/spec/unit/functions/defined_spec.rb

@@ -268,11 +268,11 @@ describe "the 'defined' function" do
   end
 
   it 'raises error if referencing undef' do
-    expect{func.call(@scope, nil)}.to raise_error(ArgumentError, /'defined' parameter 'vals' expects a value of type String or Type, got Undef/)
+    expect{func.call(@scope, nil)}.to raise_error(ArgumentError, /'defined' parameter 'vals' expects a value of type String, Type\[CatalogEntry\], or Type\[Type\], got Undef/)
   end
 
   it 'raises error if referencing a number' do
-    expect{func.call(@scope, 42)}.to raise_error(ArgumentError, /'defined' parameter 'vals' expects a value of type String or Type, got Integer/)
+    expect{func.call(@scope, 42)}.to raise_error(ArgumentError, /'defined' parameter 'vals' expects a value of type String, Type\[CatalogEntry\], or Type\[Type\], got Integer/)
   end
 
   it 'is false if referencing empty string' do

data/spec/unit/functions/hiera_spec.rb

@@ -182,7 +182,6 @@ describe 'when calling' do
     result = nil
     Puppet[:code] = 'undef'
     Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
-      compiler.topscope['environment'] = 'test'
       compiler.compile do |catalog|
         result = yield(compiler.topscope)
         catalog

data/spec/unit/functions/lookup_spec.rb

@@ -96,7 +96,6 @@ describe "The lookup function" do
     Puppet[:code] = code
     Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
       scope = compiler.topscope
-      scope['environment'] = env_name
       scope['domain'] = 'example.com'
       scope_additions.each_pair { |k, v| scope[k] = v }
       if explain
@@ -168,7 +167,7 @@ describe "The lookup function" do
           YAML
 
         it 'fails and reports error' do
-          expect { lookup('a') }.to raise_error("This runtime does not support hiera.yaml version 6 in #{code_dir}/hiera.yaml")
+          expect { lookup('a') }.to raise_error("This runtime does not support hiera.yaml version 6 (file: #{code_dir}/hiera.yaml)")
         end
       end
 
@@ -183,7 +182,7 @@ describe "The lookup function" do
 
         it 'fails and reports error' do
           expect { lookup('a') }.to raise_error(
-            "Backend 'yaml' is defined more than once. First defined at line 3 at #{code_dir}/hiera.yaml:5")
+            "Backend 'yaml' is defined more than once. First defined at (line: 3) (file: #{code_dir}/hiera.yaml, line: 5)")
         end
       end
 
@@ -194,7 +193,7 @@ describe "The lookup function" do
 
         it 'fails and reports error' do
           expect { lookup('a') }.to raise_error(
-            "hiera.yaml version 4 cannot be used in the global layer in #{code_dir}/hiera.yaml")
+            "hiera.yaml version 4 cannot be used in the global layer (file: #{code_dir}/hiera.yaml)")
         end
       end
 
@@ -213,7 +212,7 @@ describe "The lookup function" do
 
           it 'fails and reports error' do
             expect { lookup('a') }.to raise_error(
-              "Hierarchy name 'Common' defined more than once. First defined at line 3 at #{code_dir}/hiera.yaml:7")
+              "Hierarchy name 'Common' defined more than once. First defined at (line: 3) (file: #{code_dir}/hiera.yaml, line: 7)")
           end
         end
 
@@ -228,7 +227,7 @@ describe "The lookup function" do
 
           it 'fails and reports error' do
             expect { lookup('a') }.to raise_error(
-              "Use \"data_hash: hocon_data\" instead of \"hiera3_backend: hocon\" at #{code_dir}/hiera.yaml:4")
+              "Use \"data_hash: hocon_data\" instead of \"hiera3_backend: hocon\" (file: #{code_dir}/hiera.yaml, line: 4)")
           end
         end
 
@@ -244,7 +243,7 @@ describe "The lookup function" do
 
           it 'fails and reports error' do
             expect { lookup('a') }.to raise_error(
-              "One of data_hash, lookup_key, data_dig, or hiera3_backend must be defined in hierarchy 'Common' in #{code_dir}/hiera.yaml")
+              "One of data_hash, lookup_key, data_dig, or hiera3_backend must be defined in hierarchy 'Common' (file: #{code_dir}/hiera.yaml)")
           end
         end
 
@@ -262,7 +261,7 @@ describe "The lookup function" do
 
           it 'fails and reports error' do
             expect { lookup('a') }.to raise_error(
-              "Only one of data_hash, lookup_key, data_dig, or hiera3_backend can be defined in defaults in #{code_dir}/hiera.yaml")
+              "Only one of data_hash, lookup_key, data_dig, or hiera3_backend can be defined in defaults (file: #{code_dir}/hiera.yaml)")
           end
         end
 
@@ -278,7 +277,7 @@ describe "The lookup function" do
           it 'fails and reports error' do
             Puppet[:strict] = :error
             expect { lookup('a') }.to raise_error(
-              "Unable to find 'data_hash' function named 'nonesuch_txt_data' in #{code_dir}/hiera.yaml")
+              "Unable to find 'data_hash' function named 'nonesuch_txt_data' (file: #{code_dir}/hiera.yaml)")
           end
         end
 
@@ -296,7 +295,7 @@ describe "The lookup function" do
           it 'fails and reports error' do
             Puppet[:strict] = :error
             expect { lookup('a') }.to raise_error(
-              "'default_hierarchy' is only allowed in the module layer at #{code_dir}/hiera.yaml:5")
+              "'default_hierarchy' is only allowed in the module layer (file: #{code_dir}/hiera.yaml, line: 5)")
           end
         end
 
@@ -311,7 +310,7 @@ describe "The lookup function" do
 
           it 'fails and reports errors when strict == error' do
             Puppet[:strict] = :error
-            expect { lookup('a') }.to raise_error("Undefined variable '::nonesuch' at #{code_dir}/hiera.yaml:4")
+            expect { lookup('a') }.to raise_error("Undefined variable '::nonesuch' (file: #{code_dir}/hiera.yaml, line: 4)")
           end
         end
 
@@ -325,7 +324,7 @@ describe "The lookup function" do
 
           it 'fails and reports errors when strict == error' do
             Puppet[:strict] = :error
-            expect { lookup('a') }.to raise_error("Interpolation using method syntax is not allowed in this context in #{code_dir}/hiera.yaml")
+            expect { lookup('a') }.to raise_error("Interpolation using method syntax is not allowed in this context (file: #{code_dir}/hiera.yaml)")
           end
         end
       end
@@ -344,7 +343,7 @@ describe "The lookup function" do
 
           it 'fails and reports error' do
             expect { lookup('a') }.to raise_error(
-              "No data provider is registered for backend 'nonesuch' at #{env_dir}/spec/hiera.yaml:4")
+              "No data provider is registered for backend 'nonesuch' (file: #{env_dir}/spec/hiera.yaml, line: 4)")
           end
         end
 
@@ -365,7 +364,7 @@ describe "The lookup function" do
 
           it 'fails and reports error' do
             expect { lookup('a') }.to raise_error(
-              "Hierarchy name 'Common' defined more than once. First defined at line 3 at #{env_dir}/spec/hiera.yaml:9")
+              "Hierarchy name 'Common' defined more than once. First defined at (line: 3) (file: #{env_dir}/spec/hiera.yaml, line: 9)")
           end
         end
       end
@@ -381,7 +380,7 @@ describe "The lookup function" do
 
           it 'fails and reports error' do
             expect { lookup('a') }.to raise_error(
-              "'hiera3_backend' is only allowed in the global layer at #{env_dir}/spec/hiera.yaml:4")
+              "'hiera3_backend' is only allowed in the global layer (file: #{env_dir}/spec/hiera.yaml, line: 4)")
           end
         end
 
@@ -399,7 +398,7 @@ describe "The lookup function" do
           it 'fails and reports error' do
             Puppet[:strict] = :error
             expect { lookup('a') }.to raise_error(
-              "'default_hierarchy' is only allowed in the module layer at #{env_dir}/spec/hiera.yaml:5")
+              "'default_hierarchy' is only allowed in the module layer (file: #{env_dir}/spec/hiera.yaml, line: 5)")
           end
         end
       end
@@ -1102,14 +1101,81 @@ describe "The lookup function" do
               glob_c: value glob_a
               YAML
             'b.yaml' => <<-YAML.unindent
-              glob_b:
-                c: value glob_b.c
-                d: value glob_b.d
+              glob_d:
+                a: value glob_d.a
+                b: value glob_d.b
             YAML
 
           }
         }
       end
+
+      it 'finds environment data using globs' do
+        expect(lookup('glob_a')).to eql('value glob_a')
+        expect(warnings).to be_empty
+      end
+
+      it 'finds environment data using interpolated globs' do
+        expect(lookup('glob_d.a')).to eql('value glob_d.a')
+        expect(warnings).to be_empty
+      end
+    end
+
+    context 'and an environment Hiera v5 configuration using uris' do
+      let(:env_hiera_yaml) do
+        <<-YAML.unindent
+        ---
+        version: 5
+        hierarchy:
+          - name: Uris
+            uris:
+              - "http://test.example.com"
+              - "/some/arbitrary/path"
+              - "urn:with:opaque:path"
+              - "dothis%20-f%20bar"
+            data_hash: mod::uri_test_func
+        YAML
+      end
+
+      let(:env_modules) do
+        {
+          'mod' => { 'lib' => { 'puppet' => { 'functions' => { 'mod' => { 'uri_test_func.rb' => <<-RUBY } } } } }
+            Puppet::Functions.create_function(:'mod::uri_test_func') do
+              dispatch :uri_test_func do
+                param 'Hash', :options
+                param 'Puppet::LookupContext', :context
+              end
+
+              def uri_test_func(options, context)
+                { 'uri' => [ options['uri'] ] }
+              end
+            end
+            RUBY
+        }
+      end
+
+      it 'The uris are propagated in the options hash' do
+        expect(lookup('uri', 'merge' => 'unique')).to eql(
+          %w(http://test.example.com /some/arbitrary/path urn:with:opaque:path dothis%20-f%20bar))
+        expect(warnings).to be_empty
+      end
+
+      context 'and a uri uses bad syntax' do
+        let(:env_hiera_yaml) do
+          <<-YAML.unindent
+        ---
+        version: 5
+        hierarchy:
+          - name: Uris
+            uri: "dothis -f bar"
+            data_hash: mod::uri_test_func
+          YAML
+        end
+
+        it 'an attempt to lookup raises InvalidURIError' do
+          expect{ lookup('uri', 'merge' => 'unique') }.to raise_error(/bad URI/)
+        end
+      end
     end
 
     context 'and an environment Hiera v5 configuration using mapped_paths' do

data/spec/unit/functions/next_spec.rb

@@ -88,6 +88,6 @@ describe 'the next function' do
         # line 2
         next()
       CODE
-    end.to raise_error(/next\(\) from context where this is illegal at unknown:3 on node.*/)
+    end.to raise_error(/next\(\) from context where this is illegal \(file: unknown, line: 3\) on node.*/)
   end
 end

data/spec/unit/functions/return_spec.rb

@@ -90,7 +90,7 @@ describe 'the return function' do
         $result = with(1) |$x| { with($x) |$x| {return(100) }}
         notice $result
       CODE
-    end.to raise_error(/return\(\) from context where this is illegal at unknown:3 on node.*/)
+    end.to raise_error(/return\(\) from context where this is illegal \(file: unknown, line: 3\) on node.*/)
   end
 
   it 'can not be called from top scope' do
@@ -100,6 +100,6 @@ describe 'the return function' do
         # line 2
         return()
       CODE
-    end.to raise_error(/return\(\) from context where this is illegal at unknown:3 on node.*/)
+    end.to raise_error(/return\(\) from context where this is illegal \(file: unknown, line: 3\) on node.*/)
   end
 end

data/spec/unit/gettext/config_spec.rb

@@ -0,0 +1,125 @@
+require 'puppet/gettext/config'
+require 'spec_helper'
+
+describe Puppet::GettextConfig do
+  require 'puppet_spec/files'
+  include PuppetSpec::Files
+  include Puppet::GettextConfig
+
+  let(:local_path) do
+    local_path ||= Puppet::GettextConfig::LOCAL_PATH
+  end
+
+  let(:windows_path) do
+    windows_path ||= Puppet::GettextConfig::WINDOWS_PATH
+  end
+
+  let(:posix_path) do
+    windows_path ||= Puppet::GettextConfig::POSIX_PATH
+  end
+
+  before(:each) do
+    Puppet::GettextConfig.stubs(:gettext_loaded?).returns true
+  end
+
+  after(:each) do
+    Puppet::GettextConfig.set_locale('en')
+    Puppet::GettextConfig.delete_all_text_domains
+  end
+
+  describe 'setting and getting the locale' do
+    it 'should return "en" when gettext is unavailable' do
+      Puppet::GettextConfig.stubs(:gettext_loaded?).returns(false)
+
+      expect(Puppet::GettextConfig.current_locale).to eq('en')
+    end
+
+    it 'should allow the locale to be set' do
+      Puppet::GettextConfig.set_locale('hu')
+      expect(Puppet::GettextConfig.current_locale).to eq('hu')
+    end
+  end
+
+  describe 'translation mode selection' do
+    it 'should select PO mode when given a local config path' do
+      expect(Puppet::GettextConfig.translation_mode(local_path)).to eq(:po)
+    end
+
+    it 'should select PO mode when given a non-package config path' do
+      expect(Puppet::GettextConfig.translation_mode('../fake/path')).to eq(:po)
+    end
+
+    it 'should select MO mode when given a Windows package config path' do
+      expect(Puppet::GettextConfig.translation_mode(windows_path)).to eq(:mo)
+    end
+
+    it 'should select MO mode when given a POSIX package config path' do
+      expect(Puppet::GettextConfig.translation_mode(posix_path)).to eq(:mo)
+    end
+  end
+
+  describe 'loading translations' do
+    context 'when given a nil locale path' do
+      it 'should return false' do
+        expect(Puppet::GettextConfig.load_translations('puppet', nil, :po)).to be false
+      end
+    end
+
+    context 'when given a valid locale file location' do
+      it 'should return true' do
+        Puppet::GettextConfig.expects(:add_repository_to_domain).with('puppet', local_path, :po, anything)
+
+        expect(Puppet::GettextConfig.load_translations('puppet', local_path, :po)).to be true
+      end
+    end
+
+    context 'when given a bad file format' do
+      it 'should raise an exception' do
+        expect { Puppet::GettextConfig.load_translations('puppet', local_path, :bad_format) }.to raise_error(Puppet::Error)
+      end
+    end
+  end
+
+  describe "setting up text domains" do
+    it 'can create the default text domain after another is set' do
+      Puppet::GettextConfig.delete_all_text_domains
+      FastGettext.text_domain = 'other'
+      Puppet::GettextConfig.create_default_text_domain
+    end
+
+    it 'should add puppet translations to the default text domain' do
+      Puppet::GettextConfig.expects(:load_translations).with('puppet', local_path, :po, Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN).returns(true)
+
+      Puppet::GettextConfig.create_default_text_domain
+      expect(Puppet::GettextConfig.loaded_text_domains).to include(Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN)
+    end
+
+    it 'should copy default translations when creating a non-default text domain' do
+      Puppet::GettextConfig.reset_text_domain('test')
+      expect(Puppet::GettextConfig.loaded_text_domains).to include(Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN, 'test')
+    end
+  end
+
+  describe "deleting text domains" do
+    it 'can delete a text domain by name' do
+      Puppet::GettextConfig.reset_text_domain('test')
+      expect(Puppet::GettextConfig.loaded_text_domains).to include(Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN, 'test')
+      Puppet::GettextConfig.delete_text_domain(Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN)
+      expect(Puppet::GettextConfig.loaded_text_domains).not_to include(Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN)
+    end
+
+    it 'can delete all non-default text domains' do
+      Puppet::GettextConfig.reset_text_domain('test')
+      expect(Puppet::GettextConfig.loaded_text_domains).to include(Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN, 'test')
+      Puppet::GettextConfig.delete_environment_text_domains
+      expect(Puppet::GettextConfig.loaded_text_domains).not_to include('test')
+    end
+
+    it 'can delete all text domains' do
+      Puppet::GettextConfig.reset_text_domain('test')
+      expect(Puppet::GettextConfig.loaded_text_domains).to include(Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN, 'test')
+      Puppet::GettextConfig.delete_all_text_domains
+      expect(Puppet::GettextConfig.loaded_text_domains).to be_empty
+    end
+  end
+end

data/spec/unit/gettext/module_loading_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+require 'puppet_spec/modules'
+require 'puppet_spec/files'
+
+require 'puppet/gettext/module_translations'
+
+describe Puppet::ModuleTranslations do
+  include PuppetSpec::Files
+
+  describe "loading translations from the module path" do
+    let(:modpath) { tmpdir('modpath') }
+
+    let(:module_a) { PuppetSpec::Modules.create(
+      "mod_a",
+      modpath,
+      :metadata => {
+        :author => 'foo'
+      },
+      :environment => mock("environment"))
+    }
+
+    let(:module_b) { PuppetSpec::Modules.create(
+      "mod_b",
+      modpath,
+      :metadata => {
+        :author => 'foo'
+      },
+      :environment => mock("environment"))
+    }
+
+    it "should attempt to load translations only for modules that have them" do
+      module_a.expects(:has_translations?).returns(false)
+      module_b.expects(:has_translations?).returns(true)
+      Puppet::GettextConfig.expects(:load_translations).with("foo-mod_b", File.join(modpath, "mod_b", "locales"), :po).returns(true)
+
+      Puppet::ModuleTranslations.load_from_modulepath([module_a, module_b])
+    end
+  end
+
+  describe "loading translations from $vardir" do
+    let(:vardir) {
+      dir_containing("vardir",
+        { "locales" => { "ja" => { "foo-mod_a.po" => "" } } })
+    }
+
+    it "should attempt to load translations for the current locale" do
+      Puppet::GettextConfig.expects(:current_locale).returns("ja")
+      Puppet::GettextConfig.expects(:load_translations).with("foo-mod_a", File.join(vardir, "locales"), :po).returns(true)
+
+      Puppet::ModuleTranslations.load_from_vardir(vardir)
+    end
+  end
+end