puppet-magnum 4.0.2 → 4.0.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +11 -0
- data/Gemfile.lock +3 -3
- data/VERSION +1 -1
- data/generator_files/git/gitignore.erb +3 -0
- data/generator_files/spec/fixtures.yml.erb +5 -0
- data/generator_files/spec/{acceptance/spec_helper_acceptance.rb.erb → spec_helper_acceptance.rb.erb} +9 -7
- data/generator_files/util/Gemfile.erb +1 -1
- data/generator_files/util/Rakefile.erb +15 -3
- data/lib/puppet-magnum.rb +1 -1
- data/lib/puppet-magnum/generators/create_generator.rb +8 -8
- data/puppet-magnum.gemspec +1 -1
- metadata +6 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c24663450943b47282e03f3441fe1c7cb3585096
|
4
|
+
data.tar.gz: 0e710162293ecfe9d1aa1d5196a75460584b5bf9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 37505447030f2b8efec1a1e43c69af4f5fcaf6c6090b43e3c58ad7daff9a9fdad08f23a3ab1996aa99a8dc4cfa324e518e7b5323e8c2819b89ba10c2e8378465
|
7
|
+
data.tar.gz: 7463e8027bb0ec286a7963b4ce8e1923b1581eeec09f1ec9a8df54ae46f12785fc5d4dddce0ee78266ac5b92c2b8320c7e481213bee4b9ffd7ff294bf155a833
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,13 @@
|
|
1
|
+
## [4.0.3]
|
2
|
+
|
3
|
+
### FIXES:
|
4
|
+
|
5
|
+
* Reintro .fixtures.yml support since Beaker doesn't support private git repos properly.
|
6
|
+
|
7
|
+
### IMPROVEMENTS:
|
8
|
+
|
9
|
+
* Update gem versions.
|
10
|
+
|
1
11
|
## [4.0.2]
|
2
12
|
|
3
13
|
### IMPROVEMENTS:
|
@@ -10,6 +20,7 @@
|
|
10
20
|
- Vagrantfile (removed)
|
11
21
|
- spec => spec.old (renamed)
|
12
22
|
- serverspec => serverspec.old (renamed)
|
23
|
+
* In `puppet-magnum` 4.x - `.puppet-magnum.init` is now `.puppet-magnum` and it is in YAML format.
|
13
24
|
|
14
25
|
## [4.0.1]
|
15
26
|
|
data/Gemfile.lock
CHANGED
@@ -1,10 +1,10 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
puppet-magnum (4.0.
|
4
|
+
puppet-magnum (4.0.3)
|
5
5
|
beaker-hostgenerator (~> 0.8.4)
|
6
6
|
bundler (>= 1.14.6)
|
7
|
-
puppet (~> 4.10.
|
7
|
+
puppet (~> 4.10.1)
|
8
8
|
puppet-lint (~> 2.2.1)
|
9
9
|
puppetlabs_spec_helper (~> 2.1.2)
|
10
10
|
rspec (~> 3.5.0)
|
@@ -35,7 +35,7 @@ GEM
|
|
35
35
|
metaclass (0.0.4)
|
36
36
|
mocha (1.2.1)
|
37
37
|
metaclass (~> 0.0.1)
|
38
|
-
puppet (4.10.
|
38
|
+
puppet (4.10.1)
|
39
39
|
facter (> 2.0, < 4)
|
40
40
|
gettext-setup (>= 0.10, < 1)
|
41
41
|
hiera (>= 2.0, < 4)
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
4.0.
|
1
|
+
4.0.3
|
data/generator_files/spec/{acceptance/spec_helper_acceptance.rb.erb → spec_helper_acceptance.rb.erb}
RENAMED
@@ -1,22 +1,24 @@
|
|
1
|
+
require 'pathname'
|
1
2
|
require 'beaker-rspec'
|
2
3
|
require 'beaker/puppet_install_helper'
|
3
4
|
|
4
|
-
default_modules = [
|
5
|
-
"puppetlabs-stdlib",
|
6
|
-
]
|
7
|
-
|
8
5
|
run_puppet_install_helper
|
9
6
|
|
10
7
|
RSpec.configure do |c|
|
11
|
-
proj_root
|
8
|
+
proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
|
9
|
+
modules_dir = Pathname.new("#{proj_root}/spec/fixtures/modules")
|
12
10
|
|
13
11
|
c.before :suite do
|
14
12
|
hosts.each do |host|
|
15
13
|
|
16
|
-
|
17
|
-
|
14
|
+
# copy all fixtures module dirs to host (if any)
|
15
|
+
modules_dir.each_child do |module_dir|
|
16
|
+
unless File.symlink?(module_dir)
|
17
|
+
copy_module_to(host, :source => module_dir.to_s, :module_name => module_dir.basename.to_s)
|
18
|
+
end
|
18
19
|
end
|
19
20
|
|
21
|
+
# copy this main module to host
|
20
22
|
copy_module_to(host, :source => proj_root, :module_name => '<%= module_name %>')
|
21
23
|
end
|
22
24
|
end
|
@@ -7,6 +7,8 @@ desc 'Run syntax, lint and acceptance tests'
|
|
7
7
|
task :test do
|
8
8
|
Rake::Task[:syntax].invoke
|
9
9
|
Rake::Task[:lint].invoke
|
10
|
+
|
11
|
+
Rake::Task[:spec_prep].invoke
|
10
12
|
Rake::Task[:acceptance].invoke
|
11
13
|
end
|
12
14
|
|
@@ -19,7 +21,7 @@ PuppetLint::RakeTask.new :lint do |config|
|
|
19
21
|
config.fail_on_warnings = false
|
20
22
|
end
|
21
23
|
|
22
|
-
desc 'Run acceptance tests
|
24
|
+
desc 'Run acceptance tests with VirtualBox'
|
23
25
|
task :acceptance, [:all] do |t, args|
|
24
26
|
|
25
27
|
# beaker default options
|
@@ -35,7 +37,18 @@ task :acceptance, [:all] do |t, args|
|
|
35
37
|
Rake::Task['beaker:ubuntu-server-1604-x64'].invoke
|
36
38
|
end
|
37
39
|
|
38
|
-
desc 'Run acceptance tests
|
40
|
+
desc 'Run acceptance tests with Docker'
|
41
|
+
task :acceptance_docker, [:all] do |t, args|
|
42
|
+
|
43
|
+
all = args[:all]
|
44
|
+
|
45
|
+
unless all.nil?
|
46
|
+
Rake::Task['acceptance_docker1404'].invoke
|
47
|
+
end
|
48
|
+
|
49
|
+
Rake::Task['acceptance_docker1604'].invoke
|
50
|
+
end
|
51
|
+
|
39
52
|
task :acceptance_docker1404 do
|
40
53
|
|
41
54
|
# beaker default options
|
@@ -47,7 +60,6 @@ task :acceptance_docker1404 do
|
|
47
60
|
Rake::Task['beaker'].invoke
|
48
61
|
end
|
49
62
|
|
50
|
-
desc 'Run acceptance tests (Docker/Ubuntu 1604)'
|
51
63
|
task :acceptance_docker1604 do
|
52
64
|
|
53
65
|
# beaker default options
|
data/lib/puppet-magnum.rb
CHANGED
@@ -25,7 +25,7 @@ module PuppetMagnum
|
|
25
25
|
def write_remove_legacy_files_dirs
|
26
26
|
if File.exist?(target.join('.puppet-magnum.init'))
|
27
27
|
|
28
|
-
legacy_files = ['.
|
28
|
+
legacy_files = ['.vagrant_puppet', 'Vagrantfile']
|
29
29
|
legacy_files.each do |legacy_file|
|
30
30
|
if File.exist?(target.join("#{legacy_file}"))
|
31
31
|
remove_file target.join("#{legacy_file}")
|
@@ -35,7 +35,7 @@ module PuppetMagnum
|
|
35
35
|
legacy_dirs = ['spec', 'serverspec']
|
36
36
|
legacy_dirs.each do |legacy_dir|
|
37
37
|
if File.exist?(target.join("#{legacy_dir}"))
|
38
|
-
|
38
|
+
FileUtils.cp_r target.join("#{legacy_dir}"), target.join("#{legacy_dir}.old")
|
39
39
|
remove_file target.join("#{legacy_dir}")
|
40
40
|
end
|
41
41
|
end
|
@@ -46,7 +46,8 @@ module PuppetMagnum
|
|
46
46
|
|
47
47
|
def write_dirs
|
48
48
|
dirs = ['manifests', 'data', 'templates', 'files',
|
49
|
-
'spec', 'spec/
|
49
|
+
'spec', 'spec/fixtures', 'spec/fixtures/modules',
|
50
|
+
'spec/acceptance', 'spec/acceptance/nodesets', 'spec/acceptance/nodesets/docker',
|
50
51
|
]
|
51
52
|
|
52
53
|
dirs.each do |dir|
|
@@ -78,11 +79,10 @@ module PuppetMagnum
|
|
78
79
|
end
|
79
80
|
|
80
81
|
def write_spec_setup
|
81
|
-
template 'spec/
|
82
|
-
template 'spec/
|
83
|
-
|
84
|
-
|
85
|
-
template 'spec/acceptance/spec_helper_acceptance.rb.erb', target.join('spec/spec_helper_acceptance.rb')
|
82
|
+
template 'spec/fixtures.yml.erb', target.join('.fixtures.yml')
|
83
|
+
template 'spec/rspec.erb', target.join('.rspec')
|
84
|
+
template 'spec/spec_helper_acceptance.rb.erb', target.join('spec/spec_helper_acceptance.rb')
|
85
|
+
template 'spec/acceptance/init_spec.rb.erb', target.join("spec/acceptance/#{module_name}_spec.rb")
|
86
86
|
|
87
87
|
beaker_sut_files = [
|
88
88
|
'ubuntu-server-1404-x64.yml',
|
data/puppet-magnum.gemspec
CHANGED
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
|
|
29
29
|
spec.add_runtime_dependency 'thor', '>= 0.19.4'
|
30
30
|
spec.add_runtime_dependency 'version', '>= 1.1.1'
|
31
31
|
|
32
|
-
spec.add_runtime_dependency 'puppet', '~> 4.10.
|
32
|
+
spec.add_runtime_dependency 'puppet', '~> 4.10.1'
|
33
33
|
spec.add_runtime_dependency 'rspec', '~> 3.5.0'
|
34
34
|
spec.add_runtime_dependency 'puppet-lint', '~> 2.2.1'
|
35
35
|
spec.add_runtime_dependency 'rspec-puppet', '~> 2.5.0'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: puppet-magnum
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.0.
|
4
|
+
version: 4.0.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tehmasp Chaudhri
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-05-
|
11
|
+
date: 2017-05-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sem_ver
|
@@ -86,14 +86,14 @@ dependencies:
|
|
86
86
|
requirements:
|
87
87
|
- - "~>"
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version: 4.10.
|
89
|
+
version: 4.10.1
|
90
90
|
type: :runtime
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
94
|
- - "~>"
|
95
95
|
- !ruby/object:Gem::Version
|
96
|
-
version: 4.10.
|
96
|
+
version: 4.10.1
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
98
|
name: rspec
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
@@ -198,10 +198,11 @@ files:
|
|
198
198
|
- generator_files/spec/acceptance/docker/ubuntu-server-1404-x64.yml.erb
|
199
199
|
- generator_files/spec/acceptance/docker/ubuntu-server-1604-x64.yml.erb
|
200
200
|
- generator_files/spec/acceptance/init_spec.rb.erb
|
201
|
-
- generator_files/spec/acceptance/spec_helper_acceptance.rb.erb
|
202
201
|
- generator_files/spec/acceptance/ubuntu-server-1404-x64.yml.erb
|
203
202
|
- generator_files/spec/acceptance/ubuntu-server-1604-x64.yml.erb
|
203
|
+
- generator_files/spec/fixtures.yml.erb
|
204
204
|
- generator_files/spec/rspec.erb
|
205
|
+
- generator_files/spec/spec_helper_acceptance.rb.erb
|
205
206
|
- generator_files/util/Gemfile.erb
|
206
207
|
- generator_files/util/Rakefile.erb
|
207
208
|
- generator_files/util/puppet-magnum.erb
|