rspec-puppet 0.0.8 → 0.0.9

data/lib/rspec-puppet.rb

@@ -4,4 +4,7 @@ require 'rspec-puppet/example'
 
 RSpec.configure do |c|
   c.add_setting :module_path, :default => '/etc/puppet/modules'
+  c.add_setting :manifest_dir, :default => nil
+  c.add_setting :manifest, :default => nil
+  c.add_setting :template_dir, :default => nil
 end

data/lib/rspec-puppet/example/class_example_group.rb

@@ -9,6 +9,9 @@ module RSpec::Puppet
 
     def catalogue
       Puppet[:modulepath] = self.respond_to?(:module_path) ? module_path : RSpec.configuration.module_path
+      Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
+      Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
+      Puppet[:templatedir] = self.respond_to?(:template_dir) ? template_dir : RSpec.configuration.template_dir
 
       klass_name = self.class.top_level_description.downcase
 
@@ -17,6 +20,8 @@ module RSpec::Puppet
       if File.exists?(File.join(Puppet[:modulepath], 'manifests', 'init.pp'))
         path_to_manifest = File.join([Puppet[:modulepath], 'manifests', klass_name.split('::')[1..-1]].flatten)
         import_str = "import '#{Puppet[:modulepath]}/manifests/init.pp'\nimport '#{path_to_manifest}.pp'\n"
+      elsif File.exists?(Puppet[:modulepath])
+        import_str = "import '#{Puppet[:manifest]}'\n"
       else
         import_str = ""
       end
@@ -39,6 +44,7 @@ module RSpec::Puppet
       facts_val = {
         'hostname' => nodename.split('.').first,
         'fqdn' => nodename,
+        'domain' => nodename.split('.').last,
       }
       facts_val.merge!(munge_facts(facts)) if self.respond_to?(:facts)
 

data/lib/rspec-puppet/example/define_example_group.rb

@@ -11,12 +11,17 @@ module RSpec::Puppet
       define_name = self.class.top_level_description.downcase
 
       Puppet[:modulepath] = self.respond_to?(:module_path) ? module_path : RSpec.configuration.module_path
+      Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
+      Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
+      Puppet[:templatedir] = self.respond_to?(:template_dir) ? template_dir : RSpec.configuration.template_dir
 
       # If we're testing a standalone module (i.e. one that's outside of a
       # puppet tree), the autoloader won't work, so we need to fudge it a bit.
       if File.exists?(File.join(Puppet[:modulepath], 'manifests', 'init.pp'))
         path_to_manifest = File.join([Puppet[:modulepath], 'manifests', define_name.split('::')[1..-1]].flatten)
         import_str = "import '#{Puppet[:modulepath]}/manifests/init.pp'\nimport '#{path_to_manifest}.pp'\n"
+      elsif File.exists?(Puppet[:modulepath])
+        import_str = "import '#{Puppet[:manifest]}'\n"
       else
         import_str = ""
       end
@@ -41,6 +46,7 @@ module RSpec::Puppet
       facts_val = {
         'hostname' => nodename.split('.').first,
         'fqdn' => nodename,
+        'domain' => nodename.split('.', 2).last,
       }
       facts_val.merge!(munge_facts(facts)) if self.respond_to?(:facts)
 

data/rspec-puppet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rspec-puppet'
-  s.version = '0.0.8'
+  s.version = '0.0.9'
   s.homepage = 'https://github.com/rodjek/rspec-puppet/'
   s.summary = 'RSpec tests for your Puppet manifests'
   s.description = 'RSpec tests for your Puppet manifests'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-puppet
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-29 00:00:00 Z
+date: 2011-09-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec