Fix augeas::lens with new module organization

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