puppetlabs_spec_helper 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6821247effca57cc705aad0fd004ab5fda488ed7053734c996b1ee3249cea435
-  data.tar.gz: 7b762f7e6e5ab7986574e4d080c070a1ee010dfa56baeccb3a6e13c70b4cdee8
+  metadata.gz: b21969553f83495baee878153ceb6d7dc828dded4cd8ed35792b18b23ccaa804
+  data.tar.gz: 5a2b080d487936959a2e0435682874dee0a1be4e01e908a302a293aa7418b772
 SHA512:
-  metadata.gz: 98520f9b6d4b1d7c3f4209991c6c11188b7637dea387de6322f6a2201e8af9203fbc20ab0e777c2cb19f38f05a2c106fd82f8827756a16463ef17c09b8ba8f9d
-  data.tar.gz: cc4718fd5b4424b55980117271b88bdeaf778d3a1c87b34a83d9d79425cde795bf4315c4a11fe05e672ac8f980b74fcc723d9ce238a8982b29c7eaa9d07a4a03
+  metadata.gz: 3241f6e747d967037543ae2bf8244c099c97a237a938ea8e4fcde077f49fc60b6ab6322eec0a38dd5513869b91765b77cb774d97db00517221f86a3534a67f78
+  data.tar.gz: 10dcfe69b3c546e1bd0d45298e95f555998ec9809ad804e0e46dc8366b5d24487bd9f3fd07f5f7c2d97a957d671aa223ffb256f9e30c636828b11181e2cc4a8a

data/CHANGELOG.md

@@ -3,6 +3,14 @@
 All significant changes to this repo will be summarized in this file.
 
 
+## [v2.9.1](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.9.1) (2018-06-20)
+[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.9.0...v2.9.1)
+
+**Fixed bugs:**
+
+- \(PDK-1031\) Remove thread-unsafe Dir.chdir usage [\#249](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/249) ([rodjek](https://github.com/rodjek))
+- \(PDK-1033\) Use `--unshallow` when fetching a ref [\#247](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/247) ([DavidS](https://github.com/DavidS))
+
 ## [v2.9.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.9.0) (2018-06-18)
 [Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.8.0...v2.9.0)
 
@@ -12,6 +20,7 @@ All significant changes to this repo will be summarized in this file.
 
 **Merged pull requests:**
 
+- Release prep 2.9.0 [\#248](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/248) ([DavidS](https://github.com/DavidS))
 - Stable development structure for this gem [\#246](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/246) ([cardil](https://github.com/cardil))
 
 # Previous Changes
@@ -514,4 +523,4 @@ compatible yet.
 [0.1.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.0.0...0.1.0
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -6,11 +6,11 @@ gemspec
 
 group :development do
   gem 'codecov'
-  gem 'github_changelog_generator'
+  gem 'github_changelog_generator' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.0')
   gem 'puppet', ENV['PUPPET_GEM_VERSION'] || ENV['PUPPET_VERSION'] || '~> 4.0'
   gem 'simplecov', '~> 0'
   gem 'simplecov-console'
-  if RUBY_VERSION >= '2.1'
+  if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
     gem 'rubocop', '< 0.50'
     gem 'rubocop-rspec', '~> 1'
   end

data/lib/puppetlabs_spec_helper/tasks/fixtures.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'open3'
 
 module PuppetlabsSpecHelper; end
 module PuppetlabsSpecHelper::Tasks; end
@@ -128,13 +129,17 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
            when 'hg'
              ['pull']
            when 'git'
-             ['fetch']
+             ['fetch'].tap do |git_args|
+               git_args << '--unshallow' if shallow_git_repo?
+             end
            else
              raise "Unfortunately #{scm} is not supported yet"
            end
-    Dir.chdir(target) do
-      system("#{scm} #{args.flatten.join(' ')}")
-    end
+    system("#{scm} #{args.flatten.join(' ')}", chdir: target)
+  end
+
+  def shallow_git_repo?
+    File.file?(File.join('.git', 'shallow'))
   end
 
   def revision(scm, target, ref)
@@ -147,7 +152,23 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
     else
       raise "Unfortunately #{scm} is not supported yet"
     end
-    system("cd #{target} && #{scm} #{args.flatten.join ' '}")
+    system("#{scm} #{args.flatten.join ' '}", chdir: target)
+  end
+
+  def valid_repo?(scm, target, remote)
+    return false unless File.directory?(target)
+    return true if scm == 'hg'
+
+    return true if git_remote_url(target) == remote
+
+    warn "Git remote for #{target} has changed, recloning repository"
+    FileUtils.rm_rf(target)
+    false
+  end
+
+  def git_remote_url(target)
+    output, status = Open3.capture2e('git', '-C', target, 'remote', 'get-url', 'origin')
+    status.success? ? output.strip : nil
   end
 
   def remove_subdirectory(target, subdir)
@@ -259,7 +280,7 @@ task :spec_prep do
       logger.debug "New Thread started for #{remote}"
       # start up a new thread and store it in the opts hash
       opts[:thread] = Thread.new do
-        if File.directory?(target)
+        if valid_repo?(scm, target, remote)
           update_repo(scm, target)
         else
           clone_repo(scm, remote, target, subdir, ref, branch, flags)

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
-  VERSION = '2.9.0'.freeze
+  VERSION = '2.9.1'.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.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha