puppet 3.4.3 → 3.5.0.rc1

data/lib/puppet/util/windows/registry.rb

@@ -13,7 +13,7 @@ module Puppet::Util::Windows
     def root(name)
       Win32::Registry.const_get(name)
     rescue NameError
-      raise Puppet::Error, "Invalid registry key '#{name}'"
+      raise Puppet::Error, "Invalid registry key '#{name}'", $!.backtrace
     end
 
     def open(name, path, mode = KEY_READ | KEY64, &block)
@@ -23,7 +23,7 @@ module Puppet::Util::Windows
           return yield subkey
         end
       rescue Win32::Registry::Error => error
-        raise Puppet::Util::Windows::Error.new("Failed to open registry key '#{hkey.keyname}\\#{path}'", error.code)
+        raise Puppet::Util::Windows::Error.new("Failed to open registry key '#{hkey.keyname}\\#{path}'", error.code, error)
       end
     end
 

data/lib/puppet/vendor/safe_yaml/CHANGES.md

@@ -101,4 +101,4 @@ Added support for:
 0.1
 ---
 
-Initial release
+Initial release

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '3.4.3'
+  PUPPETVERSION = '3.5.0-rc1'
 
   ##
   # version is a public API method intended to always provide a fast and

data/lib/puppetx.rb

@@ -27,14 +27,6 @@ module Puppetx
   # @api public
   BINDINGS_SCHEMES_TYPE = 'Puppetx::Puppet::BindingsSchemeHandler'
 
-  # The lookup **key** for the multibind containing a map from hiera-2 backend name to class implementing the backend.
-  # @api public
-  HIERA2_BACKENDS      = 'puppetx::puppet::hiera2::backends'
-
-  # The lookup **type** for the multibind containing a map from hiera-2 backend name to class implementing the backend.
-  # @api public
-  HIERA2_BACKENDS_TYPE = 'Puppetx::Puppet::Hiera2Backend'
-
   # This module is the name space for extension points
   # @api public
   module Puppet
@@ -53,7 +45,6 @@ module Puppetx
         extensions = system_bindings.extensions()
         extensions.multibind(SYNTAX_CHECKERS).name(SYNTAX_CHECKERS).hash_of(SYNTAX_CHECKERS_TYPE)
         extensions.multibind(BINDINGS_SCHEMES).name(BINDINGS_SCHEMES).hash_of(BINDINGS_SCHEMES_TYPE)
-        extensions.multibind(HIERA2_BACKENDS).name(HIERA2_BACKENDS).hash_of(HIERA2_BACKENDS_TYPE)
 
         # Register injector boot bindings
         # -------------------------------
@@ -63,21 +54,10 @@ module Puppetx
         require 'puppetx/puppet/bindings_scheme_handler'
         { 'module'        => 'ModuleScheme', 
           'confdir'       => 'ConfdirScheme',
-          'module-hiera'  => 'ModuleHieraScheme',
-          'confdir-hiera' => 'ConfdirHieraScheme'
         }.each do |scheme, class_name|
           boot_bindings.bind.name(scheme).instance_of(BINDINGS_SCHEMES_TYPE).in_multibind(BINDINGS_SCHEMES).
             to_instance("Puppet::Pops::Binder::SchemeHandler::#{class_name}")
         end
-
-        # Register the default hiera2 backends
-        require 'puppetx/puppet/hiera2_backend'
-        { 'json' => 'JsonBackend',
-          'yaml' => 'YamlBackend'
-        }.each do |symbolic, class_name|
-          boot_bindings.bind.name(symbolic).instance_of(HIERA2_BACKENDS_TYPE).in_multibind(HIERA2_BACKENDS).
-            to_instance("Puppet::Pops::Binder::Hiera2::#{class_name}")
-        end
       end
   end
 
@@ -106,4 +86,4 @@ module Puppetx
       end
     end
   end
-end
+end

data/lib/puppetx/puppet/syntax_checker.rb

@@ -88,4 +88,4 @@ module Puppetx::Puppet
       raise NotImplementedError, "The class #{self.class.name} should have implemented the method check()"
     end
   end
-end
+end

data/lib/puppetx/puppetlabs/syntax_checkers/json.rb

@@ -1,39 +1,37 @@
 # A syntax checker for JSON.
 # @api public
