rspec-puppet 0.0.2 → 0.0.3

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

@@ -31,7 +31,11 @@ module RSpec::Puppet
       Puppet[:code] = import_str + define_name + " { \"" + title + "\": " + param_str + " }"
 
       nodename = self.respond_to?(:node) ? node : Puppet[:certname]
-      facts_val = self.respond_to?(:facts) ? facts : {}
+      facts_val = {
+        'hostname' => nodename.split('.').first,
+        'fqdn' => nodename,
+      }
+      facts_val.merge!(facts) if self.respond_to?(:facts)
 
       node_obj = Puppet::Node.new(nodename)
 

data/lib/rspec-puppet/matchers/create_generic.rb

@@ -2,7 +2,7 @@ module RSpec::Puppet
   module Matchers
     class CreateGeneric
       def initialize(*args, &block)
-        @exp_resource_type = args.shift.to_s.gsub(/^create_/, '')
+        @exp_resource_type = args.shift.to_s.gsub(/^(create|contain)_/, '')
         @args = args
         @block = block
         @referenced_type = referenced_type(@exp_resource_type)
@@ -58,7 +58,7 @@ module RSpec::Puppet
     private
 
       def referenced_type(type)
-        type.split('-').map { |r| r.capitalize }.join('::')
+        type.split('__').map { |r| r.capitalize }.join('::')
       end
 
       def errors
@@ -67,7 +67,7 @@ module RSpec::Puppet
     end
 
     def method_missing(method, *args, &block)
-      return RSpec::Puppet::Matchers::CreateGeneric.new(method, *args, &block) if method.to_s =~ /^create_/
+      return RSpec::Puppet::Matchers::CreateGeneric.new(method, *args, &block) if method.to_s =~ /^(create|contain)_/
       super
     end
   end

data/rspec-puppet.gemspec

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

data/spec/classes/sysctl_common_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'sysctl::common' do
-  it { should create_exec('sysctl/reload') \
+  it { should contain_exec('sysctl/reload') \
     .with_command('/sbin/sysctl -p /etc/sysctl.conf').with_returns([0, 2]) }
   it { should_not create_augeas('foo') }
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-puppet
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 +10:00
+date: 2011-07-21 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency