[MERGE] Fix merge conflict with next

.kitchen.yml

@@ -6,6 +6,7 @@ provisioner:
   name: chef_zero
 
 platforms:
+  - name: centos-7.0
   - name: centos-6.5
   - name: centos-5.10
   - name: ubuntu-12.04

Berksfile

@@ -1,5 +1,5 @@
 # vi: set ft=ruby :
-source 'https://api.berkshelf.com'
+source 'https://supermarket.getchef.com'
 
 metadata
 

CHANGELOG.md

@@ -1,4 +1,9 @@
-0.1.0 (Mar 5 2013)
+0.2.1 (Apr 29th 2013)
+---------------------
+
+* Saver service definition, enable and start after template is written
+
+0.1.0 (Mar 05th 2013)
 ------------------
 
 * First committed version 

Rakefile

@@ -40,14 +40,13 @@ task 'foodcritic' do
 end
 
 desc 'Run ChefSpec examples'
-task 'chefspec' => 'setup_cookbooks' do
-  sh 'rspec', '--color', '--format', 'documentation',
-     File.join(COOKBOOKS_PATH, COOKBOOK_NAME, 'spec')
+task 'chefspec' do
+  sh 'rspec', '--color', '--format', 'documentation'
 end
 
 desc 'Run Rubocop'
 task :rubocop do
-  sh 'rubocop', '-fs'
+  sh 'rubocop', '-fs', File.join(COOKBOOKS_PATH, COOKBOOK_NAME)
 end
 
 desc 'Run all tests'

attributes/default.rb

@@ -79,6 +79,6 @@
 }
 
 # Addresses a compatibility breaking upgrade, might be better to set to NO explicitly but for testing purposes it's enabled
-if node['platform'] == 'ubuntu' && node['platform_version'] == '14.04'
+if (node['platform'] == 'ubuntu' && node['platform_version'].to_f >= 14.04) || (node['platform'] == 'centos' && node['platform_version'].to_f >= 7.0)
   default['vsftpd']['config']['allow_writeable_chroot'] = 'YES'
 end

metadata.rb

@@ -4,7 +4,7 @@
 license           'Apache 2.0'
 description       'Installs/configures vsftpd'
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           '0.2.0'
+version           '0.2.1'
 recipe            'vsftpd::default', 'Installs/configures vsftpd'
 
 supports 'ubuntu'

recipes/_configure.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 directory node['vsftpd']['etcdir'] do
   action :create
   user 'root'

recipes/_define_service.rb

@@ -3,13 +3,15 @@
 if node['vsftpd']['enabled']
   service 'vsftpd' do
     provider Chef::Provider::Service::Upstart if node['platform'] == 'ubuntu' &&
-      node['platform_version'] == '14.04'
-    action %w( enable start )
+      node['platform_version'].to_f >= 14.04
+    action [:enable, :start]
+    supports :restart => true
   end
 else
   service 'vsftpd' do
     provider Chef::Provider::Service::Upstart if node['platform'] == 'ubuntu' &&
-      node['platform_version'] == '14.04'
-    action %w( disable stop )
+      node['platform_version'].to_f >= 14.04
+    action [:disable, :stop]
+    supports :restart => true
   end
 end

spec/default_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'chefspec'
+require 'spec_helper'
 
 describe 'vsftpd::default' do
   { 'redhat' => '6.5', 'debian' => '7.5' }.each do |platform_family, platform_version|
@@ -17,8 +17,8 @@
         expect(@chef_run).to install_package('vsftpd')
       end
 
-      it 'should create configuration directory /etc/vsftpd' do
-        expect(@chef_run).to create_directory('/etc/vsftpd')
+      it 'should create configuration directory /etc/vsftpd/users.d'do
+        expect(@chef_run).to create_directory('/etc/vsftpd/users.d')
       end if platform_family == 'debian'
 
       platform_family == 'debian' ? config = '/etc/vsftpd.conf' : config = '/etc/vsftpd/vsftpd.conf'

spec/spec_helper.rb

@@ -0,0 +1,3 @@
+require 'chefspec'
+require 'chefspec/berkshelf'
+ChefSpec::Coverage.start!