+require 'puppetx/puppet/syntax_checker'
 class Puppetx::Puppetlabs::SyntaxCheckers::Json < Puppetx::Puppet::SyntaxChecker
 
   # Checks the text for JSON syntax issues and reports them to the given acceptor.
   # This implementation is abstract, it raises {NotImplementedError} since a subclass should have implemented the
   # method.
   #
+  # Error messages from the checker are capped at 100 chars from the source text.
+  #
   # @param text [String] The text to check
   # @param syntax [String] The syntax identifier in mime style (e.g. 'json', 'json-patch+json', 'xml', 'myapp+xml'
-  # @option location_info [String] :file The filename where the string originates
-  # @option location_info [Integer] :line The line number identifying the location where the string is being used/checked
-  # @option location_info [Integer] :position The position on the line identifying the location where the string is being used/checked
-  # @return [Boolean] Whether the checked string had issues (warnings and/or errors) or not.
+  # @param acceptor [#accept] A Diagnostic acceptor
+  # @param source_pos [Puppet::Pops::Adapters::SourcePosAdapter] A source pos adapter with location information
   # @api public
   #
-  def check(text, syntax, acceptor, location_info={})
+  def check(text, syntax, acceptor, source_pos)
     raise ArgumentError.new("Json syntax checker: the text to check must be a String.") unless text.is_a?(String)
     raise ArgumentError.new("Json syntax checker: the syntax identifier must be a String, e.g. json, data+json") unless syntax.is_a?(String)
     raise ArgumentError.new("Json syntax checker: invalid Acceptor, got: '#{acceptor.class.name}'.") unless acceptor.is_a?(Puppet::Pops::Validation::Acceptor)
-    raise ArgumentError.new("Json syntax checker: location_info must be a Hash") unless info.is_a?(Hash)
+    #raise ArgumentError.new("Json syntax checker: location_info must be a Hash") unless location_info.is_a?(Hash)
 
     begin
       JSON.parse(text)
     rescue => e
       # Cap the message to 100 chars and replace newlines
-      msg = "Json syntax checker:: Cannot parse invalid JSON string. \"#{e.message().slice(0,100).gsub(/\r?\n/, "\\n")}\""
+      msg = "JSON syntax checker: Cannot parse invalid JSON string. \"#{e.message().slice(0,100).gsub(/\r?\n/, "\\n")}\""
 
       # TODO: improve the pops API to allow simpler diagnostic creation while still maintaining capabilities
       # and the issue code. (In this case especially, where there is only a single error message being issued).
       #
       issue = Puppet::Pops::Issues::issue(:ILLEGAL_JSON) { msg }
-      source_pos = Puppet::Pops::Adapters::SourcePosAdapter.new()
-      source_pos.line = location_info[:line]
-      source_pos.pos = location_info[:pos]
-      acceptor.accept(Puppet::Pops::Validation::Diagnostic.new(:error, issue, location_info[:file], source_pos, {}))
+      acceptor.accept(Puppet::Pops::Validation::Diagnostic.new(:error, issue, source_pos.locator.file, source_pos, {}))
     end
   end
 end

data/spec/fixtures/integration/node/environment/sitedir/00_a.pp

@@ -0,0 +1,2 @@
+class a {}
+$a = 10

data/spec/fixtures/integration/node/environment/sitedir/01_b.pp

@@ -0,0 +1,6 @@
+class b {}
+
+# if the files are evaluated in the wrong order, the file 'b' has a reference
+# to $a (set in file 'a') and with strict variable lookup should raise an error
+# and fail this test.
+$b = $a # error if $a not set in strict mode

data/spec/fixtures/integration/node/environment/sitedir/04_include.pp

@@ -0,0 +1,2 @@
+include a, b
+notify { "variables": message => "a: $a, b: $b" }

data/spec/fixtures/integration/provider/cron/crontab/purged

@@ -0,0 +1,8 @@
+# HEADER: some simple
+# HEADER: header
+
+# commend with blankline above and below
+
+
+# Puppet Name: only managed entry
+* * * * * /bin/true

data/spec/fixtures/releases/jamtur01-apache/lib/puppet/provider/a2mod/debian.rb

@@ -16,6 +16,6 @@ Puppet::Type.type(:a2mod).provide(:debian) do
 
     def exists?
         mod= "/etc/apache2/mods-enabled/" + resource[:name] + ".load"
-        Puppet::FileSystem::File.exist?(mod)
+        Puppet::FileSystem.exist?(mod)
     end
 end

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/binder_config.yaml

@@ -1,19 +1,10 @@
 ---
 version: 1
 layers:
