From 1373e70639e0105ec314c006bd82545573a389e6 Mon Sep 17 00:00:00 2001 From: Jeff McCune Date: Thu, 10 May 2012 21:36:46 -0700 Subject: Make file_line default to ensure => present The examples in the file_line resource documentation state the following resource should work: file_line { 'sudo_rule': path => '/etc/sudoers', line => '%sudo ALL=(ALL) ALL', } Without this patch the example does not work because ensure is not set to present. This patch fixes the problem by setting the default value of ensure to present. --- lib/puppet/type/file_line.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/puppet') diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb index 9f03771..8559cfa 100644 --- a/lib/puppet/type/file_line.rb +++ b/lib/puppet/type/file_line.rb @@ -23,18 +23,20 @@ Puppet::Type.newtype(:file_line) do EOT - ensurable + ensurable do + defaultto :present + end newparam(:name, :namevar => true) do - desc 'arbitrary name used as identity' + desc 'An arbitrary name used as the identity of the resource.' end newparam(:line) do - desc 'The line to be appended to the path.' + desc 'The line to be appended to the file located by the path parameter.' end newparam(:path) do - desc 'File to possibly append a line to.' + desc 'The file Puppet will ensure contains the line specified by the line parameter.' validate do |value| unless (Puppet.features.posix? and value =~ /^\//) or (Puppet.features.microsoft_windows? and (value =~ /^.:\// or value =~ /^\/\/[^\/]+\/[^\/]+/)) raise(Puppet::Error, "File paths must be fully qualified, not '#{value}'") -- cgit v1.2.3 From f0a62c7dba6df92b0aa809971322a7d2413b2518 Mon Sep 17 00:00:00 2001 From: Peter Meier Date: Tue, 22 May 2012 19:39:29 +0200 Subject: fix regression in #11017 properly We need the defaultvalues for that. --- lib/puppet/type/file_line.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/puppet') diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb index 8559cfa..f6fe1d0 100644 --- a/lib/puppet/type/file_line.rb +++ b/lib/puppet/type/file_line.rb @@ -24,6 +24,7 @@ Puppet::Type.newtype(:file_line) do EOT ensurable do + defaultvalues defaultto :present end -- cgit v1.2.3 From c1297755d4af11eb918ad987983ebd8398e38f58 Mon Sep 17 00:00:00 2001 From: Jeff McCune Date: Thu, 19 Jul 2012 17:37:39 -0700 Subject: (Maint) Fix up the get_module_path parser function This patch switches the spec tests for the get_module_path function to use mock objects. The underlying Puppet::Module.find method has reasonable test coverage inside of Puppet core so we might as well break the tight dependency while we're fixing up the specs to use the new parser scope. The behavior of the parser function itself should still have complete coverage even though the tests have switched to mock the implementation inside of Puppet. --- lib/puppet/parser/functions/get_module_path.rb | 2 +- .../parser/functions/get_module_path_spec.rb | 52 +++++++++++----------- 2 files changed, 28 insertions(+), 26 deletions(-) (limited to 'lib/puppet') diff --git a/lib/puppet/parser/functions/get_module_path.rb b/lib/puppet/parser/functions/get_module_path.rb index 4d2b50b..1421b91 100644 --- a/lib/puppet/parser/functions/get_module_path.rb +++ b/lib/puppet/parser/functions/get_module_path.rb @@ -7,7 +7,7 @@ module Puppet::Parser::Functions $module_path = get_module_path('stdlib') EOT ) do |args| - raise(Puppet::ParseError, "get_module_name(): Wrong number of arguments, expects one") unless args.size == 1 + raise(Puppet::ParseError, "get_module_path(): Wrong number of arguments, expects one") unless args.size == 1 if module_path = Puppet::Module.find(args[0], compiler.environment.to_s) module_path.path else diff --git a/spec/unit/puppet/parser/functions/get_module_path_spec.rb b/spec/unit/puppet/parser/functions/get_module_path_spec.rb index d8340f4..0a769eb 100644 --- a/spec/unit/puppet/parser/functions/get_module_path_spec.rb +++ b/spec/unit/puppet/parser/functions/get_module_path_spec.rb @@ -1,42 +1,44 @@ -#!/usr/bin/env rspec -require 'puppet' -require 'fileutils' +#! /usr/bin/env ruby -S rspec require 'spec_helper' + describe Puppet::Parser::Functions.function(:get_module_path) do - include PuppetSpec::Files + Internals = PuppetlabsSpec::PuppetInternals - def get_scope(environment = 'production') - scope = Puppet::Parser::Scope.new - scope.compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("floppy", :environment => environment)) - scope + def scope(environment = "production") + Internals.scope(:compiler => Internals.compiler(:node => Internals.node(:environment => environment))) end + it 'should only allow one argument' do - expect { get_scope.function_get_module_path([]) }.should raise_error(Puppet::ParseError, /Wrong number of arguments, expects one/) - expect { get_scope.function_get_module_path(['1','2','3']) }.should raise_error(Puppet::ParseError, /Wrong number of arguments, expects one/) + expect { scope.function_get_module_path([]) }.should raise_error(Puppet::ParseError, /Wrong number of arguments, expects one/) + expect { scope.function_get_module_path(['1','2','3']) }.should raise_error(Puppet::ParseError, /Wrong number of arguments, expects one/) end it 'should raise an exception when the module cannot be found' do - expect { get_scope.function_get_module_path(['foo']) }.should raise_error(Puppet::ParseError, /Could not find module/) + expect { scope.function_get_module_path(['foo']) }.should raise_error(Puppet::ParseError, /Could not find module/) end describe 'when locating a module' do - let(:modulepath) { tmpdir('modulepath') } - let(:foo_path) { File.join(modulepath, 'foo') } - before(:each) { FileUtils.mkdir(foo_path) } + let(:modulepath) { "/tmp/does_not_exist" } + let(:path_of_module_foo) do + mod = mock("Puppet::Module") + mod.stubs(:path).returns("/tmp/does_not_exist/foo") + mod + end + + before(:each) { Puppet[:modulepath] = modulepath } + it 'should be able to find module paths from the modulepath setting' do - Puppet[:modulepath] = modulepath - get_scope.function_get_module_path(['foo']).should == foo_path + Puppet::Module.expects(:find).with('foo', 'production').returns(path_of_module_foo) + scope.function_get_module_path(['foo']).should == path_of_module_foo.path end it 'should be able to find module paths when the modulepath is a list' do Puppet[:modulepath] = modulepath + ":/tmp" - get_scope.function_get_module_path(['foo']).should == foo_path + Puppet::Module.expects(:find).with('foo', 'production').returns(path_of_module_foo) + scope.function_get_module_path(['foo']).should == path_of_module_foo.path end - it 'should be able to find module paths from the environment' do - conf_file = tmpfile('conffile') - File.open(conf_file, 'w') do |fh| - fh.write("[dansenvironment]\nmodulepath = #{modulepath}") - end - Puppet[:config] = conf_file - Puppet.parse_config - get_scope('dansenvironment').function_get_module_path(['foo']).should ==foo_path + it 'should respect the environment' do + pending("Disabled on Puppet 2.6.x") if Puppet.version =~ /^2\.6\b/ + Puppet.settings[:environment] = 'danstestenv' + Puppet::Module.expects(:find).with('foo', 'danstestenv').returns(path_of_module_foo) + scope('danstestenv').function_get_module_path(['foo']).should == path_of_module_foo.path end end end -- cgit v1.2.3