From aa31dc9e7ea2161c34826279c2302bacd8fa7233 Mon Sep 17 00:00:00 2001 From: micah Date: Wed, 20 Feb 2013 11:05:16 -0500 Subject: Update README The previous version said that one of the three things it did was to "provide a few lenses only included in recent augeas releases". The module doesn't do that anymore, and some of the other things it did do were not document, so this updates the README to be more current. --- README | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/README b/README index 84d77c6..460e4c0 100644 --- a/README +++ b/README @@ -7,8 +7,24 @@ == Description == This module does 3 things: - - o provides a few lenses only included in recent augeas releases. - o let's you force the version by defining $augeas_version, else puppet will + o lets you force the augeas version by defining $augeas_version, otherwise puppet will only ensure the packages are present. + o lets you force the ruby library version by defining $augeas_ruby_version, otherwise puppet will + only ensure the libagueas-ruby version will be installed according to internal critera + o lets you deploy an augeas lens and any associated test files, running unit tests and not installing if they fail: + + Parameters: + - *ensure*: present/absent + - *lens_source*: the source for the lens + - *test_source*: optionally, the source for the test file. + - *stock_since*: optionally, indicate in which version of Augeas + the lens became stock, so it will not be deployed above that version. + + Example usage: + + augeas::lens { 'networkmanager': + lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', + test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', + stock_since => '1.0.0', + } -- cgit v1.2.3 From e4f9a282b86566430652e69d40b9ecaa723fbb05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 10:12:04 +0100 Subject: Rename README as README.markdown --- README | 30 ------------------------------ README.markdown | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 README create mode 100644 README.markdown diff --git a/README b/README deleted file mode 100644 index 460e4c0..0000000 --- a/README +++ /dev/null @@ -1,30 +0,0 @@ -= Augeas Puppet module = - -== Usage == - - include augeas - -== Description == - -This module does 3 things: - - o lets you force the augeas version by defining $augeas_version, otherwise puppet will - only ensure the packages are present. - o lets you force the ruby library version by defining $augeas_ruby_version, otherwise puppet will - only ensure the libagueas-ruby version will be installed according to internal critera - o lets you deploy an augeas lens and any associated test files, running unit tests and not installing if they fail: - - Parameters: - - *ensure*: present/absent - - *lens_source*: the source for the lens - - *test_source*: optionally, the source for the test file. - - *stock_since*: optionally, indicate in which version of Augeas - the lens became stock, so it will not be deployed above that version. - - Example usage: - - augeas::lens { 'networkmanager': - lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', - test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', - stock_since => '1.0.0', - } diff --git a/README.markdown b/README.markdown new file mode 100644 index 0000000..460e4c0 --- /dev/null +++ b/README.markdown @@ -0,0 +1,30 @@ += Augeas Puppet module = + +== Usage == + + include augeas + +== Description == + +This module does 3 things: + + o lets you force the augeas version by defining $augeas_version, otherwise puppet will + only ensure the packages are present. + o lets you force the ruby library version by defining $augeas_ruby_version, otherwise puppet will + only ensure the libagueas-ruby version will be installed according to internal critera + o lets you deploy an augeas lens and any associated test files, running unit tests and not installing if they fail: + + Parameters: + - *ensure*: present/absent + - *lens_source*: the source for the lens + - *test_source*: optionally, the source for the test file. + - *stock_since*: optionally, indicate in which version of Augeas + the lens became stock, so it will not be deployed above that version. + + Example usage: + + augeas::lens { 'networkmanager': + lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', + test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', + stock_since => '1.0.0', + } -- cgit v1.2.3 From 391a3d68da2e28f4ae5fff06eab994a3eec37239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 10:13:35 +0100 Subject: Use markdown in README --- README.markdown | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/README.markdown b/README.markdown index 460e4c0..9961912 100644 --- a/README.markdown +++ b/README.markdown @@ -1,27 +1,28 @@ -= Augeas Puppet module = +# Augeas Puppet module -== Usage == +## Usage include augeas -== Description == +## Description This module does 3 things: - o lets you force the augeas version by defining $augeas_version, otherwise puppet will +* lets you force the augeas version by defining $augeas_version, otherwise puppet will only ensure the packages are present. - o lets you force the ruby library version by defining $augeas_ruby_version, otherwise puppet will +* lets you force the ruby library version by defining $augeas_ruby_version, otherwise puppet will only ensure the libagueas-ruby version will be installed according to internal critera - o lets you deploy an augeas lens and any associated test files, running unit tests and not installing if they fail: +* lets you deploy an augeas lens and any associated test files, running unit tests and not installing if they fail: - Parameters: - - *ensure*: present/absent - - *lens_source*: the source for the lens - - *test_source*: optionally, the source for the test file. - - *stock_since*: optionally, indicate in which version of Augeas - the lens became stock, so it will not be deployed above that version. +Parameters: - Example usage: +- *ensure*: present/absent +- *lens_source*: the source for the lens +- *test_source*: optionally, the source for the test file. +- *stock_since*: optionally, indicate in which version of Augeas + the lens became stock, so it will not be deployed above that version. + +Example usage: augeas::lens { 'networkmanager': lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', -- cgit v1.2.3 From ac7eac58c948183dbb309fb226d882514cf8e49a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 10:17:17 +0100 Subject: Add augeas() function --- Rakefile | 2 + lib/puppet/parser/functions/augeas.rb | 68 +++++++++++++++++++ spec/spec.opts | 6 ++ spec/spec_helper.rb | 28 ++++++++ spec/unit/puppet/parser/functions/augeas_spec.rb | 83 ++++++++++++++++++++++++ 5 files changed, 187 insertions(+) create mode 100644 Rakefile create mode 100644 lib/puppet/parser/functions/augeas.rb create mode 100644 spec/spec.opts create mode 100644 spec/spec_helper.rb create mode 100644 spec/unit/puppet/parser/functions/augeas_spec.rb diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..14f1c24 --- /dev/null +++ b/Rakefile @@ -0,0 +1,2 @@ +require 'rubygems' +require 'puppetlabs_spec_helper/rake_tasks' diff --git a/lib/puppet/parser/functions/augeas.rb b/lib/puppet/parser/functions/augeas.rb new file mode 100644 index 0000000..08026f7 --- /dev/null +++ b/lib/puppet/parser/functions/augeas.rb @@ -0,0 +1,68 @@ +# +# augeas.rb +# + +module Puppet::Parser::Functions + newfunction(:augeas, :type => :rvalue, :doc => <<-EOS +Modifies a string using Augeas. + +*Example:* + + augeas("proc /proc proc nodev,noexec,nosuid 0 0\n", 'Fstab.lns', ['rm ./1/opt[3]']) + +Would result in: + + "proc /proc proc nodev,noexec 0 0\n" + EOS + ) do |arguments| + unless Puppet.features.augeas? + raise Puppet::ParseError, ('augeas(): this function requires the augeas feature. See http://projects.puppetlabs.com/projects/puppet/wiki/Puppet_Augeas#Pre-requisites for how to activate it.') + end + + # Check that 2 arguments have been given ... + raise(Puppet::ParseError, 'augeas(): Wrong number of arguments ' + + "given (#{arguments.size} for 3)") if arguments.size != 3 + + content = arguments[0] + lens = arguments[1] + changes = arguments[2] + + # Check arguments + raise(Puppet::ParseError, 'augeas(): content must be a string') unless content.is_a?(String) + raise(Puppet::ParseError, 'augeas(): lens must be a string') unless lens.is_a?(String) + raise(Puppet::ParseError, 'augeas(): changes must be an array') unless changes.is_a?(Array) + + require 'augeas' + aug = Augeas::open(nil, nil, Augeas::NO_MODL_AUTOLOAD) + augeas_version = aug.get('/augeas/version') + raise(Puppet::ParseError, 'augeas(): requires Augeas 1.0.0 or greater') unless Puppet::Util::Package.versioncmp(augeas_version, '1.0.0') >= 0 + raise(Puppet::ParseError, 'augeas(): requires ruby-augeas 0.5.0 or greater') unless aug.methods.include?('text_store') + + result = nil + begin + aug.set('/input', content) + aug.text_store(lens, '/input', '/store') + unless aug.match("/augeas/text/store//error").empty? + error = aug.get("/augeas/text/store//error/message") + raise Puppet::ParseError, "augeas(): Failed to parse string with lens #{lens}: #{error}" + end + + # Apply changes + aug.context = '/store' + changes.each do |c| + r = aug.srun(c) + raise Puppet::ParseError, "augeas(): Failed to apply change to tree" unless r and r[0] >= 0 + end + unless aug.text_retrieve(lens, '/input', '/store', '/output') + error = aug.get("/augeas/text/store//error/message") + raise Puppet::ParseError, "augeas(): Failed to apply changes with lens #{lens}: #{error}" + end + result = aug.get("/output") + ensure + aug.close + end + return result + end +end + +# vim: set ts=2 sw=2 et : diff --git a/spec/spec.opts b/spec/spec.opts new file mode 100644 index 0000000..91cd642 --- /dev/null +++ b/spec/spec.opts @@ -0,0 +1,6 @@ +--format +s +--colour +--loadby +mtime +--backtrace diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb new file mode 100644 index 0000000..931d35c --- /dev/null +++ b/spec/spec_helper.rb @@ -0,0 +1,28 @@ +dir = File.expand_path(File.dirname(__FILE__)) +$LOAD_PATH.unshift File.join(dir, 'lib') + +# Don't want puppet getting the command line arguments for rake or autotest +ARGV.clear + +require 'puppet' +require 'facter' +require 'mocha' +gem 'rspec', '>=2.0.0' +require 'rspec/expectations' + +require 'puppetlabs_spec_helper/module_spec_helper' + +RSpec.configure do |config| + # FIXME REVISIT - We may want to delegate to Facter like we do in + # Puppet::PuppetSpecInitializer.initialize_via_testhelper(config) because + # this behavior is a duplication of the spec_helper in Facter. + config.before :each do + # Ensure that we don't accidentally cache facts and environment between + # test cases. This requires each example group to explicitly load the + # facts being exercised with something like + # Facter.collection.loader.load(:ipaddress) + Facter::Util::Loader.any_instance.stubs(:load_all) + Facter.clear + Facter.clear_messages + end +end diff --git a/spec/unit/puppet/parser/functions/augeas_spec.rb b/spec/unit/puppet/parser/functions/augeas_spec.rb new file mode 100644 index 0000000..9c48773 --- /dev/null +++ b/spec/unit/puppet/parser/functions/augeas_spec.rb @@ -0,0 +1,83 @@ +#! /usr/bin/env ruby -S rspec +require 'spec_helper' + +describe 'the augeas function' do + let(:scope) { PuppetlabsSpec::PuppetInternals.scope } + + it "should fail if the augeas feature is not present" do + Puppet.features.expects(:augeas?).returns(false) + expect { scope.function_augeas([]) }.to raise_error(Puppet::ParseError, /requires the augeas feature/) + end + + it "should exist" do + Puppet::Parser::Functions.function("augeas").should == "function_augeas" + end + + context "when passing wrong arguments" do + before :each do + Puppet.features.stubs(:augeas?).returns(true) + end + + it "should raise a ParseError if there are no arguments" do + expect { scope.function_augeas([]) }.to raise_error(Puppet::ParseError, /Wrong number of arguments/) + end + + it "should raise a ParseError if content is not a string" do + expect { scope.function_augeas([['foo'], 'Fstab.lns', []]) }.to raise_error(Puppet::ParseError, /content must be a string/) + end + + it "should raise a ParseError if lens is not a string" do + expect { scope.function_augeas(['foo', ['Fstab.lns'], []]) }.to raise_error(Puppet::ParseError, /lens must be a string/) + end + + it "should raise a ParseError if changes is not an array" do + expect { scope.function_augeas(['foo', 'Fstab.lns', 'changes']) }.to raise_error(Puppet::ParseError, /changes must be an array/) + end + end + + if Puppet.features.augeas? + context "when passing invalid input" do + it "should fail to parse input with lens" do + expect { scope.function_augeas(['foo', 'Fstab.lns', []]) }.to raise_error(Puppet::ParseError, /Failed to parse string with lens Fstab.lns:/) + end + end + + context "when passing illegal changes" do + it "should fail to apply illegal change" do + expect { scope.function_augeas(["\n", 'Fstab.lns', ['foo bar']]) }.to raise_error(Puppet::ParseError, /Failed to apply change to tree/) + end + end + + context "when generating an invalid tree" do + it "should fail to apply changes with wrong tree" do + expect { scope.function_augeas(["\n", 'Fstab.lns', ['set ./1/opt 3']]) }.to raise_error(Puppet::ParseError, /Failed to apply changes with lens Fstab.lns:/) + end + end + + context "when applying valid changes" do + it "should remove the 3rd option" do + result = scope.function_augeas(["proc /proc proc nodev,noexec,nosuid 0 0\n", 'Fstab.lns', ['rm ./1/opt[3]']]) + result.class.should == String + #result.should == "proc /proc proc nodev,noexec 0 0\n" + end + + it "should set a 4th option" do + result = scope.function_augeas(["proc /proc proc nodev,noexec,nosuid 0 0\n", 'Fstab.lns', ['ins opt after ./1/opt[last()]', 'set ./1/opt[last()] nofoo']]) + result.class.should == String + #result.should == "proc /proc proc nodev,noexec,nosuid,nofoo 0 0\n" + end + end + + context "when using old libs" do + it "should not work with Augeas prior to 1.0.0" do + Augeas.any_instance.expects(:get).with('/augeas/version').returns('0.10.0') + expect { scope.function_augeas(["\n", 'Fstab.lns', []]) }.to raise_error(Puppet::ParseError, /requires Augeas 1\.0\.0/) + end + + it "should not work with ruby-augeas prior to 0.5.0" do + Augeas.any_instance.expects(:methods).returns([]) + expect { scope.function_augeas(["\n", 'Fstab.lns', []]) }.to raise_error(Puppet::ParseError, /requires ruby-augeas 0\.5\.0/) + end + end + end +end -- cgit v1.2.3 From d446ba6d773ff767cc74e5caaab3ec9d743f0fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 10:23:27 +0100 Subject: Add .travis.yml --- .travis.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..6d7c0f8 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,15 @@ +language: ruby +rvm: + - 1.8.7 + - 1.9.3 + - 2.0.0 + - ruby-head +env: + - PUPPET_GEM_VERSION=">= 3.0.0" +matrix: + allow_failures: + - rvm: 2.0.0 + - rvm: ruby-head + include: + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7" -- cgit v1.2.3 From b7074ef4ef403428ee6e89a28ef4411d4a58fe07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 10:25:32 +0100 Subject: Update README --- README.markdown | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.markdown b/README.markdown index 9961912..8c97a7c 100644 --- a/README.markdown +++ b/README.markdown @@ -6,12 +6,13 @@ ## Description -This module does 3 things: +This module does 4 things: * lets you force the augeas version by defining $augeas_version, otherwise puppet will - only ensure the packages are present. + only ensure the packages are present; * lets you force the ruby library version by defining $augeas_ruby_version, otherwise puppet will - only ensure the libagueas-ruby version will be installed according to internal critera + only ensure the libaugeas-ruby version will be installed according to internal critera; +* provides an `augeas()` master-side function to manipulate strings using Augeas; * lets you deploy an augeas lens and any associated test files, running unit tests and not installing if they fail: Parameters: -- cgit v1.2.3 From 1081c18948d47f116b10c56581ea9d526a23492f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 10:27:37 +0100 Subject: Add Modulefile --- Modulefile | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Modulefile diff --git a/Modulefile b/Modulefile new file mode 100644 index 0000000..ba76e4b --- /dev/null +++ b/Modulefile @@ -0,0 +1,5 @@ +name 'camptocamp-augeas' +version '0.0.1' +license 'GPLv2' +summary 'Augeas Puppet module' +project_page 'https://github.com/camptocamp/puppet-augeas' -- cgit v1.2.3 From 32d4226c2c9235cfd36691f535dc817991e16d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 10:31:38 +0100 Subject: Improve README --- README.markdown | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/README.markdown b/README.markdown index 8c97a7c..b8ecbd3 100644 --- a/README.markdown +++ b/README.markdown @@ -2,18 +2,26 @@ ## Usage - include augeas +Simple usage: -## Description + include augeas -This module does 4 things: - -* lets you force the augeas version by defining $augeas_version, otherwise puppet will +### Classes + +The module provides an `augeas` class which installs and configures Augeas. + + +* lets you force the augeas version by defining `$augeas\_version`, otherwise puppet will only ensure the packages are present; -* lets you force the ruby library version by defining $augeas_ruby_version, otherwise puppet will +* lets you force the ruby library version by defining `$augeas\_ruby\_version`, otherwise puppet will only ensure the libaugeas-ruby version will be installed according to internal critera; * provides an `augeas()` master-side function to manipulate strings using Augeas; -* lets you deploy an augeas lens and any associated test files, running unit tests and not installing if they fail: + +### Definitions + +#### `augeas::lens` + +The `augeas::lens` definition allows you to deploy an Augeas lens and any associated test files, running unit tests and not installing if they fail: Parameters: @@ -30,3 +38,21 @@ Example usage: test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', stock_since => '1.0.0', } + +### Functions + +#### `augeas()` + +Modifies a string using Augeas. + +*Example:* + + augeas("proc /proc proc nodev,noexec,nosuid 0 0\n", 'Fstab.lns', ['rm ./1/opt[3]']) + +Would result in: + + "proc /proc proc nodev,noexec 0 0\n" + + +- *Type*: rvalue + -- cgit v1.2.3 From 8df48d003efcf055b27593091fb981c5c193bc6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 10:32:15 +0100 Subject: Do not escape _ in README --- README.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index b8ecbd3..e41c137 100644 --- a/README.markdown +++ b/README.markdown @@ -11,9 +11,9 @@ Simple usage: The module provides an `augeas` class which installs and configures Augeas. -* lets you force the augeas version by defining `$augeas\_version`, otherwise puppet will +* lets you force the augeas version by defining `$augeas_version`, otherwise puppet will only ensure the packages are present; -* lets you force the ruby library version by defining `$augeas\_ruby\_version`, otherwise puppet will +* lets you force the ruby library version by defining `$augeas_ruby_version`, otherwise puppet will only ensure the libaugeas-ruby version will be installed according to internal critera; * provides an `augeas()` master-side function to manipulate strings using Augeas; -- cgit v1.2.3 From d404a31e789d9e2d90aa1238374a11fd3d3f565b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 11:17:16 +0100 Subject: Reorganize classes --- manifests/base.pp | 42 ------------------------------------------ manifests/debian.pp | 18 ------------------ manifests/files.pp | 32 ++++++++++++++++++++++++++++++++ manifests/init.pp | 15 +++++++++------ manifests/packages.pp | 21 +++++++++++++++++++++ manifests/params.pp | 20 ++++++++++++++++++++ manifests/redhat.pp | 13 ------------- 7 files changed, 82 insertions(+), 79 deletions(-) delete mode 100644 manifests/base.pp delete mode 100644 manifests/debian.pp create mode 100644 manifests/files.pp create mode 100644 manifests/packages.pp create mode 100644 manifests/params.pp delete mode 100644 manifests/redhat.pp diff --git a/manifests/base.pp b/manifests/base.pp deleted file mode 100644 index 37ad0e2..0000000 --- a/manifests/base.pp +++ /dev/null @@ -1,42 +0,0 @@ -class augeas::base { - $lens_dir = '/usr/share/augeas/lenses' - - $version = $augeas_version ? { - '' => 'present', - default => $augeas_version - } - - $rubylib_version = $augeas_ruby_version ? { - '' => 'present', - default => $augeas_ruby_version - } - - # ensure no file not managed by puppet ends up in there. - file { $lens_dir: - ensure => directory, - purge => true, - force => true, - recurse => true, - recurselimit => 1, - mode => '0644', - owner => 'root', - group => 'root', - } - - file { "${lens_dir}/dist": - ensure => directory, - purge => false, - mode => '0644', - owner => 'root', - group => 'root', - } - - file { "${lens_dir}/tests": - ensure => directory, - purge => true, - force => true, - mode => '0644', - owner => 'root', - group => 'root', - } -} diff --git a/manifests/debian.pp b/manifests/debian.pp deleted file mode 100644 index bc2e3eb..0000000 --- a/manifests/debian.pp +++ /dev/null @@ -1,18 +0,0 @@ -class augeas::debian inherits augeas::base { - - package { - ['augeas-lenses', 'libaugeas0', 'augeas-tools']: - ensure => $augeas::base::version, - before => File['/usr/share/augeas/lenses'], - } - - $augeas_ruby = $::lsbdistcodename ? { - 'wheezy' => 'libaugeas-ruby1.9.1', - default => 'libaugeas-ruby1.8', - } - - package {$augeas_ruby: - ensure => $augeas::base::rubylib_version, - } - -} diff --git a/manifests/files.pp b/manifests/files.pp new file mode 100644 index 0000000..01427ad --- /dev/null +++ b/manifests/files.pp @@ -0,0 +1,32 @@ +class augeas::files { + $lens_dir = $augeas::lens_dir + + # ensure no file not managed by puppet ends up in there. + file { $lens_dir: + ensure => directory, + purge => true, + force => true, + recurse => true, + recurselimit => 1, + mode => '0644', + owner => 'root', + group => 'root', + } + + file { "${lens_dir}/dist": + ensure => directory, + purge => false, + mode => '0644', + owner => 'root', + group => 'root', + } + + file { "${lens_dir}/tests": + ensure => directory, + purge => true, + force => true, + mode => '0644', + owner => 'root', + group => 'root', + } +} diff --git a/manifests/init.pp b/manifests/init.pp index e82e21c..9b8ba42 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,7 +1,10 @@ -class augeas { - case $::operatingsystem { - /RedHat|CentOS|Fedora/: { include augeas::redhat } - /Debian|Ubuntu|kFreeBSD/: { include augeas::debian } - default: { include augeas::base } - } +class augeas ( + $version = $augeas_version, + $ruby_version = $augeas_ruby_version, + $lens_dir = $augeas::params::lens_dir, +) inherits augeas::params { + + class {'::augeas::packages': } -> + class {'::augeas::files': } -> + Class['augeas'] } diff --git a/manifests/packages.pp b/manifests/packages.pp new file mode 100644 index 0000000..1192933 --- /dev/null +++ b/manifests/packages.pp @@ -0,0 +1,21 @@ +class augeas::packages { + # Augeas packages + $augeas_ensure = $augeas::version ? { + '' => 'present', + default => $augeas::version + } + + package { $augeas::params::pkgs: + ensure => $augeas_ensure, + } + + # Ruby package + $ruby_ensure = $augeas::ruby_version ? { + '' => 'present', + default => $augeas::ruby_version + } + + package { $augeas::params::ruby_pkg: + ensure => $ruby_ensure, + } +} diff --git a/manifests/params.pp b/manifests/params.pp new file mode 100644 index 0000000..e7120af --- /dev/null +++ b/manifests/params.pp @@ -0,0 +1,20 @@ +class augeas::params { + $lens_dir = '/usr/share/augeas/lenses' + + case $::osfamily { + 'RedHat': { + $ruby_pkg = 'ruby-augeas' + $augeas_pkgs = ['augeas', 'augeas-libs'] + } + + 'Debian': { + $ruby_pkg = $::lsbdistcodename ? { + 'wheezy' => 'libaugeas-ruby1.9.1', + default => 'libaugeas-ruby1.8', + } + $augeas_pkgs = ['augeas-lenses', 'libaugeas0', 'augeas-tools'] + } + + default: { fail("Unsupported OS family: ${::osfamily}") } + } +} diff --git a/manifests/redhat.pp b/manifests/redhat.pp deleted file mode 100644 index 1e95728..0000000 --- a/manifests/redhat.pp +++ /dev/null @@ -1,13 +0,0 @@ -class augeas::redhat inherits augeas::base { - - package { - ['augeas', 'augeas-libs']: - ensure => $augeas::base::version, - before => File['/usr/share/augeas/lenses'], - } - - package { 'ruby-augeas': - ensure => $augeas::base::rubylib_version, - } - -} -- cgit v1.2.3 From 0b807da215eadc363e9c9f67d5da37c034cf73dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 11:21:59 +0100 Subject: Fix augeas::lens with new module organization --- Rakefile | 13 ++++++++++++- manifests/lens.pp | 12 +++++++----- spec/spec_helper.rb | 6 ++++++ 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/Rakefile b/Rakefile index 14f1c24..e2eca5a 100644 --- a/Rakefile +++ b/Rakefile @@ -1,2 +1,13 @@ -require 'rubygems' +require 'rake' + +require 'rspec/core/rake_task' +require 'puppet-lint/tasks/puppet-lint' require 'puppetlabs_spec_helper/rake_tasks' + +RSpec::Core::RakeTask.new(:spec) do |t| + t.pattern = 'spec/*/*_spec.rb' + t.rspec_opts = ['-c'] +end + +task :default => [:spec, :lint] + diff --git a/manifests/lens.pp b/manifests/lens.pp index 55dc9ae..db65d11 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -31,10 +31,12 @@ define augeas::lens ( ) { if (!$stock_since or !versioncmp($::augeasversion, $stock_since)) { - include augeas::base + if !declared(Class['augeas']) { + fail('You must declare the augeas class before using augeas::lens') + } - $lens_dest = "${augeas::base::lens_dir}/${name}.aug" - $test_dest = "${augeas::base::lens_dir}/tests/test_${name}.aug" + $lens_dest = "${augeas::lens_dir}/${name}.aug" + $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" file { $lens_dest: ensure => $ensure, @@ -42,7 +44,7 @@ define augeas::lens ( } exec { "Typecheck lens ${name}": - command => "augparse -I ${augeas::base::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", + command => "augparse -I ${augeas::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", refreshonly => true, subscribe => File[$lens_dest], } @@ -55,7 +57,7 @@ define augeas::lens ( } exec { "Test lens ${name}": - command => "augparse -I ${augeas::base::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", + command => "augparse -I ${augeas::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", refreshonly => true, subscribe => File[$lens_dest, $test_dest], } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 931d35c..3106389 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -11,6 +11,9 @@ gem 'rspec', '>=2.0.0' require 'rspec/expectations' require 'puppetlabs_spec_helper/module_spec_helper' +require 'rspec-puppet' + +fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures')) RSpec.configure do |config| # FIXME REVISIT - We may want to delegate to Facter like we do in @@ -25,4 +28,7 @@ RSpec.configure do |config| Facter.clear Facter.clear_messages end + config.module_path = File.join(fixture_path, 'modules') + config.manifest_dir = File.join(fixture_path, 'manifests') + config.color_enabled = true end -- cgit v1.2.3 From 9ecff9bf6ea2606e70e0244bcd7ed1a466c87e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 11:24:14 +0100 Subject: Use defined instead of declared --- manifests/lens.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/lens.pp b/manifests/lens.pp index db65d11..f4d2ba2 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -31,7 +31,7 @@ define augeas::lens ( ) { if (!$stock_since or !versioncmp($::augeasversion, $stock_since)) { - if !declared(Class['augeas']) { + if !defined(Class['augeas']) { fail('You must declare the augeas class before using augeas::lens') } -- cgit v1.2.3 From 3dc0352a5b6a05d9235c82b2ef1209549cf5a72d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 11:27:55 +0100 Subject: Add Gemfile --- Gemfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Gemfile diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..2ca44e7 --- /dev/null +++ b/Gemfile @@ -0,0 +1,13 @@ +source :rubygems + +if ENV.key?('PUPPET_VERSION') + puppetversion = "= #{ENV['PUPPET_VERSION']}" +else + puppetversion = ['>= 2.7'] +end + +gem 'rake' +gem 'puppet-lint' +gem 'rspec-puppet' +gem 'puppet', puppetversion +gem 'puppetlabs_spec_helper' -- cgit v1.2.3 From d20fee71946820d13dfa6c788590011c9de6a320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 11:30:09 +0100 Subject: Fix ::params::pkgs as ::params::augeas_pkgs --- manifests/packages.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/packages.pp b/manifests/packages.pp index 1192933..39c1c23 100644 --- a/manifests/packages.pp +++ b/manifests/packages.pp @@ -5,7 +5,7 @@ class augeas::packages { default => $augeas::version } - package { $augeas::params::pkgs: + package { $augeas::params::augeas_pkgs: ensure => $augeas_ensure, } -- cgit v1.2.3 From 616b59bead6a57f71b4b4e59aaf080cd130ab250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 14 Mar 2013 09:42:08 +0100 Subject: Abstract package name for ruby-augeas, define dependency for all Augeas resources --- manifests/init.pp | 2 ++ manifests/packages.pp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 9b8ba42..6374955 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -7,4 +7,6 @@ class augeas ( class {'::augeas::packages': } -> class {'::augeas::files': } -> Class['augeas'] + + Package['ruby-augeas'] -> Augeas <| |> } diff --git a/manifests/packages.pp b/manifests/packages.pp index 39c1c23..e41f800 100644 --- a/manifests/packages.pp +++ b/manifests/packages.pp @@ -15,7 +15,8 @@ class augeas::packages { default => $augeas::ruby_version } - package { $augeas::params::ruby_pkg: + package { 'ruby-augeas': ensure => $ruby_ensure, + name => $augeas::params::ruby_pkg, } } -- cgit v1.2.3 From b9de77d2043341a6dd60c91daa26b6434c988f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 15 Mar 2013 19:02:04 +0100 Subject: Improve rspec options --- Rakefile | 5 ----- spec/.rspec | 6 ++++++ spec/spec.opts | 6 ------ spec/spec_helper.rb | 1 - 4 files changed, 6 insertions(+), 12 deletions(-) create mode 100644 spec/.rspec delete mode 100644 spec/spec.opts diff --git a/Rakefile b/Rakefile index e2eca5a..2f92f39 100644 --- a/Rakefile +++ b/Rakefile @@ -4,10 +4,5 @@ require 'rspec/core/rake_task' require 'puppet-lint/tasks/puppet-lint' require 'puppetlabs_spec_helper/rake_tasks' -RSpec::Core::RakeTask.new(:spec) do |t| - t.pattern = 'spec/*/*_spec.rb' - t.rspec_opts = ['-c'] -end - task :default => [:spec, :lint] diff --git a/spec/.rspec b/spec/.rspec new file mode 100644 index 0000000..91cd642 --- /dev/null +++ b/spec/.rspec @@ -0,0 +1,6 @@ +--format +s +--colour +--loadby +mtime +--backtrace diff --git a/spec/spec.opts b/spec/spec.opts deleted file mode 100644 index 91cd642..0000000 --- a/spec/spec.opts +++ /dev/null @@ -1,6 +0,0 @@ ---format -s ---colour ---loadby -mtime ---backtrace diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3106389..d63accd 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -30,5 +30,4 @@ RSpec.configure do |config| end config.module_path = File.join(fixture_path, 'modules') config.manifest_dir = File.join(fixture_path, 'manifests') - config.color_enabled = true end -- cgit v1.2.3 From a534f53b803ba46dd7ea2b55312949af688f850b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 15 Mar 2013 20:39:16 +0100 Subject: Add specs for hosts --- spec/fixtures/manifests/site.pp | 23 ++++++++ spec/hosts/simple_debian_squeeze_spec.rb | 91 ++++++++++++++++++++++++++++++++ spec/hosts/simple_debian_wheezy_spec.rb | 91 ++++++++++++++++++++++++++++++++ spec/hosts/simple_redhat_spec.rb | 82 ++++++++++++++++++++++++++++ spec/hosts/with_lens_noaugeas_spec.rb | 9 ++++ spec/hosts/with_lens_spec.rb | 64 ++++++++++++++++++++++ spec/hosts/wrong_os_spec.rb | 11 ++++ 7 files changed, 371 insertions(+) create mode 100644 spec/fixtures/manifests/site.pp create mode 100644 spec/hosts/simple_debian_squeeze_spec.rb create mode 100644 spec/hosts/simple_debian_wheezy_spec.rb create mode 100644 spec/hosts/simple_redhat_spec.rb create mode 100644 spec/hosts/with_lens_noaugeas_spec.rb create mode 100644 spec/hosts/with_lens_spec.rb create mode 100644 spec/hosts/wrong_os_spec.rb diff --git a/spec/fixtures/manifests/site.pp b/spec/fixtures/manifests/site.pp new file mode 100644 index 0000000..fb803e5 --- /dev/null +++ b/spec/fixtures/manifests/site.pp @@ -0,0 +1,23 @@ +# simple_* and wrong_os tests +node default { + class { '::augeas': + version => $::augeas_version, + ruby_version => $::augeas_ruby_version, + lens_dir => $::augeas_lens_dir, + } +} + +node 'with_lens_noaugeas' { + ::augeas::lens { 'foo': + lens_source => '/tmp/foo.aug', + } +} + +node 'with_lens' { + include ::augeas + ::augeas::lens { 'foo': + lens_source => $::augeas_lens_source, + test_source => $::augeas_test_source, + stock_since => $::augeas_stock_since, + } +} diff --git a/spec/hosts/simple_debian_squeeze_spec.rb b/spec/hosts/simple_debian_squeeze_spec.rb new file mode 100644 index 0000000..4b41105 --- /dev/null +++ b/spec/hosts/simple_debian_squeeze_spec.rb @@ -0,0 +1,91 @@ +require 'spec_helper' + +describe 'simple_debian_squeeze' do + let (:facts) { { + :osfamily => 'Debian', + :lsbdistcodename => 'squeeze', + } } + + context 'when versions are not specified' do + it { should contain_package('libaugeas0').with( + :ensure => 'present' + ) } + it { should contain_package('augeas-tools').with( + :ensure => 'present' + ) } + it { should contain_package('augeas-lenses').with( + :ensure => 'present' + ) } + it { should contain_package('ruby-augeas').with( + :ensure => 'present', + :name => 'libaugeas-ruby1.8' + ) } + end + + context 'when versions are specified' do + let (:facts) { { + :osfamily => 'Debian', + :lsbdistcodename => 'squeeze', + :augeas_version => '1.2.3', + :augeas_ruby_version => '3.2.1', + } } + + it { should contain_package('libaugeas0').with( + :ensure => '1.2.3' + ) } + it { should contain_package('augeas-tools').with( + :ensure => '1.2.3' + ) } + it { should contain_package('augeas-lenses').with( + :ensure => '1.2.3' + ) } + it { should contain_package('ruby-augeas').with( + :ensure => '3.2.1', + :name => 'libaugeas-ruby1.8' + ) } + end + + context 'with standard lens_dir' do + it { should contain_file('/usr/share/augeas/lenses').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true', + :recurse => 'true', + :recurselimit => 1 + ) } + it { should contain_file('/usr/share/augeas/lenses/dist').with( + :ensure => 'directory', + :purge => 'false' + ) } + it { should contain_file('/usr/share/augeas/lenses/tests').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true' + ).without(:recurse) } + end + + context 'with a non standard lens_dir' do + let (:facts) { { + :osfamily => 'Debian', + :lsbdistcodename => 'squeeze', + :augeas_lens_dir => '/opt/augeas/lenses' + } } + + it { should contain_file('/opt/augeas/lenses').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true', + :recurse => 'true', + :recurselimit => 1 + ) } + it { should contain_file('/opt/augeas/lenses/dist').with( + :ensure => 'directory', + :purge => 'false' + ) } + it { should contain_file('/opt/augeas/lenses/tests').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true' + ).without(:recurse) } + end +end diff --git a/spec/hosts/simple_debian_wheezy_spec.rb b/spec/hosts/simple_debian_wheezy_spec.rb new file mode 100644 index 0000000..23c0d1d --- /dev/null +++ b/spec/hosts/simple_debian_wheezy_spec.rb @@ -0,0 +1,91 @@ +require 'spec_helper' + +describe 'simple_debian_squeeze' do + let (:facts) { { + :osfamily => 'Debian', + :lsbdistcodename => 'wheezy', + } } + + context 'when versions are not specified' do + it { should contain_package('libaugeas0').with( + :ensure => 'present' + ) } + it { should contain_package('augeas-tools').with( + :ensure => 'present' + ) } + it { should contain_package('augeas-lenses').with( + :ensure => 'present' + ) } + it { should contain_package('ruby-augeas').with( + :ensure => 'present', + :name => 'libaugeas-ruby1.9.1' + ) } + end + + context 'when versions are specified' do + let (:facts) { { + :osfamily => 'Debian', + :lsbdistcodename => 'wheezy', + :augeas_version => '1.2.3', + :augeas_ruby_version => '3.2.1', + } } + + it { should contain_package('libaugeas0').with( + :ensure => '1.2.3' + ) } + it { should contain_package('augeas-tools').with( + :ensure => '1.2.3' + ) } + it { should contain_package('augeas-lenses').with( + :ensure => '1.2.3' + ) } + it { should contain_package('ruby-augeas').with( + :ensure => '3.2.1', + :name => 'libaugeas-ruby1.9.1' + ) } + end + + context 'with standard lens_dir' do + it { should contain_file('/usr/share/augeas/lenses').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true', + :recurse => 'true', + :recurselimit => 1 + ) } + it { should contain_file('/usr/share/augeas/lenses/dist').with( + :ensure => 'directory', + :purge => 'false' + ) } + it { should contain_file('/usr/share/augeas/lenses/tests').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true' + ).without(:recurse) } + end + + context 'with a non standard lens_dir' do + let (:facts) { { + :osfamily => 'Debian', + :lsbdistcodename => 'wheezy', + :augeas_lens_dir => '/opt/augeas/lenses' + } } + + it { should contain_file('/opt/augeas/lenses').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true', + :recurse => 'true', + :recurselimit => 1 + ) } + it { should contain_file('/opt/augeas/lenses/dist').with( + :ensure => 'directory', + :purge => 'false' + ) } + it { should contain_file('/opt/augeas/lenses/tests').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true' + ).without(:recurse) } + end +end diff --git a/spec/hosts/simple_redhat_spec.rb b/spec/hosts/simple_redhat_spec.rb new file mode 100644 index 0000000..5045377 --- /dev/null +++ b/spec/hosts/simple_redhat_spec.rb @@ -0,0 +1,82 @@ +require 'spec_helper' + +describe 'simple_redhat' do + let (:facts) { { + :osfamily => 'RedHat', + } } + + context 'when versions are not specified' do + it { should contain_package('augeas').with( + :ensure => 'present' + ) } + it { should contain_package('augeas-libs').with( + :ensure => 'present' + ) } + it { should contain_package('ruby-augeas').with( + :ensure => 'present', + :name => 'ruby-augeas' + ) } + end + + context 'when versions are specified' do + let (:facts) { { + :osfamily => 'RedHat', + :augeas_version => '1.2.3', + :augeas_ruby_version => '3.2.1', + } } + + it { should contain_package('augeas').with( + :ensure => '1.2.3' + ) } + it { should contain_package('augeas-libs').with( + :ensure => '1.2.3' + ) } + it { should contain_package('ruby-augeas').with( + :ensure => '3.2.1', + :name => 'ruby-augeas' + ) } + end + + context 'with standard lens_dir' do + it { should contain_file('/usr/share/augeas/lenses').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true', + :recurse => 'true', + :recurselimit => 1 + ) } + it { should contain_file('/usr/share/augeas/lenses/dist').with( + :ensure => 'directory', + :purge => 'false' + ) } + it { should contain_file('/usr/share/augeas/lenses/tests').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true' + ).without(:recurse) } + end + + context 'with a non standard lens_dir' do + let (:facts) { { + :osfamily => 'RedHat', + :augeas_lens_dir => '/opt/augeas/lenses' + } } + + it { should contain_file('/opt/augeas/lenses').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true', + :recurse => 'true', + :recurselimit => 1 + ) } + it { should contain_file('/opt/augeas/lenses/dist').with( + :ensure => 'directory', + :purge => 'false' + ) } + it { should contain_file('/opt/augeas/lenses/tests').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true' + ).without(:recurse) } + end +end diff --git a/spec/hosts/with_lens_noaugeas_spec.rb b/spec/hosts/with_lens_noaugeas_spec.rb new file mode 100644 index 0000000..b26563b --- /dev/null +++ b/spec/hosts/with_lens_noaugeas_spec.rb @@ -0,0 +1,9 @@ +require 'spec_helper' + +describe 'with_lens_noaugeas' do + it 'should error' do + expect { + should contain_file('/usr/share/augeas/lenses/foo.aug') + }.to raise_error(Puppet::Error, /You must declare the augeas class/) + end +end diff --git a/spec/hosts/with_lens_spec.rb b/spec/hosts/with_lens_spec.rb new file mode 100644 index 0000000..125d786 --- /dev/null +++ b/spec/hosts/with_lens_spec.rb @@ -0,0 +1,64 @@ +require 'spec_helper' + +describe 'with_lens' do + let (:facts) { { + :osfamily => 'RedHat', + } } + + context 'when no lens_source is passed' do + it 'should error' do + expect { + should contain_file('/usr/share/augeas/lenses/foo.aug') + }.to raise_error(Puppet::Error, /Must pass lens_source/) + end + end + + context 'when lens_source is passed' do + let (:facts) { { + :osfamily => 'RedHat', + :augeas_lens_source => '/tmp/foo.aug', + } } + + it { should contain_file('/usr/share/augeas/lenses/foo.aug') } + it { should contain_exec('Typecheck lens foo') } + it { should_not contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } + it { should_not contain_exec('Test lens foo') } + end + + context 'when lens_source and test_source are passed' do + let (:facts) { { + :osfamily => 'RedHat', + :augeas_lens_source => '/tmp/foo.aug', + :augeas_test_source => '/tmp/test_foo.aug', + } } + + it { should contain_file('/usr/share/augeas/lenses/foo.aug') } + it { should contain_exec('Typecheck lens foo') } + it { should contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } + it { should contain_exec('Test lens foo') } + end + + context 'when stock_since is passed and augeas is older' do + let (:facts) { { + :osfamily => 'RedHat', + :augeas_lens_source => '/tmp/foo.aug', + :augeas_stock_since => '1.2.3', + :augeasversion => '1.0.0', + } } + + it { should contain_file('/usr/share/augeas/lenses/foo.aug') } + it { should contain_exec('Typecheck lens foo') } + end + + context 'when stock_since is passed and augeas is newer' do + let (:facts) { { + :osfamily => 'RedHat', + :augeas_lens_source => '/tmp/foo.aug', + :augeas_stock_since => '1.2.3', + :augeasversion => '1.5.0', + } } + + it { should_not contain_file('/usr/share/augeas/lenses/foo.aug') } + it { should_not contain_exec('Typecheck lens foo') } + end +end diff --git a/spec/hosts/wrong_os_spec.rb b/spec/hosts/wrong_os_spec.rb new file mode 100644 index 0000000..5704ded --- /dev/null +++ b/spec/hosts/wrong_os_spec.rb @@ -0,0 +1,11 @@ +require 'spec_helper' + +describe 'wrong_os' do + let (:facts) { { + :osfamily => 'MS-DOS' + } } + + it 'should fail' do + expect { should contain_package('ruby-augeas') }.to raise_error(Puppet::Error, /Unsupported OS family/) + end +end -- cgit v1.2.3 From 461deeeebf4336fe485f566083813e9d1ac3f9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 15 Mar 2013 20:39:38 +0100 Subject: Fix augeas::lens --- manifests/lens.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/lens.pp b/manifests/lens.pp index f4d2ba2..723f217 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -29,11 +29,11 @@ define augeas::lens ( $test_source=false, $stock_since=false, ) { + if !defined(Class['augeas']) { + fail('You must declare the augeas class before using augeas::lens') + } - if (!$stock_since or !versioncmp($::augeasversion, $stock_since)) { - if !defined(Class['augeas']) { - fail('You must declare the augeas class before using augeas::lens') - } + if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" -- cgit v1.2.3 From e0d04d6a8c0373edeeedfc9680973926ecc142c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 15 Mar 2013 20:46:16 +0100 Subject: Fix .fixtures.yml --- .fixtures.yml | 3 +++ Gemfile | 13 ------------- 2 files changed, 3 insertions(+), 13 deletions(-) create mode 100644 .fixtures.yml delete mode 100644 Gemfile diff --git a/.fixtures.yml b/.fixtures.yml new file mode 100644 index 0000000..bf1a633 --- /dev/null +++ b/.fixtures.yml @@ -0,0 +1,3 @@ +fixtures: + symlinks: + "collectd": "#{source_dir}" diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 2ca44e7..0000000 --- a/Gemfile +++ /dev/null @@ -1,13 +0,0 @@ -source :rubygems - -if ENV.key?('PUPPET_VERSION') - puppetversion = "= #{ENV['PUPPET_VERSION']}" -else - puppetversion = ['>= 2.7'] -end - -gem 'rake' -gem 'puppet-lint' -gem 'rspec-puppet' -gem 'puppet', puppetversion -gem 'puppetlabs_spec_helper' -- cgit v1.2.3 From 90b15adca74b8d3f3da67f2eec720b4a58faee82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 15 Mar 2013 20:47:44 +0100 Subject: Simplify Rakefile --- Rakefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Rakefile b/Rakefile index 2f92f39..4d31fec 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,3 @@ -require 'rake' - -require 'rspec/core/rake_task' require 'puppet-lint/tasks/puppet-lint' require 'puppetlabs_spec_helper/rake_tasks' -- cgit v1.2.3 From d51dc4b3501e60c4480659a234884a14eabd7696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 15 Mar 2013 20:49:03 +0100 Subject: Simplify spec_helper --- spec/spec_helper.rb | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d63accd..5e28e1f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,33 +1,14 @@ -dir = File.expand_path(File.dirname(__FILE__)) -$LOAD_PATH.unshift File.join(dir, 'lib') - -# Don't want puppet getting the command line arguments for rake or autotest -ARGV.clear - -require 'puppet' -require 'facter' require 'mocha' -gem 'rspec', '>=2.0.0' -require 'rspec/expectations' - -require 'puppetlabs_spec_helper/module_spec_helper' require 'rspec-puppet' fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures')) -RSpec.configure do |config| - # FIXME REVISIT - We may want to delegate to Facter like we do in - # Puppet::PuppetSpecInitializer.initialize_via_testhelper(config) because - # this behavior is a duplication of the spec_helper in Facter. - config.before :each do - # Ensure that we don't accidentally cache facts and environment between - # test cases. This requires each example group to explicitly load the - # facts being exercised with something like - # Facter.collection.loader.load(:ipaddress) - Facter::Util::Loader.any_instance.stubs(:load_all) - Facter.clear - Facter.clear_messages - end - config.module_path = File.join(fixture_path, 'modules') - config.manifest_dir = File.join(fixture_path, 'manifests') +RSpec.configure do |c| + c.module_path = File.join(fixture_path, 'modules') + c.manifest_dir = File.join(fixture_path, 'manifests') end + + +dir = File.expand_path(File.dirname(__FILE__)) +$LOAD_PATH.unshift File.join(dir, 'lib') + -- cgit v1.2.3 From 48d46a0f7deb0b472d604c7763181f5c8f678cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 15 Mar 2013 20:49:46 +0100 Subject: Readd Gemfile --- Gemfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Gemfile diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..2ca44e7 --- /dev/null +++ b/Gemfile @@ -0,0 +1,13 @@ +source :rubygems + +if ENV.key?('PUPPET_VERSION') + puppetversion = "= #{ENV['PUPPET_VERSION']}" +else + puppetversion = ['>= 2.7'] +end + +gem 'rake' +gem 'puppet-lint' +gem 'rspec-puppet' +gem 'puppet', puppetversion +gem 'puppetlabs_spec_helper' -- cgit v1.2.3 From 9fa9a960f520d108be6f0f42630299a4e14c766f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 15 Mar 2013 21:32:43 +0100 Subject: Fix .fixtures.yml with augeas --- .fixtures.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.fixtures.yml b/.fixtures.yml index bf1a633..d8386fa 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,3 +1,3 @@ fixtures: symlinks: - "collectd": "#{source_dir}" + "augeas": "#{source_dir}" -- cgit v1.2.3 From a7c41208cc4a6e9b543487bf606b551307fdc05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 15 Mar 2013 21:53:17 +0100 Subject: Add spec/defines/augeas_lens_spec.rb --- spec/defines/augeas_lens_spec.rb | 68 ++++++++++++++++++++++++++++++++++++++++ spec/hosts/with_lens_spec.rb | 8 ----- 2 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 spec/defines/augeas_lens_spec.rb diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb new file mode 100644 index 0000000..57d30b6 --- /dev/null +++ b/spec/defines/augeas_lens_spec.rb @@ -0,0 +1,68 @@ +require 'spec_helper' + +describe 'augeas::lens' do + let (:title) { 'foo' } + let (:facts) { { + :osfamily => 'RedHat', + } } + context 'when no lens_source is passed' do + it 'should error' do + expect { + should contain_file('/usr/share/augeas/lenses/foo.aug') + }.to raise_error(Puppet::Error, /Must pass lens_source/) + end + end + + context 'when lens_source is passed' do + let (:params) { { + :lens_source => '/tmp/foo.aug', + } } + + it { should contain_file('/usr/share/augeas/lenses/foo.aug') } + it { should contain_exec('Typecheck lens foo') } + it { should_not contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } + it { should_not contain_exec('Test lens foo') } + end + + context 'when lens_source and test_source are passed' do + let (:params) { { + :lens_source => '/tmp/foo.aug', + :test_source => '/tmp/test_foo.aug', + } } + + it { should contain_file('/usr/share/augeas/lenses/foo.aug') } + it { should contain_exec('Typecheck lens foo') } + it { should contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } + it { should contain_exec('Test lens foo') } + end + + context 'when stock_since is passed and augeas is older' do + let (:params) { { + :lens_source => '/tmp/foo.aug', + :stock_since => '1.2.3', + } } + + let (:facts) { { + :osfamily => 'RedHat', + :augeasversion => '1.0.0', + } } + + it { should contain_file('/usr/share/augeas/lenses/foo.aug') } + it { should contain_exec('Typecheck lens foo') } + end + + context 'when stock_since is passed and augeas is newer' do + let (:params) { { + :lens_source => '/tmp/foo.aug', + :stock_since => '1.2.3', + } } + + let (:facts) { { + :osfamily => 'RedHat', + :augeasversion => '1.5.0', + } } + + it { should_not contain_file('/usr/share/augeas/lenses/foo.aug') } + it { should_not contain_exec('Typecheck lens foo') } + end +end diff --git a/spec/hosts/with_lens_spec.rb b/spec/hosts/with_lens_spec.rb index 125d786..d7a5249 100644 --- a/spec/hosts/with_lens_spec.rb +++ b/spec/hosts/with_lens_spec.rb @@ -5,14 +5,6 @@ describe 'with_lens' do :osfamily => 'RedHat', } } - context 'when no lens_source is passed' do - it 'should error' do - expect { - should contain_file('/usr/share/augeas/lenses/foo.aug') - }.to raise_error(Puppet::Error, /Must pass lens_source/) - end - end - context 'when lens_source is passed' do let (:facts) { { :osfamily => 'RedHat', -- cgit v1.2.3 From 77a9b7e32e42f124b1293f172c0ceba81ff2dd59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 18 Mar 2013 11:57:30 +0100 Subject: Use validate_re to check $augeas::lens_dir in augeas::lens --- .fixtures.yml | 2 ++ manifests/lens.pp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.fixtures.yml b/.fixtures.yml index d8386fa..f074a0f 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,3 +1,5 @@ fixtures: + repositories: + "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git" symlinks: "augeas": "#{source_dir}" diff --git a/manifests/lens.pp b/manifests/lens.pp index 723f217..def3768 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -35,6 +35,8 @@ define augeas::lens ( if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { + validate_re($augeas::lens_dir, '/.*', '$augeas::lens_dir must be a valid path') + $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" -- cgit v1.2.3 From bcd9746bff9a54016077a93e359b66f1e104b926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 18 Mar 2013 11:57:30 +0100 Subject: Use validate_re to check $augeas::lens_dir in augeas::lens --- .fixtures.yml | 2 ++ manifests/lens.pp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.fixtures.yml b/.fixtures.yml index d8386fa..f074a0f 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,3 +1,5 @@ fixtures: + repositories: + "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git" symlinks: "augeas": "#{source_dir}" diff --git a/manifests/lens.pp b/manifests/lens.pp index 723f217..def3768 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -35,6 +35,8 @@ define augeas::lens ( if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { + validate_re($augeas::lens_dir, '/.*', '$augeas::lens_dir must be a valid path') + $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" -- cgit v1.2.3 From ded6f67c399d31d6b3d6d5d7295bfad0cf786102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 18 Mar 2013 14:12:16 +0100 Subject: Make validate_re message clearer in augeas::lens --- manifests/lens.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/lens.pp b/manifests/lens.pp index def3768..06db221 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -35,7 +35,7 @@ define augeas::lens ( if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { - validate_re($augeas::lens_dir, '/.*', '$augeas::lens_dir must be a valid path') + validate_re($augeas::lens_dir, '/.*', "'${augeas::lens_dir}' is not a valid path for lens ${name}") $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" -- cgit v1.2.3 From 0082bbaffee02aae0aebe3093d24a75daa50d764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 21 Mar 2013 16:53:23 +0100 Subject: Simplify spec_helper.rb --- spec/spec_helper.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 5e28e1f..4edc964 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,14 +1,4 @@ require 'mocha' require 'rspec-puppet' - -fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures')) - -RSpec.configure do |c| - c.module_path = File.join(fixture_path, 'modules') - c.manifest_dir = File.join(fixture_path, 'manifests') -end - - -dir = File.expand_path(File.dirname(__FILE__)) -$LOAD_PATH.unshift File.join(dir, 'lib') +require 'puppetlabs_spec_helper/module_spec_helper' -- cgit v1.2.3 From f21de867507355d06080b5d6fd087cf8265969ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 21 Mar 2013 17:15:33 +0100 Subject: Ensure puppetlabs_spec_helper >= 0.4.0 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2ca44e7..a500d9e 100644 --- a/Gemfile +++ b/Gemfile @@ -10,4 +10,4 @@ gem 'rake' gem 'puppet-lint' gem 'rspec-puppet' gem 'puppet', puppetversion -gem 'puppetlabs_spec_helper' +gem 'puppetlabs_spec_helper', '>= 0.4.0' -- cgit v1.2.3 From b1ee7d740de50e140277df774b353721890fa2df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 21 Mar 2013 17:21:49 +0100 Subject: README --- README.markdown | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/README.markdown b/README.markdown index e41c137..bf25e75 100644 --- a/README.markdown +++ b/README.markdown @@ -1,5 +1,9 @@ # Augeas Puppet module +**Install and configure Augeas.** + +This module is provided by [Camptocamp](http://www.camptocamp.com/) + ## Usage Simple usage: @@ -56,3 +60,29 @@ Would result in: - *Type*: rvalue +## Contributing + +Please report bugs and feature request using [GitHub issue +tracker](https://github.com/camptocamp/puppet-augeas/issues). + +For pull requests, it is very much appreciated to check your Puppet manifest +with [puppet-lint](https://github.com/camptocamp/puppet-augeas/issues) to follow the recommended Puppet style guidelines from the +[Puppet Labs style guide](http://docs.puppetlabs.com/guides/style_guide.html). + +## License + +Copyright (c) 2013 All rights reserved. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + -- cgit v1.2.3 From 66e0aed733989307382952f8c3c5be1490418e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 21 Mar 2013 17:23:03 +0100 Subject: Update Modulefile --- Modulefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Modulefile b/Modulefile index ba76e4b..653c539 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,7 @@ -name 'camptocamp-augeas' -version '0.0.1' -license 'GPLv2' -summary 'Augeas Puppet module' +name 'camptocamp-augeas' +version '0.0.1' +source 'https://github.com/camptocamp/puppet-apt' +license 'GNU GPLv3' +summary 'Camptocamp Augeas module' +description 'Augeas Module for Puppet' project_page 'https://github.com/camptocamp/puppet-augeas' -- cgit v1.2.3 From effcf6222cfd745537a8fa49dbf81cb4bfae0465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 21 Mar 2013 17:23:19 +0100 Subject: Add LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. -- cgit v1.2.3 From d570368dbb58516446c83371b53869935684e23f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 22 Mar 2013 09:27:27 +0100 Subject: Depend on rspec-puppet >= 0.1.6 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index a500d9e..1f2bb49 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,6 @@ end gem 'rake' gem 'puppet-lint' -gem 'rspec-puppet' +gem 'rspec-puppet', '>= 0.1.6' gem 'puppet', puppetversion gem 'puppetlabs_spec_helper', '>= 0.4.0' -- cgit v1.2.3 From 50914333ba51f58d4a4419b8171094b9eabb6fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 22 Mar 2013 09:33:04 +0100 Subject: Add dependency on stdlib --- Modulefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Modulefile b/Modulefile index 653c539..0e042d5 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,6 @@ name 'camptocamp-augeas' version '0.0.1' +dependency 'puppetlabs/stdlib', '3.2.0' source 'https://github.com/camptocamp/puppet-apt' license 'GNU GPLv3' summary 'Camptocamp Augeas module' -- cgit v1.2.3 From 0c6ca2848fbbe849a3e59779ffeb2c7979c6b0c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 22 Mar 2013 10:09:35 +0100 Subject: Doc and lint --- manifests/files.pp | 4 ++++ manifests/init.pp | 8 ++++++++ manifests/lens.pp | 53 +++++++++++++++++++++++++++-------------------------- 3 files changed, 39 insertions(+), 26 deletions(-) diff --git a/manifests/files.pp b/manifests/files.pp index 01427ad..4f36a57 100644 --- a/manifests/files.pp +++ b/manifests/files.pp @@ -1,3 +1,7 @@ +# Class: augeas::files +# +# Sets up directories and files for Augeas +# class augeas::files { $lens_dir = $augeas::lens_dir diff --git a/manifests/init.pp b/manifests/init.pp index 6374955..80fbbd8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,3 +1,11 @@ +# Class: augeas +# +# Install and configure Augeas +# +# Parameters: +# ['version'] - the desired version of Augeas +# ['ruby_version'] - the desired version of the Ruby bindings for Augeas +# ['lens_dir'] - the lens directory to use class augeas ( $version = $augeas_version, $ruby_version = $augeas_ruby_version, diff --git a/manifests/lens.pp b/manifests/lens.pp index 06db221..ac4fddf 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -1,28 +1,25 @@ -/* - -== Definition: augeas::lens - -Deploy an Augeas lens (and its test file). -Check the lens (and run the unit tests) automatically and remove the files if -the checks fail. - -Parameters: -- *ensure*: present/absent -- *lens_source*: the source for the lens -- *test_source*: optionally, the source for the test file. -- *stock_since*: optionally, indicate in which version of Augeas - the lens became stock, so it will not be deployed above that version. - -Example usage: - - augeas::lens { 'networkmanager': - lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', - test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', - stock_since => '1.0.0', - } - -*/ - +# Definition: augeas::lens +# +# Deploy an Augeas lens (and its test file). +# Check the lens (and run the unit tests) automatically and remove the files if +# the checks fail. +# +# Parameters: +# ['ensure'] - present/absent +# ['lens_source'] - the source for the lens +# ['test_source'] - optionally, the source for the test file. +# ['stock_since'] - optionally, indicate in which version of Augeas +# the lens became stock, so it will not be deployed +# above that version. +# +# Example usage: +# +# augeas::lens { 'networkmanager': +# lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', +# test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', +# stock_since => '1.0.0', +# } +# define augeas::lens ( $lens_source, $ensure=present, @@ -35,7 +32,11 @@ define augeas::lens ( if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { - validate_re($augeas::lens_dir, '/.*', "'${augeas::lens_dir}' is not a valid path for lens ${name}") + validate_re( + $augeas::lens_dir, + '/.*', + "'${augeas::lens_dir}' is not a valid path for lens ${name}" + ) $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" -- cgit v1.2.3 From 3cdeb92a29db581f0d0f8a987c22de0a94971726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 22 Mar 2013 10:10:22 +0100 Subject: doc --- manifests/packages.pp | 4 ++++ manifests/params.pp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/manifests/packages.pp b/manifests/packages.pp index e41f800..91dbb74 100644 --- a/manifests/packages.pp +++ b/manifests/packages.pp @@ -1,3 +1,7 @@ +# Class: augeas::packages +# +# Sets up packages for Augeas +# class augeas::packages { # Augeas packages $augeas_ensure = $augeas::version ? { diff --git a/manifests/params.pp b/manifests/params.pp index e7120af..ee2dbea 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,3 +1,7 @@ +# Class: augeas::params +# +# Default parameters for the Augeas module +# class augeas::params { $lens_dir = '/usr/share/augeas/lenses' -- cgit v1.2.3 From 5b0631950a43acdd8a2a2236dc1b772e7f16e449 Mon Sep 17 00:00:00 2001 From: Patrick Hemmer Date: Fri, 5 Apr 2013 10:09:26 -0400 Subject: Better detection of ruby version --- manifests/params.pp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index ee2dbea..9998308 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -12,9 +12,10 @@ class augeas::params { } 'Debian': { - $ruby_pkg = $::lsbdistcodename ? { - 'wheezy' => 'libaugeas-ruby1.9.1', - default => 'libaugeas-ruby1.8', + if versioncmp($::rubyversion, '1.9.1') >= 0 { + $ruby_pkg = 'libaugeas-ruby1.9.1' + } else { + $ruby_pkg = 'libaugeas-ruby1.8' } $augeas_pkgs = ['augeas-lenses', 'libaugeas0', 'augeas-tools'] } -- cgit v1.2.3 From 9b1bec2ace7f4d9529c6593e4a23990216eb1319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 18 Apr 2013 22:35:50 +0200 Subject: Adapt specs to use rubyversion for ruby lib version detection --- spec/hosts/simple_debian_wheezy_spec.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spec/hosts/simple_debian_wheezy_spec.rb b/spec/hosts/simple_debian_wheezy_spec.rb index 23c0d1d..8985e28 100644 --- a/spec/hosts/simple_debian_wheezy_spec.rb +++ b/spec/hosts/simple_debian_wheezy_spec.rb @@ -1,9 +1,10 @@ require 'spec_helper' -describe 'simple_debian_squeeze' do +describe 'simple_debian_wheezy' do let (:facts) { { :osfamily => 'Debian', :lsbdistcodename => 'wheezy', + :rubyversion => '1.9.1', } } context 'when versions are not specified' do @@ -26,6 +27,7 @@ describe 'simple_debian_squeeze' do let (:facts) { { :osfamily => 'Debian', :lsbdistcodename => 'wheezy', + :rubyversion => '1.9.1', :augeas_version => '1.2.3', :augeas_ruby_version => '3.2.1', } } @@ -68,6 +70,7 @@ describe 'simple_debian_squeeze' do let (:facts) { { :osfamily => 'Debian', :lsbdistcodename => 'wheezy', + :rubyversion => '1.9.1', :augeas_lens_dir => '/opt/augeas/lenses' } } -- cgit v1.2.3 From 53ab6b124272d9876b6f1b782c4fc38f791c56b8 Mon Sep 17 00:00:00 2001 From: Lienhart Woitok Date: Mon, 14 Oct 2013 18:24:24 +0200 Subject: Ensure lenses are owned by root This is necessary as lenses are fetched with file via puppet urls. This leads to whoever ownes the files on the puppet master owns the files on the node. This may lead to arbitrary users owning the lenses. See http://projects.puppetlabs.com/issues/5240 --- manifests/lens.pp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/manifests/lens.pp b/manifests/lens.pp index ac4fddf..b299dc6 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -30,6 +30,12 @@ define augeas::lens ( fail('You must declare the augeas class before using augeas::lens') } + File { + owner => 'root', + group => 'root', + mode => '0644', + } + if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { validate_re( -- cgit v1.2.3 From b6268100972bf2f65d4b3a8b4e08180bd2149eee Mon Sep 17 00:00:00 2001 From: poikilotherm Date: Tue, 4 Feb 2014 13:35:35 +0100 Subject: Update params.pp This can be used on Suse flavors via adding two repos: A) for recent puppet packages: https://build.opensuse.org/project/show/systemsmanagement:puppet (holding the actual rubygem-ruby-augeas package, official repos only include python-augeas *grrr*) B) for dependency rubygems on SLES 11 add the SLE11-SDK repo available from Novell, openSuSE status unknown --- manifests/params.pp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/manifests/params.pp b/manifests/params.pp index 9998308..5141f73 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -10,6 +10,11 @@ class augeas::params { $ruby_pkg = 'ruby-augeas' $augeas_pkgs = ['augeas', 'augeas-libs'] } + + 'Suse': { + $ruby_pkg = 'rubygem-ruby-augeas' + $augeas_pkgs = ['augeas', 'augeas-lenses', 'libaugeas0' ] + } 'Debian': { if versioncmp($::rubyversion, '1.9.1') >= 0 { -- cgit v1.2.3 From eefb0c6dfe8806c02fcb7fcadf299ab8898db350 Mon Sep 17 00:00:00 2001 From: poikilotherm Date: Wed, 5 Feb 2014 13:32:04 +0100 Subject: Update params.pp Corrected auto-indent on line 13 breaking the tests (not puppet ;)) --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 5141f73..8b8f89c 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -10,7 +10,7 @@ class augeas::params { $ruby_pkg = 'ruby-augeas' $augeas_pkgs = ['augeas', 'augeas-libs'] } - + 'Suse': { $ruby_pkg = 'rubygem-ruby-augeas' $augeas_pkgs = ['augeas', 'augeas-lenses', 'libaugeas0' ] -- cgit v1.2.3 From 5ea5f2352bd51ce7fb67e837730e8c2f18eb9733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 5 Feb 2014 14:50:54 +0100 Subject: Release 0.2.0 --- Modulefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modulefile b/Modulefile index 0e042d5..b294a87 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ name 'camptocamp-augeas' -version '0.0.1' +version '0.2.0' dependency 'puppetlabs/stdlib', '3.2.0' source 'https://github.com/camptocamp/puppet-apt' license 'GNU GPLv3' -- cgit v1.2.3 From b92feec5f171333c5d6fa6eaecca4286e3868512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 14 Feb 2014 15:50:09 +0100 Subject: Fix dependencies in Modulefile. Release 0.2.1 --- Modulefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modulefile b/Modulefile index b294a87..600acd6 100644 --- a/Modulefile +++ b/Modulefile @@ -1,7 +1,7 @@ name 'camptocamp-augeas' -version '0.2.0' -dependency 'puppetlabs/stdlib', '3.2.0' -source 'https://github.com/camptocamp/puppet-apt' +version '0.2.1' +dependency 'puppetlabs/stdlib', '>= 3.2.0' +source 'https://github.com/camptocamp/puppet-augeas' license 'GNU GPLv3' summary 'Camptocamp Augeas module' description 'Augeas Module for Puppet' -- cgit v1.2.3 From ab2805c76a1c73594bd71d83f542cf3375cdf271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 3 Mar 2014 12:16:30 +0100 Subject: Add purge parameter to augeas class --- manifests/files.pp | 4 ++-- manifests/init.pp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/manifests/files.pp b/manifests/files.pp index 4f36a57..e643ee6 100644 --- a/manifests/files.pp +++ b/manifests/files.pp @@ -8,7 +8,7 @@ class augeas::files { # ensure no file not managed by puppet ends up in there. file { $lens_dir: ensure => directory, - purge => true, + purge => $::augeas::purge, force => true, recurse => true, recurselimit => 1, @@ -27,7 +27,7 @@ class augeas::files { file { "${lens_dir}/tests": ensure => directory, - purge => true, + purge => $::augeas::purge, force => true, mode => '0644', owner => 'root', diff --git a/manifests/init.pp b/manifests/init.pp index 80fbbd8..206f65c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -6,10 +6,12 @@ # ['version'] - the desired version of Augeas # ['ruby_version'] - the desired version of the Ruby bindings for Augeas # ['lens_dir'] - the lens directory to use +# ['purge'] - whether to purge lens directories class augeas ( $version = $augeas_version, $ruby_version = $augeas_ruby_version, $lens_dir = $augeas::params::lens_dir, + $purge = true, ) inherits augeas::params { class {'::augeas::packages': } -> -- cgit v1.2.3 From fe92d9649812174c35bcaed9080eb16e11b9940b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 24 Mar 2014 11:19:05 +0100 Subject: Add all augeas packages to dependency --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 206f65c..41178ee 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -18,5 +18,5 @@ class augeas ( class {'::augeas::files': } -> Class['augeas'] - Package['ruby-augeas'] -> Augeas <| |> + Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |> } -- cgit v1.2.3 From cdcf531ee299e0bbab959da0579ebac7531e3d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 8 Apr 2014 09:56:52 +0200 Subject: Fix dynamic scoping --- manifests/init.pp | 8 ++++---- manifests/packages.pp | 20 ++++---------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 41178ee..4289765 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -8,10 +8,10 @@ # ['lens_dir'] - the lens directory to use # ['purge'] - whether to purge lens directories class augeas ( - $version = $augeas_version, - $ruby_version = $augeas_ruby_version, - $lens_dir = $augeas::params::lens_dir, - $purge = true, + $version = present, + $ruby_version = present, + $lens_dir = $augeas::params::lens_dir, + $purge = true, ) inherits augeas::params { class {'::augeas::packages': } -> diff --git a/manifests/packages.pp b/manifests/packages.pp index 91dbb74..ff8628d 100644 --- a/manifests/packages.pp +++ b/manifests/packages.pp @@ -3,24 +3,12 @@ # Sets up packages for Augeas # class augeas::packages { - # Augeas packages - $augeas_ensure = $augeas::version ? { - '' => 'present', - default => $augeas::version - } - - package { $augeas::params::augeas_pkgs: - ensure => $augeas_ensure, - } - - # Ruby package - $ruby_ensure = $augeas::ruby_version ? { - '' => 'present', - default => $augeas::ruby_version + package { $::augeas::params::augeas_pkgs: + ensure => $::augeas::version, } package { 'ruby-augeas': - ensure => $ruby_ensure, - name => $augeas::params::ruby_pkg, + ensure => $::augeas::ruby_version, + name => $::augeas::params::ruby_pkg, } } -- cgit v1.2.3 From a6d8dd515489730863341e6d5610bcbe7d7ce97d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 18 Apr 2014 13:58:26 +0200 Subject: Update travis matrix --- .travis.yml | 35 ++++++++++++++++++++++++++++------- Gemfile | 15 ++++----------- README.markdown | 2 ++ 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d7c0f8..d780a76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,36 @@ language: ruby +bundler_args: --without development +script: + - bundle exec rake spec SPEC_OPTS='--format documentation' + - bundle exec rake lint rvm: - 1.8.7 - 1.9.3 - 2.0.0 - - ruby-head + - 2.1.0 env: - - PUPPET_GEM_VERSION=">= 3.0.0" + - PUPPET_GEM_VERSION="~> 2.7.0" + - PUPPET_GEM_VERSION="~> 3.1.0" + - PUPPET_GEM_VERSION="~> 3.2.0" + - PUPPET_GEM_VERSION="~> 3.3.0" + - PUPPET_GEM_VERSION="~> 3.4.0" + - PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes" matrix: - allow_failures: + fast_finish: true + exclude: + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 2.7.0" - rvm: 2.0.0 - - rvm: ruby-head - include: - - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 2.7" + env: PUPPET_GEM_VERSION="~> 2.7.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.1.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 2.7.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 3.1.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 3.2.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 3.3.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 3.4.0" diff --git a/Gemfile b/Gemfile index 1f2bb49..0774000 100644 --- a/Gemfile +++ b/Gemfile @@ -1,13 +1,6 @@ -source :rubygems +source 'https://rubygems.org' -if ENV.key?('PUPPET_VERSION') - puppetversion = "= #{ENV['PUPPET_VERSION']}" -else - puppetversion = ['>= 2.7'] -end - -gem 'rake' +puppetversion = ENV['PUPPET_GEM_VERSION'] +gem 'puppet', puppetversion, :require => false gem 'puppet-lint' -gem 'rspec-puppet', '>= 0.1.6' -gem 'puppet', puppetversion -gem 'puppetlabs_spec_helper', '>= 0.4.0' +gem 'puppetlabs_spec_helper' diff --git a/README.markdown b/README.markdown index bf25e75..a97d229 100644 --- a/README.markdown +++ b/README.markdown @@ -1,5 +1,7 @@ # Augeas Puppet module +[![Build Status](https://travis-ci.org/camptocamp/puppet-augeas.png?branch=master)](https://travis-ci.org/camptocamp/puppet-augeas) + **Install and configure Augeas.** This module is provided by [Camptocamp](http://www.camptocamp.com/) -- cgit v1.2.3 From 8f02d027d7ebd7167827cf5ca8318914e3417ef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 18 Apr 2014 14:39:01 +0200 Subject: Update spec_helper.rb --- spec/spec_helper.rb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4edc964..3a125ee 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,3 +2,26 @@ require 'mocha' require 'rspec-puppet' require 'puppetlabs_spec_helper/module_spec_helper' +RSpec.configure do |c| + c.include PuppetlabsSpec::Files + + c.before :each do + # Ensure that we don't accidentally cache facts and environment + # between test cases. + Facter::Util::Loader.any_instance.stubs(:load_all) + Facter.clear + Facter.clear_messages + + # Store any environment variables away to be restored later + @old_env = {} + ENV.each_key {|k| @old_env[k] = ENV[k]} + + if ENV['STRICT_VARIABLES'] == 'yes' + Puppet.settings[:strict_variables]=true + end + end + + c.after :each do + PuppetlabsSpec::Files.cleanup + end +end -- cgit v1.2.3 From 047c275c6aadc1e42558ed95ef0a5dd0535105cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 30 Apr 2014 09:30:55 +0200 Subject: Upgrade ruby version to 2.1.1 in travis matrix --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d780a76..3ced93c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ rvm: - 1.8.7 - 1.9.3 - 2.0.0 - - 2.1.0 + - 2.1.1 env: - PUPPET_GEM_VERSION="~> 2.7.0" - PUPPET_GEM_VERSION="~> 3.1.0" @@ -24,13 +24,13 @@ matrix: env: PUPPET_GEM_VERSION="~> 2.7.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.1.0" - - rvm: 2.1.0 + - rvm: 2.1.1 env: PUPPET_GEM_VERSION="~> 2.7.0" - - rvm: 2.1.0 + - rvm: 2.1.1 env: PUPPET_GEM_VERSION="~> 3.1.0" - - rvm: 2.1.0 + - rvm: 2.1.1 env: PUPPET_GEM_VERSION="~> 3.2.0" - - rvm: 2.1.0 + - rvm: 2.1.1 env: PUPPET_GEM_VERSION="~> 3.3.0" - - rvm: 2.1.0 + - rvm: 2.1.1 env: PUPPET_GEM_VERSION="~> 3.4.0" -- cgit v1.2.3 From 2791a33ce95a64a2c72dd124aa3c873a7a19219c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 30 Apr 2014 09:31:01 +0200 Subject: Fix unit tests --- .gitignore | 1 + spec/defines/augeas_lens_spec.rb | 19 ++++++++++++----- spec/hosts/simple_debian_squeeze_spec.rb | 36 +++++++++++++++++++++++++++----- spec/hosts/simple_debian_wheezy_spec.rb | 28 ++++++++++++++++++------- spec/hosts/simple_redhat_spec.rb | 21 +++++++++++++++++-- spec/hosts/with_lens_spec.rb | 5 +++++ spec/hosts/wrong_os_spec.rb | 6 +++++- 7 files changed, 96 insertions(+), 20 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1377554 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.swp diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index 57d30b6..8b57b3f 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -3,7 +3,10 @@ require 'spec_helper' describe 'augeas::lens' do let (:title) { 'foo' } let (:facts) { { - :osfamily => 'RedHat', + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :osfamily => 'RedHat', } } context 'when no lens_source is passed' do it 'should error' do @@ -43,8 +46,11 @@ describe 'augeas::lens' do } } let (:facts) { { - :osfamily => 'RedHat', - :augeasversion => '1.0.0', + :augeas_lens_dir => :undef, + :augeas_version => :undef, + :augeasversion => '1.0.0', + :augeas_ruby_version => :undef, + :osfamily => 'RedHat', } } it { should contain_file('/usr/share/augeas/lenses/foo.aug') } @@ -58,8 +64,11 @@ describe 'augeas::lens' do } } let (:facts) { { - :osfamily => 'RedHat', - :augeasversion => '1.5.0', + :augeas_lens_dir => :undef, + :augeas_version => :undef, + :augeasversion => '1.5.0', + :augeas_ruby_version => :undef, + :osfamily => 'RedHat', } } it { should_not contain_file('/usr/share/augeas/lenses/foo.aug') } diff --git a/spec/hosts/simple_debian_squeeze_spec.rb b/spec/hosts/simple_debian_squeeze_spec.rb index 4b41105..08ecd3e 100644 --- a/spec/hosts/simple_debian_squeeze_spec.rb +++ b/spec/hosts/simple_debian_squeeze_spec.rb @@ -2,11 +2,23 @@ require 'spec_helper' describe 'simple_debian_squeeze' do let (:facts) { { - :osfamily => 'Debian', - :lsbdistcodename => 'squeeze', + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :lsbdistcodename => 'squeeze', + :osfamily => 'Debian', } } context 'when versions are not specified' do + let (:facts) { { + :augeas_lens_dir => :undef, + :augeas_version => :undef, + :augeas_ruby_version => :undef, + :lsbdistcodename => 'squeeze', + :osfamily => 'Debian', + :rubyversion => '1.8.7', + } } + it { should contain_package('libaugeas0').with( :ensure => 'present' ) } @@ -26,8 +38,10 @@ describe 'simple_debian_squeeze' do let (:facts) { { :osfamily => 'Debian', :lsbdistcodename => 'squeeze', + :augeas_lens_dir => :undef, :augeas_version => '1.2.3', :augeas_ruby_version => '3.2.1', + :rubyversion => '1.8.7', } } it { should contain_package('libaugeas0').with( @@ -46,6 +60,15 @@ describe 'simple_debian_squeeze' do end context 'with standard lens_dir' do + let (:facts) { { + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :lsbdistcodename => 'squeeze', + :osfamily => 'Debian', + :rubyversion => '1.8.7', + } } + it { should contain_file('/usr/share/augeas/lenses').with( :ensure => 'directory', :purge => 'true', @@ -66,9 +89,12 @@ describe 'simple_debian_squeeze' do context 'with a non standard lens_dir' do let (:facts) { { - :osfamily => 'Debian', - :lsbdistcodename => 'squeeze', - :augeas_lens_dir => '/opt/augeas/lenses' + :augeas_lens_dir => '/opt/augeas/lenses', + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :lsbdistcodename => 'squeeze', + :osfamily => 'Debian', + :rubyversion => '1.8.7', } } it { should contain_file('/opt/augeas/lenses').with( diff --git a/spec/hosts/simple_debian_wheezy_spec.rb b/spec/hosts/simple_debian_wheezy_spec.rb index 8985e28..f301038 100644 --- a/spec/hosts/simple_debian_wheezy_spec.rb +++ b/spec/hosts/simple_debian_wheezy_spec.rb @@ -2,9 +2,12 @@ require 'spec_helper' describe 'simple_debian_wheezy' do let (:facts) { { - :osfamily => 'Debian', - :lsbdistcodename => 'wheezy', - :rubyversion => '1.9.1', + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :lsbdistcodename => 'wheezy', + :osfamily => 'Debian', + :rubyversion => '1.9.1', } } context 'when versions are not specified' do @@ -28,6 +31,7 @@ describe 'simple_debian_wheezy' do :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :rubyversion => '1.9.1', + :augeas_lens_dir => :undef, :augeas_version => '1.2.3', :augeas_ruby_version => '3.2.1', } } @@ -48,6 +52,14 @@ describe 'simple_debian_wheezy' do end context 'with standard lens_dir' do + let (:facts) { { + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :osfamily => 'Debian', + :rubyversion => '1.9.1', + } } + it { should contain_file('/usr/share/augeas/lenses').with( :ensure => 'directory', :purge => 'true', @@ -68,10 +80,12 @@ describe 'simple_debian_wheezy' do context 'with a non standard lens_dir' do let (:facts) { { - :osfamily => 'Debian', - :lsbdistcodename => 'wheezy', - :rubyversion => '1.9.1', - :augeas_lens_dir => '/opt/augeas/lenses' + :augeas_lens_dir => '/opt/augeas/lenses', + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :lsbdistcodename => 'wheezy', + :osfamily => 'Debian', + :rubyversion => '1.9.1', } } it { should contain_file('/opt/augeas/lenses').with( diff --git a/spec/hosts/simple_redhat_spec.rb b/spec/hosts/simple_redhat_spec.rb index 5045377..a7acd1f 100644 --- a/spec/hosts/simple_redhat_spec.rb +++ b/spec/hosts/simple_redhat_spec.rb @@ -6,6 +6,13 @@ describe 'simple_redhat' do } } context 'when versions are not specified' do + let (:facts) { { + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :osfamily => 'RedHat', + } } + it { should contain_package('augeas').with( :ensure => 'present' ) } @@ -21,6 +28,7 @@ describe 'simple_redhat' do context 'when versions are specified' do let (:facts) { { :osfamily => 'RedHat', + :augeas_lens_dir => :undef, :augeas_version => '1.2.3', :augeas_ruby_version => '3.2.1', } } @@ -38,6 +46,13 @@ describe 'simple_redhat' do end context 'with standard lens_dir' do + let (:facts) { { + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :osfamily => 'RedHat', + } } + it { should contain_file('/usr/share/augeas/lenses').with( :ensure => 'directory', :purge => 'true', @@ -58,8 +73,10 @@ describe 'simple_redhat' do context 'with a non standard lens_dir' do let (:facts) { { - :osfamily => 'RedHat', - :augeas_lens_dir => '/opt/augeas/lenses' + :augeas_lens_dir => '/opt/augeas/lenses', + :augeas_ruby_version => :undef, + :augeas_version => :undef, + :osfamily => 'RedHat', } } it { should contain_file('/opt/augeas/lenses').with( diff --git a/spec/hosts/with_lens_spec.rb b/spec/hosts/with_lens_spec.rb index d7a5249..35ab8b6 100644 --- a/spec/hosts/with_lens_spec.rb +++ b/spec/hosts/with_lens_spec.rb @@ -9,6 +9,8 @@ describe 'with_lens' do let (:facts) { { :osfamily => 'RedHat', :augeas_lens_source => '/tmp/foo.aug', + :augeas_stock_since => :undef, + :augeas_test_source => :undef, } } it { should contain_file('/usr/share/augeas/lenses/foo.aug') } @@ -22,6 +24,7 @@ describe 'with_lens' do :osfamily => 'RedHat', :augeas_lens_source => '/tmp/foo.aug', :augeas_test_source => '/tmp/test_foo.aug', + :augeas_stock_since => :undef, } } it { should contain_file('/usr/share/augeas/lenses/foo.aug') } @@ -36,6 +39,7 @@ describe 'with_lens' do :augeas_lens_source => '/tmp/foo.aug', :augeas_stock_since => '1.2.3', :augeasversion => '1.0.0', + :augeas_test_source => :undef, } } it { should contain_file('/usr/share/augeas/lenses/foo.aug') } @@ -48,6 +52,7 @@ describe 'with_lens' do :augeas_lens_source => '/tmp/foo.aug', :augeas_stock_since => '1.2.3', :augeasversion => '1.5.0', + :augeas_test_source => :undef, } } it { should_not contain_file('/usr/share/augeas/lenses/foo.aug') } diff --git a/spec/hosts/wrong_os_spec.rb b/spec/hosts/wrong_os_spec.rb index 5704ded..4180e81 100644 --- a/spec/hosts/wrong_os_spec.rb +++ b/spec/hosts/wrong_os_spec.rb @@ -2,7 +2,11 @@ require 'spec_helper' describe 'wrong_os' do let (:facts) { { - :osfamily => 'MS-DOS' + :augeas_lens_dir => :undef, + :augeas_ruby_version => :undef, + :augeas_test_source => :undef, + :augeas_version => :undef, + :osfamily => 'MS-DOS', } } it 'should fail' do -- cgit v1.2.3 From 34704e64f1680d3e02a3938ed58ddf72d7753190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 6 Jun 2014 13:36:39 +0200 Subject: Auto enable strict_variables for unit tests when puppet > 3.5 --- .travis.yml | 2 +- spec/spec_helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ced93c..6e83623 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: - PUPPET_GEM_VERSION="~> 3.2.0" - PUPPET_GEM_VERSION="~> 3.3.0" - PUPPET_GEM_VERSION="~> 3.4.0" - - PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes" + - PUPPET_GEM_VERSION="~> 3.5.0" matrix: fast_finish: true exclude: diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3a125ee..3fa3306 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -16,7 +16,7 @@ RSpec.configure do |c| @old_env = {} ENV.each_key {|k| @old_env[k] = ENV[k]} - if ENV['STRICT_VARIABLES'] == 'yes' + if Gem::Version.new(`puppet --version`) >= Gem::Version.new('3.5') Puppet.settings[:strict_variables]=true end end -- cgit v1.2.3 From cb9f5a95f69ae9902adfcc1bdfb186bcc5b11a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 6 Jun 2014 13:36:57 +0200 Subject: Use ruby 2.1.2 instead of 2.1.1 --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e83623..3759c0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ rvm: - 1.8.7 - 1.9.3 - 2.0.0 - - 2.1.1 + - 2.1.2 env: - PUPPET_GEM_VERSION="~> 2.7.0" - PUPPET_GEM_VERSION="~> 3.1.0" @@ -24,13 +24,13 @@ matrix: env: PUPPET_GEM_VERSION="~> 2.7.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.1.0" - - rvm: 2.1.1 + - rvm: 2.1.2 env: PUPPET_GEM_VERSION="~> 2.7.0" - - rvm: 2.1.1 + - rvm: 2.1.2 env: PUPPET_GEM_VERSION="~> 3.1.0" - - rvm: 2.1.1 + - rvm: 2.1.2 env: PUPPET_GEM_VERSION="~> 3.2.0" - - rvm: 2.1.1 + - rvm: 2.1.2 env: PUPPET_GEM_VERSION="~> 3.3.0" - - rvm: 2.1.1 + - rvm: 2.1.2 env: PUPPET_GEM_VERSION="~> 3.4.0" -- cgit v1.2.3 From 5bb62dfc4a48b9cbc325858550ba184dcebad151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 6 Jun 2014 13:37:13 +0200 Subject: Add 3.6 to unit tests --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3759c0b..3496ad6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ env: - PUPPET_GEM_VERSION="~> 3.3.0" - PUPPET_GEM_VERSION="~> 3.4.0" - PUPPET_GEM_VERSION="~> 3.5.0" + - PUPPET_GEM_VERSION="~> 3.6.0" matrix: fast_finish: true exclude: -- cgit v1.2.3 From 090df58baec6827d3013eb4cc07cc70db16f2b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 2 Jul 2014 15:36:54 +0200 Subject: Release 0.3.0 --- CHANGELOG | 4 ++++ Modulefile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..0108cf7 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,4 @@ +2014-07-02 - Version 0.3.0 + +- Add purge parameter +- Cleanup unscoped variables diff --git a/Modulefile b/Modulefile index 600acd6..c51fcb4 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ name 'camptocamp-augeas' -version '0.2.1' +version '0.3.0' dependency 'puppetlabs/stdlib', '>= 3.2.0' source 'https://github.com/camptocamp/puppet-augeas' license 'GNU GPLv3' -- cgit v1.2.3 From e770960939bb2173e33b945d832d13e51fd13fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 5 Sep 2014 13:23:01 +0200 Subject: Use modulesync to manage meta files --- .gitignore | 8 +++- .travis.yml | 44 ++++++---------------- Gemfile | 31 ++++++++++++--- Rakefile | 7 ++-- spec/acceptance/nodesets/centos-59-x64.yml | 10 +++++ spec/acceptance/nodesets/centos-64-x64-pe.yml | 12 ++++++ spec/acceptance/nodesets/centos-65-x64.yml | 10 +++++ .../nodesets/ubuntu-server-10044-x64.yml | 10 +++++ .../nodesets/ubuntu-server-12042-x64.yml | 10 +++++ .../acceptance/nodesets/ubuntu-server-1404-x64.yml | 11 ++++++ spec/spec.opts | 6 +++ spec/spec_helper.rb | 23 ++++++++++- 12 files changed, 138 insertions(+), 44 deletions(-) create mode 100644 spec/acceptance/nodesets/centos-59-x64.yml create mode 100644 spec/acceptance/nodesets/centos-64-x64-pe.yml create mode 100644 spec/acceptance/nodesets/centos-65-x64.yml create mode 100644 spec/acceptance/nodesets/ubuntu-server-10044-x64.yml create mode 100644 spec/acceptance/nodesets/ubuntu-server-12042-x64.yml create mode 100644 spec/acceptance/nodesets/ubuntu-server-1404-x64.yml create mode 100644 spec/spec.opts diff --git a/.gitignore b/.gitignore index 1377554..b5b7a00 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ -*.swp +pkg/ +Gemfile.lock +vendor/ +spec/fixtures/ +.vagrant/ +.bundle/ +coverage/ diff --git a/.travis.yml b/.travis.yml index 3496ad6..66e90e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,37 +1,15 @@ +--- language: ruby bundler_args: --without development -script: - - bundle exec rake spec SPEC_OPTS='--format documentation' - - bundle exec rake lint -rvm: - - 1.8.7 - - 1.9.3 - - 2.0.0 - - 2.1.2 -env: - - PUPPET_GEM_VERSION="~> 2.7.0" - - PUPPET_GEM_VERSION="~> 3.1.0" - - PUPPET_GEM_VERSION="~> 3.2.0" - - PUPPET_GEM_VERSION="~> 3.3.0" - - PUPPET_GEM_VERSION="~> 3.4.0" - - PUPPET_GEM_VERSION="~> 3.5.0" - - PUPPET_GEM_VERSION="~> 3.6.0" +script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'" matrix: fast_finish: true - exclude: - - rvm: 1.9.3 - env: PUPPET_GEM_VERSION="~> 2.7.0" - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 2.7.0" - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.1.0" - - rvm: 2.1.2 - env: PUPPET_GEM_VERSION="~> 2.7.0" - - rvm: 2.1.2 - env: PUPPET_GEM_VERSION="~> 3.1.0" - - rvm: 2.1.2 - env: PUPPET_GEM_VERSION="~> 3.2.0" - - rvm: 2.1.2 - env: PUPPET_GEM_VERSION="~> 3.3.0" - - rvm: 2.1.2 - env: PUPPET_GEM_VERSION="~> 3.4.0" + include: + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 3.0" + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 3.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.0" +notifications: + email: false diff --git a/Gemfile b/Gemfile index 0774000..e960f7c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,27 @@ -source 'https://rubygems.org' +source ENV['GEM_SOURCE'] || "https://rubygems.org" -puppetversion = ENV['PUPPET_GEM_VERSION'] -gem 'puppet', puppetversion, :require => false -gem 'puppet-lint' -gem 'puppetlabs_spec_helper' +group :development, :test do + gem 'rake', :require => false + gem 'rspec-puppet', :require => false + gem 'puppetlabs_spec_helper', :require => false + gem 'serverspec', :require => false + gem 'puppet-lint', :require => false + gem 'beaker', :require => false + gem 'beaker-rspec', :require => false + gem 'pry', :require => false + gem 'simplecov', :require => false +end + +if facterversion = ENV['FACTER_GEM_VERSION'] + gem 'facter', facterversion, :require => false +else + gem 'facter', :require => false +end + +if puppetversion = ENV['PUPPET_GEM_VERSION'] + gem 'puppet', puppetversion, :require => false +else + gem 'puppet', :require => false +end + +# vim:ft=ruby diff --git a/Rakefile b/Rakefile index 4d31fec..ee78ce6 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,6 @@ -require 'puppet-lint/tasks/puppet-lint' require 'puppetlabs_spec_helper/rake_tasks' +require 'puppet-lint/tasks/puppet-lint' -task :default => [:spec, :lint] - +PuppetLint.configuration.fail_on_warnings +PuppetLint.configuration.send('disable_80chars') +PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"] diff --git a/spec/acceptance/nodesets/centos-59-x64.yml b/spec/acceptance/nodesets/centos-59-x64.yml new file mode 100644 index 0000000..2ad90b8 --- /dev/null +++ b/spec/acceptance/nodesets/centos-59-x64.yml @@ -0,0 +1,10 @@ +HOSTS: + centos-59-x64: + roles: + - master + platform: el-5-x86_64 + box : centos-59-x64-vbox4210-nocm + box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box + hypervisor : vagrant +CONFIG: + type: git diff --git a/spec/acceptance/nodesets/centos-64-x64-pe.yml b/spec/acceptance/nodesets/centos-64-x64-pe.yml new file mode 100644 index 0000000..7d9242f --- /dev/null +++ b/spec/acceptance/nodesets/centos-64-x64-pe.yml @@ -0,0 +1,12 @@ +HOSTS: + centos-64-x64: + roles: + - master + - database + - dashboard + platform: el-6-x86_64 + box : centos-64-x64-vbox4210-nocm + box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box + hypervisor : vagrant +CONFIG: + type: pe diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml new file mode 100644 index 0000000..4e2cb80 --- /dev/null +++ b/spec/acceptance/nodesets/centos-65-x64.yml @@ -0,0 +1,10 @@ +HOSTS: + centos-65-x64: + roles: + - master + platform: el-6-x86_64 + box : centos-65-x64-vbox436-nocm + box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box + hypervisor : vagrant +CONFIG: + type: foss diff --git a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml new file mode 100644 index 0000000..5ca1514 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml @@ -0,0 +1,10 @@ +HOSTS: + ubuntu-server-10044-x64: + roles: + - master + platform: ubuntu-10.04-amd64 + box : ubuntu-server-10044-x64-vbox4210-nocm + box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box + hypervisor : vagrant +CONFIG: + type: foss diff --git a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml new file mode 100644 index 0000000..d065b30 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml @@ -0,0 +1,10 @@ +HOSTS: + ubuntu-server-12042-x64: + roles: + - master + platform: ubuntu-12.04-amd64 + box : ubuntu-server-12042-x64-vbox4210-nocm + box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box + hypervisor : vagrant +CONFIG: + type: foss diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml new file mode 100644 index 0000000..cba1cd0 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml @@ -0,0 +1,11 @@ +HOSTS: + ubuntu-server-1404-x64: + roles: + - master + platform: ubuntu-14.04-amd64 + box : puppetlabs/ubuntu-14.04-64-nocm + box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm + hypervisor : vagrant +CONFIG: + log_level : debug + type: git diff --git a/spec/spec.opts b/spec/spec.opts new file mode 100644 index 0000000..91cd642 --- /dev/null +++ b/spec/spec.opts @@ -0,0 +1,6 @@ +--format +s +--colour +--loadby +mtime +--backtrace diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3fa3306..adbb191 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,3 @@ -require 'mocha' -require 'rspec-puppet' require 'puppetlabs_spec_helper/module_spec_helper' RSpec.configure do |c| @@ -25,3 +23,24 @@ RSpec.configure do |c| PuppetlabsSpec::Files.cleanup end end + +require 'pathname' +dir = Pathname.new(__FILE__).parent +Puppet[:modulepath] = File.join(dir, 'fixtures', 'modules') + +# There's no real need to make this version dependent, but it helps find +# regressions in Puppet +# +# 1. Workaround for issue #16277 where default settings aren't initialised from +# a spec and so the libdir is never initialised (3.0.x) +# 2. Workaround for 2.7.20 that now only loads types for the current node +# environment (#13858) so Puppet[:modulepath] seems to get ignored +# 3. Workaround for 3.5 where context hasn't been configured yet, +# ticket https://tickets.puppetlabs.com/browse/MODULES-823 +# +ver = Gem::Version.new(Puppet.version.split('-').first) +if Gem::Requirement.new("~> 2.7.20") =~ ver || Gem::Requirement.new("~> 3.0.0") =~ ver || Gem::Requirement.new("~> 3.5") =~ ver + puts "augeasproviders: setting Puppet[:libdir] to work around broken type autoloading" + # libdir is only a single dir, so it can only workaround loading of one external module + Puppet[:libdir] = "#{Puppet[:modulepath]}/augeasproviders_core/lib" +end -- cgit v1.2.3 From 6baa38e6a036b283814592f96b524257fd52583a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 5 Sep 2014 14:20:42 +0200 Subject: Use modulesync to manage meta files --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 66e90e3..0e0b6c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake matrix: fast_finish: true include: + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7" - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 1.9.3 -- cgit v1.2.3 From 46190cefc4820df9cc35a830158b92eb39509e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 23 Sep 2014 10:48:45 +0200 Subject: Remove acceptance nodesets --- spec/acceptance/nodesets/centos-59-x64.yml | 10 ---------- spec/acceptance/nodesets/centos-64-x64-pe.yml | 12 ------------ spec/acceptance/nodesets/centos-65-x64.yml | 10 ---------- spec/acceptance/nodesets/ubuntu-server-10044-x64.yml | 10 ---------- spec/acceptance/nodesets/ubuntu-server-12042-x64.yml | 10 ---------- spec/acceptance/nodesets/ubuntu-server-1404-x64.yml | 11 ----------- 6 files changed, 63 deletions(-) delete mode 100644 spec/acceptance/nodesets/centos-59-x64.yml delete mode 100644 spec/acceptance/nodesets/centos-64-x64-pe.yml delete mode 100644 spec/acceptance/nodesets/centos-65-x64.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-server-10044-x64.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-server-12042-x64.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-server-1404-x64.yml diff --git a/spec/acceptance/nodesets/centos-59-x64.yml b/spec/acceptance/nodesets/centos-59-x64.yml deleted file mode 100644 index 2ad90b8..0000000 --- a/spec/acceptance/nodesets/centos-59-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-59-x64: - roles: - - master - platform: el-5-x86_64 - box : centos-59-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: git diff --git a/spec/acceptance/nodesets/centos-64-x64-pe.yml b/spec/acceptance/nodesets/centos-64-x64-pe.yml deleted file mode 100644 index 7d9242f..0000000 --- a/spec/acceptance/nodesets/centos-64-x64-pe.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - centos-64-x64: - roles: - - master - - database - - dashboard - platform: el-6-x86_64 - box : centos-64-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: pe diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml deleted file mode 100644 index 4e2cb80..0000000 --- a/spec/acceptance/nodesets/centos-65-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-65-x64: - roles: - - master - platform: el-6-x86_64 - box : centos-65-x64-vbox436-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box - hypervisor : vagrant -CONFIG: - type: foss diff --git a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml deleted file mode 100644 index 5ca1514..0000000 --- a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-server-10044-x64: - roles: - - master - platform: ubuntu-10.04-amd64 - box : ubuntu-server-10044-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: foss diff --git a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml deleted file mode 100644 index d065b30..0000000 --- a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-server-12042-x64: - roles: - - master - platform: ubuntu-12.04-amd64 - box : ubuntu-server-12042-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: foss diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml deleted file mode 100644 index cba1cd0..0000000 --- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml +++ /dev/null @@ -1,11 +0,0 @@ -HOSTS: - ubuntu-server-1404-x64: - roles: - - master - platform: ubuntu-14.04-amd64 - box : puppetlabs/ubuntu-14.04-64-nocm - box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm - hypervisor : vagrant -CONFIG: - log_level : debug - type: git -- cgit v1.2.3 From e2e4f2e7eb87cbe86508f8523400769bcc5f0e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 23 Sep 2014 10:50:53 +0200 Subject: Use metadata.json --- CHANGELOG | 5 ++++- Modulefile | 8 -------- metadata.json | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 Modulefile create mode 100644 metadata.json diff --git a/CHANGELOG b/CHANGELOG index 0108cf7..6bc89df 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,7 @@ -2014-07-02 - Version 0.3.0 +##2014-09-23 - Version 0.3.1 +- Centralize metadata files +##2014-07-02 - Version 0.3.0 +###Summary - Add purge parameter - Cleanup unscoped variables diff --git a/Modulefile b/Modulefile deleted file mode 100644 index c51fcb4..0000000 --- a/Modulefile +++ /dev/null @@ -1,8 +0,0 @@ -name 'camptocamp-augeas' -version '0.3.0' -dependency 'puppetlabs/stdlib', '>= 3.2.0' -source 'https://github.com/camptocamp/puppet-augeas' -license 'GNU GPLv3' -summary 'Camptocamp Augeas module' -description 'Augeas Module for Puppet' -project_page 'https://github.com/camptocamp/puppet-augeas' diff --git a/metadata.json b/metadata.json new file mode 100644 index 0000000..72cafbe --- /dev/null +++ b/metadata.json @@ -0,0 +1,14 @@ +{ + "name": "camptocamp-augeas", + "version": "0.3.1", + "author": "camptocamp", + "summary": "Camptocamp Augeas module", + "license": "GNU GPLv3", + "source": "https://github.com/camptocamp/puppet-augeas", + "project_page": "https://github.com/camptocamp/puppet-augeas", + "issues_url": "https://github.com/camptocamp/puppet-augeas/issues", + "description": "Augeas Module for Puppet", + "dependencies": [ + {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0"} + ] +} -- cgit v1.2.3 From 7b0f30ad33ee3088c2e658262a692b75f02053a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 6 Oct 2014 09:44:15 +0200 Subject: Release 0.3.2 --- CHANGELOG | 3 +++ metadata.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 6bc89df..4cda8c2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +##2014-10-06 - Version 0.3.2 +- Remove symlink in spec/ directory (Fix #40) + ##2014-09-23 - Version 0.3.1 - Centralize metadata files diff --git a/metadata.json b/metadata.json index 72cafbe..9a126c4 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "0.3.1", + "version": "0.3.2", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "GNU GPLv3", -- cgit v1.2.3 From 6762d98ba5de14755d73cc811747e940c4c4db32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 17 Oct 2014 14:21:30 +0200 Subject: Use modulesync to manage meta files --- .puppet-lint.rc | 5 +++++ Gemfile | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .puppet-lint.rc diff --git a/.puppet-lint.rc b/.puppet-lint.rc new file mode 100644 index 0000000..d8f5c59 --- /dev/null +++ b/.puppet-lint.rc @@ -0,0 +1,5 @@ +--fail-on-warnings +--relative +--no-80chars +--no-documentation +--no-class_inherits_from_params_class-check diff --git a/Gemfile b/Gemfile index e960f7c..b7bdc1a 100644 --- a/Gemfile +++ b/Gemfile @@ -6,8 +6,6 @@ group :development, :test do gem 'puppetlabs_spec_helper', :require => false gem 'serverspec', :require => false gem 'puppet-lint', :require => false - gem 'beaker', :require => false - gem 'beaker-rspec', :require => false gem 'pry', :require => false gem 'simplecov', :require => false end -- cgit v1.2.3 From 9334a2369e8a0da67b6c186d490da05817254973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 20 Oct 2014 08:55:22 +0200 Subject: Do not depend on serverspec --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index b7bdc1a..cff878d 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,6 @@ group :development, :test do gem 'rake', :require => false gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false - gem 'serverspec', :require => false gem 'puppet-lint', :require => false gem 'pry', :require => false gem 'simplecov', :require => false -- cgit v1.2.3 From 1920d06d6fa35709da5e36ffec2c870b2dd4a677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 20 Oct 2014 09:16:37 +0200 Subject: Add badges --- README.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/README.markdown b/README.markdown index a97d229..a25cb40 100644 --- a/README.markdown +++ b/README.markdown @@ -1,5 +1,6 @@ # Augeas Puppet module +[![Puppet Forge](http://img.shields.io/puppetforge/v/camptocamp/augeas.svg)](https://forge.puppetlabs.com/camptocamp/augeas) [![Build Status](https://travis-ci.org/camptocamp/puppet-augeas.png?branch=master)](https://travis-ci.org/camptocamp/puppet-augeas) **Install and configure Augeas.** -- cgit v1.2.3 From 58b5170140c1f5a49f3db4ee6954259fd65a6e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 20 Oct 2014 11:18:33 +0200 Subject: Add .sync.yml [skip ci] --- .sync.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .sync.yml diff --git a/.sync.yml b/.sync.yml new file mode 100644 index 0000000..b369409 --- /dev/null +++ b/.sync.yml @@ -0,0 +1,5 @@ +--- +.travis.yml: + secure_global_env: + # PUBLISHER_PASSWORD + - "DRCxF7vpgZUChYEMgIak/7FoM9zitsD6fP1bTpT2MbBViBK+Eic05ePayroWzI/vDNkqIjet1pzoA0XVlEtVfkuhCGXVOJJ1nXH7fMezcdxRgnzxUK0cj8CZLQbFxJX0THn0BUf75fncMfySTNZ/K+Ln6Rzdfra3vVbk5suoSSA=" -- cgit v1.2.3 From f8c231ad8b7a3246a20e57e39deaf8af00afd9f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 20 Oct 2014 11:31:57 +0200 Subject: Update .travis.yml with ghpublisher [skip ci] --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0e0b6c6..675dd9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,12 @@ language: ruby bundler_args: --without development script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'" +after_success: + ["git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng", ".forge-releng/publish"] +env: + global: + - PUBLISHER_LOGIN=camptocamp + - secure: "DRCxF7vpgZUChYEMgIak/7FoM9zitsD6fP1bTpT2MbBViBK+Eic05ePayroWzI/vDNkqIjet1pzoA0XVlEtVfkuhCGXVOJJ1nXH7fMezcdxRgnzxUK0cj8CZLQbFxJX0THn0BUf75fncMfySTNZ/K+Ln6Rzdfra3vVbk5suoSSA=" matrix: fast_finish: true include: -- cgit v1.2.3 From 3caa6ddfe910c8946e77b44a24b3355473e4bc85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 20 Oct 2014 11:44:07 +0200 Subject: No need for pry and simplecov [skip ci] --- Gemfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gemfile b/Gemfile index cff878d..2e01aab 100644 --- a/Gemfile +++ b/Gemfile @@ -5,8 +5,6 @@ group :development, :test do gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false - gem 'pry', :require => false - gem 'simplecov', :require => false end if facterversion = ENV['FACTER_GEM_VERSION'] -- cgit v1.2.3 From c55d60c4c99131bc09eb655bd0f28bacb7176bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 20 Oct 2014 14:43:57 +0200 Subject: Linting --- manifests/files.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/files.pp b/manifests/files.pp index e643ee6..c73c19b 100644 --- a/manifests/files.pp +++ b/manifests/files.pp @@ -26,11 +26,11 @@ class augeas::files { } file { "${lens_dir}/tests": - ensure => directory, - purge => $::augeas::purge, - force => true, - mode => '0644', - owner => 'root', - group => 'root', + ensure => directory, + purge => $::augeas::purge, + force => true, + mode => '0644', + owner => 'root', + group => 'root', } } -- cgit v1.2.3 From 8348ca065aa46701a041576e15519e068c8ace20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 20 Oct 2014 14:45:21 +0200 Subject: Release 1.0.0 --- CHANGELOG | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 4cda8c2..738748f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +##2014-10-20 - Version 1.0.0 +- Linting +- Setup automatic Forge releases + ##2014-10-06 - Version 0.3.2 - Remove symlink in spec/ directory (Fix #40) diff --git a/metadata.json b/metadata.json index 9a126c4..276541b 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "0.3.2", + "version": "1.0.0", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "GNU GPLv3", -- cgit v1.2.3 From e2a067202ecc8d70ac793b5f4c59b9b9d67b0454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 21 Oct 2014 13:46:24 +0200 Subject: Use modulesync to manage meta files --- spec/spec_helper.rb | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index adbb191..2471da9 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -23,24 +23,3 @@ RSpec.configure do |c| PuppetlabsSpec::Files.cleanup end end - -require 'pathname' -dir = Pathname.new(__FILE__).parent -Puppet[:modulepath] = File.join(dir, 'fixtures', 'modules') - -# There's no real need to make this version dependent, but it helps find -# regressions in Puppet -# -# 1. Workaround for issue #16277 where default settings aren't initialised from -# a spec and so the libdir is never initialised (3.0.x) -# 2. Workaround for 2.7.20 that now only loads types for the current node -# environment (#13858) so Puppet[:modulepath] seems to get ignored -# 3. Workaround for 3.5 where context hasn't been configured yet, -# ticket https://tickets.puppetlabs.com/browse/MODULES-823 -# -ver = Gem::Version.new(Puppet.version.split('-').first) -if Gem::Requirement.new("~> 2.7.20") =~ ver || Gem::Requirement.new("~> 3.0.0") =~ ver || Gem::Requirement.new("~> 3.5") =~ ver - puts "augeasproviders: setting Puppet[:libdir] to work around broken type autoloading" - # libdir is only a single dir, so it can only workaround loading of one external module - Puppet[:libdir] = "#{Puppet[:modulepath]}/augeasproviders_core/lib" -end -- cgit v1.2.3 From e0363d1840afb141e408338ad9d2d2693970b39d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 27 Oct 2014 12:16:07 +0100 Subject: Use modulesync to manage meta files --- spec/spec_helper.rb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2471da9..adbb191 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -23,3 +23,24 @@ RSpec.configure do |c| PuppetlabsSpec::Files.cleanup end end + +require 'pathname' +dir = Pathname.new(__FILE__).parent +Puppet[:modulepath] = File.join(dir, 'fixtures', 'modules') + +# There's no real need to make this version dependent, but it helps find +# regressions in Puppet +# +# 1. Workaround for issue #16277 where default settings aren't initialised from +# a spec and so the libdir is never initialised (3.0.x) +# 2. Workaround for 2.7.20 that now only loads types for the current node +# environment (#13858) so Puppet[:modulepath] seems to get ignored +# 3. Workaround for 3.5 where context hasn't been configured yet, +# ticket https://tickets.puppetlabs.com/browse/MODULES-823 +# +ver = Gem::Version.new(Puppet.version.split('-').first) +if Gem::Requirement.new("~> 2.7.20") =~ ver || Gem::Requirement.new("~> 3.0.0") =~ ver || Gem::Requirement.new("~> 3.5") =~ ver + puts "augeasproviders: setting Puppet[:libdir] to work around broken type autoloading" + # libdir is only a single dir, so it can only workaround loading of one external module + Puppet[:libdir] = "#{Puppet[:modulepath]}/augeasproviders_core/lib" +end -- cgit v1.2.3 From 681e60915d9f09360d28291b9259ecbff1c12dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 28 Oct 2014 12:22:32 +0100 Subject: Set default path for commands in augeas::lens --- manifests/lens.pp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifests/lens.pp b/manifests/lens.pp index b299dc6..b5b9acd 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -36,6 +36,10 @@ define augeas::lens ( mode => '0644', } + Exec { + path => $::path, + } + if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { validate_re( -- cgit v1.2.3 From ca7e23f876d71ea910563e090a4c426545d1a3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 28 Oct 2014 12:45:04 +0100 Subject: Release 1.0.1 --- CHANGELOG | 3 +++ metadata.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 738748f..7907111 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +##2014-10-28 - Version 1.0.1 +- Add path to exec in augeas::lens + ##2014-10-20 - Version 1.0.0 - Linting - Setup automatic Forge releases diff --git a/metadata.json b/metadata.json index 276541b..6b652d3 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.0.0", + "version": "1.0.1", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "GNU GPLv3", -- cgit v1.2.3 From 304446d1a91643f50ee723c13276c65b39310b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 28 Oct 2014 12:49:53 +0100 Subject: Fix unit tests in recent Puppet 3 versions --- spec/defines/augeas_lens_spec.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index 8b57b3f..cd9d515 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -7,6 +7,7 @@ describe 'augeas::lens' do :augeas_ruby_version => :undef, :augeas_version => :undef, :osfamily => 'RedHat', + :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } context 'when no lens_source is passed' do it 'should error' do @@ -51,6 +52,7 @@ describe 'augeas::lens' do :augeasversion => '1.0.0', :augeas_ruby_version => :undef, :osfamily => 'RedHat', + :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } it { should contain_file('/usr/share/augeas/lenses/foo.aug') } @@ -69,6 +71,7 @@ describe 'augeas::lens' do :augeasversion => '1.5.0', :augeas_ruby_version => :undef, :osfamily => 'RedHat', + :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } it { should_not contain_file('/usr/share/augeas/lenses/foo.aug') } -- cgit v1.2.3 From 58d103993ffe332a8746f298b151b7d495ce58aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 28 Oct 2014 12:55:00 +0100 Subject: Also fix with_lens host spec --- spec/hosts/with_lens_spec.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/hosts/with_lens_spec.rb b/spec/hosts/with_lens_spec.rb index 35ab8b6..10437c9 100644 --- a/spec/hosts/with_lens_spec.rb +++ b/spec/hosts/with_lens_spec.rb @@ -3,6 +3,7 @@ require 'spec_helper' describe 'with_lens' do let (:facts) { { :osfamily => 'RedHat', + :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } context 'when lens_source is passed' do @@ -11,6 +12,7 @@ describe 'with_lens' do :augeas_lens_source => '/tmp/foo.aug', :augeas_stock_since => :undef, :augeas_test_source => :undef, + :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } it { should contain_file('/usr/share/augeas/lenses/foo.aug') } @@ -25,6 +27,7 @@ describe 'with_lens' do :augeas_lens_source => '/tmp/foo.aug', :augeas_test_source => '/tmp/test_foo.aug', :augeas_stock_since => :undef, + :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } it { should contain_file('/usr/share/augeas/lenses/foo.aug') } @@ -40,6 +43,7 @@ describe 'with_lens' do :augeas_stock_since => '1.2.3', :augeasversion => '1.0.0', :augeas_test_source => :undef, + :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } it { should contain_file('/usr/share/augeas/lenses/foo.aug') } @@ -53,6 +57,7 @@ describe 'with_lens' do :augeas_stock_since => '1.2.3', :augeasversion => '1.5.0', :augeas_test_source => :undef, + :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } it { should_not contain_file('/usr/share/augeas/lenses/foo.aug') } -- cgit v1.2.3 From aa246c2df133f47e9687bad512597a54ff504cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 30 Oct 2014 14:48:02 +0100 Subject: Use modulesync to manage meta files --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 675dd9a..c2df7b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,6 @@ env: matrix: fast_finish: true include: - - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 2.7" - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 1.9.3 -- cgit v1.2.3 From 4da147cb54b0e78935e46ece4f9213402dce0f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 4 Nov 2014 14:56:34 +0100 Subject: Release 1.0.2 --- CHANGELOG | 5 +++++ metadata.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 7907111..c8cebf9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +##2014-11-04 - Version 1.0.2 + +- Fix path in unit tests +- Drop Puppet 2.7 support + ##2014-10-28 - Version 1.0.1 - Add path to exec in augeas::lens diff --git a/metadata.json b/metadata.json index 6b652d3..5f65ac3 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.0.1", + "version": "1.0.2", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "GNU GPLv3", -- cgit v1.2.3 From d40d1066c0078825c4ee439a9dd263ece44ce7d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 12 Nov 2014 11:22:19 +0100 Subject: Use forge_password in .sync.yml --- .sync.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.sync.yml b/.sync.yml index b369409..677d00c 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,5 +1,3 @@ --- .travis.yml: - secure_global_env: - # PUBLISHER_PASSWORD - - "DRCxF7vpgZUChYEMgIak/7FoM9zitsD6fP1bTpT2MbBViBK+Eic05ePayroWzI/vDNkqIjet1pzoA0XVlEtVfkuhCGXVOJJ1nXH7fMezcdxRgnzxUK0cj8CZLQbFxJX0THn0BUf75fncMfySTNZ/K+Ln6Rzdfra3vVbk5suoSSA=" + forge_password: "GYBg84VC7Mx8BhAJ/56VjPU8tctatVVafGjuM9rJVmvJpbHkTz+XORHkvdVxCCkAkiq0/NZjwWpbxkQGMz0MxnXT5V/H90+h6YRHnWIEEqlW+5dR76uKZ9mO65cqk+l8UA+GUr5ZWKTS0fEJzjNR8aFM56DaM1u+SWIfjBXfE0k=" -- cgit v1.2.3 From 1c80b35d5d19626cb87f2683a490f3d7edadd6cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 12 Nov 2014 12:02:10 +0100 Subject: Sync .travis.yml --- .travis.yml | 19 ++++++++++++------- Gemfile | 1 + Rakefile | 5 +++++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2df7b0..fa23833 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,7 @@ --- language: ruby bundler_args: --without development -script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'" -after_success: - ["git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng", ".forge-releng/publish"] -env: - global: - - PUBLISHER_LOGIN=camptocamp - - secure: "DRCxF7vpgZUChYEMgIak/7FoM9zitsD6fP1bTpT2MbBViBK+Eic05ePayroWzI/vDNkqIjet1pzoA0XVlEtVfkuhCGXVOJJ1nXH7fMezcdxRgnzxUK0cj8CZLQbFxJX0THn0BUf75fncMfySTNZ/K+Ln6Rzdfra3vVbk5suoSSA=" +script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation' && bundle exec rake metadata" matrix: fast_finish: true include: @@ -19,3 +13,14 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.0" notifications: email: false +deploy: + provider: puppetforge + user: camptocamp + password: + secure: "GYBg84VC7Mx8BhAJ/56VjPU8tctatVVafGjuM9rJVmvJpbHkTz+XORHkvdVxCCkAkiq0/NZjwWpbxkQGMz0MxnXT5V/H90+h6YRHnWIEEqlW+5dR76uKZ9mO65cqk+l8UA+GUr5ZWKTS0fEJzjNR8aFM56DaM1u+SWIfjBXfE0k=" + on: + tags: true + # all_branches is required to use tags + all_branches: true + # Only publish if our main Ruby target builds + rvm: 1.9.3 diff --git a/Gemfile b/Gemfile index 2e01aab..29ed93f 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,7 @@ group :development, :test do gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false + gem 'metadata-json-lint', :require => false end if facterversion = ENV['FACTER_GEM_VERSION'] diff --git a/Rakefile b/Rakefile index ee78ce6..47d75d8 100644 --- a/Rakefile +++ b/Rakefile @@ -4,3 +4,8 @@ require 'puppet-lint/tasks/puppet-lint' PuppetLint.configuration.fail_on_warnings PuppetLint.configuration.send('disable_80chars') PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"] + +desc "Lint metadata.json file" +task :metadata do + sh "metadata-json-lint metadata.json" +end -- cgit v1.2.3 From 6daa52d964c034fb6f0705d47647d8a989fa1971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 13 Nov 2014 11:02:48 +0100 Subject: .travis.yml: Split the script command [skip ci] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa23833..1e90441 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- language: ruby bundler_args: --without development -script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation' && bundle exec rake metadata" +script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] matrix: fast_finish: true include: -- cgit v1.2.3 From 5e7d4efec33115463fc42dc07b5b864eb8978f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 17 Nov 2014 14:48:11 +0100 Subject: Release 1.0.3 --- CHANGELOG | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index c8cebf9..f264605 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +##2014-11-17 - Version 1.0.3 + +- Lint metadata.json + ##2014-11-04 - Version 1.0.2 - Fix path in unit tests diff --git a/metadata.json b/metadata.json index 5f65ac3..190d22b 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.0.2", + "version": "1.0.3", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "GNU GPLv3", -- cgit v1.2.3 From fe75c3cd416a10d5bc6fec0f64fe77a43d63ce0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 25 Nov 2014 14:20:22 +0100 Subject: Use parser=future --- .travis.yml | 5 +++++ Gemfile | 2 +- spec/spec_helper.rb | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1e90441..25be65c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,11 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.0" PUPPET_PARSER="future" + allow_failures: + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.0" PUPPET_PARSER="future" notifications: email: false deploy: diff --git a/Gemfile b/Gemfile index 29ed93f..3928d5a 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :test do gem 'rake', :require => false - gem 'rspec-puppet', :require => false + gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false gem 'metadata-json-lint', :require => false diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index adbb191..98b22c3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -17,6 +17,10 @@ RSpec.configure do |c| if Gem::Version.new(`puppet --version`) >= Gem::Version.new('3.5') Puppet.settings[:strict_variables]=true end + + if ENV['PUPPET_PARSER'] == 'future' + Puppet.settings[:parser]='future' + end end c.after :each do -- cgit v1.2.3 From 9f83121325b04c0f51e6e8b2846bbcdd4f1267c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 25 Nov 2014 17:43:49 +0100 Subject: Fix future parser tests --- Gemfile | 2 +- spec/spec_helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 3928d5a..fa8cc38 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :test do gem 'rake', :require => false - gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' + gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git', :branch => 'future-no-import' gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false gem 'metadata-json-lint', :require => false diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 98b22c3..0b4bc99 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -19,7 +19,7 @@ RSpec.configure do |c| end if ENV['PUPPET_PARSER'] == 'future' - Puppet.settings[:parser]='future' + c.parser='future' end end -- cgit v1.2.3 From 714d9cb556f4374cf2c47913f9ccc8d613109895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 25 Nov 2014 17:58:57 +0100 Subject: Use camptocamp's fork for rspec-puppet --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index fa8cc38..8db393c 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :test do gem 'rake', :require => false - gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git', :branch => 'future-no-import' + gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet.git', :branch => 'future-no-import' gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false gem 'metadata-json-lint', :require => false -- cgit v1.2.3 From acdf2d26d6cf96b85b8f868ae585e0ff31aa0a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 27 Nov 2014 12:20:01 +0100 Subject: Activate puppet_facts by default [skip ci] --- Gemfile | 1 + spec/spec_helper.rb | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/Gemfile b/Gemfile index 8db393c..c021926 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ group :development, :test do gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false gem 'metadata-json-lint', :require => false + gem 'puppet_facts', :require => false end if facterversion = ENV['FACTER_GEM_VERSION'] diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0b4bc99..9675ded 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,9 @@ require 'puppetlabs_spec_helper/module_spec_helper' +require 'puppet_facts' +include PuppetFacts + +ENV['UNIT_TEST_PLATFORMS'] = 'debian-7-x86_64' + RSpec.configure do |c| c.include PuppetlabsSpec::Files -- cgit v1.2.3 From a58268a8a75d845b6b06cf224084af2ee2c2a66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 27 Nov 2014 13:50:13 +0100 Subject: Use FUTURE_PARSER=yes instead of PUPPET_PARSER=future --- .travis.yml | 4 ++-- spec/spec_helper.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 25be65c..3d54a1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,10 @@ matrix: - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.0" PUPPET_PARSER="future" + env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" allow_failures: - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.0" PUPPET_PARSER="future" + env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" notifications: email: false deploy: diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9675ded..cf5db0b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -23,7 +23,7 @@ RSpec.configure do |c| Puppet.settings[:strict_variables]=true end - if ENV['PUPPET_PARSER'] == 'future' + if ENV['FUTURE_PARSER'] == 'yes' c.parser='future' end end -- cgit v1.2.3 From e770b9b1fee17661a26fd8ce995b4829aabd7073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 27 Nov 2014 16:09:24 +0100 Subject: Use camptocamp's version of puppet_facts [skip ci] --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index c021926..c716faa 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ group :development, :test do gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false gem 'metadata-json-lint', :require => false - gem 'puppet_facts', :require => false + gem 'puppet_facts', :require => false, :git => 'https://github.com/camptocamp/puppet_facts.git' end if facterversion = ENV['FACTER_GEM_VERSION'] -- cgit v1.2.3 From 2ab024ab14bdf831233d727f55d0a3cc0cf5e5b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 9 Dec 2014 15:37:21 +0100 Subject: Improve metadata.json --- README.markdown | 91 --------------------------------------------------------- README.md | 73 +++++++++++++++++++++++++++++++++++++++++++++ metadata.json | 55 ++++++++++++++++++++++++++++++++-- 3 files changed, 126 insertions(+), 93 deletions(-) delete mode 100644 README.markdown create mode 100644 README.md diff --git a/README.markdown b/README.markdown deleted file mode 100644 index a25cb40..0000000 --- a/README.markdown +++ /dev/null @@ -1,91 +0,0 @@ -# Augeas Puppet module - -[![Puppet Forge](http://img.shields.io/puppetforge/v/camptocamp/augeas.svg)](https://forge.puppetlabs.com/camptocamp/augeas) -[![Build Status](https://travis-ci.org/camptocamp/puppet-augeas.png?branch=master)](https://travis-ci.org/camptocamp/puppet-augeas) - -**Install and configure Augeas.** - -This module is provided by [Camptocamp](http://www.camptocamp.com/) - -## Usage - -Simple usage: - - include augeas - -### Classes - -The module provides an `augeas` class which installs and configures Augeas. - - -* lets you force the augeas version by defining `$augeas_version`, otherwise puppet will - only ensure the packages are present; -* lets you force the ruby library version by defining `$augeas_ruby_version`, otherwise puppet will - only ensure the libaugeas-ruby version will be installed according to internal critera; -* provides an `augeas()` master-side function to manipulate strings using Augeas; - -### Definitions - -#### `augeas::lens` - -The `augeas::lens` definition allows you to deploy an Augeas lens and any associated test files, running unit tests and not installing if they fail: - -Parameters: - -- *ensure*: present/absent -- *lens_source*: the source for the lens -- *test_source*: optionally, the source for the test file. -- *stock_since*: optionally, indicate in which version of Augeas - the lens became stock, so it will not be deployed above that version. - -Example usage: - - augeas::lens { 'networkmanager': - lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', - test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', - stock_since => '1.0.0', - } - -### Functions - -#### `augeas()` - -Modifies a string using Augeas. - -*Example:* - - augeas("proc /proc proc nodev,noexec,nosuid 0 0\n", 'Fstab.lns', ['rm ./1/opt[3]']) - -Would result in: - - "proc /proc proc nodev,noexec 0 0\n" - - -- *Type*: rvalue - -## Contributing - -Please report bugs and feature request using [GitHub issue -tracker](https://github.com/camptocamp/puppet-augeas/issues). - -For pull requests, it is very much appreciated to check your Puppet manifest -with [puppet-lint](https://github.com/camptocamp/puppet-augeas/issues) to follow the recommended Puppet style guidelines from the -[Puppet Labs style guide](http://docs.puppetlabs.com/guides/style_guide.html). - -## License - -Copyright (c) 2013 All rights reserved. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - diff --git a/README.md b/README.md new file mode 100644 index 0000000..4a7bed1 --- /dev/null +++ b/README.md @@ -0,0 +1,73 @@ +# Augeas Puppet module + +[![Puppet Forge](http://img.shields.io/puppetforge/v/camptocamp/augeas.svg)](https://forge.puppetlabs.com/camptocamp/augeas) +[![Build Status](https://travis-ci.org/camptocamp/puppet-augeas.png?branch=master)](https://travis-ci.org/camptocamp/puppet-augeas) + +**Install and configure Augeas.** + +This module is provided by [Camptocamp](http://www.camptocamp.com/) + +## Usage + +Simple usage: + + include augeas + +### Classes + +The module provides an `augeas` class which installs and configures Augeas. + + +* lets you force the augeas version by defining `$augeas_version`, otherwise puppet will + only ensure the packages are present; +* lets you force the ruby library version by defining `$augeas_ruby_version`, otherwise puppet will + only ensure the libaugeas-ruby version will be installed according to internal critera; +* provides an `augeas()` master-side function to manipulate strings using Augeas; + +### Definitions + +#### `augeas::lens` + +The `augeas::lens` definition allows you to deploy an Augeas lens and any associated test files, running unit tests and not installing if they fail: + +Parameters: + +- *ensure*: present/absent +- *lens_source*: the source for the lens +- *test_source*: optionally, the source for the test file. +- *stock_since*: optionally, indicate in which version of Augeas + the lens became stock, so it will not be deployed above that version. + +Example usage: + + augeas::lens { 'networkmanager': + lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', + test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', + stock_since => '1.0.0', + } + +### Functions + +#### `augeas()` + +Modifies a string using Augeas. + +*Example:* + + augeas("proc /proc proc nodev,noexec,nosuid 0 0\n", 'Fstab.lns', ['rm ./1/opt[3]']) + +Would result in: + + "proc /proc proc nodev,noexec 0 0\n" + + +- *Type*: rvalue + +## Contributing + +Please report bugs and feature request using [GitHub issue +tracker](https://github.com/camptocamp/puppet-augeas/issues). + +For pull requests, it is very much appreciated to check your Puppet manifest +with [puppet-lint](https://github.com/camptocamp/puppet-augeas/issues) to follow the recommended Puppet style guidelines from the +[Puppet Labs style guide](http://docs.puppetlabs.com/guides/style_guide.html). diff --git a/metadata.json b/metadata.json index 190d22b..6116923 100644 --- a/metadata.json +++ b/metadata.json @@ -3,12 +3,63 @@ "version": "1.0.3", "author": "camptocamp", "summary": "Camptocamp Augeas module", - "license": "GNU GPLv3", + "license": "Apache-2.0", "source": "https://github.com/camptocamp/puppet-augeas", "project_page": "https://github.com/camptocamp/puppet-augeas", "issues_url": "https://github.com/camptocamp/puppet-augeas/issues", "description": "Augeas Module for Puppet", "dependencies": [ - {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0"} + { + "name":"puppetlabs/stdlib", + "version_requirement":">= 3.2.0 <5.0.0" + } + ], + "requirements": [ + { + "name": "pe", + "version_requirement": "3.x" + }, + { + "name": "puppet", + "version_requirement": "3.x" + } + ], + "operatingsystem_support": [ + { + "operatingsystem": "Debian", + "operatingsystemrelease": [ + "6", + "7" + ] + }, + { + "operatingsystem": "Ubuntu", + "operatingsystemrelease": [ + "10.04", + "12.04", + "14.04" + ] + }, + { + "operatingsystem": "RedHat", + "operatingsystemrelease": [ + "5", + "6" + ] + }, + { + "operatingsystem": "SLES" + } + ], + "puppet_version": [ + "2.7", + "3.0", + "3.1", + "3.2", + "3.3", + "3.4", + "3.5", + "3.6", + "3.7" ] } -- cgit v1.2.3 From 1d1bab299473365788deef074e50167c1e082c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 9 Dec 2014 15:43:05 +0100 Subject: Convert specs to rspec3 syntax --- spec/defines/augeas_lens_spec.rb | 26 +++++++++++----------- spec/hosts/simple_debian_squeeze_spec.rb | 28 ++++++++++++------------ spec/hosts/simple_debian_wheezy_spec.rb | 28 ++++++++++++------------ spec/hosts/simple_redhat_spec.rb | 24 ++++++++++---------- spec/hosts/with_lens_noaugeas_spec.rb | 2 +- spec/hosts/with_lens_spec.rb | 24 ++++++++++---------- spec/hosts/wrong_os_spec.rb | 2 +- spec/unit/puppet/parser/functions/augeas_spec.rb | 6 ++--- 8 files changed, 70 insertions(+), 70 deletions(-) diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index cd9d515..5318d8d 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -12,7 +12,7 @@ describe 'augeas::lens' do context 'when no lens_source is passed' do it 'should error' do expect { - should contain_file('/usr/share/augeas/lenses/foo.aug') + is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') }.to raise_error(Puppet::Error, /Must pass lens_source/) end end @@ -22,10 +22,10 @@ describe 'augeas::lens' do :lens_source => '/tmp/foo.aug', } } - it { should contain_file('/usr/share/augeas/lenses/foo.aug') } - it { should contain_exec('Typecheck lens foo') } - it { should_not contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } - it { should_not contain_exec('Test lens foo') } + it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_exec('Typecheck lens foo') } + it { is_expected.not_to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } + it { is_expected.not_to contain_exec('Test lens foo') } end context 'when lens_source and test_source are passed' do @@ -34,10 +34,10 @@ describe 'augeas::lens' do :test_source => '/tmp/test_foo.aug', } } - it { should contain_file('/usr/share/augeas/lenses/foo.aug') } - it { should contain_exec('Typecheck lens foo') } - it { should contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } - it { should contain_exec('Test lens foo') } + it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_exec('Typecheck lens foo') } + it { is_expected.to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } + it { is_expected.to contain_exec('Test lens foo') } end context 'when stock_since is passed and augeas is older' do @@ -55,8 +55,8 @@ describe 'augeas::lens' do :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } - it { should contain_file('/usr/share/augeas/lenses/foo.aug') } - it { should contain_exec('Typecheck lens foo') } + it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_exec('Typecheck lens foo') } end context 'when stock_since is passed and augeas is newer' do @@ -74,7 +74,7 @@ describe 'augeas::lens' do :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } - it { should_not contain_file('/usr/share/augeas/lenses/foo.aug') } - it { should_not contain_exec('Typecheck lens foo') } + it { is_expected.not_to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.not_to contain_exec('Typecheck lens foo') } end end diff --git a/spec/hosts/simple_debian_squeeze_spec.rb b/spec/hosts/simple_debian_squeeze_spec.rb index 08ecd3e..18bc50c 100644 --- a/spec/hosts/simple_debian_squeeze_spec.rb +++ b/spec/hosts/simple_debian_squeeze_spec.rb @@ -19,16 +19,16 @@ describe 'simple_debian_squeeze' do :rubyversion => '1.8.7', } } - it { should contain_package('libaugeas0').with( + it { is_expected.to contain_package('libaugeas0').with( :ensure => 'present' ) } - it { should contain_package('augeas-tools').with( + it { is_expected.to contain_package('augeas-tools').with( :ensure => 'present' ) } - it { should contain_package('augeas-lenses').with( + it { is_expected.to contain_package('augeas-lenses').with( :ensure => 'present' ) } - it { should contain_package('ruby-augeas').with( + it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.8' ) } @@ -44,16 +44,16 @@ describe 'simple_debian_squeeze' do :rubyversion => '1.8.7', } } - it { should contain_package('libaugeas0').with( + it { is_expected.to contain_package('libaugeas0').with( :ensure => '1.2.3' ) } - it { should contain_package('augeas-tools').with( + it { is_expected.to contain_package('augeas-tools').with( :ensure => '1.2.3' ) } - it { should contain_package('augeas-lenses').with( + it { is_expected.to contain_package('augeas-lenses').with( :ensure => '1.2.3' ) } - it { should contain_package('ruby-augeas').with( + it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.8' ) } @@ -69,18 +69,18 @@ describe 'simple_debian_squeeze' do :rubyversion => '1.8.7', } } - it { should contain_file('/usr/share/augeas/lenses').with( + it { is_expected.to contain_file('/usr/share/augeas/lenses').with( :ensure => 'directory', :purge => 'true', :force => 'true', :recurse => 'true', :recurselimit => 1 ) } - it { should contain_file('/usr/share/augeas/lenses/dist').with( + it { is_expected.to contain_file('/usr/share/augeas/lenses/dist').with( :ensure => 'directory', :purge => 'false' ) } - it { should contain_file('/usr/share/augeas/lenses/tests').with( + it { is_expected.to contain_file('/usr/share/augeas/lenses/tests').with( :ensure => 'directory', :purge => 'true', :force => 'true' @@ -97,18 +97,18 @@ describe 'simple_debian_squeeze' do :rubyversion => '1.8.7', } } - it { should contain_file('/opt/augeas/lenses').with( + it { is_expected.to contain_file('/opt/augeas/lenses').with( :ensure => 'directory', :purge => 'true', :force => 'true', :recurse => 'true', :recurselimit => 1 ) } - it { should contain_file('/opt/augeas/lenses/dist').with( + it { is_expected.to contain_file('/opt/augeas/lenses/dist').with( :ensure => 'directory', :purge => 'false' ) } - it { should contain_file('/opt/augeas/lenses/tests').with( + it { is_expected.to contain_file('/opt/augeas/lenses/tests').with( :ensure => 'directory', :purge => 'true', :force => 'true' diff --git a/spec/hosts/simple_debian_wheezy_spec.rb b/spec/hosts/simple_debian_wheezy_spec.rb index f301038..3e20db0 100644 --- a/spec/hosts/simple_debian_wheezy_spec.rb +++ b/spec/hosts/simple_debian_wheezy_spec.rb @@ -11,16 +11,16 @@ describe 'simple_debian_wheezy' do } } context 'when versions are not specified' do - it { should contain_package('libaugeas0').with( + it { is_expected.to contain_package('libaugeas0').with( :ensure => 'present' ) } - it { should contain_package('augeas-tools').with( + it { is_expected.to contain_package('augeas-tools').with( :ensure => 'present' ) } - it { should contain_package('augeas-lenses').with( + it { is_expected.to contain_package('augeas-lenses').with( :ensure => 'present' ) } - it { should contain_package('ruby-augeas').with( + it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.9.1' ) } @@ -36,16 +36,16 @@ describe 'simple_debian_wheezy' do :augeas_ruby_version => '3.2.1', } } - it { should contain_package('libaugeas0').with( + it { is_expected.to contain_package('libaugeas0').with( :ensure => '1.2.3' ) } - it { should contain_package('augeas-tools').with( + it { is_expected.to contain_package('augeas-tools').with( :ensure => '1.2.3' ) } - it { should contain_package('augeas-lenses').with( + it { is_expected.to contain_package('augeas-lenses').with( :ensure => '1.2.3' ) } - it { should contain_package('ruby-augeas').with( + it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.9.1' ) } @@ -60,18 +60,18 @@ describe 'simple_debian_wheezy' do :rubyversion => '1.9.1', } } - it { should contain_file('/usr/share/augeas/lenses').with( + it { is_expected.to contain_file('/usr/share/augeas/lenses').with( :ensure => 'directory', :purge => 'true', :force => 'true', :recurse => 'true', :recurselimit => 1 ) } - it { should contain_file('/usr/share/augeas/lenses/dist').with( + it { is_expected.to contain_file('/usr/share/augeas/lenses/dist').with( :ensure => 'directory', :purge => 'false' ) } - it { should contain_file('/usr/share/augeas/lenses/tests').with( + it { is_expected.to contain_file('/usr/share/augeas/lenses/tests').with( :ensure => 'directory', :purge => 'true', :force => 'true' @@ -88,18 +88,18 @@ describe 'simple_debian_wheezy' do :rubyversion => '1.9.1', } } - it { should contain_file('/opt/augeas/lenses').with( + it { is_expected.to contain_file('/opt/augeas/lenses').with( :ensure => 'directory', :purge => 'true', :force => 'true', :recurse => 'true', :recurselimit => 1 ) } - it { should contain_file('/opt/augeas/lenses/dist').with( + it { is_expected.to contain_file('/opt/augeas/lenses/dist').with( :ensure => 'directory', :purge => 'false' ) } - it { should contain_file('/opt/augeas/lenses/tests').with( + it { is_expected.to contain_file('/opt/augeas/lenses/tests').with( :ensure => 'directory', :purge => 'true', :force => 'true' diff --git a/spec/hosts/simple_redhat_spec.rb b/spec/hosts/simple_redhat_spec.rb index a7acd1f..42c17c8 100644 --- a/spec/hosts/simple_redhat_spec.rb +++ b/spec/hosts/simple_redhat_spec.rb @@ -13,13 +13,13 @@ describe 'simple_redhat' do :osfamily => 'RedHat', } } - it { should contain_package('augeas').with( + it { is_expected.to contain_package('augeas').with( :ensure => 'present' ) } - it { should contain_package('augeas-libs').with( + it { is_expected.to contain_package('augeas-libs').with( :ensure => 'present' ) } - it { should contain_package('ruby-augeas').with( + it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'ruby-augeas' ) } @@ -33,13 +33,13 @@ describe 'simple_redhat' do :augeas_ruby_version => '3.2.1', } } - it { should contain_package('augeas').with( + it { is_expected.to contain_package('augeas').with( :ensure => '1.2.3' ) } - it { should contain_package('augeas-libs').with( + it { is_expected.to contain_package('augeas-libs').with( :ensure => '1.2.3' ) } - it { should contain_package('ruby-augeas').with( + it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'ruby-augeas' ) } @@ -53,18 +53,18 @@ describe 'simple_redhat' do :osfamily => 'RedHat', } } - it { should contain_file('/usr/share/augeas/lenses').with( + it { is_expected.to contain_file('/usr/share/augeas/lenses').with( :ensure => 'directory', :purge => 'true', :force => 'true', :recurse => 'true', :recurselimit => 1 ) } - it { should contain_file('/usr/share/augeas/lenses/dist').with( + it { is_expected.to contain_file('/usr/share/augeas/lenses/dist').with( :ensure => 'directory', :purge => 'false' ) } - it { should contain_file('/usr/share/augeas/lenses/tests').with( + it { is_expected.to contain_file('/usr/share/augeas/lenses/tests').with( :ensure => 'directory', :purge => 'true', :force => 'true' @@ -79,18 +79,18 @@ describe 'simple_redhat' do :osfamily => 'RedHat', } } - it { should contain_file('/opt/augeas/lenses').with( + it { is_expected.to contain_file('/opt/augeas/lenses').with( :ensure => 'directory', :purge => 'true', :force => 'true', :recurse => 'true', :recurselimit => 1 ) } - it { should contain_file('/opt/augeas/lenses/dist').with( + it { is_expected.to contain_file('/opt/augeas/lenses/dist').with( :ensure => 'directory', :purge => 'false' ) } - it { should contain_file('/opt/augeas/lenses/tests').with( + it { is_expected.to contain_file('/opt/augeas/lenses/tests').with( :ensure => 'directory', :purge => 'true', :force => 'true' diff --git a/spec/hosts/with_lens_noaugeas_spec.rb b/spec/hosts/with_lens_noaugeas_spec.rb index b26563b..7786918 100644 --- a/spec/hosts/with_lens_noaugeas_spec.rb +++ b/spec/hosts/with_lens_noaugeas_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe 'with_lens_noaugeas' do it 'should error' do expect { - should contain_file('/usr/share/augeas/lenses/foo.aug') + is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') }.to raise_error(Puppet::Error, /You must declare the augeas class/) end end diff --git a/spec/hosts/with_lens_spec.rb b/spec/hosts/with_lens_spec.rb index 10437c9..e0f5dff 100644 --- a/spec/hosts/with_lens_spec.rb +++ b/spec/hosts/with_lens_spec.rb @@ -15,10 +15,10 @@ describe 'with_lens' do :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } - it { should contain_file('/usr/share/augeas/lenses/foo.aug') } - it { should contain_exec('Typecheck lens foo') } - it { should_not contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } - it { should_not contain_exec('Test lens foo') } + it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_exec('Typecheck lens foo') } + it { is_expected.not_to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } + it { is_expected.not_to contain_exec('Test lens foo') } end context 'when lens_source and test_source are passed' do @@ -30,10 +30,10 @@ describe 'with_lens' do :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } - it { should contain_file('/usr/share/augeas/lenses/foo.aug') } - it { should contain_exec('Typecheck lens foo') } - it { should contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } - it { should contain_exec('Test lens foo') } + it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_exec('Typecheck lens foo') } + it { is_expected.to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } + it { is_expected.to contain_exec('Test lens foo') } end context 'when stock_since is passed and augeas is older' do @@ -46,8 +46,8 @@ describe 'with_lens' do :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } - it { should contain_file('/usr/share/augeas/lenses/foo.aug') } - it { should contain_exec('Typecheck lens foo') } + it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_exec('Typecheck lens foo') } end context 'when stock_since is passed and augeas is newer' do @@ -60,7 +60,7 @@ describe 'with_lens' do :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } } - it { should_not contain_file('/usr/share/augeas/lenses/foo.aug') } - it { should_not contain_exec('Typecheck lens foo') } + it { is_expected.not_to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.not_to contain_exec('Typecheck lens foo') } end end diff --git a/spec/hosts/wrong_os_spec.rb b/spec/hosts/wrong_os_spec.rb index 4180e81..98fb93f 100644 --- a/spec/hosts/wrong_os_spec.rb +++ b/spec/hosts/wrong_os_spec.rb @@ -10,6 +10,6 @@ describe 'wrong_os' do } } it 'should fail' do - expect { should contain_package('ruby-augeas') }.to raise_error(Puppet::Error, /Unsupported OS family/) + expect { is_expected.to contain_package('ruby-augeas') }.to raise_error(Puppet::Error, /Unsupported OS family/) end end diff --git a/spec/unit/puppet/parser/functions/augeas_spec.rb b/spec/unit/puppet/parser/functions/augeas_spec.rb index 9c48773..b34fa5b 100644 --- a/spec/unit/puppet/parser/functions/augeas_spec.rb +++ b/spec/unit/puppet/parser/functions/augeas_spec.rb @@ -10,7 +10,7 @@ describe 'the augeas function' do end it "should exist" do - Puppet::Parser::Functions.function("augeas").should == "function_augeas" + expect(Puppet::Parser::Functions.function("augeas")).to eq("function_augeas") end context "when passing wrong arguments" do @@ -57,13 +57,13 @@ describe 'the augeas function' do context "when applying valid changes" do it "should remove the 3rd option" do result = scope.function_augeas(["proc /proc proc nodev,noexec,nosuid 0 0\n", 'Fstab.lns', ['rm ./1/opt[3]']]) - result.class.should == String + expect(result.class).to eq(String) #result.should == "proc /proc proc nodev,noexec 0 0\n" end it "should set a 4th option" do result = scope.function_augeas(["proc /proc proc nodev,noexec,nosuid 0 0\n", 'Fstab.lns', ['ins opt after ./1/opt[last()]', 'set ./1/opt[last()] nofoo']]) - result.class.should == String + expect(result.class).to eq(String) #result.should == "proc /proc proc nodev,noexec,nosuid,nofoo 0 0\n" end end -- cgit v1.2.3 From ea11eb2c35eb06575893b77b922ee35a365cf78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 9 Dec 2014 15:45:05 +0100 Subject: Release 1.1.0 --- CHANGELOG | 6 ++++++ metadata.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index f264605..8938071 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +##2014-12-09 - Version 1.1.0 + +- Add future parser tests +- Convert specs to rspec3 syntax +- Fix metadata.json + ##2014-11-17 - Version 1.0.3 - Lint metadata.json diff --git a/metadata.json b/metadata.json index 6116923..00a4e1c 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.0.3", + "version": "1.1.0", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 7bb6cf0507448d3ddea6ba28ab0afffeaa4c1c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 9 Dec 2014 15:47:34 +0100 Subject: Modulesync [skip ci] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3d54a1a..d07b09f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- language: ruby bundler_args: --without development -script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] +script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec fakeroot rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] matrix: fast_finish: true include: -- cgit v1.2.3 From 6bf3c5c9679d6ddf6d3aeb48477004e283c9c6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 11 Dec 2014 13:57:12 +0100 Subject: Update with modulesync_configs [skip ci] --- .travis.yml | 6 ++++-- Gemfile | 13 ++++++++++--- Rakefile | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d07b09f..50e247d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,14 @@ --- language: ruby -bundler_args: --without development +bundler_args: --without system_tests script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec fakeroot rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] matrix: fast_finish: true include: - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 3.0" + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 diff --git a/Gemfile b/Gemfile index c716faa..cd34bef 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,19 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" -group :development, :test do +group :development, :unit_tests do gem 'rake', :require => false - gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet.git', :branch => 'future-no-import' + gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false - gem 'metadata-json-lint', :require => false + gem 'simplecov', :require => false gem 'puppet_facts', :require => false, :git => 'https://github.com/camptocamp/puppet_facts.git' + gem 'json', :require => false + gem 'metadata-json-lint', :require => false +end + +group :system_tests do + gem 'beaker-rspec', :require => false + gem 'serverspec', :require => false end if facterversion = ENV['FACTER_GEM_VERSION'] diff --git a/Rakefile b/Rakefile index 47d75d8..5cf3aa8 100644 --- a/Rakefile +++ b/Rakefile @@ -2,6 +2,7 @@ require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-lint/tasks/puppet-lint' PuppetLint.configuration.fail_on_warnings +PuppetLint.configuration.send('relative') PuppetLint.configuration.send('disable_80chars') PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"] -- cgit v1.2.3 From e771438f3dce19ff2e2cac17e5a1da8b2a2b0457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Sat, 13 Dec 2014 08:58:06 +0100 Subject: Upate with modulesync --- .travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 50e247d..3c0157a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,18 +6,13 @@ matrix: fast_finish: true include: - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" - - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" + env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 1.7.0" - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - allow_failures: - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" notifications: email: false deploy: -- cgit v1.2.3 From 4a4b48adeebedf1a2ca4bd8835c4728e85df0eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Sat, 13 Dec 2014 08:59:42 +0100 Subject: Upate with modulesync --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index cd34bef..f9c2b63 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ group :development, :unit_tests do gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false gem 'simplecov', :require => false - gem 'puppet_facts', :require => false, :git => 'https://github.com/camptocamp/puppet_facts.git' + gem 'rspec-puppet-facts', :require => false gem 'json', :require => false gem 'metadata-json-lint', :require => false end -- cgit v1.2.3 From 04368d6d58d5a1f0f0c27dffcc624139f6a06ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Sat, 13 Dec 2014 09:04:53 +0100 Subject: Update with modulesync --- spec/spec_helper.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cf5db0b..41dd7da 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,8 +1,6 @@ require 'puppetlabs_spec_helper/module_spec_helper' -require 'puppet_facts' -include PuppetFacts - -ENV['UNIT_TEST_PLATFORMS'] = 'debian-7-x86_64' +require 'rspec-puppet-facts' +include RspecPuppetFacts RSpec.configure do |c| -- cgit v1.2.3 From d7086df1d68892ada68e18168428febe30ea1c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 18 Dec 2014 09:40:28 +0100 Subject: Use Travis container infrastructure --- .travis.yml | 2 ++ Gemfile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3c0157a..eabd598 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ --- language: ruby +sudo: false +cache: bundler bundler_args: --without system_tests script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec fakeroot rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] matrix: diff --git a/Gemfile b/Gemfile index f9c2b63..b83f8b6 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ group :development, :unit_tests do gem 'rake', :require => false gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' gem 'puppetlabs_spec_helper', :require => false - gem 'puppet-lint', :require => false + gem 'puppet-lint', '< 1.1.0', :require => false gem 'simplecov', :require => false gem 'rspec-puppet-facts', :require => false gem 'json', :require => false -- cgit v1.2.3 From 8ad8061bc77a12d39019381017564043be41054a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 18 Dec 2014 09:43:46 +0100 Subject: Exclude vendor directories from tests --- Rakefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 5cf3aa8..a81b2c6 100644 --- a/Rakefile +++ b/Rakefile @@ -4,7 +4,9 @@ require 'puppet-lint/tasks/puppet-lint' PuppetLint.configuration.fail_on_warnings PuppetLint.configuration.send('relative') PuppetLint.configuration.send('disable_80chars') -PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"] +PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"] + +PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"] desc "Lint metadata.json file" task :metadata do -- cgit v1.2.3 From 89f0cdd790ceea5d5e8023bd99a4afc283b8684d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 18 Dec 2014 10:21:36 +0100 Subject: Cache spec/fixtures/modules --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index eabd598..14c5b97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,12 @@ --- language: ruby sudo: false -cache: bundler +cache: + directories: + - vendor/bundle + - spec/fixtures/modules bundler_args: --without system_tests -script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec fakeroot rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] +script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec_prep", "bundle exec fakeroot rake spec_standalone SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] matrix: fast_finish: true include: -- cgit v1.2.3 From 9dec7802897542d1601ba84d223bd66a26b0fc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 18 Dec 2014 10:25:48 +0100 Subject: Use vendor/bundle for gems --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 14c5b97..c356eb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ cache: directories: - vendor/bundle - spec/fixtures/modules -bundler_args: --without system_tests +bundler_args: --without system_tests --path vendor/bundle script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec_prep", "bundle exec fakeroot rake spec_standalone SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] matrix: fast_finish: true -- cgit v1.2.3 From 465bb2cdd500ace6a9abbbfc5805e1c20801d9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 18 Dec 2014 17:20:10 +0100 Subject: Release version 1.1.0 --- metadata.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/metadata.json b/metadata.json index 00a4e1c..5050bfc 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.1.0", + "version": "1.1.1", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", @@ -10,8 +10,8 @@ "description": "Augeas Module for Puppet", "dependencies": [ { - "name":"puppetlabs/stdlib", - "version_requirement":">= 3.2.0 <5.0.0" + "name": "puppetlabs/stdlib", + "version_requirement": ">= 3.2.0 <5.0.0" } ], "requirements": [ -- cgit v1.2.3 From 8d6f31f443761da6914e5c3218bfbb4482baae32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 18 Dec 2014 17:20:39 +0100 Subject: Release version 1.1.1 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 5050bfc..6fa7275 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.1.1", + "version": "1.1.2", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 8b375611b7dec7806bb0e519756cd365e75986e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 18 Dec 2014 17:25:55 +0100 Subject: Release version 1.1.3 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 6fa7275..0a29753 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.1.2", + "version": "1.1.3", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 520b5e876c5a31b9f4bf38a3714a125316833dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 22 Dec 2014 18:34:19 +0100 Subject: Fix unit tests when using future parser --- metadata.json | 3 - spec/classes/augeas_spec.rb | 149 +++++++++++++++++++++++++++++ spec/defines/augeas_lens_spec.rb | 158 +++++++++++++++++++------------ spec/fixtures/manifests/site.pp | 23 ----- spec/hosts/simple_debian_squeeze_spec.rb | 117 ----------------------- spec/hosts/simple_debian_wheezy_spec.rb | 108 --------------------- spec/hosts/simple_redhat_spec.rb | 99 ------------------- spec/hosts/with_lens_noaugeas_spec.rb | 9 -- spec/hosts/with_lens_spec.rb | 66 ------------- spec/hosts/wrong_os_spec.rb | 15 --- 10 files changed, 244 insertions(+), 503 deletions(-) create mode 100644 spec/classes/augeas_spec.rb delete mode 100644 spec/fixtures/manifests/site.pp delete mode 100644 spec/hosts/simple_debian_squeeze_spec.rb delete mode 100644 spec/hosts/simple_debian_wheezy_spec.rb delete mode 100644 spec/hosts/simple_redhat_spec.rb delete mode 100644 spec/hosts/with_lens_noaugeas_spec.rb delete mode 100644 spec/hosts/with_lens_spec.rb delete mode 100644 spec/hosts/wrong_os_spec.rb diff --git a/metadata.json b/metadata.json index 0a29753..2c14f20 100644 --- a/metadata.json +++ b/metadata.json @@ -46,9 +46,6 @@ "5", "6" ] - }, - { - "operatingsystem": "SLES" } ], "puppet_version": [ diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb new file mode 100644 index 0000000..ab4241f --- /dev/null +++ b/spec/classes/augeas_spec.rb @@ -0,0 +1,149 @@ +require 'spec_helper' + +describe 'augeas' do + + context 'when on an unsupported Operating System' do + let (:facts) do + { + :osfamily => 'MS-DOS', + } + end + + it 'should fail' do + expect { is_expected.to contain_package('ruby-augeas') }.to raise_error(Puppet::Error, /Unsupported OS family/) + end + end + + on_supported_os.each do |os, facts| + context "on #{os}" do + let(:facts) do + facts + end + + context 'without params' do + case facts[:osfamily] + when 'Debian' + it { is_expected.to contain_package('libaugeas0').with( + :ensure => 'present' + ) } + it { is_expected.to contain_package('augeas-tools').with( + :ensure => 'present' + ) } + it { is_expected.to contain_package('augeas-lenses').with( + :ensure => 'present' + ) } + case facts[:lsbdistcodename] + when 'squeeze', 'lucid', 'precise' + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => 'present', + :name => 'libaugeas-ruby1.8' + ) } + else + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => 'present', + :name => 'libaugeas-ruby1.9.1' + ) } + end + when 'RedHat' + it { is_expected.to contain_package('augeas').with( + :ensure => 'present' + ) } + it { is_expected.to contain_package('augeas-libs').with( + :ensure => 'present' + ) } + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => 'present', + :name => 'ruby-augeas' + ) } + end + it { is_expected.to contain_file('/usr/share/augeas/lenses').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true', + :recurse => 'true', + :recurselimit => 1 + ) } + it { is_expected.to contain_file('/usr/share/augeas/lenses/dist').with( + :ensure => 'directory', + :purge => 'false' + ) } + it { is_expected.to contain_file('/usr/share/augeas/lenses/tests').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true' + ).without(:recurse) } + end + + context 'when versions are specified' do + let (:params) do + { + :version => '1.2.3', + :ruby_version => '3.2.1', + } + end + + case facts[:osfamily] + when 'Debian' + it { is_expected.to contain_package('libaugeas0').with( + :ensure => '1.2.3' + ) } + it { is_expected.to contain_package('augeas-tools').with( + :ensure => '1.2.3' + ) } + it { is_expected.to contain_package('augeas-lenses').with( + :ensure => '1.2.3' + ) } + case facts[:lsbdistcodename] + when 'squeeze', 'lucid', 'precise' + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => '3.2.1', + :name => 'libaugeas-ruby1.8' + ) } + else + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => '3.2.1', + :name => 'libaugeas-ruby1.9.1' + ) } + end + when 'RedHat' + it { is_expected.to contain_package('augeas').with( + :ensure => '1.2.3' + ) } + it { is_expected.to contain_package('augeas-libs').with( + :ensure => '1.2.3' + ) } + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => '3.2.1', + :name => 'ruby-augeas' + ) } + end + + end + + context 'with a non standard lens_dir' do + let (:params) do + { + :lens_dir => '/opt/augeas/lenses', + } + end + + it { is_expected.to contain_file('/opt/augeas/lenses').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true', + :recurse => 'true', + :recurselimit => 1 + ) } + it { is_expected.to contain_file('/opt/augeas/lenses/dist').with( + :ensure => 'directory', + :purge => 'false' + ) } + it { is_expected.to contain_file('/opt/augeas/lenses/tests').with( + :ensure => 'directory', + :purge => 'true', + :force => 'true' + ).without(:recurse) } + end + end + end +end diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index 5318d8d..7feeefb 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -2,79 +2,111 @@ require 'spec_helper' describe 'augeas::lens' do let (:title) { 'foo' } - let (:facts) { { - :augeas_lens_dir => :undef, - :augeas_ruby_version => :undef, - :augeas_version => :undef, - :osfamily => 'RedHat', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - } } - context 'when no lens_source is passed' do + + context 'when not declaring augeas class first' do + let (:params) do + { + :lens_source => '/tmp/foo.aug', + } + end + it 'should error' do expect { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') - }.to raise_error(Puppet::Error, /Must pass lens_source/) + }.to raise_error(Puppet::Error, /You must declare the augeas class/) end end - context 'when lens_source is passed' do - let (:params) { { - :lens_source => '/tmp/foo.aug', - } } + context 'when declaring augeas class first' do - it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } - it { is_expected.to contain_exec('Typecheck lens foo') } - it { is_expected.not_to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } - it { is_expected.not_to contain_exec('Test lens foo') } - end + on_supported_os.each do |os, facts| + context "on #{os}" do + let(:facts) do + facts.merge({ + :augeasversion => :undef, + }) + end - context 'when lens_source and test_source are passed' do - let (:params) { { - :lens_source => '/tmp/foo.aug', - :test_source => '/tmp/test_foo.aug', - } } + context 'With standard augeas version' do - it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } - it { is_expected.to contain_exec('Typecheck lens foo') } - it { is_expected.to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } - it { is_expected.to contain_exec('Test lens foo') } - end + let(:pre_condition) do + "class { '::augeas': }" + end - context 'when stock_since is passed and augeas is older' do - let (:params) { { - :lens_source => '/tmp/foo.aug', - :stock_since => '1.2.3', - } } - - let (:facts) { { - :augeas_lens_dir => :undef, - :augeas_version => :undef, - :augeasversion => '1.0.0', - :augeas_ruby_version => :undef, - :osfamily => 'RedHat', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - } } - - it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } - it { is_expected.to contain_exec('Typecheck lens foo') } - end + context 'when no lens_source is passed' do + it 'should error' do + expect { + is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') + }.to raise_error(Puppet::Error, /Must pass lens_source/) + end + end + + context 'when lens_source is passed' do + let (:params) do + { + :lens_source => '/tmp/foo.aug', + } + end + + it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_exec('Typecheck lens foo') } + it { is_expected.not_to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } + it { is_expected.not_to contain_exec('Test lens foo') } + end - context 'when stock_since is passed and augeas is newer' do - let (:params) { { - :lens_source => '/tmp/foo.aug', - :stock_since => '1.2.3', - } } - - let (:facts) { { - :augeas_lens_dir => :undef, - :augeas_version => :undef, - :augeasversion => '1.5.0', - :augeas_ruby_version => :undef, - :osfamily => 'RedHat', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - } } - - it { is_expected.not_to contain_file('/usr/share/augeas/lenses/foo.aug') } - it { is_expected.not_to contain_exec('Typecheck lens foo') } + context 'when lens_source and test_source are passed' do + let (:params) do + { + :lens_source => '/tmp/foo.aug', + :test_source => '/tmp/test_foo.aug', + } + end + + it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_exec('Typecheck lens foo') } + it { is_expected.to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } + it { is_expected.to contain_exec('Test lens foo') } + end + end + + context 'when stock_since is passed and augeas is older' do + let (:params) do + { + :lens_source => '/tmp/foo.aug', + :stock_since => '1.2.3', + } + end + + let(:pre_condition) do + "class { '::augeas': version => '1.0.0' }" + end + + it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_exec('Typecheck lens foo') } + end + + context 'when stock_since is passed and augeas is newer' do + let (:params) do + { + :lens_source => '/tmp/foo.aug', + :stock_since => '1.2.3', + } + end + + let(:pre_condition) do + "class { '::augeas': version => '1.3.0' }" + end + + it do + pending "undefined method `negative_failure_message'" + is_expected.not_to contain_file('/usr/share/augeas/lenses/foo.aug') + end + it do + pending "undefined method `negative_failure_message'" + is_expected.not_to contain_exec('Typecheck lens foo') + end + end + end + end end end diff --git a/spec/fixtures/manifests/site.pp b/spec/fixtures/manifests/site.pp deleted file mode 100644 index fb803e5..0000000 --- a/spec/fixtures/manifests/site.pp +++ /dev/null @@ -1,23 +0,0 @@ -# simple_* and wrong_os tests -node default { - class { '::augeas': - version => $::augeas_version, - ruby_version => $::augeas_ruby_version, - lens_dir => $::augeas_lens_dir, - } -} - -node 'with_lens_noaugeas' { - ::augeas::lens { 'foo': - lens_source => '/tmp/foo.aug', - } -} - -node 'with_lens' { - include ::augeas - ::augeas::lens { 'foo': - lens_source => $::augeas_lens_source, - test_source => $::augeas_test_source, - stock_since => $::augeas_stock_since, - } -} diff --git a/spec/hosts/simple_debian_squeeze_spec.rb b/spec/hosts/simple_debian_squeeze_spec.rb deleted file mode 100644 index 18bc50c..0000000 --- a/spec/hosts/simple_debian_squeeze_spec.rb +++ /dev/null @@ -1,117 +0,0 @@ -require 'spec_helper' - -describe 'simple_debian_squeeze' do - let (:facts) { { - :augeas_lens_dir => :undef, - :augeas_ruby_version => :undef, - :augeas_version => :undef, - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - } } - - context 'when versions are not specified' do - let (:facts) { { - :augeas_lens_dir => :undef, - :augeas_version => :undef, - :augeas_ruby_version => :undef, - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :rubyversion => '1.8.7', - } } - - it { is_expected.to contain_package('libaugeas0').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-tools').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-lenses').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => 'present', - :name => 'libaugeas-ruby1.8' - ) } - end - - context 'when versions are specified' do - let (:facts) { { - :osfamily => 'Debian', - :lsbdistcodename => 'squeeze', - :augeas_lens_dir => :undef, - :augeas_version => '1.2.3', - :augeas_ruby_version => '3.2.1', - :rubyversion => '1.8.7', - } } - - it { is_expected.to contain_package('libaugeas0').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-tools').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-lenses').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => '3.2.1', - :name => 'libaugeas-ruby1.8' - ) } - end - - context 'with standard lens_dir' do - let (:facts) { { - :augeas_lens_dir => :undef, - :augeas_ruby_version => :undef, - :augeas_version => :undef, - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :rubyversion => '1.8.7', - } } - - it { is_expected.to contain_file('/usr/share/augeas/lenses').with( - :ensure => 'directory', - :purge => 'true', - :force => 'true', - :recurse => 'true', - :recurselimit => 1 - ) } - it { is_expected.to contain_file('/usr/share/augeas/lenses/dist').with( - :ensure => 'directory', - :purge => 'false' - ) } - it { is_expected.to contain_file('/usr/share/augeas/lenses/tests').with( - :ensure => 'directory', - :purge => 'true', - :force => 'true' - ).without(:recurse) } - end - - context 'with a non standard lens_dir' do - let (:facts) { { - :augeas_lens_dir => '/opt/augeas/lenses', - :augeas_ruby_version => :undef, - :augeas_version => :undef, - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :rubyversion => '1.8.7', - } } - - it { is_expected.to contain_file('/opt/augeas/lenses').with( - :ensure => 'directory', - :purge => 'true', - :force => 'true', - :recurse => 'true', - :recurselimit => 1 - ) } - it { is_expected.to contain_file('/opt/augeas/lenses/dist').with( - :ensure => 'directory', - :purge => 'false' - ) } - it { is_expected.to contain_file('/opt/augeas/lenses/tests').with( - :ensure => 'directory', - :purge => 'true', - :force => 'true' - ).without(:recurse) } - end -end diff --git a/spec/hosts/simple_debian_wheezy_spec.rb b/spec/hosts/simple_debian_wheezy_spec.rb deleted file mode 100644 index 3e20db0..0000000 --- a/spec/hosts/simple_debian_wheezy_spec.rb +++ /dev/null @@ -1,108 +0,0 @@ -require 'spec_helper' - -describe 'simple_debian_wheezy' do - let (:facts) { { - :augeas_lens_dir => :undef, - :augeas_ruby_version => :undef, - :augeas_version => :undef, - :lsbdistcodename => 'wheezy', - :osfamily => 'Debian', - :rubyversion => '1.9.1', - } } - - context 'when versions are not specified' do - it { is_expected.to contain_package('libaugeas0').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-tools').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-lenses').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => 'present', - :name => 'libaugeas-ruby1.9.1' - ) } - end - - context 'when versions are specified' do - let (:facts) { { - :osfamily => 'Debian', - :lsbdistcodename => 'wheezy', - :rubyversion => '1.9.1', - :augeas_lens_dir => :undef, - :augeas_version => '1.2.3', - :augeas_ruby_version => '3.2.1', - } } - - it { is_expected.to contain_package('libaugeas0').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-tools').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-lenses').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => '3.2.1', - :name => 'libaugeas-ruby1.9.1' - ) } - end - - context 'with standard lens_dir' do - let (:facts) { { - :augeas_lens_dir => :undef, - :augeas_ruby_version => :undef, - :augeas_version => :undef, - :osfamily => 'Debian', - :rubyversion => '1.9.1', - } } - - it { is_expected.to contain_file('/usr/share/augeas/lenses').with( - :ensure => 'directory', - :purge => 'true', - :force => 'true', - :recurse => 'true', - :recurselimit => 1 - ) } - it { is_expected.to contain_file('/usr/share/augeas/lenses/dist').with( - :ensure => 'directory', - :purge => 'false' - ) } - it { is_expected.to contain_file('/usr/share/augeas/lenses/tests').with( - :ensure => 'directory', - :purge => 'true', - :force => 'true' - ).without(:recurse) } - end - - context 'with a non standard lens_dir' do - let (:facts) { { - :augeas_lens_dir => '/opt/augeas/lenses', - :augeas_ruby_version => :undef, - :augeas_version => :undef, - :lsbdistcodename => 'wheezy', - :osfamily => 'Debian', - :rubyversion => '1.9.1', - } } - - it { is_expected.to contain_file('/opt/augeas/lenses').with( - :ensure => 'directory', - :purge => 'true', - :force => 'true', - :recurse => 'true', - :recurselimit => 1 - ) } - it { is_expected.to contain_file('/opt/augeas/lenses/dist').with( - :ensure => 'directory', - :purge => 'false' - ) } - it { is_expected.to contain_file('/opt/augeas/lenses/tests').with( - :ensure => 'directory', - :purge => 'true', - :force => 'true' - ).without(:recurse) } - end -end diff --git a/spec/hosts/simple_redhat_spec.rb b/spec/hosts/simple_redhat_spec.rb deleted file mode 100644 index 42c17c8..0000000 --- a/spec/hosts/simple_redhat_spec.rb +++ /dev/null @@ -1,99 +0,0 @@ -require 'spec_helper' - -describe 'simple_redhat' do - let (:facts) { { - :osfamily => 'RedHat', - } } - - context 'when versions are not specified' do - let (:facts) { { - :augeas_lens_dir => :undef, - :augeas_ruby_version => :undef, - :augeas_version => :undef, - :osfamily => 'RedHat', - } } - - it { is_expected.to contain_package('augeas').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-libs').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => 'present', - :name => 'ruby-augeas' - ) } - end - - context 'when versions are specified' do - let (:facts) { { - :osfamily => 'RedHat', - :augeas_lens_dir => :undef, - :augeas_version => '1.2.3', - :augeas_ruby_version => '3.2.1', - } } - - it { is_expected.to contain_package('augeas').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-libs').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => '3.2.1', - :name => 'ruby-augeas' - ) } - end - - context 'with standard lens_dir' do - let (:facts) { { - :augeas_lens_dir => :undef, - :augeas_ruby_version => :undef, - :augeas_version => :undef, - :osfamily => 'RedHat', - } } - - it { is_expected.to contain_file('/usr/share/augeas/lenses').with( - :ensure => 'directory', - :purge => 'true', - :force => 'true', - :recurse => 'true', - :recurselimit => 1 - ) } - it { is_expected.to contain_file('/usr/share/augeas/lenses/dist').with( - :ensure => 'directory', - :purge => 'false' - ) } - it { is_expected.to contain_file('/usr/share/augeas/lenses/tests').with( - :ensure => 'directory', - :purge => 'true', - :force => 'true' - ).without(:recurse) } - end - - context 'with a non standard lens_dir' do - let (:facts) { { - :augeas_lens_dir => '/opt/augeas/lenses', - :augeas_ruby_version => :undef, - :augeas_version => :undef, - :osfamily => 'RedHat', - } } - - it { is_expected.to contain_file('/opt/augeas/lenses').with( - :ensure => 'directory', - :purge => 'true', - :force => 'true', - :recurse => 'true', - :recurselimit => 1 - ) } - it { is_expected.to contain_file('/opt/augeas/lenses/dist').with( - :ensure => 'directory', - :purge => 'false' - ) } - it { is_expected.to contain_file('/opt/augeas/lenses/tests').with( - :ensure => 'directory', - :purge => 'true', - :force => 'true' - ).without(:recurse) } - end -end diff --git a/spec/hosts/with_lens_noaugeas_spec.rb b/spec/hosts/with_lens_noaugeas_spec.rb deleted file mode 100644 index 7786918..0000000 --- a/spec/hosts/with_lens_noaugeas_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe 'with_lens_noaugeas' do - it 'should error' do - expect { - is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') - }.to raise_error(Puppet::Error, /You must declare the augeas class/) - end -end diff --git a/spec/hosts/with_lens_spec.rb b/spec/hosts/with_lens_spec.rb deleted file mode 100644 index e0f5dff..0000000 --- a/spec/hosts/with_lens_spec.rb +++ /dev/null @@ -1,66 +0,0 @@ -require 'spec_helper' - -describe 'with_lens' do - let (:facts) { { - :osfamily => 'RedHat', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - } } - - context 'when lens_source is passed' do - let (:facts) { { - :osfamily => 'RedHat', - :augeas_lens_source => '/tmp/foo.aug', - :augeas_stock_since => :undef, - :augeas_test_source => :undef, - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - } } - - it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } - it { is_expected.to contain_exec('Typecheck lens foo') } - it { is_expected.not_to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } - it { is_expected.not_to contain_exec('Test lens foo') } - end - - context 'when lens_source and test_source are passed' do - let (:facts) { { - :osfamily => 'RedHat', - :augeas_lens_source => '/tmp/foo.aug', - :augeas_test_source => '/tmp/test_foo.aug', - :augeas_stock_since => :undef, - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - } } - - it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } - it { is_expected.to contain_exec('Typecheck lens foo') } - it { is_expected.to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } - it { is_expected.to contain_exec('Test lens foo') } - end - - context 'when stock_since is passed and augeas is older' do - let (:facts) { { - :osfamily => 'RedHat', - :augeas_lens_source => '/tmp/foo.aug', - :augeas_stock_since => '1.2.3', - :augeasversion => '1.0.0', - :augeas_test_source => :undef, - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - } } - - it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } - it { is_expected.to contain_exec('Typecheck lens foo') } - end - - context 'when stock_since is passed and augeas is newer' do - let (:facts) { { - :osfamily => 'RedHat', - :augeas_lens_source => '/tmp/foo.aug', - :augeas_stock_since => '1.2.3', - :augeasversion => '1.5.0', - :augeas_test_source => :undef, - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - } } - - it { is_expected.not_to contain_file('/usr/share/augeas/lenses/foo.aug') } - it { is_expected.not_to contain_exec('Typecheck lens foo') } - end -end diff --git a/spec/hosts/wrong_os_spec.rb b/spec/hosts/wrong_os_spec.rb deleted file mode 100644 index 98fb93f..0000000 --- a/spec/hosts/wrong_os_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'spec_helper' - -describe 'wrong_os' do - let (:facts) { { - :augeas_lens_dir => :undef, - :augeas_ruby_version => :undef, - :augeas_test_source => :undef, - :augeas_version => :undef, - :osfamily => 'MS-DOS', - } } - - it 'should fail' do - expect { is_expected.to contain_package('ruby-augeas') }.to raise_error(Puppet::Error, /Unsupported OS family/) - end -end -- cgit v1.2.3 From fbf18831947abee6a21e7a5a867dd0e99bc6d0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 5 Jan 2015 10:09:08 +0100 Subject: Update with modulesync --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index c356eb8..eabd598 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,9 @@ --- language: ruby sudo: false -cache: - directories: - - vendor/bundle - - spec/fixtures/modules -bundler_args: --without system_tests --path vendor/bundle -script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec_prep", "bundle exec fakeroot rake spec_standalone SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] +cache: bundler +bundler_args: --without system_tests +script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec fakeroot rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] matrix: fast_finish: true include: -- cgit v1.2.3 From 5ecc7eed668031677fd874926f2b387d87666307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 7 Jan 2015 09:24:47 +0100 Subject: Release 1.1.4 --- CHANGELOG | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 8938071..70b89b1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +##2015-01-07 - Version 1.1.4 + +- Manage unit tests with rspec-puppet-facts + ##2014-12-09 - Version 1.1.0 - Add future parser tests diff --git a/metadata.json b/metadata.json index 2c14f20..9ad13b2 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.1.3", + "version": "1.1.4", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 12cfe4f3b3ed76ba89e67a39ce5b9ee353d8c97e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 7 Jan 2015 17:02:04 +0100 Subject: Add puppet-lint-unquoted_string-check to Gemfile --- Gemfile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index b83f8b6..c0df17b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,15 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do - gem 'rake', :require => false - gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' - gem 'puppetlabs_spec_helper', :require => false - gem 'puppet-lint', '< 1.1.0', :require => false - gem 'simplecov', :require => false - gem 'rspec-puppet-facts', :require => false - gem 'json', :require => false - gem 'metadata-json-lint', :require => false + gem 'rake', :require => false + gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' + gem 'puppetlabs_spec_helper', :require => false + gem 'puppet-lint', '< 1.1.0', :require => false + gem 'puppet-lint-unquoted_string-check', :require => false + gem 'simplecov', :require => false + gem 'rspec-puppet-facts', :require => false + gem 'json', :require => false + gem 'metadata-json-lint', :require => false end group :system_tests do -- cgit v1.2.3 From e4c504187b668edd32ac4f3c5c56fa3199f94a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 8 Jan 2015 13:47:16 +0100 Subject: Add puppet-lint-empty_string-check --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index c0df17b..b8a46c1 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ group :development, :unit_tests do gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', '< 1.1.0', :require => false gem 'puppet-lint-unquoted_string-check', :require => false + gem 'puppet-lint-empty_string-check', :require => false gem 'simplecov', :require => false gem 'rspec-puppet-facts', :require => false gem 'json', :require => false -- cgit v1.2.3 From 9019413acd291079a212e44944948bb88d189822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 9 Jan 2015 11:29:41 +0100 Subject: Fix puppet-lint pinning --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b8a46c1..3840904 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ group :development, :unit_tests do gem 'rake', :require => false gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' gem 'puppetlabs_spec_helper', :require => false - gem 'puppet-lint', '< 1.1.0', :require => false + gem 'puppet-lint', '~> 1.0.0', :require => false gem 'puppet-lint-unquoted_string-check', :require => false gem 'puppet-lint-empty_string-check', :require => false gem 'simplecov', :require => false -- cgit v1.2.3 From bf4c2ffa6f9f1935d9e7c49719d23ab0692b20fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 12 Jan 2015 08:43:38 +0100 Subject: Add puppet-lint plugins --- Gemfile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 3840904..8f07045 100644 --- a/Gemfile +++ b/Gemfile @@ -1,16 +1,18 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do - gem 'rake', :require => false - gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' - gem 'puppetlabs_spec_helper', :require => false - gem 'puppet-lint', '~> 1.0.0', :require => false - gem 'puppet-lint-unquoted_string-check', :require => false - gem 'puppet-lint-empty_string-check', :require => false - gem 'simplecov', :require => false - gem 'rspec-puppet-facts', :require => false - gem 'json', :require => false - gem 'metadata-json-lint', :require => false + gem 'rake', :require => false + gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' + gem 'puppetlabs_spec_helper', :require => false + gem 'puppet-lint', '~> 1.0.0', :require => false + gem 'puppet-lint-unquoted_string-check', :require => false + gem 'puppet-lint-empty_string-check', :require => false + gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false + gem 'puppet-lint-variable_contains_upcase', :require => false + gem 'simplecov', :require => false + gem 'rspec-puppet-facts', :require => false + gem 'json', :require => false + gem 'metadata-json-lint', :require => false end group :system_tests do -- cgit v1.2.3 From 6e8c8b7e9b798fb6091dcba593e362e9e6f914a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 12 Jan 2015 08:55:16 +0100 Subject: Ignore spaceship_operator_without_tag + note in README --- README.md | 3 +++ manifests/init.pp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/README.md b/README.md index 4a7bed1..e2055b0 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,9 @@ The module provides an `augeas` class which installs and configures Augeas. only ensure the libaugeas-ruby version will be installed according to internal critera; * provides an `augeas()` master-side function to manipulate strings using Augeas; +Note: the `augeas` class realizes all `augeas` resources in order to ensure they are managed after the required Augeas packages. + + ### Definitions #### `augeas::lens` diff --git a/manifests/init.pp b/manifests/init.pp index 4289765..41f4f87 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -18,5 +18,7 @@ class augeas ( class {'::augeas::files': } -> Class['augeas'] + # lint:ignore:spaceship_operator_without_tag Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |> + # lint:endignore } -- cgit v1.2.3 From 86d21dda5df737734f4afc8540d5a7471354be62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 12 Jan 2015 16:45:43 +0100 Subject: Fix LICENSE file issue --- LICENSE | 875 +++++++++++++++------------------------------------------------- 1 file changed, 201 insertions(+), 674 deletions(-) diff --git a/LICENSE b/LICENSE index 94a9ed0..8d968b6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,201 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -- cgit v1.2.3 From b4c863af238c46064eb18fabc1d87a5d8bfa70c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 12 Jan 2015 16:51:08 +0100 Subject: Release 1.1.5 --- CHANGELOG | 5 +++++ metadata.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 70b89b1..8904c66 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +##2015-01-12 - Version 1.1.5 + +- Fix LICENSE file +- Add some puppet-lint plugins to Gemfile + ##2015-01-07 - Version 1.1.4 - Manage unit tests with rspec-puppet-facts diff --git a/metadata.json b/metadata.json index 9ad13b2..17474bc 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.1.4", + "version": "1.1.5", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 6a8d0e72c01f245f1946c5b260c6c01e8e4fc3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 19 Jan 2015 11:57:43 +0100 Subject: Add puppet-lint-absolute_classname-check --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 8f07045..159079f 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,7 @@ group :development, :unit_tests do gem 'puppet-lint-empty_string-check', :require => false gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false gem 'puppet-lint-variable_contains_upcase', :require => false + gem 'puppet-lint-absolute_classname-check', :require => false gem 'simplecov', :require => false gem 'rspec-puppet-facts', :require => false gem 'json', :require => false -- cgit v1.2.3 From 828be37ef02d7507516e38544912a2905a26e3d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 19 Jan 2015 15:32:30 +0100 Subject: Rename CHANGELOG as CHANGELOG.md --- CHANGELOG | 41 ----------------------------------------- CHANGELOG.md | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 CHANGELOG create mode 100644 CHANGELOG.md diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index 8904c66..0000000 --- a/CHANGELOG +++ /dev/null @@ -1,41 +0,0 @@ -##2015-01-12 - Version 1.1.5 - -- Fix LICENSE file -- Add some puppet-lint plugins to Gemfile - -##2015-01-07 - Version 1.1.4 - -- Manage unit tests with rspec-puppet-facts - -##2014-12-09 - Version 1.1.0 - -- Add future parser tests -- Convert specs to rspec3 syntax -- Fix metadata.json - -##2014-11-17 - Version 1.0.3 - -- Lint metadata.json - -##2014-11-04 - Version 1.0.2 - -- Fix path in unit tests -- Drop Puppet 2.7 support - -##2014-10-28 - Version 1.0.1 -- Add path to exec in augeas::lens - -##2014-10-20 - Version 1.0.0 -- Linting -- Setup automatic Forge releases - -##2014-10-06 - Version 0.3.2 -- Remove symlink in spec/ directory (Fix #40) - -##2014-09-23 - Version 0.3.1 -- Centralize metadata files - -##2014-07-02 - Version 0.3.0 -###Summary -- Add purge parameter -- Cleanup unscoped variables diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..45da86f --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,41 @@ +##2015-01-12 - Release 1.1.5 + +- Fix LICENSE file +- Add some puppet-lint plugins to Gemfile + +##2015-01-07 - Release 1.1.4 + +- Manage unit tests with rspec-puppet-facts + +##2014-12-09 - Release 1.1.0 + +- Add future parser tests +- Convert specs to rspec3 syntax +- Fix metadata.json + +##2014-11-17 - Release 1.0.3 + +- Lint metadata.json + +##2014-11-04 - Release 1.0.2 + +- Fix path in unit tests +- Drop Puppet 2.7 support + +##2014-10-28 - Release 1.0.1 +- Add path to exec in augeas::lens + +##2014-10-20 - Release 1.0.0 +- Linting +- Setup automatic Forge releases + +##2014-10-06 - Release 0.3.2 +- Remove symlink in spec/ directory (Fix #40) + +##2014-09-23 - Release 0.3.1 +- Centralize metadata files + +##2014-07-02 - Release 0.3.0 +###Summary +- Add purge parameter +- Cleanup unscoped variables -- cgit v1.2.3 From 55c89116d8ce481240c7e2c45ed70e228b685e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 19 Jan 2015 15:33:03 +0100 Subject: Release 1.1.6 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45da86f..3bebf66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-01-19 - Release 1.1.6 + +- Add puppet-ling plugins + ##2015-01-12 - Release 1.1.5 - Fix LICENSE file diff --git a/metadata.json b/metadata.json index 17474bc..f6bfbf9 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.1.5", + "version": "1.1.6", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 1990647110d1944abea0dbcf8e4020d851cc370e Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 20 Jan 2015 16:24:59 +0100 Subject: Fix augeas rubygem package name for SLES. --- manifests/params.pp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 8b8f89c..e540033 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -12,7 +12,14 @@ class augeas::params { } 'Suse': { - $ruby_pkg = 'rubygem-ruby-augeas' + # RPM Sources: https://build.opensuse.org/project/show/systemsmanagement:puppet + # SLES 11 SP3 + if versioncmp($::rubyversion, '1.8.7') >= 0 { + $ruby_pkg = 'ruby1.8-rubygem-ruby-augeas' + # SLES 12 + } else { + $ruby_pkg = 'ruby2.1-rubygem-ruby-augeas' + } $augeas_pkgs = ['augeas', 'augeas-lenses', 'libaugeas0' ] } -- cgit v1.2.3 From 18bb732cd218921cac302c8fa1e4fb3fe9ed14a6 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 20 Jan 2015 16:31:50 +0100 Subject: Fix augeas rubygem package name for SLES (had typo...). --- manifests/params.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index e540033..99a7187 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -15,10 +15,10 @@ class augeas::params { # RPM Sources: https://build.opensuse.org/project/show/systemsmanagement:puppet # SLES 11 SP3 if versioncmp($::rubyversion, '1.8.7') >= 0 { - $ruby_pkg = 'ruby1.8-rubygem-ruby-augeas' + $ruby_pkg = 'ruby1.8-rubygem-augeas' # SLES 12 } else { - $ruby_pkg = 'ruby2.1-rubygem-ruby-augeas' + $ruby_pkg = 'ruby2.1-rubygem-augeas' } $augeas_pkgs = ['augeas', 'augeas-lenses', 'libaugeas0' ] } -- cgit v1.2.3 From a3ec1f11ac51fb6ee220fabc6b3613d3a69ffd42 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Wed, 21 Jan 2015 10:59:29 +0100 Subject: fixed package name for current SLES repo problems --- manifests/params.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 99a7187..e540033 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -15,10 +15,10 @@ class augeas::params { # RPM Sources: https://build.opensuse.org/project/show/systemsmanagement:puppet # SLES 11 SP3 if versioncmp($::rubyversion, '1.8.7') >= 0 { - $ruby_pkg = 'ruby1.8-rubygem-augeas' + $ruby_pkg = 'ruby1.8-rubygem-ruby-augeas' # SLES 12 } else { - $ruby_pkg = 'ruby2.1-rubygem-augeas' + $ruby_pkg = 'ruby2.1-rubygem-ruby-augeas' } $augeas_pkgs = ['augeas', 'augeas-lenses', 'libaugeas0' ] } -- cgit v1.2.3 From 88c37a4c57fa8f03efb91ddcd773f2214785edf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 23 Jan 2015 08:57:10 +0100 Subject: Update with msync --- .travis.yml | 2 +- spec/spec_helper.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eabd598..777290c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: ruby sudo: false cache: bundler bundler_args: --without system_tests -script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec fakeroot rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] +script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] matrix: fast_finish: true include: diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 41dd7da..1148f7f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -24,6 +24,8 @@ RSpec.configure do |c| if ENV['FUTURE_PARSER'] == 'yes' c.parser='future' end + + Puppet.features.stubs(:root?).returns(true) end c.after :each do -- cgit v1.2.3 From 2e548f1188edc48544bafec3c09bf89ce653388b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 29 Jan 2015 14:57:12 +0100 Subject: Update with modulesync --- .travis.yml | 5 +++-- spec/acceptance/nodesets/centos-7-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/centos-7-x86_64-openstack.yml | 13 +++++++++++++ spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml | 10 ++++++++++ spec/acceptance/nodesets/debian-7-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/debian-7-x86_64-openstack.yml | 13 +++++++++++++ spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml | 11 +++++++++++ spec/acceptance/nodesets/debian-8-x86_64-openstack.yml | 13 +++++++++++++ 8 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 spec/acceptance/nodesets/centos-7-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/centos-7-x86_64-openstack.yml create mode 100644 spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml create mode 100644 spec/acceptance/nodesets/debian-7-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/debian-7-x86_64-openstack.yml create mode 100644 spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml create mode 100644 spec/acceptance/nodesets/debian-8-x86_64-openstack.yml diff --git a/.travis.yml b/.travis.yml index 777290c..c2f0cdb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,9 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" + allow_failures: + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" notifications: email: false deploy: diff --git a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml new file mode 100644 index 0000000..6eb5641 --- /dev/null +++ b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + centos-7-x86_64: + default_apply_opts: + strict_variables: + platform: el-7-x86_64 + hypervisor : docker + image: centos:7 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml new file mode 100644 index 0000000..69d1bfc --- /dev/null +++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + centos-7-x86_64: + default_apply_opts: + strict_variables: + platform: el-7-x86_64 + hypervisor : openstack + flavor: m1.small + image: centos-7-x86_64-genericcloud-20140929_01 + user: centos +CONFIG: + type: foss + log_level: debug + openstack_network: default diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml new file mode 100644 index 0000000..d479428 --- /dev/null +++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml @@ -0,0 +1,10 @@ +HOSTS: + centos-7-x86_64: + default_apply_opts: + strict_variables: + platform: el-7-x86_64 + hypervisor : vagrant + box : puppetlabs/centos-6.5-64-nocm +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml new file mode 100644 index 0000000..64f2534 --- /dev/null +++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + debian-7-x86_64: + default_apply_opts: + strict_variables: + platform: debian-7-amd64 + hypervisor : docker + image: debian:7.5 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml new file mode 100644 index 0000000..0643d03 --- /dev/null +++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + debian-7-x86_64: + default_apply_opts: + strict_variables: + platform: debian-7-amd64 + hypervisor : openstack + flavor: m1.small + image: debian-7-amd64-20141121 + user: debian +CONFIG: + type: foss + log_level: debug + openstack_network: default diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml new file mode 100644 index 0000000..30f31ad --- /dev/null +++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml @@ -0,0 +1,11 @@ +HOSTS: + debian-7-x86_64: + default_apply_opts: + strict_variables: + platform: debian-7-amd64 + hypervisor : vagrant + box : debian-73-x64-virtualbox-nocm + box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml new file mode 100644 index 0000000..1cc9c6d --- /dev/null +++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + debian-8-x86_64: + default_apply_opts: + strict_variables: + platform: debian-8-amd64 + hypervisor : openstack + flavor: m1.small + image: debian-8-amd64-20141121 + user: debian +CONFIG: + type: foss + openstack_network: default + log_level: debug -- cgit v1.2.3 From a1c573b5d265f4943cef075f34a807e59b7a3b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 3 Feb 2015 10:51:14 +0100 Subject: Modulesync --- .travis.yml | 5 ++--- Gemfile | 4 +++- spec/acceptance/nodesets/debian-6-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/debian-7-x86_64-docker.yml | 2 +- spec/acceptance/nodesets/debian-8-x86_64-docker.yml | 12 ++++++++++++ 5 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 spec/acceptance/nodesets/debian-6-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/debian-8-x86_64-docker.yml diff --git a/.travis.yml b/.travis.yml index c2f0cdb..777290c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,8 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" - allow_failures: - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" notifications: email: false deploy: diff --git a/Gemfile b/Gemfile index 159079f..a47fea7 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do gem 'rake', :require => false - gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' + gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', '~> 1.0.0', :require => false gem 'puppet-lint-unquoted_string-check', :require => false @@ -10,6 +10,7 @@ group :development, :unit_tests do gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false gem 'puppet-lint-variable_contains_upcase', :require => false gem 'puppet-lint-absolute_classname-check', :require => false + gem 'puppet-lint-undef_in_function-check', :require => false gem 'simplecov', :require => false gem 'rspec-puppet-facts', :require => false gem 'json', :require => false @@ -17,6 +18,7 @@ group :development, :unit_tests do end group :system_tests do + gem 'beaker', :require => false, :git => 'https://github.com/mcanevet/beaker', :branch => 'openstack' gem 'beaker-rspec', :require => false gem 'serverspec', :require => false end diff --git a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml new file mode 100644 index 0000000..b6cf1e6 --- /dev/null +++ b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + debian-6-x86_64: + default_apply_opts: + strict_variables: + platform: debian-6-amd64 + hypervisor : docker + image: debian:6 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml index 64f2534..e7b916b 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: debian-7-amd64 hypervisor : docker - image: debian:7.5 + image: debian:7 # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true CONFIG: diff --git a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml new file mode 100644 index 0000000..ef99efb --- /dev/null +++ b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + debian-8-x86_64: + default_apply_opts: + strict_variables: + platform: debian-8-amd64 + hypervisor : docker + image: debian:8 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug -- cgit v1.2.3 From 20159635468928bca6aabbd9a6376c06f5bbf034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 3 Feb 2015 14:10:06 +0100 Subject: Speed up unit tests --- Gemfile | 2 +- spec/spec_helper.rb | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index a47fea7..f1bdbfc 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do gem 'rake', :require => false - gem 'rspec-puppet', :require => false + gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet.git', :branch => 'rspec3' gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', '~> 1.0.0', :require => false gem 'puppet-lint-unquoted_string-check', :require => false diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1148f7f..86cc740 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -7,24 +7,11 @@ RSpec.configure do |c| c.include PuppetlabsSpec::Files c.before :each do - # Ensure that we don't accidentally cache facts and environment - # between test cases. - Facter::Util::Loader.any_instance.stubs(:load_all) - Facter.clear - Facter.clear_messages - # Store any environment variables away to be restored later @old_env = {} ENV.each_key {|k| @old_env[k] = ENV[k]} - if Gem::Version.new(`puppet --version`) >= Gem::Version.new('3.5') - Puppet.settings[:strict_variables]=true - end - - if ENV['FUTURE_PARSER'] == 'yes' - c.parser='future' - end - + Puppet.settings[:strict_variables]=true if Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('3.5') Puppet.features.stubs(:root?).returns(true) end -- cgit v1.2.3 From 49f5b8eefa974ab246cb2a29b9548e8891eb8366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 4 Feb 2015 10:28:28 +0100 Subject: Add puppet-lint-leading_zero-check gem --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index f1bdbfc..c9823f6 100644 --- a/Gemfile +++ b/Gemfile @@ -11,6 +11,7 @@ group :development, :unit_tests do gem 'puppet-lint-variable_contains_upcase', :require => false gem 'puppet-lint-absolute_classname-check', :require => false gem 'puppet-lint-undef_in_function-check', :require => false + gem 'puppet-lint-leading_zero-check', :require => false gem 'simplecov', :require => false gem 'rspec-puppet-facts', :require => false gem 'json', :require => false -- cgit v1.2.3 From ca0d105a9f89c7d2b68d9817339c11ad1f12d855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 4 Feb 2015 11:01:19 +0100 Subject: Update with modulesync --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index c9823f6..3190b06 100644 --- a/Gemfile +++ b/Gemfile @@ -2,9 +2,9 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do gem 'rake', :require => false - gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet.git', :branch => 'rspec3' + gem 'rspec-puppet', '~> 2.0', :require => false gem 'puppetlabs_spec_helper', :require => false - gem 'puppet-lint', '~> 1.0.0', :require => false + gem 'puppet-lint', :require => false gem 'puppet-lint-unquoted_string-check', :require => false gem 'puppet-lint-empty_string-check', :require => false gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false -- cgit v1.2.3 From 84211a7877390f3467a9c4a44e6a2af3a4ba97fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 6 Feb 2015 11:58:12 +0100 Subject: Clear lint rake task --- Rakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Rakefile b/Rakefile index a81b2c6..a334275 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,7 @@ require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-lint/tasks/puppet-lint' +Rake::Task[:lint].clear PuppetLint.configuration.fail_on_warnings PuppetLint.configuration.send('relative') PuppetLint.configuration.send('disable_80chars') -- cgit v1.2.3 From 844e39a75df97ff207c79ebeb4a4e981fee24c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 6 Feb 2015 13:27:13 +0100 Subject: [ci skip] Fix hostname in nodesets --- spec/acceptance/nodesets/centos-7-x86_64-docker.yml | 2 +- spec/acceptance/nodesets/centos-7-x86_64-openstack.yml | 2 +- spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-6-x86_64-docker.yml | 2 +- spec/acceptance/nodesets/debian-7-x86_64-docker.yml | 2 +- spec/acceptance/nodesets/debian-7-x86_64-openstack.yml | 2 +- spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-8-x86_64-docker.yml | 2 +- spec/acceptance/nodesets/debian-8-x86_64-openstack.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml index 6eb5641..599a681 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml @@ -1,5 +1,5 @@ HOSTS: - centos-7-x86_64: + centos-7-x64: default_apply_opts: strict_variables: platform: el-7-x86_64 diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml index 69d1bfc..37dfc5f 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml @@ -1,5 +1,5 @@ HOSTS: - centos-7-x86_64: + centos-7-x64: default_apply_opts: strict_variables: platform: el-7-x86_64 diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml index d479428..a9c461b 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml @@ -1,5 +1,5 @@ HOSTS: - centos-7-x86_64: + centos-7-x64: default_apply_opts: strict_variables: platform: el-7-x86_64 diff --git a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml index b6cf1e6..0296d12 100644 --- a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml @@ -1,5 +1,5 @@ HOSTS: - debian-6-x86_64: + debian-6-x64: default_apply_opts: strict_variables: platform: debian-6-amd64 diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml index e7b916b..ef1c9b2 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml @@ -1,5 +1,5 @@ HOSTS: - debian-7-x86_64: + debian-7-x64: default_apply_opts: strict_variables: platform: debian-7-amd64 diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml index 0643d03..e52336b 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml @@ -1,5 +1,5 @@ HOSTS: - debian-7-x86_64: + debian-7-x64: default_apply_opts: strict_variables: platform: debian-7-amd64 diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml index 30f31ad..97099de 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml @@ -1,5 +1,5 @@ HOSTS: - debian-7-x86_64: + debian-7-x64: default_apply_opts: strict_variables: platform: debian-7-amd64 diff --git a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml index ef99efb..28c3e02 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml @@ -1,5 +1,5 @@ HOSTS: - debian-8-x86_64: + debian-8-x64: default_apply_opts: strict_variables: platform: debian-8-amd64 diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml index 1cc9c6d..194ca46 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml @@ -1,5 +1,5 @@ HOSTS: - debian-8-x86_64: + debian-8-x64: default_apply_opts: strict_variables: platform: debian-8-amd64 -- cgit v1.2.3 From 2ffbef295cc9e44a6ac336032da0b93fae8cf58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 10 Feb 2015 11:26:49 +0100 Subject: Modulesync --- Gemfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 3190b06..f0887ec 100644 --- a/Gemfile +++ b/Gemfile @@ -12,14 +12,17 @@ group :development, :unit_tests do gem 'puppet-lint-absolute_classname-check', :require => false gem 'puppet-lint-undef_in_function-check', :require => false gem 'puppet-lint-leading_zero-check', :require => false + gem 'puppet-lint-trailing_comma-check', :require => false + gem 'puppet-lint-file_ensure-check', :require => false gem 'simplecov', :require => false gem 'rspec-puppet-facts', :require => false gem 'json', :require => false gem 'metadata-json-lint', :require => false + gem 'docker-api', '1.15.0', :require => false end group :system_tests do - gem 'beaker', :require => false, :git => 'https://github.com/mcanevet/beaker', :branch => 'openstack' + gem 'beaker', :require => false, :git => 'https://github.com/raphink/beaker', :branch => 'openstack' gem 'beaker-rspec', :require => false gem 'serverspec', :require => false end -- cgit v1.2.3 From 43d625bf452914124bc9e4be75b3874a02a6e09c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 18 Feb 2015 09:11:58 +0100 Subject: Fix puppet-lint configuration --- Rakefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index a334275..f0f08fc 100644 --- a/Rakefile +++ b/Rakefile @@ -2,10 +2,11 @@ require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-lint/tasks/puppet-lint' Rake::Task[:lint].clear -PuppetLint.configuration.fail_on_warnings -PuppetLint.configuration.send('relative') -PuppetLint.configuration.send('disable_80chars') -PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"] +PuppetLint::RakeTask.new :lint do |config| + config.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"] + config.disable_checks = ['80chars'] + config.fail_on_warnings = true +end PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"] -- cgit v1.2.3 From 32df8f5157ccbdd57e1d26f9e053fef2cf42d82f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 19 Feb 2015 11:56:33 +0100 Subject: Add puppet-lint-version_comparison-check gem --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index f0887ec..09b902f 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,7 @@ group :development, :unit_tests do gem 'puppet-lint-leading_zero-check', :require => false gem 'puppet-lint-trailing_comma-check', :require => false gem 'puppet-lint-file_ensure-check', :require => false + gem 'puppet-lint-version_comparison-check', :require => false gem 'simplecov', :require => false gem 'rspec-puppet-facts', :require => false gem 'json', :require => false -- cgit v1.2.3 From 421caada213cd5de7c5211789fcd6dbf24895ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 19 Feb 2015 12:31:57 +0100 Subject: Use unreleased puppetlabs_spec_helper --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 09b902f..c7aa4a5 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do gem 'rake', :require => false gem 'rspec-puppet', '~> 2.0', :require => false - gem 'puppetlabs_spec_helper', :require => false + gem 'puppetlabs_spec_helper', :require => false, :git => 'https://github.com/puppetlabs/puppetlabs_spec_helper', :branch => 'master' gem 'puppet-lint', :require => false gem 'puppet-lint-unquoted_string-check', :require => false gem 'puppet-lint-empty_string-check', :require => false -- cgit v1.2.3 From 9a37fbd6beb470604d4a6f3d8264d8cce6eb7096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 19 Feb 2015 14:09:14 +0100 Subject: Fix metadata rake task --- Rakefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Rakefile b/Rakefile index f0f08fc..f87e608 100644 --- a/Rakefile +++ b/Rakefile @@ -9,8 +9,3 @@ PuppetLint::RakeTask.new :lint do |config| end PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"] - -desc "Lint metadata.json file" -task :metadata do - sh "metadata-json-lint metadata.json" -end -- cgit v1.2.3 From 9b506f08d7fc0708067fecc708ef597ed338bf04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 24 Feb 2015 09:34:22 +0100 Subject: Update with msync --- Gemfile | 8 ++------ spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml | 10 ++++++++++ 3 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml diff --git a/Gemfile b/Gemfile index c7aa4a5..f4364ea 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do gem 'rake', :require => false - gem 'rspec-puppet', '~> 2.0', :require => false + gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet', :branch => 'rspec3' gem 'puppetlabs_spec_helper', :require => false, :git => 'https://github.com/puppetlabs/puppetlabs_spec_helper', :branch => 'master' gem 'puppet-lint', :require => false gem 'puppet-lint-unquoted_string-check', :require => false @@ -15,15 +15,11 @@ group :development, :unit_tests do gem 'puppet-lint-trailing_comma-check', :require => false gem 'puppet-lint-file_ensure-check', :require => false gem 'puppet-lint-version_comparison-check', :require => false - gem 'simplecov', :require => false gem 'rspec-puppet-facts', :require => false - gem 'json', :require => false - gem 'metadata-json-lint', :require => false - gem 'docker-api', '1.15.0', :require => false end group :system_tests do - gem 'beaker', :require => false, :git => 'https://github.com/raphink/beaker', :branch => 'openstack' + gem 'beaker', :require => false, :git => 'https://github.com/mcanevet/beaker', :branch => 'openstack' gem 'beaker-rspec', :require => false gem 'serverspec', :require => false end diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml index a9c461b..6f02769 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: el-7-x86_64 hypervisor : vagrant - box : puppetlabs/centos-6.5-64-nocm + box : camptocamp/centos-7-x86_64 CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml new file mode 100644 index 0000000..71e8194 --- /dev/null +++ b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml @@ -0,0 +1,10 @@ +HOSTS: + debian-6-x64: + default_apply_opts: + strict_variables: + platform: debian-6-amd64 + hypervisor : vagrant + box : puppetlabs/debian-6.0.9-64-nocm +CONFIG: + type: foss + log_level: debug -- cgit v1.2.3 From 5db064f2683caf868e56ffe302ac555cb52b3155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 25 Feb 2015 10:08:39 +0100 Subject: Use puppetlabs_spec_helper's gem --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f4364ea..8d7ba6f 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do gem 'rake', :require => false gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet', :branch => 'rspec3' - gem 'puppetlabs_spec_helper', :require => false, :git => 'https://github.com/puppetlabs/puppetlabs_spec_helper', :branch => 'master' + gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false gem 'puppet-lint-unquoted_string-check', :require => false gem 'puppet-lint-empty_string-check', :require => false -- cgit v1.2.3 From eb7de93c4fa42ca141355c16ee5c947b0bc6cddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 25 Feb 2015 10:27:21 +0100 Subject: Add metadata-json-lint to Gemfile --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 8d7ba6f..6db8c1e 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ group :development, :unit_tests do gem 'rake', :require => false gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet', :branch => 'rspec3' gem 'puppetlabs_spec_helper', :require => false + gem 'metadata-json-lint', :require => false gem 'puppet-lint', :require => false gem 'puppet-lint-unquoted_string-check', :require => false gem 'puppet-lint-empty_string-check', :require => false -- cgit v1.2.3 From a8965c81749e80f4257edf73ac7ea29f52852921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 25 Feb 2015 11:13:08 +0100 Subject: Pin rspec version to 3.1.0 (https://github.com/rspec/rspec-core/issues/1864) --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 6db8c1e..ad0e31d 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do gem 'rake', :require => false + gem 'rspec', '~> 3.1.0', :require => false gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet', :branch => 'rspec3' gem 'puppetlabs_spec_helper', :require => false gem 'metadata-json-lint', :require => false -- cgit v1.2.3 From 1ee48f193dc92b104f6403a952cdddada7c7036f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 5 Mar 2015 12:43:35 +0100 Subject: Update beaker pinning as release contains all our patches --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index ad0e31d..a3a9eca 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ group :development, :unit_tests do end group :system_tests do - gem 'beaker', :require => false, :git => 'https://github.com/mcanevet/beaker', :branch => 'openstack' + gem 'beaker', :require => false gem 'beaker-rspec', :require => false gem 'serverspec', :require => false end -- cgit v1.2.3 From e7d20abe6f2ecc99531d70155a2589406f187f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 10 Mar 2015 17:21:32 +0100 Subject: [skip-ci] Update with modulesync --- spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml | 3 +-- spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml | 10 ++++++++++ 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml index 6f02769..fe0f83b 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: el-7-x86_64 hypervisor : vagrant - box : camptocamp/centos-7-x86_64 + box : puppetlabs/centos-7.0-64-nocm CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml index 71e8194..23dae1b 100644 --- a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: debian-6-amd64 hypervisor : vagrant - box : puppetlabs/debian-6.0.9-64-nocm + box : puppetlabs/debian-6.0.10-64-nocm CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml index 97099de..86c2165 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml @@ -4,8 +4,7 @@ HOSTS: strict_variables: platform: debian-7-amd64 hypervisor : vagrant - box : debian-73-x64-virtualbox-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box + box : puppetlabs/debian-7.8-64-nocm CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml new file mode 100644 index 0000000..a3edb70 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml @@ -0,0 +1,10 @@ +HOSTS: + ubuntu-14.04-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-14.04-amd64 + hypervisor : vagrant + box : puppetlabs/ubuntu-14.04-64-nocm +CONFIG: + type: foss + log_level: debug -- cgit v1.2.3