onceover 3.5.1 → 3.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3d218869da68665dce739bba798cf3914955836a
4
- data.tar.gz: a45ccdf69f2777daa95cd75d0abe23b3e5f1d898
3
+ metadata.gz: 6c2ba12fedb743733c215c2b933a3d1aef1febeb
4
+ data.tar.gz: 17431981ceab3f6da956ac12cde1a4181efbb14d
5
5
  SHA512:
6
- metadata.gz: 59bee1f0170ef794be337089b87630ba2efbb3f954eb4a7456dcd3e0673b78fc33378d27ae92365e0e3edba48989e4936fd072f6d78981472aaef4f0f66e8894
7
- data.tar.gz: 980d4ebf61b505e48be6d9ee753906639144ef7bef2150dd8f2f114ad04a91ecc0b80173726d82c1d3bb245395c9540cc6478353554acd0639401d291c71a85b
6
+ metadata.gz: 170d38c14abf8bcef5c26ea1ca824c8b696c9a87af7719930854a3fab808eae2de46e0be44822cded0fab298883bd98454dc1cc3d3ed26a74c4d86def7d17034
7
+ data.tar.gz: e3c3fc3e7daa590ef91794d5cc244d0d32350f313de1f96702b250d7ae011d80f630cf1ca60a78ebe4bc6b3a195c39acca3b08eded9b3946dfd33b14c2f896e1
@@ -191,6 +191,16 @@ class Onceover
191
191
  excluded_dirs << Pathname.new("#{repo.root}/.onceover")
192
192
  excluded_dirs << Pathname.new(ENV['GEM_HOME']) if ENV['GEM_HOME']
193
193
 
194
+ #
195
+ # A Local modules directory likely means that the user installed r10k folders into their local control repo
196
+ # This conflicts with the step where onceover installs r10k after copying the control repo to the temporary
197
+ # .onceover directory. The following skips copying the modules folder, to not later cause an error.
198
+ #
199
+ if File.directory?("#{repo.root}/modules")
200
+ logger.warn "Found modules directory in your controlrepo, skipping the copy of this directory. If you installed modules locally using r10k, this warning is normal, if you have created modules in a local modules directory, onceover does not support testing these files, please rename this directory to conform with Puppet best practices, as this folder will conflict with Puppet's native installation of modules."
201
+ end
202
+ excluded_dirs << Pathname.new("#{repo.root}/modules")
203
+
194
204
  controlrepo_files = get_children_recursive(Pathname.new(repo.root))
195
205
 
196
206
  # Exclude the files that should be skipped
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
4
4
 
5
5
  Gem::Specification.new do |s|
6
6
  s.name = "onceover"
7
- s.version = "3.5.1"
7
+ s.version = "3.5.2"
8
8
  s.authors = ["Dylan Ratcliffe"]
9
9
  s.email = ["dylan.ratcliffe@puppet.com"]
10
10
  s.homepage = "https://github.com/dylanratcliffe/onceover"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: onceover
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.5.1
4
+ version: 3.5.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dylan Ratcliffe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-03-08 00:00:00.000000000 Z
11
+ date: 2018-03-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake