puppetlabs_spec_helper 0.10.3 → 1.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODRhM2NjMmRkMTA5ZTMxMzEwMjdhZDI0MmE3MzRiMmM3Y2NkMWFjZg==
-  data.tar.gz: !binary |-
-    MDhkZjY5NmZlY2FhMjAzY2E4YWZlODlmMzEyNWVjZDRjMjFkNGFmYg==
+SHA1:
+  metadata.gz: b731a22b64d8bfbdd59ff39f43eda181e29802ef
+  data.tar.gz: 1a7cf2a4677943474c5df7055222dc99cd726c2a
 SHA512:
-  metadata.gz: !binary |-
-    YmI3NzE2Njk0ODMyZGRkMzMyZTM3NzI4MGFjNzBiNjJhYzJlNjZmNDMzZTU2
-    NThmMWYwOWU4NDFkMzU4YzQ1YzBlY2NmZjFkMjk5YjFiNTkzZDYwMjRjNDk3
-    ZDlkM2E4NzllZDNhMWZlMjJlMmJmMzUyOWNjN2I0NjMyMjJkYmM=
-  data.tar.gz: !binary |-
-    NDlhNGU0OTIxZmNlM2I3MjJjMDY0MDEwNDhiOGE5ZjAyZGNjNmYzMjAyYWZh
-    YzVlY2M5N2IzN2Q3YTQ0OGMyZTgzNDE5MWZkN2FkMjI4YWU3NzM0MDZmZDVl
-    YThkMWM3NmUwODQ0ZmVjYzhmMWE2NTg2YjkzMzMxMzg4YzdjNzE=
+  metadata.gz: 26e1e8a4edb8177f53f09a70a4dcab81a02768c43f47cd6ab069033557ebf8e3bf2a497c55ca9fd6fc2f8d157243f013aebed27f4ab19114e1aca9afacd0947b
+  data.tar.gz: 47ccbe214b1f858632c9a7286f59e2d40f872dd3b8761eebe35d72c3b13714c68c0aad1b5a3975f3e316ee46e7284340ba0bfde0447039ed9b0c6fc1d324dd2d

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.0.0] - 2015-11-04
+### Summary:
+The first 1.0 release, though the gem has been considered stable for a while.
+
+### Added:
+- `flags` value for fixtures to allow passing CLI flags when installing modules
+- `spec_standalone` rake task also runs `spec/types` specs
+- Can now use `.fixtures.yaml` instead of `.fixtures.yml`
+
+### Fixed:
+- Remove double-initialization that was conflicting with rspec-puppet
+- Better error handling on malformed fixtures yaml
+- Bug in rake task's ignore\_paths
+
 ## [0.10.3] - 2015-05-11
 ### Summary:
 A bugfix for puppet 3 and puppet 4 tests being able to run with the same environment variables.
@@ -194,7 +208,9 @@ compatible yet.
 ### Added
  * Initial release
 
