puppetlabs_spec_helper 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45bf89e508fd4e7455ff251a5aa2743007ffe4f3
-  data.tar.gz: 9152f0a0445f9ddeb10555e35ab1b5e29f138aff
+  metadata.gz: ad8505aa8fe7098a8d93aad0c4afda481d0e3512
+  data.tar.gz: 1190981ff63c6ceabc641ea537264ffde1a8097c
 SHA512:
-  metadata.gz: 1446edba63e86631ea5cc121440e92834ea150a59df692d445d3c4225b10d8141a0e662acb457b44e4ce3c7892e1342dbdd4b8b6436117bbd67dd1fd25d2809b
-  data.tar.gz: 6ab7060e156d08fbaf6e15e54fa3d670c39ae05d0ab8bb844014e41d03fbb88d1b08d55141b2265e1995b6597175b9f05f02460557b0975568eae62b9c616542
+  metadata.gz: 836edb5dabb80f1f5b3f98581ed07123fe5f77996ba84a4199bd7d2b59109b42e59b8ec94115d05ea0e9c27d3d39b24c70163faf809ac4d22d0f56f01bf357b1
+  data.tar.gz: 2801e062d093770f274a69c44e3c7414f562ec7144c228a88eaf9c74d6b87aaad55a9cae33a2dadcebb2d8db6c6ebd68101227a12d6a40cf6dc5c9789bc78d25

data/.rubocop_todo.yml

@@ -89,6 +89,7 @@ Style/Documentation:
     - 'lib/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals.rb'
     - 'lib/puppetlabs_spec_helper/tasks/beaker.rb'
     - 'lib/puppetlabs_spec_helper/tasks/fixtures.rb'
+    - 'lib/puppetlabs_spec_helper/tasks/check_symlinks.rb'
 
 # Offense count: 1
 Style/DoubleNegation:

data/.travis.yml

@@ -2,12 +2,17 @@ sudo: false
 language: ruby
 cache: bundler
 before_install:
-  # https://github.com/bundler/bundler/issues/3558
-  gem update bundler
+   bundle -v
 script: env COVERAGE=yes bundle exec rake
 matrix:
   fast_finish: true
   include:
+  - rvm: '2.5'
+    env: PUPPET_GEM_VERSION='~> 6.0'
+  - rvm: '2.4'
+    env: PUPPET_GEM_VERSION='~> 6.0'
+  - rvm: '2.3'
+    env: PUPPET_GEM_VERSION='~> 6.0'
   - rvm: '2.4'
     env: PUPPET_GEM_VERSION='~> 5.0'
   - rvm: '2.3'

data/CHANGELOG.md

@@ -3,6 +3,24 @@
 All significant changes to this repo will be summarized in this file.
 
 
