puppetlabs_spec_helper 0.8.2 → 0.9.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWQxN2I3ZjM0MWZhYWQ4NTVhZGExNDAzMDA4OGU5NDg1M2QyZWJhOQ==
+  data.tar.gz: !binary |-
+    ZGExZjlmZTlmYTNlNTdkYzY0OTlhNzIyNDRmZGE1OTZhOGZlMjY0Mg==
+SHA512:
+  metadata.gz: !binary |-
+    NjhjZmE1YjQxZTkxZTQ5NzE4NzkwYzBhMDNjMDA2YjUyNjJkNjZiZTI0NjA1
+    MTc5NzY3NDA3YmQ1MjllYjUzNDc4MzYwOGQ4Mjc4MjFkNDEyMzM0NmQ5OWJi
+    NDkxNDcxZWMxNTFjNmE3ODQwMTI5OWIzNTQ3MWVhNTgyODJkODY=
+  data.tar.gz: !binary |-
+    N2JiNmY2ZGQ3MWRhMmVmMzcxZjg2YmNjN2FiZTk3ZmZkZGY2NDVkOWY2Mzk2
+    N2RmOGM1YWRjMmU4ZmQxNjZjZGQ0ODhlMjM1MTRjN2E0NWI5ZmFjNDVlZDdl
+    ZDZhZDc0MjE2YTE1OGMxYjQyZWY2ZTk2YmZjM2Q1MWZiNzhmMmE=

data/CHANGELOG

@@ -1,3 +1,17 @@
+2015-02-24 - Release 0.9.0
+Summary:
+This release adds fixes for rspec-puppet 2.0 and json linting for metadata.json
+
+Features:
+- Add json linting for metadata.json (adds dep on metadata-json-lint gem)
+- Document using references in fixtures
+
+Bugfixes:
+- FUTURE_PARSER=yes working with rspec-puppet 2.0
+- Symlinks breaking on windows
+- rspec as a runtime dependency conflicting with rspec-puppet
+- root stub for testing execs
+
 2014-10-01 - Release 0.8.2
 Summary:
 This release fixes the lint task on the latest puppet-lint

data/README.markdown

@@ -142,6 +142,24 @@ 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. 
+
+ * 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.
+   ```yaml
+   scm: git
+   scm: hg
+   ```
+ * target - the directory name to clone the repo into ie. `target: mymodule`  defaults to the repo name  (Optional)
+ * ref - used to specify the tag name like version hash of commit (Optional)
+   ```yaml
+   ref: 1.0.0
+   ref: 880fca52c
+   ```
+ * branch - used to specify the branch name you want to use ie. `branch: development`
+ 
+ **Note:** ref and branch can be used together to get a specific revision on a specific branch
+
 Fixtures Examples
 -----------------
 Basic fixtures that will symlink `spec/fixtures/modules/my_modules` to the

data/lib/puppetlabs_spec_helper/module_spec_helper.rb

@@ -21,8 +21,8 @@ module_path = [module_path, env_module_path].join(File::PATH_SEPARATOR) if env_m
 RSpec.configure do |c|
   c.module_path = module_path
   c.manifest_dir = File.join(fixture_path, 'manifests')
-  ## These depend on rspec-puppet #209 and #183 being released
-  #c.parser = 'future' if ENV['FUTURE_PARSER'] == 'yes'
+  c.parser = 'future' if ENV['FUTURE_PARSER'] == 'yes'
+  ## This depends on rspec-puppet #209 being released
   #c.strict_variables = true if ENV['STRICT_VARIABLES'] == 'yes'
   ## These depend on rspec-puppet #212 being released
   #c.stringify_facts = false if ENV['STRINGIFY_FACTS'] == 'no'
@@ -30,8 +30,8 @@ RSpec.configure do |c|
   #c.ordering = ENV['ORDERING'] if ENV['ORDERING']
 
   c.before :each do
+    Puppet.features.stubs(:root?).returns(true)
     Puppet.settings[:strict_variables] = true if ENV['STRICT_VARIABLES'] == 'yes'
-    Puppet.settings[:parser] = 'future' if ENV['FUTURE_PARSER'] == 'yes'
     Puppet.settings[:stringify_facts] = false if ENV['STRINGIFY_FACTS'] == 'no'
     Puppet.settings[:trusted_node_data] = true if ENV['TRUSTED_NODE_DATA'] == 'yes'
     Puppet.settings[:ordering] = ENV['ORDERING'] if ENV['ORDERING']

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -88,6 +88,17 @@ end
 
 desc "Create the fixtures directory"
 task :spec_prep do
+  # Ruby only sets File::ALT_SEPARATOR on Windows and Rubys standard library
+  # uses this to check for Windows
+  is_windows = !!File::ALT_SEPARATOR
+  puppet_symlink_available = false
+  begin
+    require 'puppet'
+    puppet_symlink_available = Puppet::FileSystem.respond_to?(:symlink)
+  rescue
+  end
+
+
   fixtures("repositories").each do |remote, opts|
     scm = 'git'
     if opts.instance_of?(String)
@@ -107,7 +118,12 @@ task :spec_prep do
 
   FileUtils::mkdir_p("spec/fixtures/modules")
   fixtures("symlinks").each do |source, target|
-    File::exists?(target) || FileUtils::ln_sf(source, target)
+    if is_windows
+      fail "Cannot symlink on Windows unless using at least Puppet 3.5" if !puppet_symlink_available
+      Puppet::FileSystem::exist?(target) || Puppet::FileSystem::symlink(source, target)
+    else
+      File::exists?(target) || FileUtils::ln_sf(source, target)
+    end
   end
 
   fixtures("forge_modules").each do |remote, opts|
@@ -208,13 +224,19 @@ PuppetSyntax.exclude_paths ||= []
 PuppetSyntax.exclude_paths << "spec/fixtures/**/*.pp"
 PuppetSyntax.future_parser = true if ENV['FUTURE_PARSER'] == 'yes'
 
-desc "Check syntax of Ruby files and call :syntax"
+desc "Check syntax of Ruby files and call :syntax and :metadata"
 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')
+end
+
+desc "Validate metadata.json file"
+task :metadata do
+  sh "metadata-json-lint metadata.json"
 end
 
 desc "Display the list of available rake tasks"

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
   module Version
-    STRING = '0.8.2'
+    STRING = '0.9.0'
   end
 end

data/puppetlabs_spec_helper.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rspec-puppet'
   s.add_runtime_dependency 'puppet-lint'
   s.add_runtime_dependency 'puppet-syntax'
-  s.add_runtime_dependency 'rspec'
+  s.add_runtime_dependency 'metadata-json-lint'
   s.add_runtime_dependency 'mocha'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 0.8.2
-  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-puppet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-syntax
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,15 +62,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: metadata-json-lint
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -141,36 +128,30 @@ files:
 homepage: http://github.com/puppetlabs/puppetlabs_spec_helper
 licenses:
 - Apache-2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3854310657550255365
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3854310657550255365
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+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
+has_rdoc: