Merge pull request #333 from wilman0/master

Fix for debian/ubuntu hold and a way to add debian src only

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf8553d8b606c6c710e53f3b8cef34a94c77b966..011c41d378a2560bff5a5cfdd9d4998821ff66b4 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+##2014-07-15 - Supported Release 1.5.2
+###Summary
+
+This release merely updates metadata.json so the module can be uninstalled and
+upgraded via the puppet module command.
+
+##2014-07-10 - Supported Release 1.5.1
+###Summary
+
+This release has added tests to ensure graceful failure on OSX.
+
 ##2014-06-04 - Release 1.5.0
 ###Summary
 

diff --git a/Modulefile b/Modulefile
deleted file mode 100644 (file)
index 45169b3..0000000
--- a/Modulefile
+++ /dev/null
@@ -1,14 +0,0 @@
-name    'puppetlabs-apt'
-version '1.5.0'
-source  'https://github.com/puppetlabs/puppetlabs-apt'
-author  'Evolving Web / Puppet Labs'
-license 'Apache License 2.0'
-summary 'Puppet Labs Apt Module'
-description 'APT Module for Puppet'
-project_page 'https://github.com/puppetlabs/puppetlabs-apt'
-
-## Add dependencies, if any:
-#dependency 'puppetlabs/stdlib', '2.x'
-# The dependency should be written as above but librarian-puppet
-# does not support the expression as the PMT does.
-dependency 'puppetlabs/stdlib', '>= 2.2.1'

diff --git a/manifests/init.pp b/manifests/init.pp
index 597774c8338775a56e1e64c1d3a03ffe8ceb59ce..1c318b67ca979259ef79933b6b0faf2dedb85f7d 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -139,19 +139,25 @@ class apt(
     default: { fail('Valid values for disable_keys are true or false') }
   }
 
-  $proxy_set = $proxy_host ? {
-    undef   => absent,
-    default => present
-  }
-
-  file { '01proxy':
-    ensure  => $proxy_set,
-    path    => "${apt_conf_d}/01proxy",
-    content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n",
-    notify  => Exec['apt_update'],
-    mode    => '0644',
-    owner   => root,
-    group   => root,
+  case $proxy_host {
+    false, '', undef: {
+      file { '01proxy':
+        ensure  => absent,
+        path    => "${apt_conf_d}/01proxy",
+        notify  => Exec['apt_update'],
+      }
+    }
+    default: {
+      file { '01proxy':
+        ensure  => present,
+        path    => "${apt_conf_d}/01proxy",
+        content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n",
+        notify  => Exec['apt_update'],
+        mode    => '0644',
+        owner   => root,
+        group   => root,
+      }
+    }
   }
 
   file { 'old-proxy-file':

diff --git a/manifests/params.pp b/manifests/params.pp
index f635b5801cd98889582d19c088f6923a2708ace0..d57b80110c8209d4511a722120096a7ae721a4b2 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -49,6 +49,9 @@ class apt::params {
         }
       }
     }
