puppetlabs_spec_helper 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51b4fc08aa43ea4df29d204be5a86f0e7d3f2015
-  data.tar.gz: d760da22c37eb44ba79b32b005e2e90c3330b1eb
+  metadata.gz: d40eb48aae63d24394a645d4bf5d437db8097e79
+  data.tar.gz: e09d2f87d8f18eb5e0cd5e86b8160c0624176ce6
 SHA512:
-  metadata.gz: 1f68c4e945087d2dae2f75a8f9bcc1df10992604958be56874d88dc1f51284e00b16989bf73aafa41b3fd83dcfbc923cb3e2c58994e69bf386757be2e2e9bf67
-  data.tar.gz: e910986a66e093ec80a4d5073c6498f6ed4552a3282a52e6b0483dd1997a2c3347e415af3e4248fbe06c00d548d19dc6b05fcb6baf5ea6b2f76a8dac5c949223
+  metadata.gz: a39cc71ee400db75509c38dc41bbeda0df3ab17cd4192ac82473a35aff91119fa74e893551c99ae6e19b7391da77f8e75b3aa0755ad2b2c0189d032ce670e1ed
+  data.tar.gz: 245f2b941cf6b373c8df8371e3f8213f8ce595b7b79ffdbb9e2398fe071c32efa76156d2fd7f0eb44b244bcc8170ecd2e9ece37b6d3320e3cc249607fa40989a

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.0]
+### Summary:
+This release makes the module working dir configurable, adds features for future puppet features, and updates the spec rake task for TravisCI
+
+### Changed:
+- The `release_tasks` rake task now calls `parallel_spec` instead of `spec`
+
+### Added:
+- Make `module_working_dir` configurable
+- Check `type_aliases` directory for spec tests
+- Locales support for i18n
+
+### Fixed:
+- Ensure /-only used on windows
+
 ## [1.2.2]
 ### Summary:
 
@@ -280,9 +295,10 @@ compatible yet.
 ### Added
  * Initial release
 
-[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.1.1...master
-[1.2.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.2.1...1.2.2
-[1.2.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.2.0...1.2.1
+[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.0.0...master
+[2.0.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v1.2.2...v2.0.0
+[1.2.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v1.2.1...v1.2.2
+[1.2.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.2.0...v1.2.1
 [1.2.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.1.1...1.2.0
 [1.1.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.0.1...1.1.0

data/README.md

@@ -199,6 +199,9 @@ 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. You can specify a alternate location for that file in the `FIXTURES_YML` environment variable.
 
+You can use the `MODULE_WORKING_DIR` environment variable to specify a diffent location when installing module fixtures via the forge. By default the
+working directory is `<module directory>/spec/fixtures/work-dir`.
+
 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

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -13,7 +13,17 @@ end
 
 task :default => [:help]
 
-pattern = 'spec/{aliases,classes,defines,unit,functions,hosts,integration,types}/**/*_spec.rb'
+pattern = 'spec/{aliases,classes,defines,unit,functions,hosts,integration,type_aliases,types}/**/*_spec.rb'
+
+spec = Gem::Specification.find_by_name 'gettext-setup'
+load "#{spec.gem_dir}/lib/tasks/gettext.rake"
+locales_dir = File.absolute_path('locales', File.dirname(__FILE__))
+# Initialization requires a valid locales directory
+if File.exist? locales_dir
+  GettextSetup.initialize(locales_dir)
+else
+  puts "No 'locales' directory found in #{File.dirname(__FILE__)}, skipping gettext initialization"
+end
 
 desc "Run spec tests on an existing fixtures directory"
 RSpec::Core::RakeTask.new(:spec_standalone) do |t|
@@ -195,6 +205,13 @@ def logger
   @logger
 end
 
+def module_working_directory
+  # The problem with the relative path is that PMT doesn't expand the path properly and so passing in a relative path here
+  # becomes something like C:\somewhere\backslashes/spec/fixtures/work-dir on Windows, and then PMT barfs itself.
+  # This has been reported as https://tickets.puppetlabs.com/browse/PUP-4884
+  File.expand_path(ENV['MODULE_WORKING_DIR'] ? ENV['MODULE_WORKING_DIR'] : 'spec/fixtures/work-dir')
+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
@@ -292,11 +309,14 @@ task :spec_prep do
     end
     next if File::exists?(target)
 
+    working_dir = module_working_directory
+    target_dir = File.expand_path('spec/fixtures/modules')
+
     command = "puppet module install" + ref + flags + \
       " --ignore-dependencies" \
       " --force" \
-      " --module_working_dir spec/fixtures/module-working-dir" \
-      " --target-dir spec/fixtures/modules #{remote}"
+      " --module_working_dir #{working_dir}" \
+      " --target-dir #{target_dir} #{remote}"
 
     unless system(command)
       fail "Failed to install module #{remote} to #{target}"
@@ -327,7 +347,7 @@ task :spec_clean do
     FileUtils::rm_rf(target)
   end
 
-  FileUtils::rm_rf("spec/fixtures/module-working-dir")
+  FileUtils::rm_rf(module_working_directory)
 
   fixtures("symlinks").each do |source, target|
     FileUtils::rm_f(target)
@@ -502,7 +522,7 @@ desc "Runs all necessary 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[:parallel_spec].invoke
   Rake::Task["check:symlinks"].invoke
   Rake::Task["check:test_file"].invoke
   Rake::Task["check:dot_underscore"].invoke

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
-  VERSION = "1.2.2"
+  VERSION = "2.0.0"
 
   # compat for pre-1.2.0 users; deprecated
   module Version

data/puppetlabs_spec_helper.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   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.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -151,6 +151,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gettext-setup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 description: Contains rake tasks and a standard spec_helper for running spec tests
   on puppet modules.
 email: