From: Daniele Sluijters <daenney@users.noreply.github.com>
Date: Wed, 25 Feb 2015 17:22:37 +0000 (+0100)
Subject: Merge pull request #442 from mhaskel/add_base_name
X-Git-Tag: 2.0.0~32
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1c0c6f106aa7b99241e17406919786df4001c151;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #442 from mhaskel/add_base_name

Add base_name parameter to apt::setting
---

1c0c6f106aa7b99241e17406919786df4001c151
diff --cc manifests/setting.pp
index 7740fd6,8e46ed9..78f007f
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@@ -19,10 -20,10 +20,11 @@@ define apt::setting 
  
    validate_re($setting_type, ['conf', 'pref', 'list'])
    validate_re($ensure,  ['file', 'present', 'absent'])
+   validate_string($base_name)
  
    unless is_integer($priority) {
 -    fail('apt::setting priority must be an integer')
 +    # need this to allow zero-padded priority.
 +    validate_re($priority, '^\d+$', 'apt::setting priority must be an integer or a zero-padded integer.')
    }
  
    if $source {
diff --cc spec/defines/setting_spec.rb
index 0abcead,a597cb8..7b7c54e
--- a/spec/defines/setting_spec.rb
+++ b/spec/defines/setting_spec.rb
@@@ -92,12 -92,24 +92,24 @@@ describe 'apt::setting' d
  
    describe 'with priority=100' do
      let(:params) { default_params.merge({ :priority => 100 }) }
 -    it { should contain_file('/etc/apt/apt.conf.d/100teddybear') }
 +    it { is_expected.to contain_file('/etc/apt/apt.conf.d/100teddybear') }
    end
  
+   describe 'with base_name=puppy' do
+     let(:params) { default_params.merge({ :base_name => 'puppy' }) }
+     it { should contain_file('/etc/apt/apt.conf.d/50puppy') }
+   end
+ 
+   describe 'with base_name=true' do
+     let(:params) { default_params.merge({ :base_name => true }) }
+       it do
+         expect { should compile }.to raise_error(Puppet::Error, /not a string/)
+       end
+   end
+ 
    describe 'with ensure=absent' do
      let(:params) { default_params.merge({ :ensure => 'absent' }) }
 -    it { should contain_file('/etc/apt/apt.conf.d/50teddybear').with({
 +    it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').with({
        :ensure => 'absent',
      })}
    end