puppetlabs_spec_helper 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b893338e787bafe13cafce81b8513264ef35cd74
-  data.tar.gz: 4c1bcdbcf336de9486e52ee9c6ddd1ff41d23157
+  metadata.gz: 426cd8838d534c5070cb5995d7a985f07870dd68
+  data.tar.gz: a1145c2a54a8c44760bf51d731720587a60deba4
 SHA512:
-  metadata.gz: 8744098fa158561caf9b31abce27fcbc5fa85106398dba473276cc52660ef4ecc8750388099cadb0845ac23082509fecf7eecd46cd234a2e6f28bab2960dcc42
-  data.tar.gz: 9ce7bad037d78361d29db6df4ac946cd236dfa7d09c19bff47b83c3d79f881e7f5289ed8f2eac0692ce814f3b01674b4f1939fd2ce1f455775bed86a9dbcf9e9
+  metadata.gz: 868efeb2d113293f52366537491a22e29505a7a406332327cae0301734cddd6ca307f7a0217100c271ccac9c1f72348baef6763f5e4132a6e24a645a47c1c500
+  data.tar.gz: 2fa3274a70b1ebe0a8ba9284ee685d579de416ae2db87ce3954275758d49402babbfcc535776fabbf89e9b816ffb84ac48f88f828d39d0550372114eacd9ab87

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+before_install: 
+  # https://github.com/bundler/bundler/issues/3558
+  gem update bundler
+script: bundle exec rake spec 
+rvm:
+  - 1.9.3
+  - 2.0
+  - 2.1
+notifications:
+  email: false

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.0] - 2015-02-25
+### Summary:
+This release adds the ability to clone fixtures from git in parallel, speeding
+up the spec\_prep rake task.
+
+### Added:
+- Parallel fixtures cloning
+- Various rake check tasks for module release preparation
+
+### Fixed:
+- Added travis ci
+- Added contributing doc
+- Don't validate metadata if metadata-json-lint gem is not present
+
 ## [1.0.1] - 2015-11-06
 ### Summary:
 This bugfix release fixes the Error vs. Errno bug in 1.0.0
@@ -215,7 +229,8 @@ compatible yet.
 ### Added
  * Initial release
 
