Merge pull request #325 from apenney/merge

Merge

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10503c9144cd4e18867df3c50adf6f9ceb29f3d1..bf8553d8b606c6c710e53f3b8cef34a94c77b966 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+##2014-06-04 - Release 1.5.0
+###Summary
+
+This release adds support for Ubuntu 14.04.  It also includes many new features 
+and important bugfixes.  One huge change is that apt::key was replaced with
+apt_key, which allows you to use puppet resource apt_key to inventory keys on
+your system.
+
+Special thanks to daenney, our intrepid unofficial apt maintainer!
+
+####Features
+- Add support for Ubuntu Trusty!
+- Add apt::hold define
+- Generate valid *.pref files in apt::pin
+- Made pin_priority configurable for apt::backports
+- Add apt_key type and provider
+- Rename "${apt_conf_d}/proxy" to "${apt_conf_d}/01proxy"
+- apt::key rewritten to use apt_key type
+- Add support for update_tries to apt::update
+
+####Bugfixes
+- Typo fixes
+- Fix unattended upgrades
+- Removed bogus line when using purge_preferences
+- Fix apt::force to upgrade allow packages to be upgraded to the pacakge from the specified release
+
 ##2014-03-04 - Supported Release 1.4.2
 ###Summary
 

diff --git a/Modulefile b/Modulefile
index 40a87f4ef3967d56c9ee7c18985ff9524d7384f7..45169b31e8305b2016a7e0e662f3209d3298730d 100644 (file)
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-apt'
-version '1.4.2'
+version '1.5.0'
 source  'https://github.com/puppetlabs/puppetlabs-apt'
 author  'Evolving Web / Puppet Labs'
 license 'Apache License 2.0'

diff --git a/manifests/init.pp b/manifests/init.pp
index c32c5daca4b0cf753756f419a1a298e00e1dc2a4..597774c8338775a56e1e64c1d3a03ffe8ceb59ce 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -153,7 +153,7 @@ class apt(
     owner   => root,
     group   => root,
   }
-  
+
   file { 'old-proxy-file':
     ensure  => absent,
     path    => "${apt_conf_d}/proxy",

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index ab79b9417904664542386c572a607772f51638b2..a55e1e0e5c7a075b04ee4861370d40e107a42254 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -15,7 +15,7 @@ define apt::ppa(
   }
 
   if $::operatingsystem != 'Ubuntu' {
-    fail("apt::ppa is currently supported on Ubuntu only.")
+    fail('apt::ppa is currently supported on Ubuntu only.')
   }
 
   $filename_without_slashes = regsubst($name, '/', '-', 'G')

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index c57a9ee7f533b79b9a38e74d73d72909f8c1af7b..7e3ccc44b07637ee1a21d86b88f68a7eb03d516d 100644 (file)
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -16,26 +16,26 @@
 class apt::unattended_upgrades (
   $origins             = $::apt::params::origins,
   $blacklist           = [],
-  $update              = "1",
-  $download            = "1",
-  $upgrade             = "1",
-  $autoclean           = "7",
+  $update              = '1',
+  $download            = '1',
+  $upgrade             = '1',
+  $autoclean           = '7',
   $auto_fix            = true,
   $minimal_steps       = false,
   $install_on_shutdown = false,
-  $mail_to             = "NONE",
+  $mail_to             = 'NONE',
   $mail_only_on_error  = false,
   $remove_unused       = true,
   $auto_reboot         = false,
-  $dl_limit            = "NONE",
-  $enable              = "1",
-  $backup_interval     = "0",
-  $backup_level        = "3",
-  $max_age             = "0",
-  $min_age             = "0",
-  $max_size            = "0",
-  $download_delta      = "0",
-  $verbose             = "0",
+  $dl_limit            = 'NONE',
+  $enable              = '1',
+  $backup_interval     = '0',
+  $backup_level        = '3',
+  $max_age             = '0',
+  $min_age             = '0',
+  $max_size            = '0',
+  $download_delta      = '0',
+  $verbose             = '0',
 ) inherits ::apt::params {
 
   validate_bool(

diff --git a/metadata.json b/metadata.json
index f1e8663059bcf2825130052fb0c30b10b92272f9..7365c67f86cbc4c10453b0a1042a2e485ababa20 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "puppetlabs-apt",
-    "version": "1.4.1",
+    "version": "1.5.0",
     "source": "https://github.com/puppetlabs/puppetlabs-apt",
     "author": "Puppet Labs",
     "license": "Apache-2.0",
@@ -18,12 +18,13 @@
         "operatingsystem": "Ubuntu",
         "operatingsystemrelease": [
           "10.04",
-          "12.04"
+          "12.04",
+          "14.04"
         ]
       }
     ],
     "requirements": [
-      { "name": "pe", "version_requirement": "3.2.x" },
+      { "name": "pe", "version_requirement": ">= 3.2.0 < 3.4.0" },
       { "name": "puppet", "version_requirement": "3.x" }
     ],
     "dependencies": []

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index 120b7e8239849894097695ff70049a50298b0a99..c5e938a9aa72130496bebaa8fb37874ee9491753 100644 (file)
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -54,4 +54,16 @@ describe 'apt' 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
+
+  context 'with unsupported osfamily' do
+    let :facts do
+      { :osfamily        => 'Darwin', }
+    end
+
+    it do
+      expect {
+       should compile
+      }.to raise_error(Puppet::Error, /This module only works on Debian or derivatives like Ubuntu/)
+    end
+  end
 end