-  [{name: site, include: 'confdir-hiera:/'},
+  [{name: site, include: 'confdir:/confdirtest'},
    {name: test, include: 'echo:/quick/brown/fox'},
-   {name: modules, include: ['module-hiera:/*/', 'module:/*::default'], exclude: 'module-hiera:/bad/' }
-  ]
-categories:
-  [['node', '$fqdn'],
-   ['environment', '${environment}'],
-   ['osfamily', '${osfamily}'],
-   ['common', 'true']
+   {name: modules, include: ['module:/*::default'], exclude: 'module:/bad::default/' }
   ]
 extensions:
   scheme_handlers:
-    echo: 'Puppetx::Awesome::EchoSchemeHandler'
-
-  hiera_backends:
-    echo: 'Puppetx::Awesome::EchoBackend'
+    echo: 'Puppetx::Awesome2::EchoSchemeHandler'

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/lib/puppet/bindings/confdirtest.rb

@@ -0,0 +1,10 @@
+Puppet::Bindings.newbindings('confdirtest') do |scope|
+  bind {
+    name 'has_funny_hat'
+    to 'the pope'
+  }
+  bind {
+    name 'the_meaning_of_life'
+    to 42
+  }
+end

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome2/lib/puppet/bindings/awesome2/default.rb

@@ -0,0 +1,20 @@
+Puppet::Bindings.newbindings('awesome2::default') do |scope|
+  bind.name('all your base').to('are belong to us')
+  bind.name('env_meaning_of_life').to(puppet_string("$environment thinks it is 42", __FILE__))
+  bind {
+    name 'awesome_x'
+    to 'golden'
+  }
+  bind {
+    name 'the_meaning_of_life'
+    to 100
+  }
+  bind {
+    name 'has_funny_hat'
+    to 'kkk'
+  }
+  bind {
+    name 'good_x'
+    to 'golden'
+  }
+end

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/{awesome/lib/puppetx/awesome → awesome2/lib/puppetx/awesome2}/echo_scheme_handler.rb

@@ -1,7 +1,7 @@
 require 'puppetx/puppet/bindings_scheme_handler'
 
 module Puppetx
-  module Awesome
+  module Awesome2
     # A binding scheme that echos its path
     # 'echo:/quick/brown/fox' becomes key '::quick::brown::fox' => 'echo: quick brown fox'.
     # (silly class for testing loading of extension)
@@ -11,7 +11,7 @@ module Puppetx
         factory = ::Puppet::Pops::Binder::BindingsFactory
         bindings = factory.named_bindings("echo")
         bindings.bind.name(uri.path.gsub(/\//, '::')).to("echo: #{uri.path.gsub(/\//, ' ').strip!}")
-        result = factory.contributed_bindings("echo", bindings.model, nil)
+        result = factory.contributed_bindings("echo", bindings.model) ### , nil)
       end
     end
   end

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/bad/lib/puppet/bindings/bad/default.rb

@@ -0,0 +1,5 @@
+nil + nil + nil # broken on purpose, this file should never be loaded
+
+Puppet::Bindings.newbindings('bad::default') do |scope|
+  nil + nil + nil # broken on purpose, this should never be evaluated
+end

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/good/lib/puppet/bindings/good/default.rb

@@ -0,0 +1,6 @@
+Puppet::Bindings.newbindings('good::default') do |scope|
+  bind {
+    name 'the_meaning_of_life'
+    to 300
+  }
+end

data/spec/fixtures/unit/pops/binder/config/binder_config/ok/binder_config.yaml

@@ -1,8 +1,8 @@
 ---
 version: 1
 layers:
-  - {name: site, include: 'confdir-hiera:/'}
-  - {name: modules, include: 'module-hiera:/*/', exclude: 'module-hiera:/bad/' }
+  - {name: site, include: 'confdir:/'}
+  - {name: modules, include: 'module:/*::test/', exclude: 'module:/bad::test/' }
 categories:
   - ['node', '$fqn']
   - ['environment', '$environment']

data/spec/fixtures/unit/provider/service/systemd/{list_units → list_units_services}

@@ -8,7 +8,6 @@ fedora-readonly.service
 initrd-switch-root.service                                                                loaded inactive dead      Switch Root
 ip6tables.service                                                                         error  inactive dead      ip6tables.service
 puppet.service                                                                            loaded inactive dead      SYSV: Enables periodic system configuration checks through puppet.
-sshd.service                                                                              loaded failed   failed    OpenSSH server daemon
 
 LOAD   = Reflects whether the unit definition was properly loaded.
 ACTIVE = The high-level unit activation state, i.e. generalization of SUB.

data/spec/integration/agent/logging_spec.rb

@@ -94,7 +94,7 @@ describe 'agent logging' do
         #
         # It's not something we are specifically testing here since it occurs
         # regardless of user flags.
-        Puppet::Util::Log.expects(:newdestination).with(instance_of(Puppet::Transaction::Report)).once
+        Puppet::Util::Log.expects(:newdestination).with(instance_of(Puppet::Transaction::Report)).at_least_once
         expected[:loggers].each do |logclass|
           Puppet::Util::Log.expects(:newdestination).with(logclass).at_least_once
         end

data/spec/integration/application/apply_spec.rb

@@ -11,7 +11,7 @@ describe "apply" do
   end
 
   describe "when applying provided catalogs" do
-    it "should be able to apply catalogs provided in a file in pson" do
+    it "can apply catalogs provided in a file in pson" do
       file_to_create = tmpfile("pson_catalog")
       catalog = Puppet::Resource::Catalog.new
       resource = Puppet::Resource.new(:file, file_to_create, :parameters => {:content => "my stuff"})
@@ -26,8 +26,83 @@ describe "apply" do
 
       puppet.apply
 
-      Puppet::FileSystem::File.exist?(file_to_create).should be_true
-      File.read(file_to_create).should == "my stuff"
+      expect(Puppet::FileSystem.exist?(file_to_create)).to be_true
+      expect(File.read(file_to_create)).to eq("my stuff")
     end
   end
+
+  it "applies a given file even when a directory environment is specified" do
+    manifest = tmpfile("manifest.pp")
+    File.open(manifest, "w") do |f|
+      f.puts <<-EOF
+      notice('it was applied')
+      EOF
+    end
+
+    special = Puppet::Node::Environment.create(:special, [], '')
+    Puppet.override(:current_environment => special) do
+      Puppet[:environment] = 'special'
+      puppet = Puppet::Application[:apply]
+      puppet.stubs(:command_line).returns(stub('command_line', :args => [manifest]))
+      expect { puppet.run_command }.to exit_with(0)
+    end
+
+    expect(@logs.map(&:to_s)).to include('it was applied')
+  end
+
+  context "with a module" do
+    let(:modulepath) { tmpdir('modulepath') }
+    let(:execute) { 'include amod' }
+    let(:args) { ['-e', execute, '--modulepath', modulepath] }
+
+    before(:each) do
+      Puppet::FileSystem.mkpath("#{modulepath}/amod/manifests")
+      File.open("#{modulepath}/amod/manifests/init.pp", "w") do |f|
+        f.puts <<-EOF
+        class amod{
+          notice('amod class included')
+        }
+        EOF
+      end
+      create_default_directory_environment
+    end
+
+    def create_default_directory_environment
+      Puppet::FileSystem.mkpath("#{Puppet[:environmentpath]}/#{Puppet[:environment]}")
+    end
+
+    def init_cli_args_and_apply_app(args, execute)
+      Puppet.initialize_settings(args)
+      puppet = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => args))
+      puppet.options[:code] = execute
+      return puppet
+    end
+
+    it "looks in --modulepath even when the default directory environment exists" do
+      apply = init_cli_args_and_apply_app(args, execute)
+
+      expect do
+        expect { apply.run }.to exit_with(0)
+      end.to have_printed('amod class included')
+    end
+
+    it "looks in --modulepath even when given a specific directory --environment" do
+      args << '--environment' << 'production'
+      apply = init_cli_args_and_apply_app(args, execute)
+
+      expect do
+        expect { apply.run }.to exit_with(0)
+      end.to have_printed('amod class included')
+    end
+
+    it "looks in --modulepath when given multiple paths in --modulepath" do
+      args = ['-e', execute, '--modulepath', [tmpdir('notmodulepath'), modulepath].join(File::PATH_SEPARATOR)]
+      apply = init_cli_args_and_apply_app(args, execute)
+
+      expect do
+        expect { apply.run }.to exit_with(0)
+      end.to have_printed('amod class included')
+    end
+  end
+
 end

data/spec/integration/application/doc_spec.rb

@@ -6,7 +6,8 @@ require 'puppet/application/doc'
 describe Puppet::Application::Doc do
   include PuppetSpec::Files
 
-  it "should not generate an error when module dir overlaps parent of site.pp (#4798)", :if => Puppet.features.rdoc1?, :unless => Puppet.features.microsoft_windows? do
+  it "should not generate an error when module dir overlaps parent of site.pp (#4798)",
+     :if => (Puppet.features.rdoc1? and not Puppet.features.microsoft_windows?) do
     begin
       # Note: the directory structure below is more complex than it
       # needs to be, but it's representative of the directory structure
@@ -40,7 +41,7 @@ describe Puppet::Application::Doc do
 
       expect { puppet.run_command }.to exit_with 0
 
-      Puppet::FileSystem::File.exist?('doc').should be_true
+      Puppet::FileSystem.exist?('doc').should be_true
     ensure
       Dir.chdir(old_dir)
     end

data/spec/integration/configurer_spec.rb

@@ -8,6 +8,7 @@ describe Puppet::Configurer do
 
   describe "when downloading plugins" do
     it "should use the :pluginsignore setting, split on whitespace, for ignoring remote files" do
+      Puppet.settings.stubs(:use)
       resource = Puppet::Type.type(:notify).new :name => "yay"
       Puppet::Type.type(:file).expects(:new).at_most(2).with do |args|
         args[:ignore] == Puppet[:pluginsignore].split(/\s+/)
@@ -24,7 +25,7 @@ describe Puppet::Configurer do
       @catalog = Puppet::Resource::Catalog.new
       @catalog.add_resource(Puppet::Type.type(:notify).new(:title => "testing"))
 
-      # Make sure we don't try to persist the local state after the transaction ran, 
+      # Make sure we don't try to persist the local state after the transaction ran,
       # because it will fail during test (the state file is in a not-existing directory)
       # and we need the transaction to be successful to be able to produce a summary report
       @catalog.host_config = false
@@ -59,9 +60,10 @@ describe Puppet::Configurer do
       @configurer.run :catalog => @catalog, :report => report
       t2 = Time.now.tv_sec
 
-      file_mode = Puppet.features.microsoft_windows? ? '100644' : '100666'
+      # sticky bit only applies to directories in windows
+      file_mode = Puppet.features.microsoft_windows? ? '666' : '100666'
 
-      Puppet::FileSystem::File.new(Puppet[:lastrunfile]).stat.mode.to_s(8).should == file_mode
+      Puppet::FileSystem.stat(Puppet[:lastrunfile]).mode.to_s(8).should == file_mode
 
       summary = nil
       File.open(Puppet[:lastrunfile], "r") do |fd|

data/spec/integration/directory_environments_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe "directory environments" do
+  let(:args) { ['--configprint', 'modulepath', '--environment', 'direnv'] }
+  let(:puppet) do
+    app = Puppet::Application[:apply]
+    app.stubs(:command_line).returns(stub('command_line', :args => []))
+    app
+  end
+
+  context "with a single directory environmentpath" do
+    before(:each) do
+      environmentdir = Puppet[:environmentpath].split(File::PATH_SEPARATOR).first
+      FileUtils.mkdir_p(environmentdir + "/direnv/modules")
+    end
+
+    it "config prints the environments modulepath" do
+      Puppet.settings.initialize_global_settings(args)
+      expect do
+        expect { puppet.run }.to exit_with(0)
+      end.to have_printed('direnv/modules')
+    end
+
+    it "config prints the cli --modulepath despite environment" do
+      args << '--modulepath' << 'completely/different'
+      Puppet.settings.initialize_global_settings(args)
+      expect do
+        expect { puppet.run }.to exit_with(0)
+      end.to have_printed('completely/different')
+    end
+  end
+
+  context "with an environmentpath having multiple directories" do
+    let(:args) { ['--configprint', 'modulepath', '--environment', 'otherdirenv'] }
+
+    before(:each) do
+      envdir1 = File.join(Puppet[:confdir], 'env1')
+      envdir2 = File.join(Puppet[:confdir], 'env2')
+      Puppet[:environmentpath] = [envdir1, envdir2].join(File::PATH_SEPARATOR)
+      FileUtils.mkdir_p(envdir2 + "/otherdirenv/modules")
+    end
+
+    it "config prints a directory environment modulepath" do
+      Puppet.settings.initialize_global_settings(args)
+      expect do
+        expect { puppet.run }.to exit_with(0)
+      end.to have_printed('otherdirenv/modules')
+    end
+  end
+end