simp-rake-helpers 3.7.0 → 4.0.0
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 +4 -4
- data/.travis.yml +5 -0
- data/CHANGELOG.md +10 -0
- data/lib/simp/rake/helpers/version.rb +1 -1
- data/lib/simp/rake/pupmod/helpers.rb +64 -48
- data/lib/simp/rake/rubygem.rb +1 -0
- data/spec/lib/simp/rake/pupmod/fixtures/othermod/Gemfile +18 -0
- data/spec/lib/simp/rake/pupmod/fixtures/othermod/README.md +83 -0
- data/spec/lib/simp/rake/pupmod/fixtures/othermod/Rakefile +32 -0
- data/spec/lib/simp/rake/pupmod/fixtures/othermod/examples/init.pp +12 -0
- data/spec/lib/simp/rake/pupmod/fixtures/othermod/manifests/init.pp +48 -0
- data/spec/lib/simp/rake/pupmod/fixtures/othermod/metadata.json +15 -0
- data/spec/lib/simp/rake/pupmod/fixtures/othermod/spec/classes/init_spec.rb +6 -0
- data/spec/lib/simp/rake/pupmod/fixtures/othermod/spec/spec_helper.rb +1 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/CHANGELOG +11 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/CONTRIBUTORS +1 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/Gemfile +40 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/LICENSE +25 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/README.md +139 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/Rakefile +3 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/build/rpm_metadata/requires +7 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/data/common.yaml +2 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/hiera.yaml +10 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config.pp +7 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/auditing.pp +15 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/firewall.pp +14 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/logging.pp +16 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/pki.pp +16 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/selinux.pp +15 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/tcpwrappers.pp +16 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/init.pp +110 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/install.pp +11 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/service.pp +15 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/metadata.json +50 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/centos-combined-x64.yml +22 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/default.yml +1 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/class_spec.rb +32 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/nodesets +1 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/classes/init_spec.rb +87 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper.rb +92 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper_acceptance.rb +45 -0
- data/spec/lib/simp/rake/pupmod/helpers_spec.rb +56 -4
- metadata +49 -8
@@ -0,0 +1,15 @@
|
|
1
|
+
# == Class simpmod::service
|
2
|
+
#
|
3
|
+
# This class is meant to be called from simpmod.
|
4
|
+
# It ensure the service is running.
|
5
|
+
#
|
6
|
+
class simpmod::service {
|
7
|
+
assert_private()
|
8
|
+
|
9
|
+
service { $::simpmod::service_name:
|
10
|
+
ensure => running,
|
11
|
+
enable => true,
|
12
|
+
hasstatus => true,
|
13
|
+
hasrestart => true
|
14
|
+
}
|
15
|
+
}
|
@@ -0,0 +1,50 @@
|
|
1
|
+
{
|
2
|
+
"name": "simp-simpmod",
|
3
|
+
"version": "0.1.0",
|
4
|
+
"author": "simp",
|
5
|
+
"summary": "A module fixture that models a simp module",
|
6
|
+
"license": "Apache-2.0",
|
7
|
+
"source": "",
|
8
|
+
"project_page": "",
|
9
|
+
"issues_url": "",
|
10
|
+
"tags": [
|
11
|
+
"simp"
|
12
|
+
],
|
13
|
+
"dependencies": [
|
14
|
+
{
|
15
|
+
"name": "simp/iptables",
|
16
|
+
"version_requirement": ">= 6.0.1 < 7.0.0"
|
17
|
+
},
|
18
|
+
{
|
19
|
+
"name": "simp/simplib",
|
20
|
+
"version_requirement": ">= 3.3.1 < 4.0.0"
|
21
|
+
},
|
22
|
+
{
|
23
|
+
"name": "puppetlabs/stdlib",
|
24
|
+
"version_requirement": ">= 4.13.1 < 5.0.0"
|
25
|
+
}
|
26
|
+
],
|
27
|
+
"operatingsystem_support": [
|
28
|
+
{
|
29
|
+
"operatingsystem": "CentOS",
|
30
|
+
"operatingsystemrelease": [
|
31
|
+
"6",
|
32
|
+
"7"
|
33
|
+
]
|
34
|
+
},
|
35
|
+
{
|
36
|
+
"operatingsystem": "RedHat",
|
37
|
+
"operatingsystemrelease": [
|
38
|
+
"6",
|
39
|
+
"7"
|
40
|
+
]
|
41
|
+
}
|
42
|
+
],
|
43
|
+
"requirements": [
|
44
|
+
{
|
45
|
+
"name": "puppet",
|
46
|
+
"version_requirement": ">= 4.6.0 < 5.0.0"
|
47
|
+
}
|
48
|
+
],
|
49
|
+
"data_provider": "hiera"
|
50
|
+
}
|
data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/centos-combined-x64.yml
ADDED
@@ -0,0 +1,22 @@
|
|
1
|
+
# This nodeset spins up a simple one-host test VM for both EL6 and EL7
|
2
|
+
HOSTS:
|
3
|
+
centos-7:
|
4
|
+
roles:
|
5
|
+
- server
|
6
|
+
- default
|
7
|
+
- master
|
8
|
+
platform: el-7-x86_64
|
9
|
+
box: centos/7
|
10
|
+
hypervisor: vagrant
|
11
|
+
centos-6:
|
12
|
+
roles:
|
13
|
+
- agent
|
14
|
+
- client
|
15
|
+
platform: el-6-x86_64
|
16
|
+
box: centos/6
|
17
|
+
hypervisor: vagrant
|
18
|
+
CONFIG:
|
19
|
+
log_level: verbose
|
20
|
+
type: aio
|
21
|
+
vagrant_memsize: 256
|
22
|
+
## vb_gui: true
|
@@ -0,0 +1 @@
|
|
1
|
+
spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/centos-combined-x64.yml
|
@@ -0,0 +1,32 @@
|
|
1
|
+
require 'spec_helper_acceptance'
|
2
|
+
|
3
|
+
test_name 'simpmod class'
|
4
|
+
|
5
|
+
describe 'simpmod class' do
|
6
|
+
let(:manifest) {
|
7
|
+
<<-EOS
|
8
|
+
class { 'simpmod': }
|
9
|
+
EOS
|
10
|
+
}
|
11
|
+
|
12
|
+
context 'default parameters' do
|
13
|
+
# Using puppet_apply as a helper
|
14
|
+
it 'should work with no errors' do
|
15
|
+
apply_manifest(manifest, :catch_failures => true)
|
16
|
+
end
|
17
|
+
|
18
|
+
it 'should be idempotent' do
|
19
|
+
apply_manifest(manifest, :catch_changes => true)
|
20
|
+
end
|
21
|
+
|
22
|
+
|
23
|
+
describe package('simpmod') do
|
24
|
+
it { is_expected.to be_installed }
|
25
|
+
end
|
26
|
+
|
27
|
+
describe service('simpmod') do
|
28
|
+
it { is_expected.to be_enabled }
|
29
|
+
it { is_expected.to be_running }
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
@@ -0,0 +1 @@
|
|
1
|
+
spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/../../nodesets
|
@@ -0,0 +1,87 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe 'simpmod' do
|
4
|
+
shared_examples_for "a structured module" do
|
5
|
+
it { is_expected.to compile.with_all_deps }
|
6
|
+
it { is_expected.to create_class('simpmod') }
|
7
|
+
it { is_expected.to contain_class('simpmod') }
|
8
|
+
it { is_expected.to contain_class('simpmod::install').that_comes_before('Class[simpmod::config]') }
|
9
|
+
it { is_expected.to contain_class('simpmod::config') }
|
10
|
+
it { is_expected.to contain_class('simpmod::service').that_subscribes_to('Class[simpmod::config]') }
|
11
|
+
|
12
|
+
it { is_expected.to contain_service('simpmod') }
|
13
|
+
it { is_expected.to contain_package('simpmod').with_ensure('present') }
|
14
|
+
end
|
15
|
+
|
16
|
+
|
17
|
+
context 'supported operating systems' do
|
18
|
+
on_supported_os.each do |os, facts|
|
19
|
+
context "on #{os}" do
|
20
|
+
let(:facts) do
|
21
|
+
facts
|
22
|
+
end
|
23
|
+
|
24
|
+
context "simpmod class without any parameters" do
|
25
|
+
let(:params) {{ }}
|
26
|
+
it_behaves_like "a structured module"
|
27
|
+
it { is_expected.to contain_class('simpmod').with_trusted_nets(['127.0.0.1/32']) }
|
28
|
+
end
|
29
|
+
|
30
|
+
context "simpmod class with firewall enabled" do
|
31
|
+
let(:params) {{
|
32
|
+
:trusted_nets => ['10.0.2.0/24'],
|
33
|
+
:tcp_listen_port => 1234,
|
34
|
+
:enable_firewall => true,
|
35
|
+
}}
|
36
|
+
###it_behaves_like "a structured module"
|
37
|
+
it { is_expected.to contain_class('simpmod::config::firewall') }
|
38
|
+
|
39
|
+
it { is_expected.to contain_class('simpmod::config::firewall').that_comes_before('Class[simpmod::service]') }
|
40
|
+
it { is_expected.to create_iptables__listen__tcp_stateful('allow_simpmod_tcp_connections').with_dports(1234)
|
41
|
+
}
|
42
|
+
end
|
43
|
+
|
44
|
+
context "simpmod class with selinux enabled" do
|
45
|
+
let(:params) {{
|
46
|
+
:enable_selinux => true,
|
47
|
+
}}
|
48
|
+
###it_behaves_like "a structured module"
|
49
|
+
it { is_expected.to contain_class('simpmod::config::selinux') }
|
50
|
+
it { is_expected.to contain_class('simpmod::config::selinux').that_comes_before('Class[simpmod::service]') }
|
51
|
+
it { is_expected.to create_notify('FIXME: selinux') }
|
52
|
+
end
|
53
|
+
|
54
|
+
context "simpmod class with auditing enabled" do
|
55
|
+
let(:params) {{
|
56
|
+
:enable_auditing => true,
|
57
|
+
}}
|
58
|
+
###it_behaves_like "a structured module"
|
59
|
+
it { is_expected.to contain_class('simpmod::config::auditing') }
|
60
|
+
it { is_expected.to contain_class('simpmod::config::auditing').that_comes_before('Class[simpmod::service]') }
|
61
|
+
it { is_expected.to create_notify('FIXME: auditing') }
|
62
|
+
end
|
63
|
+
|
64
|
+
context "simpmod class with logging enabled" do
|
65
|
+
let(:params) {{
|
66
|
+
:enable_logging => true,
|
67
|
+
}}
|
68
|
+
###it_behaves_like "a structured module"
|
69
|
+
it { is_expected.to contain_class('simpmod::config::logging') }
|
70
|
+
it { is_expected.to contain_class('simpmod::config::logging').that_comes_before('Class[simpmod::service]') }
|
71
|
+
it { is_expected.to create_notify('FIXME: logging') }
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|
75
|
+
end
|
76
|
+
|
77
|
+
context 'unsupported operating system' do
|
78
|
+
describe 'simpmod class without any parameters on Solaris/Nexenta' do
|
79
|
+
let(:facts) {{
|
80
|
+
:osfamily => 'Solaris',
|
81
|
+
:operatingsystem => 'Nexenta',
|
82
|
+
}}
|
83
|
+
|
84
|
+
it { expect { is_expected.to contain_package('simpmod') }.to raise_error(Puppet::Error, /Nexenta not supported/) }
|
85
|
+
end
|
86
|
+
end
|
87
|
+
end
|
@@ -0,0 +1,92 @@
|
|
1
|
+
require 'puppetlabs_spec_helper/module_spec_helper'
|
2
|
+
require 'rspec-puppet'
|
3
|
+
require 'simp/rspec-puppet-facts'
|
4
|
+
include Simp::RspecPuppetFacts
|
5
|
+
|
6
|
+
require 'pathname'
|
7
|
+
|
8
|
+
# RSpec Material
|
9
|
+
fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
|
10
|
+
module_name = File.basename(File.expand_path(File.join(__FILE__,'../..')))
|
11
|
+
|
12
|
+
default_hiera_config =<<-EOM
|
13
|
+
---
|
14
|
+
:backends:
|
15
|
+
- "rspec"
|
16
|
+
- "yaml"
|
17
|
+
:yaml:
|
18
|
+
:datadir: "stub"
|
19
|
+
:hierarchy:
|
20
|
+
- "%{custom_hiera}"
|
21
|
+
- "%{spec_title}"
|
22
|
+
- "%{module_name}"
|
23
|
+
- "default"
|
24
|
+
EOM
|
25
|
+
|
26
|
+
|
27
|
+
['hieradata','modules'].each do |dir|
|
28
|
+
_dir = File.join(fixture_path,dir)
|
29
|
+
FileUtils.mkdir_p(_dir) unless File.directory?(_dir)
|
30
|
+
end
|
31
|
+
|
32
|
+
RSpec.configure do |c|
|
33
|
+
# If nothing else...
|
34
|
+
c.default_facts = {
|
35
|
+
:production => {
|
36
|
+
#:fqdn => 'production.rspec.test.localdomain',
|
37
|
+
:path => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
|
38
|
+
:concat_basedir => '/tmp'
|
39
|
+
}
|
40
|
+
}
|
41
|
+
|
42
|
+
c.mock_framework = :rspec
|
43
|
+
c.mock_with :mocha
|
44
|
+
|
45
|
+
c.module_path = File.join(fixture_path, 'modules')
|
46
|
+
c.manifest_dir = File.join(fixture_path, 'manifests')
|
47
|
+
c.hiera_config = File.join(fixture_path,'hieradata','hiera.yaml')
|
48
|
+
|
49
|
+
# Useless backtrace noise
|
50
|
+
backtrace_exclusion_patterns = [ /spec_helper/, /gems/ ]
|
51
|
+
|
52
|
+
if c.respond_to?(:backtrace_exclusion_patterns)
|
53
|
+
c.backtrace_exclusion_patterns = backtrace_exclusion_patterns
|
54
|
+
elsif c.respond_to?(:backtrace_clean_patterns)
|
55
|
+
c.backtrace_clean_patterns = backtrace_exclusion_patterns
|
56
|
+
end
|
57
|
+
|
58
|
+
c.before(:all) do
|
59
|
+
data = YAML.load(default_hiera_config)
|
60
|
+
data[:yaml][:datadir] = File.join(fixture_path, 'hieradata')
|
61
|
+
|
62
|
+
File.open(c.hiera_config, 'w') do |f|
|
63
|
+
f.write data.to_yaml
|
64
|
+
end
|
65
|
+
end
|
66
|
+
|
67
|
+
c.before(:each) do
|
68
|
+
@spec_global_env_temp = Dir.mktmpdir('simpspec')
|
69
|
+
|
70
|
+
if defined?(environment)
|
71
|
+
FileUtils.mkdir_p(File.join(@spec_global_env_temp,environment.to_s))
|
72
|
+
end
|
73
|
+
|
74
|
+
# ensure the user running these tests has an accessible environmentpath
|
75
|
+
Puppet[:environmentpath] = @spec_global_env_temp
|
76
|
+
Puppet[:user] = Etc.getpwuid(Process.uid).name
|
77
|
+
Puppet[:group] = Etc.getgrgid(Process.gid).name
|
78
|
+
end
|
79
|
+
|
80
|
+
c.after(:each) do
|
81
|
+
FileUtils.rm_rf(@spec_global_env_temp) # clean up the mocked environmentpath
|
82
|
+
@spec_global_env_temp = nil
|
83
|
+
end
|
84
|
+
end
|
85
|
+
|
86
|
+
Dir.glob("#{RSpec.configuration.module_path}/*").each do |dir|
|
87
|
+
begin
|
88
|
+
Pathname.new(dir).realpath
|
89
|
+
rescue
|
90
|
+
fail "ERROR: The module '#{dir}' is not installed. Tests cannot continue."
|
91
|
+
end
|
92
|
+
end
|
@@ -0,0 +1,45 @@
|
|
1
|
+
require 'beaker-rspec'
|
2
|
+
require 'tmpdir'
|
3
|
+
require 'yaml'
|
4
|
+
require 'simp/beaker_helpers'
|
5
|
+
include Simp::BeakerHelpers
|
6
|
+
|
7
|
+
unless ENV['BEAKER_provision'] == 'no'
|
8
|
+
hosts.each do |host|
|
9
|
+
# Install Puppet
|
10
|
+
if host.is_pe?
|
11
|
+
install_pe
|
12
|
+
else
|
13
|
+
install_puppet
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
|
19
|
+
RSpec.configure do |c|
|
20
|
+
# ensure that environment OS is ready on each host
|
21
|
+
fix_errata_on hosts
|
22
|
+
|
23
|
+
# Readable test descriptions
|
24
|
+
c.formatter = :documentation
|
25
|
+
|
26
|
+
# Configure all nodes in nodeset
|
27
|
+
c.before :suite do
|
28
|
+
begin
|
29
|
+
# Install modules and dependencies from spec/fixtures/modules
|
30
|
+
copy_fixture_modules_to( hosts )
|
31
|
+
|
32
|
+
# Generate and install PKI certificates on each SUT
|
33
|
+
Dir.mktmpdir do |cert_dir|
|
34
|
+
run_fake_pki_ca_on( default, hosts, cert_dir )
|
35
|
+
hosts.each{ |sut| copy_pki_to( sut, cert_dir, '/etc/pki/simp-testing' )}
|
36
|
+
end
|
37
|
+
rescue StandardError, ScriptError => e
|
38
|
+
if ENV['PRY']
|
39
|
+
require 'pry'; binding.pry
|
40
|
+
else
|
41
|
+
raise e
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
@@ -3,12 +3,64 @@ require 'spec_helper'
|
|
3
3
|
|
4
4
|
describe Simp::Rake::Pupmod::Helpers do
|
5
5
|
before :each do
|
6
|
-
|
6
|
+
fixtures_dir = File.expand_path( '../fixtures', __FILE__ )
|
7
|
+
@simpmod = Simp::Rake::Pupmod::Helpers.new(File.join(fixtures_dir, 'simpmod'))
|
8
|
+
@othermod = Simp::Rake::Pupmod::Helpers.new(File.join(fixtures_dir, 'othermod'))
|
7
9
|
end
|
8
10
|
|
9
|
-
describe
|
10
|
-
it
|
11
|
-
expect( @
|
11
|
+
describe '#initialize' do
|
12
|
+
it 'initialized (smoke test)' do
|
13
|
+
expect( @simpmod.class ).to eq Simp::Rake::Pupmod::Helpers
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
17
|
+
describe '#metadata' do
|
18
|
+
it 'reads a valid metadata.json (simp)' do
|
19
|
+
expect( @simpmod.send( :metadata )['name'] ).to eq 'simp-simpmod'
|
20
|
+
expect( @othermod.send( :metadata )['name'] ).to eq 'other-othermod'
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
describe '::CHANGELOG_ENTRY_REGEX' do
|
25
|
+
before :all do
|
26
|
+
@rgx = Simp::Rake::Pupmod::Helpers::CHANGELOG_ENTRY_REGEX
|
27
|
+
end
|
28
|
+
|
29
|
+
it 'matches valid one-line CHANGELOG entries' do
|
30
|
+
expect("* Mon Jan 1 1970 First Last <email@domain.com> - 0.0.1\n").to match @rgx
|
31
|
+
expect("* Mon Jan 1 1970 First Last <email@domain.com> 0.0.1\n").to match @rgx
|
32
|
+
expect("* Wed Oct 22 2014 First Middle Last <first.last-a1999@domain.com> - 2.0.0\n").to match @rgx
|
33
|
+
expect('* Wed Oct 22 2014 Name <first.last-a1999+gmail.label@domain.com> - 2.0.0').to match @rgx
|
34
|
+
expect('* Fri Jul 02 2010 Kamil Dudka <kdudka@redhat.com> 2.1.5-20').to match @rgx
|
35
|
+
expect('* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.5-21').to match @rgx
|
36
|
+
end
|
37
|
+
|
38
|
+
it "doesn't match invalid one-line CHANGELOG entries" do
|
39
|
+
expect("* Foo Jan 1 1970 First Last <email@domain.com> - 0.0.1\n").to_not match @rgx
|
40
|
+
expect("* Mon Xxn 1 1970 First Last <email@domain.com> - 0.0.1\n").to_not match @rgx
|
41
|
+
expect("* Mon Jan 111 1970 First Last <email@domain.com> - 0.0.1\n").to_not match @rgx
|
42
|
+
expect("* Mon Jan 1 1970 <email@domain.com> - 0.0.1\n").to_not match @rgx
|
43
|
+
end
|
44
|
+
|
45
|
+
it 'matches valid two-line CHANGELOG entries' do
|
46
|
+
skip "Not worth implementing right now"
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
describe "#changelog_annotation" do
|
51
|
+
it "generates a tag annotation from a valid SIMP module's CHANGELOG" do
|
52
|
+
_log = @simpmod.send( :changelog_annotation )
|
53
|
+
expect( _log.class ).to be String
|
54
|
+
expect( _log.size ).to be > 0
|
55
|
+
expect( _log.scan( /^Release of/ ).size ).to eq 1
|
56
|
+
end
|
57
|
+
|
58
|
+
it 'handles multiple CHANGELOG entries for the same release' do
|
59
|
+
_log = @simpmod.send( :changelog_annotation )
|
60
|
+
expect( _log.scan(/^\*.*\d+\.\d+\.\d+$/) ).to eq [
|
61
|
+
'* Tue Jan 2 1970 Second Author <email1@domain.com> - 0.1.0',
|
62
|
+
'* Mon Jan 1 1970 First Author <email2@domain.com> - 0.1.0',
|
63
|
+
]
|
12
64
|
end
|
13
65
|
end
|
14
66
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: simp-rake-helpers
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 4.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Chris Tessmer
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2017-
|
12
|
+
date: 2017-08-01 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|
@@ -17,14 +17,14 @@ dependencies:
|
|
17
17
|
requirements:
|
18
18
|
- - "~>"
|
19
19
|
- !ruby/object:Gem::Version
|
20
|
-
version:
|
20
|
+
version: 1.14.0
|
21
21
|
type: :runtime
|
22
22
|
prerelease: false
|
23
23
|
version_requirements: !ruby/object:Gem::Requirement
|
24
24
|
requirements:
|
25
25
|
- - "~>"
|
26
26
|
- !ruby/object:Gem::Version
|
27
|
-
version:
|
27
|
+
version: 1.14.0
|
28
28
|
- !ruby/object:Gem::Dependency
|
29
29
|
name: rake
|
30
30
|
requirement: !ruby/object:Gem::Requirement
|
@@ -66,6 +66,9 @@ dependencies:
|
|
66
66
|
- - ">="
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '3.0'
|
69
|
+
- - "<"
|
70
|
+
- !ruby/object:Gem::Version
|
71
|
+
version: '6.0'
|
69
72
|
type: :runtime
|
70
73
|
prerelease: false
|
71
74
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -73,6 +76,9 @@ dependencies:
|
|
73
76
|
- - ">="
|
74
77
|
- !ruby/object:Gem::Version
|
75
78
|
version: '3.0'
|
79
|
+
- - "<"
|
80
|
+
- !ruby/object:Gem::Version
|
81
|
+
version: '6.0'
|
76
82
|
- !ruby/object:Gem::Dependency
|
77
83
|
name: puppet-lint
|
78
84
|
requirement: !ruby/object:Gem::Requirement
|
@@ -99,14 +105,14 @@ dependencies:
|
|
99
105
|
requirements:
|
100
106
|
- - "~>"
|
101
107
|
- !ruby/object:Gem::Version
|
102
|
-
version: '
|
108
|
+
version: '2.0'
|
103
109
|
type: :runtime
|
104
110
|
prerelease: false
|
105
111
|
version_requirements: !ruby/object:Gem::Requirement
|
106
112
|
requirements:
|
107
113
|
- - "~>"
|
108
114
|
- !ruby/object:Gem::Version
|
109
|
-
version: '
|
115
|
+
version: '2.0'
|
110
116
|
- !ruby/object:Gem::Dependency
|
111
117
|
name: parallel
|
112
118
|
requirement: !ruby/object:Gem::Requirement
|
@@ -127,14 +133,14 @@ dependencies:
|
|
127
133
|
requirements:
|
128
134
|
- - "~>"
|
129
135
|
- !ruby/object:Gem::Version
|
130
|
-
version: '
|
136
|
+
version: '2.0'
|
131
137
|
type: :runtime
|
132
138
|
prerelease: false
|
133
139
|
version_requirements: !ruby/object:Gem::Requirement
|
134
140
|
requirements:
|
135
141
|
- - "~>"
|
136
142
|
- !ruby/object:Gem::Version
|
137
|
-
version: '
|
143
|
+
version: '2.0'
|
138
144
|
- !ruby/object:Gem::Dependency
|
139
145
|
name: puppet-blacksmith
|
140
146
|
requirement: !ruby/object:Gem::Requirement
|
@@ -478,6 +484,41 @@ files:
|
|
478
484
|
- spec/lib/simp/rake/build/helpers_spec.rb
|
479
485
|
- spec/lib/simp/rake/helpers_spec.rb
|
480
486
|
- spec/lib/simp/rake/pkg_spec.rb
|
487
|
+
- spec/lib/simp/rake/pupmod/fixtures/othermod/Gemfile
|
488
|
+
- spec/lib/simp/rake/pupmod/fixtures/othermod/README.md
|
489
|
+
- spec/lib/simp/rake/pupmod/fixtures/othermod/Rakefile
|
490
|
+
- spec/lib/simp/rake/pupmod/fixtures/othermod/examples/init.pp
|
491
|
+
- spec/lib/simp/rake/pupmod/fixtures/othermod/manifests/init.pp
|
492
|
+
- spec/lib/simp/rake/pupmod/fixtures/othermod/metadata.json
|
493
|
+
- spec/lib/simp/rake/pupmod/fixtures/othermod/spec/classes/init_spec.rb
|
494
|
+
- spec/lib/simp/rake/pupmod/fixtures/othermod/spec/spec_helper.rb
|
495
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/CHANGELOG
|
496
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/CONTRIBUTORS
|
497
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/Gemfile
|
498
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/LICENSE
|
499
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/README.md
|
500
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/Rakefile
|
501
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/build/rpm_metadata/requires
|
502
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/data/common.yaml
|
503
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/hiera.yaml
|
504
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config.pp
|
505
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/auditing.pp
|
506
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/firewall.pp
|
507
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/logging.pp
|
508
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/pki.pp
|
509
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/selinux.pp
|
510
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/config/tcpwrappers.pp
|
511
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/init.pp
|
512
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/install.pp
|
513
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/service.pp
|
514
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/metadata.json
|
515
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/centos-combined-x64.yml
|
516
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/default.yml
|
517
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/class_spec.rb
|
518
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/nodesets
|
519
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/classes/init_spec.rb
|
520
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper.rb
|
521
|
+
- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper_acceptance.rb
|
481
522
|
- spec/lib/simp/rake/pupmod/helpers_spec.rb
|
482
523
|
- spec/lib/simp/rake_spec.rb
|
483
524
|
- spec/lib/simp/rpm_spec.rb
|