rspec-puppet-augeas 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f06061bfcf98a5fcbc5c74c34f24bbf6c6d0351
-  data.tar.gz: 4e3dbe939a0d3df172a1a830cb389e60e30af92e
+  metadata.gz: 0eae805ca8db763bdea0f2e2aa67ad0c91305821
+  data.tar.gz: acd92835edbe08de485c26f05cc2ddbb6c66d48f
 SHA512:
-  metadata.gz: 18c6661cab9a5458a711935a9245566c4441a1c73d2de328bc130a911f91f43aaaa9a481970389f92d0b309f31bcb41833a6e2f7d08b82612e882a4aa291fa2a
-  data.tar.gz: efd749b3d0333d63770aa8b0f09aa5bc2477ff59da6db9923d1f5f6628a226f08b3cb8b5767d961506b03e4ef0b167c594943d9eee9fab749c0688ba062a5ee0
+  metadata.gz: d77966c98c9cf464945697ae5f25b51ef4a5fb61f5d90b322b0243532d941cf76600cf52bdde89b5ce38a80e8862a09a53b8664dc619f98fbe7e3cae643fc301
+  data.tar.gz: e372a0ec2945b5b783d5bee7e822ad4bfb84f744565f02aa0186b750702b7a984ed6fdacc605323ac2c05a861048212fa2c389d0a7a68e3b04de57ea66c99a19

data/Gemfile

@@ -1,13 +1,12 @@
 source 'https://rubygems.org'
 
-gem 'puppetlabs_spec_helper'
-gem 'rspec-puppet', '< 1.0.0'
-gem 'ruby-augeas'
+gemspec
 
 group :test do
   gem 'puppet'
   gem 'rake'
   gem 'simplecov'
+  gem 'rspec', '< 3.2' if RUBY_VERSION < '1.9'
 end
 
 self.instance_eval(Bundler.read_file('Gemfile.local')) if File.exist? 'Gemfile.local'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Dominic Cleal
+Copyright (c) 2013-2015 Dominic Cleal
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -14,7 +14,8 @@ Install the gem first:
 
     gem install rspec-puppet-augeas
     
-**Note:** The `ruby-augeas` gem and the augeas tools and development libraries are also required.
+**Note:** The augeas tools and development libraries are also required to
+install the ruby-augeas dependency.
 
 Extend your usual rspec-puppet class test, e.g. for the 'sshd' class:
 
@@ -162,12 +163,11 @@ before_install:
 
 ### Changes to `Gemfile`
 
-The `rspec-puppet-augeas` and `ruby-augeas` gems need to be added into the development and test group:
+The `rspec-puppet-augeas` gem needs to be added into the development and test group:
 
 ```ruby
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
-  gem 'ruby-augeas', :require => false
   gem 'rspec-puppet-augeas', :require => false
 end
 ```

data/lib/rspec-puppet-augeas/fixtures.rb

@@ -40,6 +40,10 @@ module RSpec::Puppet::Augeas
       Puppet::Util::Log.newdestination(Puppet::Test::LogCollector.new(logs))
       Puppet::Util::Log.level = 'debug'
 
+      confdir = Dir.mktmpdir
+      oldconfdir = Puppet[:confdir]
+      Puppet[:confdir] = confdir
+
       [:require, :before, :notify, :subscribe].each { |p| resource.delete p }
       catalog = Puppet::Resource::Catalog.new
       catalog.add_resource resource
@@ -48,6 +52,11 @@ module RSpec::Puppet::Augeas
 
       Puppet::Util::Log.close_all
       txn
+    ensure
+      if confdir
+        Puppet[:confdir] = oldconfdir
+        FileUtils.rm_rf(confdir)
+      end
     end
   end
 end

data/lib/rspec-puppet-augeas/matchers/execute.rb

@@ -13,6 +13,7 @@ module RSpec::Puppet::Augeas::Matchers
 
     def matches?(resource)
       @resource = resource
+      RSpec::Puppet::Coverage.cover!(resource)
       return false if resource.txn.any_failed?
       return false if change and !resource.txn.changed?.any?
       return false if idempotent and resource.idempotent.changed?.any?

data/rspec-puppet-augeas.gemspec

@@ -1,9 +1,10 @@
 Gem::Specification.new do |s|
   s.name = 'rspec-puppet-augeas'
-  s.version = '0.3.0'
+  s.version = '0.4.0'
   s.homepage = 'https://github.com/domcleal/rspec-puppet-augeas/'
   s.summary = 'RSpec tests for Augeas resources in Puppet manifests'
   s.description = 'RSpec tests for Augeas resources in Puppet manifests'
+  s.license = 'MIT'
 
   s.files = [
     '.gitignore',
@@ -28,8 +29,9 @@ Gem::Specification.new do |s|
     'spec/spec_helper.rb'
   ]
 
-  s.add_dependency 'rspec-puppet', '< 1.0.0'
+  s.add_dependency 'rspec-puppet', '>= 2.0.0'
   s.add_dependency 'puppetlabs_spec_helper'
+  s.add_dependency 'ruby-augeas'
 
   s.authors = ['Dominic Cleal']
   s.email = 'dcleal@redhat.com'

data/spec/classes/sshd_config_spec.rb

@@ -112,12 +112,12 @@ describe 'sshd' do
       e = execute
       e.matches? subject
       e.description.should =~ /execute/
-      e.failure_message_for_should.should =~ /^err:.*false/
-      e.failure_message_for_should_not.should =~ /^err:.*false/
+      e.failure_message_for_should.should =~ /^err:.*(false|failed)/
+      e.failure_message_for_should_not.should =~ /^err:.*(false|failed)/
       # Check for debug logs
       e.failure_message_for_should.should =~ /^debug:.*Opening augeas/
       # Ignore transaction stuff
-      e.failure_message_for_should.split("\n").grep(/Finishing transaction/).empty?.should be_true
+      e.failure_message_for_should.split("\n").grep(/Finishing transaction/).empty?.should eq(true)
     end
   end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet-augeas
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-augeas
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RSpec tests for Augeas resources in Puppet manifests
 email: dcleal@redhat.com
 executables: []
@@ -65,7 +79,8 @@ files:
 - spec/fixtures/modules/sshd/manifests/init.pp
 - spec/spec_helper.rb
 homepage: https://github.com/domcleal/rspec-puppet-augeas/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []