puppetlabs_spec_helper 0.2.0 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+2012-08-14 Puppet Labs <info@puppetlabs.com> - 0.3.0
+ * Add PuppetInternals compatibility module for
+   scope, node, compiler, and functions
+ * Add rspec-puppet convention directories to rake tasks
+
 2012-07-05 Puppet Labs <info@puppetlabs.com> - 0.2.0
  * Fix integration with mocha-0.12.0
  * Fix coverage rake task

data/lib/puppetlabs_spec_helper/module_spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rspec-puppet'
 require 'puppetlabs_spec_helper/puppet_spec_helper'
+require 'puppetlabs_spec_helper/puppetlabs_spec/puppet_internals'
 
 def param_value(subject, type, title, param)
   subject.resource(type, title).send(:parameters)[param.to_sym]

data/lib/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals.rb

@@ -0,0 +1,68 @@
+# Initialize puppet for testing by loading the
+# 'puppetlabs_spec_helper/puppet_spec_helper' library
+require 'puppetlabs_spec_helper/puppet_spec_helper'
+
+module PuppetlabsSpec
+  module PuppetInternals
+    # parser_scope is intended to return a Puppet::Parser::Scope
+    # instance suitable for placing in a test harness with the intent of
+    # testing parser functions from modules.
+    def scope(parts = {})
+      if Puppet.version =~ /^2\.[67]/
+        # loadall should only be necessary prior to 3.x
+        # Please note, loadall needs to happen first when creating a scope, otherwise
+        # you might receive undefined method `function_*' errors
+        Puppet::Parser::Functions.autoloader.loadall
+      end
+
+      scope_compiler = parts[:compiler] || compiler
+      scope_parent = parts[:parent] || scope_compiler.topscope
+      scope_resource = parts[:resource] || resource(:type => :node, :title => scope_compiler.node.name)
+
+      if Puppet.version =~ /^2\.[67]/
+        scope = Puppet::Parser::Scope.new(:compiler => scope_compiler)
+      else
+        scope = Puppet::Parser::Scope.new(scope_compiler)
+      end
+
+      scope.source = Puppet::Resource::Type.new(:node, "foo")
+      scope.parent = scope_parent
+      scope
+    end
+    module_function :scope
+
+    def resource(parts = {})
+      resource_type = parts[:type] || :hostclass
+      resource_name = parts[:name] || "testing"
+      Puppet::Resource::Type.new(resource_type, resource_name)
+    end
+    module_function :resource
+
+    def compiler(parts = {})
+      compiler_node = parts[:node] || node()
+      Puppet::Parser::Compiler.new(compiler_node)
+    end
+    module_function :compiler
+
+    def node(parts = {})
+      node_name = parts[:name] || 'testinghost'
+      options = parts[:options] || {}
+      node_environment = Puppet::Node::Environment.new(parts[:environment] || 'test')
+      options.merge!({:environment => node_environment})
+      Puppet::Node.new(node_name, options)
+    end
+    module_function :node
+
+    # Return a method instance for a given function.  This is primarily useful
+    # for rspec-puppet
+    def function_method(name, parts = {})
+      scope = parts[:scope] || scope()
+      # Ensure the method instance is defined by side-effect of checking if it
+      # exists.  This is a hack, but at least it's a hidden hack and not an
+      # exposed hack.
+      return nil unless Puppet::Parser::Functions.function(name)
+      scope.method("function_#{name}".intern)
+    end
+    module_function :function_method
+  end
+end

data/lib/puppetlabs_spec_helper/puppetlabs_spec_helper.rb

@@ -9,6 +9,7 @@ end
 # Require all necessary helper libraries so they can be used later
 require 'puppetlabs_spec_helper/puppetlabs_spec/files'
 require 'puppetlabs_spec_helper/puppetlabs_spec/fixtures'
+require 'puppetlabs_spec_helper/puppetlabs_spec/puppet_internals'
 require 'puppetlabs_spec_helper/puppetlabs_spec/matchers'
 
 RSpec.configure do |config|

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -7,7 +7,7 @@ task :default => [:help]
 desc "Run spec tests on an existing fixtures directory"
 RSpec::Core::RakeTask.new(:spec_standalone) do |t|
   t.rspec_opts = ['--color']
-  t.pattern = 'spec/{classes,defines,unit}/**/*_spec.rb'
+  t.pattern = 'spec/{classes,defines,unit,functions,hosts}/**/*_spec.rb'
 end
 
 desc "Generate code coverage information"

metadata

@@ -1,135 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 2
-        - 9
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.9.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 10
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.10.5
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec-puppet
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.5
+- !ruby/object:Gem::Dependency
+  name: rspec-puppet
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
-  version_requirements: *id004
-description: Contains rake tasks and a standard spec_helper for running spec tests on puppet modules
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+description: Contains rake tasks and a standard spec_helper for running spec tests
+  on puppet modules
+email:
 - puppet-dev@puppetlabs.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/puppetlabs_spec_helper/module_spec_helper.rb
 - lib/puppetlabs_spec_helper/puppet_spec_helper.rb
 - lib/puppetlabs_spec_helper/puppetlabs_spec/files.rb
 - lib/puppetlabs_spec_helper/puppetlabs_spec/fixtures.rb
 - lib/puppetlabs_spec_helper/puppetlabs_spec/matchers.rb
+- lib/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals.rb
 - lib/puppetlabs_spec_helper/puppetlabs_spec_helper.rb
 - lib/puppetlabs_spec_helper/rake_tasks.rb
 - LICENSE
 - CHANGELOG
 homepage: http://github.com/puppetlabs/puppetlabs_spec_helper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Standard tasks and configuration for module spec tests
 test_files: []
-