-[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.10.1...master
+[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.0.0...master
+[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
 [0.10.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.10.1...0.10.2
 [0.10.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.10.0...0.10.1
 [0.10.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.9.1...0.10.0

data/README.markdown

@@ -157,7 +157,11 @@ When specifying the repo source of the fixture you have a few options as to whic
    ref: 880fca52c
    ```
  * branch - used to specify the branch name you want to use ie. `branch: development`
- 
+ * flags - additional flags passed to the module installer (both puppet and scm)
+   ```yaml
+   flags: --verbose
+   ```
+
  **Note:** ref and branch can be used together to get a specific revision on a specific branch
 
 Fixtures Examples
@@ -199,6 +203,19 @@ Install modules from Puppet Forge:
                 repo: "puppetlabs/stdlib"
                 ref: "2.6.0"
 
+Pass additional flags to module installation:
+
+    fixtures:
+        forge_modules:
+            stdlib:
+                repo: "puppetlabs/stdlib"
+                ref: "2.6.0"
+                flags: "--module_repository https://my_repo.com"
+        repositories:
+            firewall:
+                repo: "git://github.com/puppetlabs/puppetlabs-firewall"
+                ref: "2.6.0"
+                flags: "--verbose"
 
 Testing Parser Functions
 ========================

data/lib/puppetlabs_spec_helper/puppet_spec_helper.rb

@@ -32,46 +32,24 @@ require 'puppetlabs_spec_helper/puppetlabs_spec/files'
 # You may want to hold your nose before you proceed. :)
 #
 
+# Here we attempt to load the new TestHelper API, and print a warning if we are falling back
+# to compatibility mode for older versions of puppet.
+begin
+  require 'puppet/test/test_helper'
+rescue LoadError => err
+end
 
 # This is just a utility class to allow us to isolate the various version-specific
 # branches of initialization logic into methods without polluting the global namespace.#
 module Puppet
   class PuppetSpecInitializer
-    # This method uses the "new"/preferred approach of delegating all of the test
-    # state initialization to puppet itself, via Puppet::Test::TestHelper API.  This
-    # should be fairly future-proof as long as that API doesn't change, which it
-    # hopefully will not need to.
-    def self.initialize_via_testhelper(config)
-      begin
-        Puppet::Test::TestHelper.initialize
-      rescue NoMethodError
-        Puppet::Test::TestHelper.before_each_test
-      end
-
-      # connect rspec hooks to TestHelper methods.
-      config.before :all do
-        Puppet::Test::TestHelper.before_all_tests
-      end
-
-      config.after :all do
-        Puppet::Test::TestHelper.after_all_tests
-      end
-
-      config.before :each do
-        Puppet::Test::TestHelper.before_each_test
-      end
-
-      config.after :each do
-        Puppet::Test::TestHelper.after_each_test
-      end
-    end
-
     # This method is for initializing puppet state for testing for older versions
     # of puppet that do not support the new TestHelper API.  As you can see,
     # this involves explicitly modifying global variables, directly manipulating
     # Puppet's Settings singleton object, and other fun implementation details
     # that code external to puppet should really never know about.
     def self.initialize_via_fallback_compatibility(config)
+      $stderr.puts("Warning: you appear to be using an older version of puppet; spec_helper will use fallback compatibility mode.")
       config.before :all do
         # nothing to do for now
       end
@@ -112,17 +90,6 @@ module Puppet
   end
 end
 
-
-
-# Here we attempt to load the new TestHelper API, and print a warning if we are falling back
-# to compatibility mode for older versions of puppet.
-begin
-  require 'puppet/test/test_helper'
-rescue LoadError => err
-  $stderr.puts("Warning: you appear to be using an older version of puppet; spec_helper will use fallback compatibility mode.")
-end
-
-
 # JJM Hack to make the stdlib tests run in Puppet 2.6 (See puppet commit cf183534)
 if not Puppet.constants.include? "Test" then
   module Puppet::Test
@@ -149,14 +116,14 @@ if not Puppet.constants.include? "Test" then
   end
 end
 
-
 # And here is where we do the main rspec configuration / setup.
 RSpec.configure do |config|
+  # Some modules depend on having mocha set up for them
   config.mock_with :mocha
 
   # determine whether we can use the new API or not, and call the appropriate initializer method.
   if (defined?(Puppet::Test::TestHelper))
-    Puppet::PuppetSpecInitializer.initialize_via_testhelper(config)
+    # This case is handled by rspec-puppet since v1.0.0 (via 41257b33cb1f9ade4426b044f70be511b0c89112)
   else
     Puppet::PuppetSpecInitializer.initialize_via_fallback_compatibility(config)
   end

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -7,7 +7,7 @@ task :default => [:help]
 desc "Run spec tests on an existing fixtures directory"
 RSpec::Core::RakeTask.new(:spec_standalone) do |t|
   t.rspec_opts = ['--color']
-  t.pattern = 'spec/{classes,defines,unit,functions,hosts,integration}/**/*_spec.rb'
+  t.pattern = 'spec/{classes,defines,unit,functions,hosts,integration,types}/**/*_spec.rb'
 end
 
 desc "Run beaker acceptance tests"
@@ -28,14 +28,20 @@ def source_dir
 end
 
 def fixtures(category)
-  begin
-    fixtures = YAML.load_file(".fixtures.yml")["fixtures"]
-  rescue Errno::ENOENT
-    return {}
+  if File.exists?('.fixtures.yml')
+    fixtures_yaml = '.fixtures.yml'
+  elsif File.exists?('.fixtures.yaml')
+    fixtures_yaml = '.fixtures.yaml'
+  else
+    fixtures_yaml = ''
   end
 
-  if not fixtures
-    abort("malformed fixtures.yml")
+  begin
+    fixtures = YAML.load_file(fixtures_yaml)["fixtures"]
+  rescue Error::ENOENT
+    return {}
+  rescue Psych::SyntaxError => e
+    abort("Found malformed YAML in #{fixtures_yaml} on line #{e.line} column #{e.column}: #{e.problem}")
   end
 
   result = {}
@@ -49,24 +55,26 @@ def fixtures(category)
       elsif opts.instance_of?(Hash)
         target = "spec/fixtures/modules/#{fixture}"
         real_source = eval('"'+opts["repo"]+'"')
-        result[real_source] = { "target" => target, "ref" => opts["ref"], "branch" => opts["branch"], "scm" => opts["scm"] }
+        result[real_source] = { "target" => target, "ref" => opts["ref"], "branch" => opts["branch"], "scm" => opts["scm"], "flags" => opts["flags"]}
       end
     end
   end
   return result
 end
 
-def clone_repo(scm, remote, target, ref=nil, branch=nil)
+def clone_repo(scm, remote, target, ref=nil, branch=nil, flags = nil)
   args = []
   case scm
   when 'hg'
     args.push('clone')
     args.push('-u', ref) if ref
+    args.push(flags) if flags
     args.push(remote, target)
   when 'git'
     args.push('clone')
     args.push('--depth 1') unless ref
     args.push('-b', branch) if branch
+    args.push(flags) if flags
     args.push(remote, target)
   else
       fail "Unfortunately #{scm} is not supported yet"
@@ -109,9 +117,10 @@ task :spec_prep do
       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)
+    unless File::exists?(target) || clone_repo(scm, remote, target, ref, branch, flags)
       fail "Failed to clone #{scm} repository #{remote} into #{target}"
     end
     revision(scm, target, ref) if ref
@@ -128,18 +137,23 @@ task :spec_prep do
   end
 
   fixtures("forge_modules").each do |remote, opts|
+    ref = ""
+    flags = ""
     if opts.instance_of?(String)
       target = opts
-      ref = ""
     elsif opts.instance_of?(Hash)
       target = opts["target"]
-      ref = "--version #{opts['ref']}"
+      ref = " --version #{opts['ref']}" if not opts['ref'].nil?
+      flags = " #{opts['flags']}" if opts['flags']
     end
     next if File::exists?(target)
-    unless system("puppet module install " + ref + \
-                  " --ignore-dependencies" \
-                  " --force" \
-                  " --target-dir spec/fixtures/modules #{remote}")
+
+    command = "puppet module install" + ref + flags + \
+              " --ignore-dependencies" \
+              " --force" \
+              " --target-dir spec/fixtures/modules #{remote}"
+
+    unless system(command)
       fail "Failed to install module #{remote} to #{target}"
     end
   end
@@ -224,7 +238,7 @@ PuppetLint::RakeTask.new(:lint) do |config|
       'class_parameter_defaults',
       'documentation',
       'single_quote_string_with_variables']
-  config.ignore_paths = ["tests/**/*.pp", "vendor/**/*.pp","examples/**/*.pp" "spec/**/*.pp", "pkg/**/*.pp"]
+  config.ignore_paths = ["tests/**/*.pp", "vendor/**/*.pp","examples/**/*.pp", "spec/**/*.pp", "pkg/**/*.pp"]
 end
 
 require 'puppet-syntax/tasks/puppet-syntax'

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
   module Version
-    STRING = '0.10.3'
+    STRING = '1.0.0'
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet-syntax
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Contains rake tasks and a standard spec_helper for running spec tests
@@ -88,8 +88,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .noexec.yaml
+- ".gitignore"
+- ".noexec.yaml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -121,17 +121,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Standard tasks and configuration for module spec tests
@@ -140,4 +140,3 @@ test_files:
 - spec/unit/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals_spec.rb
 - spec/unit/spechelper_spec.rb
 - spec/watchr.rb
-has_rdoc: