Support latest apt module

.travis.yml

@@ -26,6 +26,11 @@ matrix:
       services: docker
       env: BEAKER_set=centos-6-x64
       script: bundle exec rake beaker
+    - rvm: default
+      sudo: required
+      services: docker
+      env: BEAKER_set=ubuntu-14.04-x64
+      script: bundle exec rake beaker
 
 notifications:
   email: false

manifests/config.pp

@@ -6,6 +6,11 @@
   $metrics_plugins = {},
   $check_plugins   = {}
 ) {
+  file { '/etc/mackerel-agent/conf.d':
+    ensure  => directory,
+    require => Package['mackerel-agent']
+  }
+
   file { 'mackerel-agent.conf':
     ensure  => $ensure,
     path    => '/etc/mackerel-agent/mackerel-agent.conf',

manifests/install.pp

@@ -20,30 +20,29 @@
     }
     'Debian': {
       apt::key { 'mackerel':
-        key        => 'C2B48821',
-        key_source => $gpgkey_url
+        id     => '2748FD61027D357542F8394DF92F673FC2B48821',
+        source => $gpgkey_url
       }
+
       apt::source { 'mackerel':
-        location    => 'http://apt.mackerel.io/debian/',
-        release     => 'mackerel',
-        repos       => 'contrib',
-        include_src => false
+        location => 'http://apt.mackerel.io/debian/',
+        release  => 'mackerel',
+        repos    => 'contrib',
+        include  => {
+          source => false
+        },
+        require  => Apt::Key['mackerel']
       }
     }
     default: {
       # Do nothing
     }
-  }
+  } ->
 
   package { 'mackerel-agent':
     ensure => $ensure
   }
 
-  file { '/etc/mackerel-agent/conf.d':
-    ensure  => directory,
-    require => Package['mackerel-agent']
-  }
-
   case $use_metrics_plugins {
     true: {
       package { 'mackerel-agent-plugins':

manifests/service.pp

@@ -5,7 +5,8 @@
   $enable = true,
 ) {
   service { 'mackerel-agent':
-    ensure => $ensure,
-    enable => $enable
+    ensure     => $ensure,
+    enable     => $enable,
+    hasrestart => true
   }
 }

spec/acceptance/nodesets/ubuntu-14.04-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  ubuntu-14.04-x64:
+    platform: ubuntu-14.04-x64
+    image: ubuntu:trusty
+    hypervisor: docker
+    docker_preserve_image: true
+CONFIG:
+  type: foss
+  log_level: debug
+  masterless: true

spec/classes/config_spec.rb

@@ -3,6 +3,7 @@
 describe 'mackerel_agent::config' do
   context 'with present (default)' do
     it { should contain_file('mackerel-agent.conf').with_ensure('present') }
+    it { should contain_file('/etc/mackerel-agent/conf.d').with_ensure('directory') }
   end
 
   context 'with absent' do

spec/classes/install_spec.rb

@@ -3,7 +3,6 @@
 describe 'mackerel_agent::install' do
   context 'with present (default)' do
     it { should contain_package('mackerel-agent').with_ensure('present') }
-    it { should contain_file('/etc/mackerel-agent/conf.d').with_ensure('directory') }
   end
 
   context 'with absent' do