Cleanup for `apt::source`

* Update `release` to default to `$::lsbdistcodename`
* Default `include_src` to false
* Validate more things!
* Stop redefining variables from `apt::params`

diff --git a/manifests/source.pp b/manifests/source.pp
index 78b861f29cd9d815a6985430e83fc550cbb11f8d..0ca52123190d9a06157331e7f38a11c907779415 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -1,13 +1,12 @@
 # source.pp
 # add an apt source
-
 define apt::source(
   $comment           = $name,
   $ensure            = present,
   $location          = '',
-  $release           = 'UNDEF',
+  $release           = $::lsbdistcodename,
   $repos             = 'main',
-  $include_src       = true,
+  $include_src       = false,
   $include_deb       = true,
   $key               = undef,
   $key_server        = 'keyserver.ubuntu.com',
@@ -17,17 +16,11 @@ define apt::source(
   $architecture      = undef,
   $trusted_source    = false,
 ) {
-  validate_string($architecture)
-  validate_bool($trusted_source)
+  validate_string($architecture, $comment, $location, $release, $repos, $key_server)
+  validate_bool($trusted_source, $include_src, $include_deb)
 
-  if $release == 'UNDEF' {
-    if $::lsbdistcodename == undef {
-      fail('lsbdistcodename fact not available: release parameter required')
-    } else {
-      $release_real = $::lsbdistcodename
-    }
-  } else {
-    $release_real = $release
+  if ! $release {
+    fail('lsbdistcodename fact not available: release parameter required')
   }
 
   file { "${name}.list":

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index b92f7ddabc3c60e136739a0b42f2aa44c000cde3..d4be96419b98e68014bf2891295747f22361df7c 100644 (file)
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -135,7 +135,6 @@ describe 'apt', :type => :class do
     }
 
     it { should contain_file('puppetlabs.list').with_content(/^deb http:\/\/apt.puppetlabs.com precise main$/) }
-    it { should contain_file('puppetlabs.list').with_content(/^deb-src http:\/\/apt.puppetlabs.com precise main$/) }
   end
 
   describe 'failing tests' do

diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
index 7a1cac321a0502471dfef8a8497e0d4b5f250c88..ff236bd5d01e877f88483fbc3e451eebf2247388 100644 (file)
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -23,6 +23,7 @@ describe 'apt::source', :type => :define do
     let :params do
       {
         'include_deb' => false,
+        'include_src' => true,
       }
     end
 
@@ -123,6 +124,7 @@ describe 'apt::source', :type => :define do
     let :params do
       {
         'include_deb'  => false,
+        'include_src'  => true,
         'architecture' => 'x86_64',
       }
     end

diff --git a/templates/source.list.erb b/templates/source.list.erb
index b50be8d1fd7601b3e2d4289d5f28f88793eb4962..fb0a38612e7f2ff42fa393c18488ec296004418a 100644 (file)
--- a/templates/source.list.erb
+++ b/templates/source.list.erb
@@ -2,10 +2,10 @@
 <%- if @include_deb then -%>
 deb <%- if @architecture or @trusted_source -%>
 [<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted_source %>trusted=yes<% end -%>
-] <%- end %><%= @location %> <%= @release_real %> <%= @repos %>
+] <%- end %><%= @location %> <%= @release %> <%= @repos %>
 <%- end -%>
 <%- if @include_src then -%>
 deb-src <%- if @architecture or @trusted_source -%>
 [<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted_source %>trusted=yes<% end -%>
-] <%- end %><%= @location %> <%= @release_real %> <%= @repos %>
+] <%- end %><%= @location %> <%= @release %> <%= @repos %>
 <%- end -%>