+    '': {
+      fail('Unable to determine lsbdistid, is lsb-release installed?')
+    }
     default: {
       fail("Unsupported lsbdistid (${::lsbdistid})")
     }

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index a55e1e0e5c7a075b04ee4861370d40e107a42254..27edff80b21864539f1ca9eb86cfa6cc0f2a8979 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -36,11 +36,13 @@ define apt::ppa(
     if defined(Class[apt]) {
         $proxy_host = $apt::proxy_host
         $proxy_port = $apt::proxy_port
-        case  $proxy_host {
-        false, '': {
+        case $proxy_host {
+          false, '', undef: {
             $proxy_env = []
-        }
-        default: {$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]}
+          }
+          default: {
+            $proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]
+          }
         }
     } else {
         $proxy_env = []

diff --git a/metadata.json b/metadata.json
index 7365c67f86cbc4c10453b0a1042a2e485ababa20..f1c18a5dbc067b32aaf63a1729d69c867cfebc5c 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,31 +1,43 @@
 {
-    "name": "puppetlabs-apt",
-    "version": "1.5.0",
-    "source": "https://github.com/puppetlabs/puppetlabs-apt",
-    "author": "Puppet Labs",
-    "license": "Apache-2.0",
-    "project_page": "https://github.com/puppetlabs/puppetlabs-apt",
-    "summary": "Puppet Labs Apt Module",
-    "operatingsystem_support": [
-      {
-        "operatingsystem": "Debian",
-        "operatingsystemrelease": [
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "Ubuntu",
-        "operatingsystemrelease": [
-          "10.04",
-          "12.04",
-          "14.04"
-        ]
-      }
-    ],
-    "requirements": [
-      { "name": "pe", "version_requirement": ">= 3.2.0 < 3.4.0" },
-      { "name": "puppet", "version_requirement": "3.x" }
-    ],
-    "dependencies": []
+  "name": "puppetlabs-apt",
+  "version": "1.5.2",
+  "author": "Puppet Labs",
+  "summary": "Puppet Labs Apt Module",
+  "license": "Apache-2.0",
+  "source": "https://github.com/puppetlabs/puppetlabs-apt",
+  "project_page": "https://github.com/puppetlabs/puppetlabs-apt",
+  "issues_url": "https://github.com/puppetlabs/puppetlabs-apt/issues",
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": [
+        "10.04",
+        "12.04",
+        "14.04"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": ">= 3.2.0 < 3.4.0"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": "3.x"
+    }
+  ],
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 2.2.1"
+    }
+  ]
 }

diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
index 60def0e1544cd6ff86bc982bd36f6e25dc8d5b3d..97f00f1681abd418ebe5d00261b5d2556d7d5aef 100644 (file)
--- a/spec/acceptance/apt_spec.rb
+++ b/spec/acceptance/apt_spec.rb
@@ -15,7 +15,7 @@ describe 'apt class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')
       EOS
 
       apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/apt_update/)
+        expect(r.stdout).to match(/Exec\[apt_update\]/)
       end
     end
   end
@@ -26,7 +26,7 @@ describe 'apt class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')
       EOS
 
       apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to_not match(/apt_update/)
+        expect(r.stdout).to_not match(/Exec\[apt_update\]/)
       end
     end
   end

diff --git a/spec/acceptance/unattended_upgrade_spec.rb b/spec/acceptance/unattended_upgrade_spec.rb
index 6a19f4e74e044c5efb5eaf352340241fabd047b1..09f4e2bed09888036c9c7f6f2b54dbfd9b6c5c85 100644 (file)
--- a/spec/acceptance/unattended_upgrade_spec.rb
+++ b/spec/acceptance/unattended_upgrade_spec.rb
@@ -10,8 +10,8 @@ describe 'apt::unattended_upgrades class', :unless => UNSUPPORTED_PLATFORMS.incl
 
       # Attempted workaround for problems seen on debian with
       # something holding the package database open.
-      #shell('killall -9 apt-get')
-      #shell('killall -9 dpkg')
+      shell('killall -9 apt-get', { :acceptable_exit_codes => [0,1] })
+      shell('killall -9 dpkg', { :acceptable_exit_codes => [0,1] })
       apply_manifest(pp, :catch_failures => true)
     end
 

diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index aa330bb987649ac03eeefc237164b09ad276d3ef..d85e849d5ae31a370ccce001f274f449608f32f9 100644 (file)
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -24,4 +24,16 @@ describe 'apt::params', :type => :class do
     end
 
   end
+
+  describe "With lsb-release not installed" do
+    let(:facts) { { :lsbdistid => '' } }
+    let (:title) { 'my_package' }
+
+    it do
+      expect {
+        should compile
+      }.to raise_error(Puppet::Error, /Unable to determine lsbdistid, is lsb-release installed/)
+    end
+  end
+
 end