+## [v2.13.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.13.0) (2019-01-11)
+[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.12.0...v2.13.0)
+
+**Implemented enhancements:**
+
+- \(PDK-1199\) Honour .{pdk,git}ignore in check:symlinks rake task [\#267](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/267) ([rodjek](https://github.com/rodjek))
+- \(PDK-1137\) Determine module name from metadata when possible [\#265](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/265) ([rodjek](https://github.com/rodjek))
+
+**Fixed bugs:**
+
+- \(MODULES-8242\) - Fix CI\_SPEC\_OPTIONS failing [\#268](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/268) ([stamm](https://github.com/stamm))
+- \(PDK-997\) Remove Dir.chdir call from check:test\_file task [\#266](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/266) ([rodjek](https://github.com/rodjek))
+
+**Merged pull requests:**
+
+- \(maint\) - Resolving bundler ruby version failure, updating tests to include puppet 6 [\#271](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/271) ([pmcmaw](https://github.com/pmcmaw))
+- \(MAINT\) Add Plans Path Exclusion [\#270](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/270) ([RandomNoun7](https://github.com/RandomNoun7))
+
 ## [v2.12.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.12.0) (2018-11-08)
 [Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.11.0...v2.12.0)
 
@@ -16,6 +34,10 @@ All significant changes to this repo will be summarized in this file.
 - \(bugfix\) ignore bundle directory, for symlinks [\#263](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/263) ([tphoney](https://github.com/tphoney))
 - \(MODULES-7273\) - Raise error when fixture ref invalid [\#262](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/262) ([eimlav](https://github.com/eimlav))
 
+**Merged pull requests:**
+
+- 2.12.0 Release Prep [\#264](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/264) ([tphoney](https://github.com/tphoney))
+
 ## [v2.11.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.11.0) (2018-09-26)
 [Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.10.0...v2.11.0)
 

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -6,6 +6,7 @@ require 'pathname'
 require 'puppetlabs_spec_helper/version'
 require 'puppetlabs_spec_helper/tasks/beaker'
 require 'puppetlabs_spec_helper/tasks/fixtures'
+require 'puppetlabs_spec_helper/tasks/check_symlinks'
 require 'English'
 
 # optional gems
@@ -94,8 +95,8 @@ task :parallel_spec_standalone do |_t, args|
   else
     begin
       args = ['-t', 'rspec']
-      args.push('--').concat(ENV['CI_SPEC_OPTIONS'].strip.split(' ')).push('--') unless ENV['CI_SPEC_OPTIONS'].nil? || ENV['CI_SPEC_OPTIONS'].strip.empty?
-      args.concat(Rake::FileList[pattern].to_a)
+      args += ENV['CI_SPEC_OPTIONS'].strip.split(' ') unless ENV['CI_SPEC_OPTIONS'].nil? || ENV['CI_SPEC_OPTIONS'].strip.empty?
+      args += Rake::FileList[pattern].to_a
 
       ParallelTests::CLI.new.run(args)
     end
@@ -201,6 +202,7 @@ PuppetSyntax.exclude_paths ||= []
 PuppetSyntax.exclude_paths << 'spec/fixtures/**/*'
 PuppetSyntax.exclude_paths << 'pkg/**/*'
 PuppetSyntax.exclude_paths << 'vendor/**/*'
+PuppetSyntax.exclude_paths << 'plans/*'
 if Puppet.version.to_f < 4.0
   PuppetSyntax.exclude_paths << 'types/**/*'
 end
@@ -284,7 +286,7 @@ end
 namespace :check do
   desc 'Fails if symlinks are present in directory'
   task :symlinks do
-    symlinks = check_directory_for_symlinks
+    symlinks = PuppetlabsSpecHelper::Tasks::CheckSymlinks.new.check
     unless symlinks.empty?
       symlinks.each { |r| puts "Symlink found: #{r} => #{r.readlink}" }
       raise 'Symlink(s) exist within this directory'
@@ -293,13 +295,10 @@ namespace :check do
 
   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
-        raise '.pp files present in tests folder; Move them to an examples folder following the new convention'
-      end
+    ppfiles = Dir[File.join('tests', '**', '*.pp')]
+    unless ppfiles.empty?
+      puts ppfiles
+      raise '.pp files present in tests folder; Move them to an examples folder following the new convention'
     end
   end
 

data/lib/puppetlabs_spec_helper/tasks/check_symlinks.rb

@@ -0,0 +1,49 @@
+require 'pathspec'
+
+module PuppetlabsSpecHelper; end
+module PuppetlabsSpecHelper::Tasks; end
+
+class PuppetlabsSpecHelper::Tasks::CheckSymlinks
+  DEFAULT_IGNORED = [
+    '/.git/',
+    '/.bundle/',
+    '/vendor/',
+  ].freeze
+
+  IGNORE_LIST_FILES = [
+    '.pdkignore',
+    '.gitignore',
+  ].freeze
+
+  def check(dir = Dir.pwd)
+    dir = Pathname.new(dir) unless dir.is_a?(Pathname)
+    results = []
+
+    dir.each_child(true) do |child|
+      next if ignored?(child.to_s)
+
+      if child.symlink?
+        results << child
+      elsif child.directory? && child.basename.to_s !~ %r{^(\.git|\.?bundle)$}
+        results.concat(check(child))
+      end
+    end
+
+    results
+  end
+
+  def ignored?(path)
+    path = path.to_s + '/' if File.directory?(path)
+
+    !ignore_pathspec.match_paths([path], Dir.pwd).empty?
+  end
+
+  def ignore_pathspec
+    @ignore_pathspec ||= PathSpec.new(DEFAULT_IGNORED).tap do |pathspec|
+      IGNORE_LIST_FILES.each do |f|
+        next unless File.file?(f) && File.readable?(f)
+        File.open(f, 'r') { |fd| pathspec.add(fd) }
+      end
+    end
+  end
+end

data/lib/puppetlabs_spec_helper/tasks/fixtures.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'open3'
+require 'json'
 
 module PuppetlabsSpecHelper; end
 module PuppetlabsSpecHelper::Tasks; end
@@ -9,6 +10,19 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
     Dir.pwd
   end
 
+  def module_name
+    raise ArgumentError unless File.file?('metadata.json') && File.readable?('metadata.json')
+
+    metadata = JSON.parse(File.read('metadata.json'))
+    metadata_name = metadata.fetch('name', nil) || ''
+
+    raise ArgumentError if metadata_name.empty?
+
+    metadata_name.split('-').last
+  rescue JSON::ParserError, ArgumentError
+    File.basename(Dir.pwd).split('-').last
+  end
+
   # cache the repositories and return a hash object
   def repositories
     unless @repositories
@@ -18,7 +32,7 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
   end
 
   def auto_symlink
-    { File.basename(Dir.pwd).split('-').last => '#{source_dir}' }
+    { module_name => '#{source_dir}' }
   end
 
   def fixtures(category)
@@ -247,21 +261,6 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
     end
     @max_thread_limit
   end
-
-  def check_directory_for_symlinks(dir = '.')
-    dir = Pathname.new(dir) unless dir.is_a?(Pathname)
-    results = []
-
-    dir.each_child(true) do |child|
-      if child.symlink?
-        results << child
-      elsif child.directory? && child.basename.to_s !~ %r{(^\.git$|^\.?bundle$)}
-        results.concat(check_directory_for_symlinks(child))
-      end
-    end
-
-    results
-  end
 end
 include PuppetlabsSpecHelper::Tasks::FixtureHelpers
 

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
-  VERSION = '2.12.0'.freeze
+  VERSION = '2.13.0'.freeze
 
   # compat for pre-1.2.0 users; deprecated
   module Version

data/puppetlabs_spec_helper.gemspec

@@ -24,12 +24,14 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'puppet-lint', '~> 2.0'
   spec.add_runtime_dependency 'puppet-syntax', '~> 2.0'
   spec.add_runtime_dependency 'rspec-puppet', '~> 2.0'
+  spec.add_runtime_dependency 'pathspec', '~> 0.2.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'puppet'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'gettext-setup', '~> 0.29'
+  spec.add_development_dependency 'fakefs', '~> 0.13.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -68,19 +68,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pathspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
+        version: 0.2.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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
@@ -165,6 +179,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.29'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.3
 description: Contains rake tasks and a standard spec_helper for running spec tests
   on puppet modules.
 email:
@@ -195,6 +223,7 @@ files:
 - lib/puppetlabs_spec_helper/puppetlabs_spec_helper.rb
 - lib/puppetlabs_spec_helper/rake_tasks.rb
 - lib/puppetlabs_spec_helper/tasks/beaker.rb
+- lib/puppetlabs_spec_helper/tasks/check_symlinks.rb
 - lib/puppetlabs_spec_helper/tasks/fixtures.rb
 - lib/puppetlabs_spec_helper/version.rb
 - puppet_spec_helper.rb