Merge pull request #187 from ghoneycutt/style_for_class_with_no_params

Use include instead of parameterized class when no params are given.

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 253e72ffb1af0b465f8308469ff20a2988ff8e1d..730bf7d198f452728097879841d83008f77531eb 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -48,7 +48,7 @@ define apt::ppa(
         logoutput    => 'on_failure',
         notify       => Exec['apt_update'],
         require      => [
-        File[$sources_list_d],
+        File['sources.list.d'],
         Package[$package],
         ],
     }

diff --git a/spec/classes/unattended_upgrades_spec.rb b/spec/classes/unattended_upgrades_spec.rb
index 8abc603251b62722634c6260f310f4c1f079319d..e83c6e4c3096d3a47c6d2c0844e353a930118188 100644 (file)
--- a/spec/classes/unattended_upgrades_spec.rb
+++ b/spec/classes/unattended_upgrades_spec.rb
@@ -26,7 +26,7 @@ describe 'apt::unattended_upgrades', :type => :class do
   describe "origins" do
     describe "with param defaults" do
       let(:params) {{ }}
-      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Allowed-Origins \{\n\t"\${distro_id}:\${distro_codename}-security";\n\};$/) }
+      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Allowed-Origins \{\n\t"\$\{distro_id\}:\$\{distro_codename\}-security";\n\};$/) }
     end
 
     describe "with origins => ['ubuntu:precise-security']" do

diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb
index 5b59f57776bc389e4f1c4bf7e9ef24ac09ab8e67..a05ca306452a8d08c48bd30cc706f40d18505cd5 100644 (file)
--- a/spec/defines/ppa_spec.rb
+++ b/spec/defines/ppa_spec.rb
@@ -46,7 +46,7 @@ describe 'apt::ppa', :type => :define do
           it { should contain_exec("add-apt-repository-#{t}").with(
             'command' => "/usr/bin/add-apt-repository #{options} #{t}",
             'unless'  => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
-            'require' => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"],
+            'require' => ["File[sources.list.d]", "Package[#{package}]"],
             'notify'  => "Exec[apt_update]"
             )
           }
@@ -75,7 +75,7 @@ describe 'apt::ppa', :type => :define do
           'environment' => [],
           'command'     => "/usr/bin/add-apt-repository #{options} #{title}",
           'unless'      => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
-          'require'     => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"],
+          'require'     => ["File[sources.list.d]", "Package[#{package}]"],
           'notify'      => "Exec[apt_update]"
           )
         }
@@ -101,7 +101,7 @@ describe 'apt::ppa', :type => :define do
           ],
           'command'     => "/usr/bin/add-apt-repository #{options} #{title}",
           'unless'      => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
-          'require'     => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"],
+          'require'     => ["File[sources.list.d]", "Package[#{package}]"],
           'notify'      => "Exec[apt_update]"
           )
         }