From 8bf5f4488d440941ee18a8d71f0bb7b870e1e503 Mon Sep 17 00:00:00 2001 From: Tom Wilson Date: Fri, 6 Feb 2015 15:18:19 -0700 Subject: [PATCH] Switch to Berkshelf, clean up dependencies and deprecated ChefSpec stuff. --- .gitignore | 18 ++++++++++++++++++ metadata.rb | 4 ++-- spec/recipes/default_spec.rb | 2 +- spec/spec_helper.rb | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e69de29..4699ff2 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,18 @@ +*~ +*# +.#* +\#*# +.*.sw[a-z] +*.un~ +pkg/ + +# Berkshelf +.vagrant +/cookbooks +Berksfile.lock + +# Bundler +Gemfile.lock +bin/* +.bundle/* + diff --git a/metadata.rb b/metadata.rb index 37fc8b3..aa0f12b 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,6 +4,6 @@ license 'GNU Library General Public License, version 2.0' description 'Installs/Configures logwatch_restart' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.0' +version '0.2.0' -depends 'logwatch' +depends 'logwatch', '~> 1.1' diff --git a/spec/recipes/default_spec.rb b/spec/recipes/default_spec.rb index b737650..45cf6f8 100644 --- a/spec/recipes/default_spec.rb +++ b/spec/recipes/default_spec.rb @@ -1,7 +1,7 @@ require_relative '../spec_helper' describe 'restart_watch::default' do - subject { ChefSpec::Runner.new.converge(described_recipe) } + subject { ChefSpec::SoloRunner.new.converge(described_recipe) } describe 'the conf file' do let(:filename) {'/etc/logwatch/conf/services/restart.conf'} diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7b44e82..a3c6e62 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,5 @@ require 'chefspec' -require 'chefspec/librarian' +require 'chefspec/berkshelf' RSpec.configure do |config| config.platform = 'ubuntu'