rspec-puppet 0.0.3 → 0.0.4

data/lib/rspec-puppet/example.rb

@@ -1,3 +1,4 @@
+require 'rspec-puppet/support'
 require 'rspec-puppet/example/define_example_group'
 require 'rspec-puppet/example/class_example_group'
 

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

@@ -1,6 +1,7 @@
 module RSpec::Puppet
   module ClassExampleGroup
     include RSpec::Puppet::Matchers
+    include RSpec::Puppet::Support
 
     def subject
       @catalogue ||= catalogue
@@ -20,27 +21,24 @@ module RSpec::Puppet
         import_str = ""
       end
 
+      if self.respond_to? :pre_condition
+        pre_cond = pre_condition
+      else
+        pre_cond = ''
+      end
+
       if !self.respond_to?(:params) || params == {}
         Puppet[:code] = import_str + "include #{klass_name}"
       else
-        Puppet[:code] = import_str + 'class' + " { " + klass_name + ": " + params.keys.map { |r| "#{r.to_s} => '#{params[r].to_s}'"
-      }.join(', ') + " }"
+        Puppet[:code] = import_str + 'class' + " { \"" + klass_name + "\": " + params.keys.map { |r| "#{r.to_s} => #{params[r].inspect}"
+      }.join(',' ) + " }"
       end
+      Puppet[:code] = pre_cond + "\n" + Puppet[:code]
 
       nodename = self.respond_to?(:node) ? node : Puppet[:certname]
       facts_val = self.respond_to?(:facts) ? facts : {}
 
-      node_obj = Puppet::Node.new(nodename)
-
-      node_obj.merge(facts_val)
-
-      # trying to be compatible with 2.7 as well as 2.6
-      if Puppet::Resource::Catalog.respond_to? :find
-        Puppet::Resource::Catalog.find(node_obj.name, :use_node => node_obj)
-      else
-        require 'puppet/face'
-        Puppet::Face[:catalog, :current].find(node_obj.name, :use_node => node_obj)
-      end
+      build_catalog(nodename, facts_val)
     end
   end
 end

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

@@ -1,6 +1,7 @@
 module RSpec::Puppet
   module DefineExampleGroup
     include RSpec::Puppet::Matchers
+    include RSpec::Puppet::Support
 
     def subject
       @catalogue ||= catalogue
@@ -22,13 +23,19 @@ module RSpec::Puppet
 
       if self.respond_to? :params
         param_str = params.keys.map { |r|
-          "#{r.to_s} => \"#{params[r].to_s}\""
+          "#{r.to_s} => #{params[r].inspect}"
         }.join(', ')
       else
         param_str = ""
       end
 
-      Puppet[:code] = import_str + define_name + " { \"" + title + "\": " + param_str + " }"
+      if self.respond_to? :pre_condition
+        pre_cond = pre_condition
+      else
+        pre_cond = ""
+      end
+
+      Puppet[:code] = pre_cond + "\n" + import_str + define_name + " { \"" + title + "\": " + param_str + " }"
 
       nodename = self.respond_to?(:node) ? node : Puppet[:certname]
       facts_val = {
@@ -37,17 +44,7 @@ module RSpec::Puppet
       }
       facts_val.merge!(facts) if self.respond_to?(:facts)
 
-      node_obj = Puppet::Node.new(nodename)
-
-      node_obj.merge(facts_val)
-
-      # trying to be compatible with 2.7 as well as 2.6
-      if Puppet::Resource::Catalog.respond_to? :find
-        Puppet::Resource::Catalog.find(node_obj.name, :use_node => node_obj)
-      else
-        require 'puppet/face'
-        Puppet::Face[:catalog, :current].find(node_obj.name, :use_node => node)
-      end
+      build_catalog(nodename, facts_val)
     end
   end
 end

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

@@ -21,18 +21,14 @@ module RSpec::Puppet
 
       def matches?(catalogue)
         ret = true
-        resources = catalogue.resources.select { |r|
-          r.type == @referenced_type
-        }.select { |r|
-          r.title == @title if r.respond_to? :title
-        }
+        resource = catalogue.resource(@referenced_type, @title)
 
-        unless resources.length == 1
+        if resource.nil?
           ret = false
         else
           if @expected_params
             @expected_params.each do |name, value|
-              unless resources.first.send(:parameters)[name.to_sym].to_s == value.to_s
+              unless resource.send(:parameters)[name.to_sym].to_s == value.to_s
                 ret = false
                 (@errors ||= []) << "#{name.to_s} set to `#{value.inspect}`"
               end

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

@@ -15,7 +15,7 @@ module RSpec::Puppet
           ret = false
         end
 
-        if @expected_params
+        if @expected_params and resources.length != 0
           @expected_params.each do |name, value|
             unless resources.first.send(:parameters)[name.to_sym] == value
               ret = false

data/rspec-puppet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rspec-puppet'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   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

@@ -5,3 +5,10 @@ describe 'sysctl::common' do
     .with_command('/sbin/sysctl -p /etc/sysctl.conf').with_returns([0, 2]) }
   it { should_not create_augeas('foo') }
 end
+
+describe 'sysctl::common' do
+  let(:params) { { :test_param => "yes" } }
+
+  it { should create_class("sysctl::common")\
+    .with_test_param("yes") }
+end

data/spec/fixtures/sysctl/manifests/init.pp

@@ -1,4 +1,4 @@
-class sysctl::common {
+class sysctl::common ($test_param = 'yes') {
   exec { 'sysctl/reload':
     command     => '/sbin/sysctl -p /etc/sysctl.conf',
     refreshonly => true,
@@ -16,3 +16,24 @@ define sysctl($value) {
     notify  => Exec['sysctl/reload'],
   }
 }
+
+class boolean($bool) {
+  $real_bool = $bool ? {
+    true => false,
+    false => true,
+  }
+
+  if ($real_bool) {
+    notify {"bool testing":
+      message => "This will print when \$bool is false."
+    }
+  }
+}
+
+define sysctl::before($value) {
+  Class['sysctl::common'] -> Sysctl::Before[$name]
+
+  notify {"message-${name}":
+    message => "This should print if the class is here first."
+  }
+}

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-puppet
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 +10:00
+date: 2011-08-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -67,27 +64,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your Puppet manifests