puppetlabs_spec_helper 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a9a1f7716029a379fd8c1d4af904e9093a40b37c4cf38407f82f5aa9e77b5d9a
-  data.tar.gz: e466f0292777e6cbda90f0fa1e0e9354d743667405146f2093fe8156b4f7dc81
+SHA1:
+  metadata.gz: 45bf89e508fd4e7455ff251a5aa2743007ffe4f3
+  data.tar.gz: 9152f0a0445f9ddeb10555e35ab1b5e29f138aff
 SHA512:
-  metadata.gz: 81a999915c16b01136577bd6535e03c7212e8307a12cbbd58edd44bbe6c3c83d765ea38540ecc5948fcdd7920f51f9132f74deb5114313c55c15d933365f6795
-  data.tar.gz: 6ee1c1b51b92f3f52b3cc52dd90c1c9b3f12c20f576432692cef3664860a38f300d44e3c96c8ea26d6ce028e6977e53974be2de1ed9019ccacfae21e8e66613c
+  metadata.gz: 1446edba63e86631ea5cc121440e92834ea150a59df692d445d3c4225b10d8141a0e662acb457b44e4ce3c7892e1342dbdd4b8b6436117bbd67dd1fd25d2809b
+  data.tar.gz: 6ab7060e156d08fbaf6e15e54fa3d670c39ae05d0ab8bb844014e41d03fbb88d1b08d55141b2265e1995b6597175b9f05f02460557b0975568eae62b9c616542

data/CHANGELOG.md

@@ -3,6 +3,19 @@
 All significant changes to this repo will be summarized in this file.
 
 
+## [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)
+
+**Implemented enhancements:**
+
+- Added tasks to rspec pattern. [\#261](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/261) ([dylanratcliffe](https://github.com/dylanratcliffe))
+- \(PDK-1100\) Use PDK to build module packages [\#260](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/260) ([rodjek](https://github.com/rodjek))
+
+**Fixed bugs:**
+
+- \(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))
+
 ## [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)
 
@@ -14,6 +27,10 @@ All significant changes to this repo will be summarized in this file.
 
 - Fix example conversion from mocha to rspec mocks. [\#257](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/257) ([vStone](https://github.com/vStone))
 
+**Merged pull requests:**
+
+- \(MODULES-7858\) - 2.11.0 Release Prep [\#259](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/259) ([pmcmaw](https://github.com/pmcmaw))
+
 ## [v2.10.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.10.0) (2018-08-30)
 [Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.9.1...v2.10.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 'English'
 
 # optional gems
 begin
@@ -24,7 +25,7 @@ end
 
 task default: [:help]
 
-pattern = 'spec/{aliases,classes,defines,unit,functions,hosts,integration,plans,type_aliases,types}/**/*_spec.rb'
+pattern = 'spec/{aliases,classes,defines,functions,hosts,integration,plans,tasks,type_aliases,types,unit}/**/*_spec.rb'
 
 RSpec::Core::RakeTask.new(:spec_standalone) do |t, args|
   t.rspec_opts = ['--color']
@@ -103,14 +104,39 @@ end
 
 desc 'Build puppet module package'
 task :build do
-  # This will be deprecated once puppet-module is a face.
-  begin
-    Gem::Specification.find_by_name('puppet-module')
-  rescue Gem::LoadError, NoMethodError
+  if Gem::Specification.find_by_name('puppet').version < Gem::Version.new('6.0.0')
+    Rake::Task['build:pmt'].invoke
+  else
+    Rake::Task['build:pdk'].invoke
+  end
+end
+
+namespace :build do
+  desc 'Build Puppet module package with PMT (Puppet < 6.0.0 only)'
+  task :pmt do
     require 'puppet/face'
+
     pmod = Puppet::Face['module', :current]
     pmod.build('./')
   end
+
+  desc 'Build Puppet module with PDK'
+  task :pdk do
+    begin
+      require 'pdk/module/build'
+
+      path = PDK::Module::Build.invoke(:force => true, :'target-dir' => File.join(Dir.pwd, 'pkg'))
+      puts "Module built: #{path}"
+    rescue LoadError
+      _ = `pdk --version`
+      unless $CHILD_STATUS.success?
+        $stderr.puts 'Unable to build module. Please install PDK or add the `pdk` gem to your Gemfile.'
+        abort
+      end
+
+      system('pdk build --force')
+    end
+  end
 end
 
 desc 'Clean a built module package'

data/lib/puppetlabs_spec_helper/tasks/fixtures.rb

@@ -166,7 +166,8 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
     else
       raise "Unfortunately #{scm} is not supported yet"
     end
-    system("#{scm} #{args.flatten.join ' '}", chdir: target)
+    result = system("#{scm} #{args.flatten.join ' '}", chdir: target)
+    raise "Invalid ref #{ref} for #{target}" unless result
   end
 
   def valid_repo?(scm, target, remote)
@@ -254,7 +255,7 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
     dir.each_child(true) do |child|
       if child.symlink?
         results << child
-      elsif child.directory? && child.basename.to_s != '.git'
+      elsif child.directory? && child.basename.to_s !~ %r{(^\.git$|^\.?bundle$)}
         results.concat(check_directory_for_symlinks(child))
       end
     end

data/lib/puppetlabs_spec_helper/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Standard tasks and configuration for module spec tests.