pdqtest 0.4.3 → 0.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/pdqtest/docker.rb +17 -4
- data/lib/pdqtest/skeleton.rb +5 -1
- data/lib/pdqtest/version.rb +1 -1
- data/res/skeleton/Gemfile +2 -3
- data/res/skeleton/hiera.yaml +7 -0
- data/res/skeleton/spec_helper.rb +3 -0
- data/res/skeleton/test.yaml +3 -0
- metadata +4 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1c69b57c8fc39f020f891c0723296a260f1edbb0
|
4
|
+
data.tar.gz: 2d0db562865e6b6a64b53c021a52f9c59aa9e3c7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c381af3af819891d19fea87d3564a18852983210a79e240771dd8097909b2d10be0e51f9f1aa8e7d41b5a22947d452165ef9c4eabca6860502dee702ac8ebfa2
|
7
|
+
data.tar.gz: 135bf38bc95d618c069179f7aaf80ce53fae001e6859bc8f5c02464b95ba6e2c8635fcc737554d9b7e7eede1a3a74ce42d22fc89ebe110cb80f19f15f740e71f
|
data/lib/pdqtest/docker.rb
CHANGED
@@ -5,7 +5,9 @@ module PDQTest
|
|
5
5
|
STATUS = 2
|
6
6
|
ENV='export TERM=xterm LC_ALL=C PATH=/usr/local/bats/bin:/opt/puppetlabs/puppet/bin:$PATH;'
|
7
7
|
IMAGE_NAME='geoffwilliams/pdqtest-centos:2017-05-04-0'
|
8
|
-
|
8
|
+
HIERA_YAML_CONTAINER = '/etc/puppetlabs/puppet/hiera.yaml'
|
9
|
+
HIERA_YAML_HOST = '/spec/fixtures/hiera.yaml'
|
10
|
+
HIERA_DIR = '/spec/fixtures/hieradata'
|
9
11
|
|
10
12
|
def self.wrap_cmd(cmd)
|
11
13
|
['bash', '-c', "#{ENV} #{cmd}"]
|
@@ -17,18 +19,29 @@ module PDQTest
|
|
17
19
|
|
18
20
|
def self.new_container(test_dir)
|
19
21
|
pwd = Dir.pwd
|
22
|
+
hiera_yaml_host = File.join(pwd, HIERA_YAML_HOST)
|
23
|
+
hiera_dir = File.join(pwd, HIERA_DIR)
|
24
|
+
|
25
|
+
# hiera.yaml *must* exist on the host or we will get errors from Docker
|
26
|
+
if ! File.exists?(hiera_yaml_host)
|
27
|
+
File.write(hiera_yaml_host, '# hiera configuration for testing')
|
28
|
+
end
|
20
29
|
container = ::Docker::Container.create(
|
21
30
|
'Image' => IMAGE_NAME,
|
22
31
|
'Volumes' => {
|
23
|
-
test_dir
|
24
|
-
|
25
|
-
|
32
|
+
test_dir => {pwd => 'rw'},
|
33
|
+
HIERA_YAML_CONTAINER => {hiera_yaml_host => 'ro'},
|
34
|
+
HIERA_DIR => {hiera_dir => 'ro'},
|
35
|
+
'/cut' => {pwd => 'rw'}, # DEPRECATED -FOR REMOVAL
|
36
|
+
'/sys/fs/cgroup' => {'/sys/fs/cgroup' => 'ro'},
|
26
37
|
},
|
27
38
|
'HostConfig' => {
|
28
39
|
"Binds": [
|
29
40
|
"/sys/fs/cgroup:/sys/fs/cgroup:ro",
|
30
41
|
"#{pwd}:/cut:rw", # DEPRECATED -FOR REMOVAL
|
31
42
|
"#{pwd}:#{test_dir}:rw",
|
43
|
+
"#{hiera_yaml_host}:#{HIERA_YAML_CONTAINER}:rw",
|
44
|
+
"#{hiera_dir}:#{HIERA_DIR}:rw",
|
32
45
|
],
|
33
46
|
},
|
34
47
|
)
|
data/lib/pdqtest/skeleton.rb
CHANGED
@@ -15,7 +15,9 @@ module PDQTest
|
|
15
15
|
EXAMPLES_DIR = 'examples'
|
16
16
|
GEMFILE = 'Gemfile'
|
17
17
|
GEMFILE_LINE = "gem 'pdqtest', '#{PDQTest::VERSION}'"
|
18
|
-
|
18
|
+
HIERA_DIR = File.join(SPEC_DIR, 'fixtures', 'hieradata')
|
19
|
+
HIERA_YAML = 'hiera.yaml'
|
20
|
+
HIERA_TEST = 'test.yaml'
|
19
21
|
|
20
22
|
|
21
23
|
def self.should_replace_file(target, skeleton)
|
@@ -88,6 +90,8 @@ module PDQTest
|
|
88
90
|
install_skeleton('.gitignore', 'dot_gitignore')
|
89
91
|
install_skeleton('.rspec', 'dot_rspec')
|
90
92
|
install_skeleton('Makefile', 'Makefile')
|
93
|
+
install_skeleton(File.join(SPEC_DIR, 'fixtures', HIERA_YAML), HIERA_YAML)
|
94
|
+
install_skeleton(File.join(HIERA_DIR, HIERA_TEST), HIERA_TEST)
|
91
95
|
|
92
96
|
install_acceptance()
|
93
97
|
install_gemfile()
|
data/lib/pdqtest/version.rb
CHANGED
data/res/skeleton/Gemfile
CHANGED
@@ -8,7 +8,6 @@ gem 'facter', '2.4.6'
|
|
8
8
|
gem 'rubocop', '0.47.1'
|
9
9
|
gem 'rspec-puppet-facts', '1.7.0'
|
10
10
|
|
11
|
-
# Workaround for PDOC-160
|
11
|
+
# Workaround for PDOC-160 (until gem published)
|
12
12
|
gem 'puppet-strings',
|
13
|
-
:git => 'https://github.com/
|
14
|
-
:ref => 'no_dates'
|
13
|
+
:git => 'https://github.com/puppetlabs/puppet-strings',
|
data/res/skeleton/spec_helper.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: pdqtest
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.5.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Geoff Williams
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-06-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -245,10 +245,12 @@ files:
|
|
245
245
|
- res/skeleton/dot_gitignore
|
246
246
|
- res/skeleton/dot_rspec
|
247
247
|
- res/skeleton/dot_travis.yml
|
248
|
+
- res/skeleton/hiera.yaml
|
248
249
|
- res/skeleton/init.bats
|
249
250
|
- res/skeleton/init__before.bats
|
250
251
|
- res/skeleton/init__setup.sh
|
251
252
|
- res/skeleton/spec_helper.rb
|
253
|
+
- res/skeleton/test.yaml
|
252
254
|
- res/templates/examples_init.pp.erb
|
253
255
|
- res/templates/rspec.rb.erb
|
254
256
|
homepage: https://github.com/GeoffWilliams/pdqtest
|