-[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.0.1...master
+[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.1.0...master
+[1.1.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.0.1...1.1.0
 [1.0.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.0.0...1.0.1
 [1.0.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.10.3...1.0.0
 [0.10.3]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.10.2...0.10.3

data/CONTRIBUTING.md

@@ -0,0 +1,55 @@
+# DEVELOPMENT NOTES
+
+## Building Gemspec
+The Rakefile includes all the info that the gemspec file will contain. You have to update
+the Rakefile instead of the gemspec.
+To regenerate the gemspec just run `rake gemspec` and a new gemspec will be created
+with everything required.
+
+Running `rake build` will build out the gemspec according to the Rakefile parameters.
+
+```ruby
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "puppetlabs_spec_helper"
+  gem.version = "#{PuppetlabsSpecHelper::Version::STRING}"
+  gem.homepage = "http://github.com/puppetlabs/puppetlabs_spec_helper"
+  gem.license = "Apache-2.0"
+  gem.summary = %Q{Standard tasks and configuration for module spec tests}
+  gem.description = %Q{Contains rake tasks and a standard spec_helper for running spec tests on puppet modules}
+  gem.email = ["modules-dept@puppetlabs.com"]
+  gem.authors = ["Puppet Labs"]
+  # dependencies defined in Gemfile
+end
+
+```
+
+## Version file
+As part of the `rake gemspec` task, the gemspec will reference the version that is
+defined in the `lib/puppetlabs_spec_helper/version.rb` file.  
+
+
+## Releasing
+To release the gem just run the following things.
+
+### 1. Update the version
+update the version file : `lib/puppetlabs_spec_helper/version.rb`
+
+```ruby
+module PuppetlabsSpecHelper
+  module Version
+    STRING = '1.0.1'
+  end
+end
+```
+
+### 2. Generate and push the release to git
+rake gemspec:release
+
+### 3. Tag and release to git
+Since the default behavior of jewler is to use tags like `v1.0.1` we cannot use
+the `git:release` task and will need to use `git:pl_release` which creates a tag
+without the `v` and pushes to master.
+
+### 4. Release to rubygems
+rake release

data/Gemfile

@@ -1,9 +1,16 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gemspec
+gem 'rake'
+gem 'rspec-puppet'
+gem 'puppet-lint'
+gem 'puppet-syntax'
+gem 'mocha'
 
-if File.exists? "#{__FILE__}.local"
-  eval(File.read("#{__FILE__}.local"), binding)
+group :development do
+  gem 'yard'
+  gem 'pry'
+  gem 'jeweler'
+  gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.8.3'
 end
 
 # vim:filetype=ruby

data/README.markdown

@@ -43,6 +43,24 @@ And run the spec tests:
     $ cd $modulename
     $ rake spec
 
+
+### Parallel Fixture Downloads
+Fixture downloads will now execute in parallel to speed up the testing process. Which can represent >= 600% speed increase (depending on number of threads). You can control the amount of threads by setting the `MAX_FIXTURE_THREAD_COUNT` environment variable
+to a positive integer, the default is currently 10.  We don't suggest going higher than 25 as the gains are marginal due to some repos taking a long time to download.  Please be aware that your internal VCS system may not be able to handle a high load in which case the server would fail to clone the repository. Because of this issue, this setting is tunable via `MAX_FIXTURE_THREAD_COUNT`.
+
+Additionally, you can also speed up cloning when using the ssh protocol by multiplexing ssh sessions.  Add something similar to your ssh config.
+Note: you may need to change the host if your using an internal git server.
+
+```shell
+Host github.com
+  ControlMaster auto
+  ControlPath ~/.ssh/ssh-%r@%h:%p
+  ControlPersist yes
+
+```
+
+Note: parallel downloads is only available for repositories and not forge modules.
+
 Issues
 ======
 
@@ -142,7 +160,7 @@ Using Fixtures
 `rake spec_prep` is run. To do so, all required modules should be listed in a
 file named `.fixtures.yml` in the root of the project.
 
-When specifying the repo source of the fixture you have a few options as to which revision of the codebase you wish to use. 
+When specifying the repo source of the fixture you have a few options as to which revision of the codebase you wish to use.
 
  * repo - the url to the repo
  * scm - options include git or hg. This is an optional step as the helper code will figure out which scm is used.
@@ -245,4 +263,29 @@ instances in a manner decoupled from the internal behavior of Puppet:
       end
     end
 
+Some Notes for Windows Users
+==============
+
+A windows users may need to do one of two things to execute 'rake spec'.
+
+Although things may appear to work, the init.pp may not transfer to the fixtures folder as needed
+or may transfer as an empty file.
+
+This is related to a registry security setting requiring elevated privileges to create symbolic links.
+
+Currently, there are two known approaches to get around this problem.
+
+- run your windows shell (cmd) as an Administrator  
+or
+- modify the registry entry settings to allow symbolic links to be created.
+
+The following links may give you some insight into why...
+
+[Server Fault Post](http://serverfault.com/questions/582944/puppet-file-link-doesnt-create-target-under-windows)
+
+[Stack Overflow Post](http://stackoverflow.com/questions/229643/how-do-i-overcome-the-the-symbolic-link-cannot-be-followed-because-its-type-is)
+
+[Microsoft TechNet](https://technet.microsoft.com/en-us/library/cc754077.aspx)
+
+
 EOF

data/Rakefile

@@ -1,33 +1,50 @@
-require 'rake'
-require 'rake/packagetask'
-require 'rubygems/package_task'
+# encoding: utf-8
 
-task :default do
-    sh %{rake -T}
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
+require 'rake'
+require_relative 'lib/puppetlabs_spec_helper/version'
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "puppetlabs_spec_helper"
+  gem.version = "#{PuppetlabsSpecHelper::Version::STRING}"
+  gem.homepage = "http://github.com/puppetlabs/puppetlabs_spec_helper"
+  gem.license = "Apache-2.0"
+  gem.summary = %Q{Standard tasks and configuration for module spec tests}
+  gem.description = %Q{Contains rake tasks and a standard spec_helper for running spec tests on puppet modules}
+  gem.email = ["modules-dept@puppetlabs.com"]
+  gem.authors = ["Puppet Labs"]
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new
 
-require 'fileutils'
-
-def version
-  require 'puppetlabs_spec_helper/version'
-  PuppetlabsSpecHelper::Version::STRING
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb'].exclude('spec/fixtures/**/*_spec.rb')
 end
 
-namespace :package do
-  desc "Create the gem"
-  task :gem do
-    spec = Gem::Specification.load("puppetlabs_spec_helper.gemspec")
-    Dir.mkdir("pkg") rescue nil
-    if Gem::Version.new(`gem -v`) >= Gem::Version.new("2.0.0.a")
-      Gem::Package.build(spec)
-    else
-      Gem::Builder.new(spec).build
-    end
-    FileUtils.move("puppetlabs_spec_helper-#{version}.gem", "pkg")
+namespace :git do
+  desc "Create a new tag that uses #{PuppetlabsSpecHelper::Version::STRING} as the tag"
+  task :tag do
+    `git tag -m '#{PuppetlabsSpecHelper::Version::STRING}'`
+  end
+  desc "Tag and push to master"
+  task :pl_release do
+    Rake::Task["git:tag"].invoke
+    `git push origin master --tags`
   end
 end
 
-desc "Cleanup pkg directory"
-task :clean do
-  FileUtils.rm_rf("pkg")
-end
+task :default => :spec
+
+require 'yard'
+YARD::Rake::YardocTask.new

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -2,6 +2,13 @@ require 'rake'
 require 'rspec/core/rake_task'
 require 'yaml'
 
+# optional gems
+begin
+  require 'metadata-json-lint/rake_task'
+rescue LoadError
+  # ignore
+end
+
 task :default => [:help]
 
 desc "Run spec tests on an existing fixtures directory"
@@ -27,6 +34,20 @@ def source_dir
   Dir.pwd
 end
 
+# cache the repositories and retruns and hash object
+def repositories
+  unless @repositories
+    @repositories = fixtures('repositories')
+    @repositories.each do |remote, opts|
+      if opts.instance_of?(String)
+        @repositories[remote] = {"target" => opts} # inject a hash
+      end
+    end
+  end
+  @repositories
+end
+
+
 def fixtures(category)
   if File.exists?('.fixtures.yml')
     fixtures_yaml = '.fixtures.yml'
@@ -77,9 +98,13 @@ def clone_repo(scm, remote, target, ref=nil, branch=nil, flags = nil)
     args.push(flags) if flags
     args.push(remote, target)
   else
-      fail "Unfortunately #{scm} is not supported yet"
+    fail "Unfortunately #{scm} is not supported yet"
+  end
+  result = system("#{scm} #{args.flatten.join ' '}")
+  unless File::exists?(target)
+    fail "Failed to clone #{scm} repository #{remote} into #{target}"
   end
-  system("#{scm} #{args.flatten.join ' '}")
+  result
 end
 
 def revision(scm, target, ref)
@@ -90,11 +115,56 @@ def revision(scm, target, ref)
   when 'git'
     args.push('reset', '--hard', ref)
   else
-      fail "Unfortunately #{scm} is not supported yet"
+    fail "Unfortunately #{scm} is not supported yet"
   end
   system("cd #{target} && #{scm} #{args.flatten.join ' '}")
 end
 
+# creates a logger so we can log events with certain levels
+def logger
+  unless @logger
+    require 'logger'
+    if ENV['ENABLE_LOGGER']
+       level = Logger::DEBUG
+     else
+       level = Logger::INFO
+    end
+    @logger = Logger.new(STDOUT)
+    @logger.level = level
+  end
+  @logger
+end
+
+# returns the current thread count that is currently active
+# a status of false or nil means the thread completed
+# so when anything else we count that as a active thread
+def current_thread_count(items)
+  active_threads = items.find_all do |item, opts|
+    if opts[:thread]
+      opts[:thread].status
+    else
+      false
+    end
+  end
+  logger.debug "Current thread count #{active_threads.count}"
+  active_threads.count
+end
+
+# returns the max_thread_count
+# because we may want to limit ssh or https connections
+def max_thread_limit
+  unless @max_thread_limit
+    # the default thread count is 10 but can be
+    # raised by using environment variable MAX_FIXTURE_THREAD_COUNT
+    if ENV['MAX_FIXTURE_THREAD_COUNT'].to_i > 0
+      @max_thread_limit = ENV['MAX_FIXTURE_THREAD_COUNT'].to_i
+    else
+      @max_thread_limit = 10 # the default
+    end
+  end
+  @max_thread_limit
+end
+
 desc "Create the fixtures directory"
 task :spec_prep do
   # Ruby only sets File::ALT_SEPARATOR on Windows and Rubys standard library
@@ -107,25 +177,35 @@ task :spec_prep do
   rescue
   end
 
-
-  fixtures("repositories").each do |remote, opts|
+  repositories.each do |remote, opts|
     scm = 'git'
-    if opts.instance_of?(String)
-      target = opts
-    elsif opts.instance_of?(Hash)
-      target = opts["target"]
-      ref = opts["ref"]
-      scm = opts["scm"] if opts["scm"]
-      branch = opts["branch"] if opts["branch"]
-      flags = opts["flags"]
-    end
-
-    unless File::exists?(target) || clone_repo(scm, remote, target, ref, branch, flags)
-      fail "Failed to clone #{scm} repository #{remote} into #{target}"
+    target = opts["target"]
+    ref = opts["ref"]
+    scm = opts["scm"] if opts["scm"]
+    branch = opts["branch"] if opts["branch"]
+    flags = opts["flags"]
+    # get the current active threads that are alive
+    count = current_thread_count(repositories)
+    if count < max_thread_limit
+      logger.debug "New Thread started for #{remote}"
+      # start up a new thread and store it in the opts hash
+      opts[:thread] = Thread.new do
+        clone_repo(scm, remote, target, ref, branch, flags)
+        revision(scm, target, ref) if ref
+      end
+    else
+      # the last thread started should be the longest wait
+      item, item_opts = repositories.find_all {|i,o| o.has_key?(:thread)}.last
+      logger.debug "Waiting on #{item}"
+      item_opts[:thread].join  # wait for the thread to finish
+      # now that we waited lets try again
+      redo
     end
-    revision(scm, target, ref) if ref
   end
 
+  # wait for all the threads to finish
+  repositories.each {|remote, opts| opts[:thread].join }
+
   FileUtils::mkdir_p("spec/fixtures/modules")
   fixtures("symlinks").each do |source, target|
     if is_windows
@@ -149,9 +229,9 @@ task :spec_prep do
     next if File::exists?(target)
 
     command = "puppet module install" + ref + flags + \
-              " --ignore-dependencies" \
-              " --force" \
-              " --target-dir spec/fixtures/modules #{remote}"
+      " --ignore-dependencies" \
+      " --force" \
+      " --target-dir spec/fixtures/modules #{remote}"
 
     unless system(command)
       fail "Failed to install module #{remote} to #{target}"
@@ -233,11 +313,11 @@ PuppetLint.configuration.relative = true
 PuppetLint::RakeTask.new(:lint) do |config|
   config.fail_on_warnings = true
   config.disable_checks = [
-      '80chars',
-      'class_inherits_from_params_class',
-      'class_parameter_defaults',
-      'documentation',
-      'single_quote_string_with_variables']
+    '80chars',
+    'class_inherits_from_params_class',
+    'class_parameter_defaults',
+    'documentation',
+    'single_quote_string_with_variables']
   config.ignore_paths = ["tests/**/*.pp", "vendor/**/*.pp","examples/**/*.pp", "spec/**/*.pp", "pkg/**/*.pp"]
 end
 
@@ -248,23 +328,98 @@ PuppetSyntax.exclude_paths << "pkg/**/*"
 PuppetSyntax.exclude_paths << "vendor/**/*"
 PuppetSyntax.future_parser = true if ENV['FUTURE_PARSER'] == 'yes'
 
-desc "Check syntax of Ruby files and call :syntax and :metadata"
+desc "Check syntax of Ruby files and call :syntax and :metadata_lint"
 task :validate do
   Dir['lib/**/*.rb'].each do |lib_file|
     sh "ruby -c #{lib_file}"
   end
 
   Rake::Task[:syntax].invoke
-  Rake::Task[:metadata].invoke if File.exist?('metadata.json')
+  if File.exist?('metadata.json')
+    if Rake::Task.task_defined?(:metadata_lint)
+      Rake::Task[:metadata_lint].invoke
+    else
+      warn "Skipping metadata validation; the metadata-json-lint gem was not found"
+    end
+  end
 end
 
-desc "Validate metadata.json file"
-task :metadata do
-  begin
-    require 'metadata_json_lint'
-    sh "metadata-json-lint metadata.json"
-  rescue LoadError => e
-    warn "Skipping metadata validation; the metadata-json-lint gem was not found"
+desc "Print development version of module"
+task :compute_dev_version do
+  version = ''
+  if File.exists?( 'metadata.json' )
+    require 'json'
+
+    modinfo = JSON.parse(File.read( 'metadata.json' ))
+    version = modinfo['version']
+  elsif File.exists?( 'Modulefile' )
+    modfile = File.read('Modulefile')
+    version = modfile.match(/\nversion[ ]+['"](.*)['"]/)[1]
+  else
+    fail "Could not find a metadata.json or Modulefile! Cannot compute dev version without one or the other!"
+  end
+
+  sha = `git rev-parse HEAD`[0..7]
+
+  # If we're in a CI environment include our build number
+  if build = ENV['BUILD_NUMBER'] || ENV['TRAVIS_BUILD_NUMBER']
+    new_version = sprintf('%s-%04d-%s', version, build, sha)
+  else
+    new_version = "#{version}-#{sha}"
+  end
+
+  print new_version
+end
+
+desc "Runs all nessesary checks on a module in preparation for a release"
+task :release_checks do
+  Rake::Task[:lint].invoke
+  Rake::Task[:validate].invoke
+  Rake::Task[:spec].invoke
+  Rake::Task["check:symlinks"].invoke
+  Rake::Task["check:test_file"].invoke
+  Rake::Task["check:dot_underscore"].invoke
+  Rake::Task["check:git_ignore"].invoke
+end
+
+namespace :check do
+  desc "Fails if symlinks are present in directory"
+  task :symlinks do
+    symlink = `find . -type l -ls`
+    unless symlink == ""
+      puts symlink
+      fail "A symlink exists within this directory"
+    end
+  end
+
+  desc "Fails if .pp files present in tests folder"
+  task :test_file do
+    if Dir.exist?("tests")
+      Dir.chdir("tests")
+      ppfiles = Dir["*.pp"]
+      unless ppfiles.empty?
+        puts ppfiles
+        fail ".pp files present in tests folder; Move them to an examples folder following the new convention"
+      end
+    end
+  end
+
+  desc "Fails if any ._ files are present in directory"
+  task :dot_underscore do
+    dirs = Dir["._*"]
+    unless dirs.empty?
+      puts dirs
+      fail "._ files are present in the directory"
+    end
+  end
+
+  desc "Fails if directories contain the files specified in .gitignore"
+  task :git_ignore do
+    matched = `git ls-files --ignored --exclude-standard`
+    unless matched == ""
+      puts matched
+      fail "File specified in .gitignore has been committed"
+    end
   end
 end
 

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
   module Version
-    STRING = '1.0.1'
+    STRING = '1.1.0'
   end
 end

data/puppetlabs_spec_helper.gemspec

@@ -1,25 +1,88 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "puppetlabs_spec_helper/version"
+# stub: puppetlabs_spec_helper 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name        = "puppetlabs_spec_helper"
-  s.version     = PuppetlabsSpecHelper::Version::STRING
-  s.authors     = ["Puppet Labs"]
-  s.email       = ["modules-dept@puppetlabs.com"]
-  s.homepage    = "http://github.com/puppetlabs/puppetlabs_spec_helper"
-  s.summary     = "Standard tasks and configuration for module spec tests"
+  s.name = "puppetlabs_spec_helper"
+  s.version = "1.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["Puppet Labs"]
+  s.date = "2016-02-25"
   s.description = "Contains rake tasks and a standard spec_helper for running spec tests on puppet modules"
-  s.licenses    = 'Apache-2.0'
+  s.email = ["modules-dept@puppetlabs.com"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.markdown"
+  ]
+  s.files = [
+    ".noexec.yaml",
+    ".travis.yml",
+    "CHANGELOG.md",
+    "CONTRIBUTING.md",
+    "Gemfile",
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "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",
+    "lib/puppetlabs_spec_helper/version.rb",
+    "puppet_spec_helper.rb",
+    "puppetlabs_spec_helper.gemspec",
+    "puppetlabs_spec_helper.rb",
+    "spec/lib/puppet/type/spechelper.rb",
+    "spec/spec_helper.rb",
+    "spec/unit/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals_spec.rb",
+    "spec/watchr.rb"
+  ]
+  s.homepage = "http://github.com/puppetlabs/puppetlabs_spec_helper"
+  s.licenses = ["Apache-2.0"]
+  s.rubygems_version = "2.2.3"
+  s.summary = "Standard tasks and configuration for module spec tests"
 
-  s.files       = `git ls-files`.split("\n")
-  s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
 
-  # Runtime dependencies, but also probably dependencies of requiring projects
-  s.add_runtime_dependency 'rake'
-  s.add_runtime_dependency 'rspec-puppet'
-  s.add_runtime_dependency 'puppet-lint'
-  s.add_runtime_dependency 'puppet-syntax'
-  s.add_runtime_dependency 'mocha'
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<rspec-puppet>, [">= 0"])
+      s.add_runtime_dependency(%q<puppet-lint>, [">= 0"])
+      s.add_runtime_dependency(%q<puppet-syntax>, [">= 0"])
+      s.add_runtime_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<puppet>, ["~> 3.8.3"])
+    else
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rspec-puppet>, [">= 0"])
+      s.add_dependency(%q<puppet-lint>, [">= 0"])
+      s.add_dependency(%q<puppet-syntax>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<puppet>, ["~> 3.8.3"])
+    end
+  else
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rspec-puppet>, [">= 0"])
+    s.add_dependency(%q<puppet-lint>, [">= 0"])
+    s.add_dependency(%q<puppet-syntax>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<puppet>, ["~> 3.8.3"])
+  end
 end
+

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+RSpec.configure do |c|
+end

data/spec/unit/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals_spec.rb

@@ -1,32 +1,31 @@
-#! /usr/bin/env ruby -S rspec
-
+require 'spec_helper'
 require 'puppetlabs_spec_helper/puppet_spec_helper'
 require 'puppetlabs_spec_helper/puppetlabs_spec/puppet_internals'
 
 describe PuppetlabsSpec::PuppetInternals do
+  before(:all) do
+    Puppet.initialize_settings
+  end
   describe ".scope" do
     it "should return a Puppet::Parser::Scope instance" do
       subject.scope.should be_a_kind_of Puppet::Parser::Scope
     end
 
-    it "should be suitable for function testing" do
-      scope = subject.scope
-      scope.function_split(["one;two", ";"]).should == [ 'one', 'two' ]
+    xit "should be suitable for function testing" do
+      # split is now a puppet 4x core function
+      subject.scope.function_split(["one;two", ";"]).should == [ 'one', 'two' ]
     end
 
     it "should accept a compiler" do
       compiler = subject.compiler
-
       scope = subject.scope(:compiler => compiler)
-
       scope.compiler.should == compiler
     end
 
     it "should have a source set" do
       scope = subject.scope
-
       scope.source.should_not be_nil
-      scope.source.should_not be_false
+      scope.source.name.should eq('foo')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,17 +80,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.3
 description: Contains rake tasks and a standard spec_helper for running spec tests
   on puppet modules
 email:
 - modules-dept@puppetlabs.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- LICENSE
+- README.markdown
 files:
-- ".gitignore"
 - ".noexec.yaml"
+- ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.markdown
@@ -108,8 +167,8 @@ files:
 - puppetlabs_spec_helper.gemspec
 - puppetlabs_spec_helper.rb
 - spec/lib/puppet/type/spechelper.rb
+- spec/spec_helper.rb
 - spec/unit/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals_spec.rb
-- spec/unit/spechelper_spec.rb
 - spec/watchr.rb
 homepage: http://github.com/puppetlabs/puppetlabs_spec_helper
 licenses:
@@ -135,8 +194,5 @@ rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Standard tasks and configuration for module spec tests
-test_files:
-- spec/lib/puppet/type/spechelper.rb
-- spec/unit/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals_spec.rb
-- spec/unit/spechelper_spec.rb
-- spec/watchr.rb
+test_files: []
+has_rdoc: 

data/.gitignore

@@ -1,3 +0,0 @@
-Gemfile.lock
-pkg/
-.*.sw*

data/spec/unit/spechelper_spec.rb

@@ -1,43 +0,0 @@
-#!/usr/bin/env ruby
-require 'puppetlabs_spec_helper/puppet_spec_helper'
-
-# ensure we can access puppet settings outside of any example group
-Puppet[:confdir]
-
-# set modulepath from which to load custom type
-Puppet[:modulepath] = File.join(File.dirname(__FILE__), '..', '..')
-
-def should_be_able_to_load_types?
-  return true if Puppet::Test::TestHelper.respond_to?(:initialize)
-
-  case Puppet.version
-  when /^2\.7\.20/
-    false
-  when /^3\.0\./
-    false
-  else
-    true
-  end
-end
-
-# construct a top-level describe block whose declared_class is a custom type in this module
-describe Puppet::Type.type(:spechelper) do
-  it "should load the type from the modulepath" do
-    pending("this is only supported on newer versions of puppet", :unless => should_be_able_to_load_types?) do
-      described_class.should be
-    end
-  end
-
-  it "should have a doc string" do
-    pending("this is only supported on newer versions of puppet", :unless => should_be_able_to_load_types?) do
-      described_class.doc.should == "This is the spechelper type"
-    end
-  end
-end
-
-describe "Setup of settings" do
-  it "sets confdir and vardir to something not meaningful to force tests to make their choice explicit" do
-    Puppet[:confdir].should == "/dev/null"
-    Puppet[:vardir].should == "/dev/null"
-  end
-end