puppetlabs_spec_helper 0.3.0 → 0.4.0.rc1

data/CHANGELOG

@@ -1,3 +1,13 @@
+2012-12-14 Puppet Labs <info@puppetlabs.com> - 0.4.0-rc1
+ * Rake should fail if git can't clone repository
+ * Add readme for fixtures
+ * Fix Mocha deprecations
+ * add opts logic to rake spec_clean
+ * add backwards-compatible support for arbitrary git refs in .fixtures.yml
+ * Only remove the site.pp if it is empty
+ * (#15464) Make contributing easy via bundle Gemfile
+ * (#15464) Add gemspec from 0.3.0 published gem
+
 2012-08-14 Puppet Labs <info@puppetlabs.com> - 0.3.0
  * Add PuppetInternals compatibility module for
    scope, node, compiler, and functions

data/lib/puppetlabs_spec_helper/puppet_spec_helper.rb

@@ -7,9 +7,9 @@ ARGV.clear
 ENV['MOCHA_OPTIONS']='skip_integration'
 
 require 'puppet'
-require 'mocha'
 gem 'rspec', '>=2.0.0'
 require 'rspec/expectations'
+require 'mocha/api'
 
 require 'pathname'
 require 'tmpdir'

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -34,10 +34,17 @@ def fixtures(category)
 
   result = {}
   if fixtures.include? category
-    fixtures[category].each do |fixture, source|
-      target = "spec/fixtures/modules/#{fixture}"
-      real_source = eval('"'+source+'"')
-      result[real_source] = target
+    fixtures[category].each do |fixture, opts|
+      if opts.instance_of?(String)
+        source = opts
+        target = "spec/fixtures/modules/#{fixture}"
+        real_source = eval('"'+source+'"')
+        result[real_source] = target
+      elsif opts.instance_of?(Hash)
+        target = "spec/fixtures/modules/#{fixture}"
+        real_source = eval('"'+opts["repo"]+'"')
+        result[real_source] = { "target" => target, "ref" => opts["ref"] }
+      end
     end
   end
   return result
@@ -45,8 +52,19 @@ end
 
 desc "Create the fixtures directory"
 task :spec_prep do
-  fixtures("repositories").each do |repo, target|
-    File::exists?(target) || system("git clone #{repo} #{target}")
+  fixtures("repositories").each do |remote, opts|
+    if opts.instance_of?(String)
+      target = opts
+      ref = "refs/remotes/origin/master"
+    elsif opts.instance_of?(Hash)
+      target = opts["target"]
+      ref = opts["ref"]
+    end
+
+    unless File::exists?(target) || system("git clone #{remote} #{target}")
+      fail "Failed to clone #{remote} into #{target}"
+    end
+    system("cd #{target}; git reset --hard #{ref}") if ref
   end
 
   FileUtils::mkdir_p("spec/fixtures/modules")
@@ -60,15 +78,22 @@ end
 
 desc "Clean up the fixtures directory"
 task :spec_clean do
-  fixtures("repositories").each do |repo, target|
+  fixtures("repositories").each do |remote, opts|
+    if opts.instance_of?(String)
+      target = opts
+    elsif opts.instance_of?(Hash)
+      target = opts["target"]
+    end
     FileUtils::rm_rf(target)
   end
 
   fixtures("symlinks").each do |source, target|
     FileUtils::rm(target)
   end
-
-  FileUtils::rm("spec/fixtures/manifests/site.pp")
+  site = "spec/fixtures/manifests/site.pp"
+  if File::exists?(site) and ! File.size?(site)
+    FileUtils::rm("spec/fixtures/manifests/site.pp")
+  end
 end
 
 desc "Run spec tests in a clean fixtures directory"

metadata

@@ -1,88 +1,96 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: puppetlabs_spec_helper
-version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: -228997126
+  prerelease: 6
+  segments: 
+  - 0
+  - 4
+  - 0
+  - rc
+  - 1
+  version: 0.4.0.rc1
 platform: ruby
-authors:
+authors: 
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-12-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  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
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.9.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 2
+        - 9
+        - 0
         version: 2.9.0
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.10.5
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 10
+        - 5
         version: 0.10.5
-- !ruby/object:Gem::Dependency
-  name: rspec-puppet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec-puppet
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-description: Contains rake tasks and a standard spec_helper for running spec tests
-  on puppet modules
-email:
+  type: :runtime
+  version_requirements: *id004
+description: Contains rake tasks and a standard spec_helper for running spec tests on puppet modules
+email: 
 - puppet-dev@puppetlabs.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/puppetlabs_spec_helper/module_spec_helper.rb
 - lib/puppetlabs_spec_helper/puppet_spec_helper.rb
 - lib/puppetlabs_spec_helper/puppetlabs_spec/files.rb
@@ -95,26 +103,38 @@ files:
 - CHANGELOG
 homepage: http://github.com/puppetlabs/puppetlabs_spec_helper
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Standard tasks and configuration for module spec tests
 test_files: []
+