simp-rake-helpers 5.24.0 → 6.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/.gitignore +20 -1
- data/CHANGELOG.md +33 -0
- data/Gemfile +14 -6
- data/lib/simp/command_utils.rb +6 -3
- data/lib/simp/componentinfo.rb +47 -33
- data/lib/simp/local_gpg_signing_key.rb +302 -303
- data/lib/simp/packer/iso_vars_json.rb +17 -15
- data/lib/simp/rake/build/auto.rb +415 -432
- data/lib/simp/rake/build/build.rb +119 -124
- data/lib/simp/rake/build/clean.rb +39 -39
- data/lib/simp/rake/build/code.rb +125 -128
- data/lib/simp/rake/build/constants.rb +7 -4
- data/lib/simp/rake/build/deps.rb +196 -207
- data/lib/simp/rake/build/helpers.rb +17 -13
- data/lib/simp/rake/build/iso.rb +404 -411
- data/lib/simp/rake/build/pkg.rb +752 -759
- data/lib/simp/rake/build/rpmdeps.rb +70 -70
- data/lib/simp/rake/build/spec.rb +44 -46
- data/lib/simp/rake/build/tar.rb +169 -173
- data/lib/simp/rake/build/unpack.rb +105 -107
- data/lib/simp/rake/build/upload.rb +93 -102
- data/lib/simp/rake/fixtures.rb +69 -66
- data/lib/simp/rake/helpers/rpm_spec.rb +10 -7
- data/lib/simp/rake/helpers/version.rb +3 -1
- data/lib/simp/rake/helpers.rb +12 -10
- data/lib/simp/rake/pkg.rb +417 -440
- data/lib/simp/rake/pupmod/helpers.rb +100 -87
- data/lib/simp/rake/pupmod/module_build.rb +39 -0
- data/lib/simp/rake/rubygem.rb +57 -56
- data/lib/simp/rake.rb +34 -29
- data/lib/simp/relchecks.rb +52 -43
- data/lib/simp/rpm.rb +123 -127
- data/lib/simp/rpm_signer.rb +57 -55
- data/lib/simp/yum.rb +54 -53
- data/spec/acceptance/nodesets/{default_ruby3_1.yml → almalinux10.yml} +4 -4
- data/spec/acceptance/nodesets/{default.yml → almalinux8.yml} +2 -2
- data/spec/acceptance/nodesets/almalinux9.yml +25 -0
- data/spec/acceptance/suites/default/00_pkg_rpm_custom_scriptlets_spec.rb +23 -28
- data/spec/acceptance/suites/default/10_pkg_rpm_spec.rb +54 -56
- data/spec/acceptance/suites/default/30_pkg_misc_spec.rb +17 -19
- data/spec/acceptance/suites/default/50_local_gpg_signing_key_spec.rb +5 -5
- data/spec/acceptance/suites/default/55_build_pkg_signing_spec.rb +109 -101
- data/spec/acceptance/suites/default/files/testpackage/spec/classes/init_spec.rb +1 -0
- data/spec/acceptance/suites/default/files/testpackage/spec/files/mock_something.rb +3 -1
- data/spec/acceptance/suites/default/files/testpackage/utils/convert_v1_to_v2.rb +2 -0
- data/spec/acceptance/suites/default/support/build_project_helpers.rb +20 -17
- data/spec/acceptance/suites/default/support/build_user_helpers.rb +4 -2
- data/spec/acceptance/suites/default/support/pkg_rpm_helpers.rb +30 -31
- data/spec/acceptance/support/simp_rake_helpers.rb +3 -1
- data/spec/lib/simp/command_utils_spec.rb +13 -10
- data/spec/lib/simp/componentinfo_changelog_regex_spec.rb +33 -33
- data/spec/lib/simp/componentinfo_spec.rb +99 -86
- data/spec/lib/simp/packer/iso_vars_json_spec.rb +16 -14
- data/spec/lib/simp/rake/build/helpers_spec.rb +7 -7
- data/spec/lib/simp/rake/build/rpmdeps_spec.rb +48 -46
- data/spec/lib/simp/rake/helpers_spec.rb +6 -5
- data/spec/lib/simp/rake/pkg_spec.rb +7 -5
- data/spec/lib/simp/rake/pupmod/fixtures/othermod/spec/classes/init_spec.rb +3 -1
- data/spec/lib/simp/rake/pupmod/fixtures/othermod/spec/spec_helper.rb +2 -0
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/class_spec.rb +6 -5
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/classes/init_spec.rb +51 -33
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper.rb +15 -16
- data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper_acceptance.rb +9 -9
- data/spec/lib/simp/rake/pupmod/helpers_spec.rb +20 -19
- data/spec/lib/simp/rake/pupmod/module_build_spec.rb +87 -0
- data/spec/lib/simp/rake_spec.rb +7 -6
- data/spec/lib/simp/relchecks_check_rpm_changelog_spec.rb +26 -31
- data/spec/lib/simp/relchecks_compare_latest_tag_spec.rb +32 -26
- data/spec/lib/simp/relchecks_create_tag_changelog_spec.rb +27 -19
- data/spec/lib/simp/rpm_signer_spec.rb +45 -39
- data/spec/lib/simp/rpm_spec.rb +190 -194
- data/spec/spec_helper.rb +4 -2
- data/spec/spec_helper_acceptance.rb +3 -5
- metadata +47 -76
- data/bin/simp_rake_helpers +0 -3
- data/lib/simp/ci/gitlab.rb +0 -226
- data/lib/simp/rake/ci.rb +0 -31
- data/spec/lib/simp/ci/files/global_nodesets_only/spec/acceptance/nodesets/default.yml +0 -41
- data/spec/lib/simp/ci/files/global_nodesets_only/spec/acceptance/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/nodesets/centos.yml +0 -41
- data/spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/suites/default/class_spec.rb +0 -0
- data/spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/nodesets/default.yml +0 -41
- data/spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/suites/default/class_spec.rb +0 -0
- data/spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/nodesets/default.yml +0 -41
- data/spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/suites/default/class_spec.rb +0 -0
- data/spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/nodesets/default.yml +0 -41
- data/spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/suites/default/class_spec.rb +0 -0
- data/spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/nodesets/default.yml +0 -41
- data/spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/suites/default/class_spec.rb +0 -0
- data/spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/nodesets/default.yml +0 -41
- data/spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/default/class_spec.rb +0 -0
- data/spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature-1/feature-1_spec.rb +0 -0
- data/spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature_2/feature_2_spec.rb +0 -0
- data/spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature_2/nodesets/default.yml +0 -35
- data/spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature_2/nodesets/oel.yml +0 -35
- data/spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/nodesets/default.yml +0 -41
- data/spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/default/class_spec.rb +0 -0
- data/spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature-1/feature-1_spec.rb +0 -0
- data/spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature_2/feature_2_spec.rb +0 -0
- data/spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature_2/nodesets/default.yml +0 -35
- data/spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature_2/nodesets/oel.yml +0 -35
- data/spec/lib/simp/ci/files/no_acceptance_tests/spec/spec_helper.rb +0 -0
- data/spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/nodesets/default.yml +0 -41
- data/spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/suites/default/class_spec.rb +0 -0
- data/spec/lib/simp/ci/files/no_gitlab_config_without_tests/spec/acceptance/nodesets/default.yml +0 -41
- data/spec/lib/simp/ci/files/no_gitlab_config_without_tests/spec/acceptance/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/nodesets/centos.yml +0 -41
- data/spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/valid_job_global_nodeset/spec/acceptance/nodesets/default.yml +0 -41
- data/spec/lib/simp/ci/files/valid_job_global_nodeset/spec/acceptance/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/valid_job_global_nodeset/spec/acceptance/suites/default/class_spec.rb +0 -0
- data/spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/nodesets/default.yml +0 -41
- data/spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/suites/default/class_spec.rb +0 -0
- data/spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/class_spec.rb +0 -0
- data/spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/nodesets/centos.yml +0 -41
- data/spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/files/valid_job_suite_nodeset/spec/acceptance/suites/default/class_spec.rb +0 -0
- data/spec/lib/simp/ci/files/valid_job_suite_nodeset/spec/acceptance/suites/default/nodesets/default.yml +0 -41
- data/spec/lib/simp/ci/files/valid_job_suite_nodeset/spec/acceptance/suites/default/nodesets/oel.yml +0 -41
- data/spec/lib/simp/ci/gitlab_spec.rb +0 -245
data/spec/lib/simp/rpm_spec.rb
CHANGED
|
@@ -1,225 +1,225 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
require 'simp/rpm'
|
|
2
4
|
require 'spec_helper'
|
|
3
5
|
|
|
4
6
|
describe Simp::RPM do
|
|
5
7
|
before :all do
|
|
8
|
+
dir = File.expand_path('files', File.dirname(__FILE__))
|
|
9
|
+
@spec_file = File.join(dir, 'testpackage.spec')
|
|
10
|
+
@spec_obj = described_class.new(@spec_file)
|
|
6
11
|
|
|
7
|
-
|
|
8
|
-
@
|
|
9
|
-
@spec_obj = Simp::RPM.new( @spec_file )
|
|
10
|
-
|
|
11
|
-
@m_spec_file = File.join( dir, 'testpackage-multi.spec' )
|
|
12
|
-
@m_spec_obj = Simp::RPM.new( @m_spec_file )
|
|
12
|
+
@m_spec_file = File.join(dir, 'testpackage-multi.spec')
|
|
13
|
+
@m_spec_obj = described_class.new(@m_spec_file)
|
|
13
14
|
|
|
14
|
-
@rpm_file = File.join(
|
|
15
|
-
@rpm_obj =
|
|
15
|
+
@rpm_file = File.join(dir, 'testpackage-1-0.noarch.rpm')
|
|
16
|
+
@rpm_obj = described_class.new(@rpm_file)
|
|
16
17
|
|
|
17
|
-
@d_spec_file = File.join(
|
|
18
|
-
@d_spec_obj =
|
|
18
|
+
@d_spec_file = File.join(dir, 'testpackage-dist.spec')
|
|
19
|
+
@d_spec_obj = described_class.new(@d_spec_file)
|
|
19
20
|
|
|
20
|
-
@d_rpm_file = File.join(
|
|
21
|
-
@d_rpm_obj =
|
|
21
|
+
@d_rpm_file = File.join(dir, 'testpackage-1-0.el7.noarch.rpm')
|
|
22
|
+
@d_rpm_obj = described_class.new(@d_rpm_file)
|
|
22
23
|
|
|
23
|
-
@rc0_spec_file = File.join(
|
|
24
|
-
@rc0_spec_obj =
|
|
24
|
+
@rc0_spec_file = File.join(dir, 'testpackage-rc0.spec')
|
|
25
|
+
@rc0_spec_obj = described_class.new(@rc0_spec_file)
|
|
25
26
|
|
|
26
|
-
#FIXME
|
|
27
|
-
# @signed_rpm_file = File.join( dir, 'testpackage-1-0.noarch.rpm' )
|
|
28
|
-
# @signed_rpm_obj = Simp::RPM.new( @signed_rpm_file )
|
|
27
|
+
# FIXME
|
|
28
|
+
# @signed_rpm_file = File.join( dir, 'testpackage-1-0.noarch.rpm' )
|
|
29
|
+
# @signed_rpm_obj = Simp::RPM.new( @signed_rpm_file )
|
|
29
30
|
end
|
|
30
31
|
|
|
31
32
|
describe 'class #initialize' do
|
|
32
|
-
|
|
33
33
|
it 'initializes w/unsigned RPM (smoke test)' do
|
|
34
|
-
expect(
|
|
34
|
+
expect(@rpm_obj.class).to eq described_class
|
|
35
35
|
end
|
|
36
36
|
|
|
37
|
-
#FIXME
|
|
38
|
-
# it 'initializes w/signed RPM (smoke test)' do
|
|
39
|
-
# expect( @signed_rpm_obj.class ).to eq Simp::RPM
|
|
40
|
-
# end
|
|
37
|
+
# FIXME
|
|
38
|
+
# it 'initializes w/signed RPM (smoke test)' do
|
|
39
|
+
# expect( @signed_rpm_obj.class ).to eq Simp::RPM
|
|
40
|
+
# end
|
|
41
41
|
|
|
42
42
|
it 'initializes w/spec file (smoke test)' do
|
|
43
|
-
expect(
|
|
43
|
+
expect(@spec_obj.class).to eq described_class
|
|
44
44
|
end
|
|
45
45
|
|
|
46
46
|
it 'initializes w/multi-package spec file (smoke test)' do
|
|
47
|
-
expect(
|
|
47
|
+
expect(@m_spec_obj.class).to eq described_class
|
|
48
48
|
end
|
|
49
49
|
|
|
50
50
|
it 'fails to initialize when rpm source cannot be opened' do
|
|
51
|
-
expect{
|
|
51
|
+
expect { described_class.new('/does/not/exist/') }.to raise_error(RuntimeError)
|
|
52
52
|
end
|
|
53
53
|
end
|
|
54
54
|
|
|
55
55
|
describe 'getter methods' do
|
|
56
|
-
|
|
56
|
+
describe '#packages' do
|
|
57
57
|
it 'returns packages' do
|
|
58
|
-
expect(
|
|
59
|
-
# expect( @signed_rpm_obj.packages ).to eq ['testpackage']
|
|
60
|
-
expect(
|
|
61
|
-
expect(
|
|
58
|
+
expect(@rpm_obj.packages).to eq ['testpackage']
|
|
59
|
+
# expect( @signed_rpm_obj.packages ).to eq ['testpackage']
|
|
60
|
+
expect(@spec_obj.packages).to eq ['testpackage']
|
|
61
|
+
expect(@m_spec_obj.packages).to eq ['testpackage', 'testpackage-doc']
|
|
62
62
|
end
|
|
63
63
|
end
|
|
64
64
|
|
|
65
|
-
|
|
65
|
+
describe '#basename' do
|
|
66
66
|
it 'returns basename' do
|
|
67
|
-
expect(
|
|
68
|
-
# expect( @signed_rpm_obj.basename ).to eq 'testpackage'
|
|
69
|
-
expect(
|
|
70
|
-
expect(
|
|
71
|
-
expect(
|
|
72
|
-
expect(
|
|
67
|
+
expect(@rpm_obj.basename).to eq 'testpackage'
|
|
68
|
+
# expect( @signed_rpm_obj.basename ).to eq 'testpackage'
|
|
69
|
+
expect(@spec_obj.basename).to eq 'testpackage'
|
|
70
|
+
expect(@m_spec_obj.basename).to eq 'testpackage'
|
|
71
|
+
expect(@m_spec_obj.basename('testpackage')).to eq 'testpackage'
|
|
72
|
+
expect(@m_spec_obj.basename('testpackage-doc')).to eq 'testpackage-doc'
|
|
73
73
|
end
|
|
74
74
|
|
|
75
75
|
it 'fails when invalid package specified' do
|
|
76
76
|
expect { @rpm_obj.basename('oops') }.to raise_error(ArgumentError)
|
|
77
|
-
# expect { @signed_rpm_obj.basename('oops') }.to raise_error(ArgumentError)
|
|
77
|
+
# expect { @signed_rpm_obj.basename('oops') }.to raise_error(ArgumentError)
|
|
78
78
|
expect { @spec_obj.basename('oops') }.to raise_error(ArgumentError)
|
|
79
79
|
expect { @m_spec_obj.basename('oops') }.to raise_error(ArgumentError)
|
|
80
80
|
end
|
|
81
81
|
end
|
|
82
82
|
|
|
83
|
-
|
|
83
|
+
describe '#version' do
|
|
84
84
|
it 'returns version' do
|
|
85
|
-
expect(
|
|
86
|
-
# expect( @signed_rpm_obj.version ).to eq '1'
|
|
87
|
-
expect(
|
|
88
|
-
expect(
|
|
89
|
-
expect(
|
|
90
|
-
expect(
|
|
91
|
-
expect(
|
|
85
|
+
expect(@rpm_obj.version).to eq '1'
|
|
86
|
+
# expect( @signed_rpm_obj.version ).to eq '1'
|
|
87
|
+
expect(@spec_obj.version).to eq '1'
|
|
88
|
+
expect(@m_spec_obj.version).to eq '1'
|
|
89
|
+
expect(@m_spec_obj.version('testpackage')).to eq '1'
|
|
90
|
+
expect(@m_spec_obj.version('testpackage-doc')).to eq '1.0.1'
|
|
91
|
+
expect(@rc0_spec_obj.version).to eq '1.0.0'
|
|
92
92
|
end
|
|
93
93
|
|
|
94
94
|
it 'fails when invalid package specified' do
|
|
95
95
|
expect { @rpm_obj.version('oops') }.to raise_error(ArgumentError)
|
|
96
|
-
# expect { @signed_rpm_obj.version('oops') }.to raise_error(ArgumentError)
|
|
96
|
+
# expect { @signed_rpm_obj.version('oops') }.to raise_error(ArgumentError)
|
|
97
97
|
expect { @spec_obj.version('oops') }.to raise_error(ArgumentError)
|
|
98
98
|
expect { @m_spec_obj.version('oops') }.to raise_error(ArgumentError)
|
|
99
99
|
end
|
|
100
100
|
end
|
|
101
101
|
|
|
102
|
-
|
|
102
|
+
describe '#release' do
|
|
103
103
|
it 'returns release' do
|
|
104
|
-
expect(
|
|
105
|
-
# expect( @signed_rpm_obj.release ).to eq '0'
|
|
106
|
-
expect(
|
|
107
|
-
expect(
|
|
108
|
-
expect(
|
|
109
|
-
expect(
|
|
110
|
-
expect(
|
|
104
|
+
expect(@rpm_obj.release).to eq '0'
|
|
105
|
+
# expect( @signed_rpm_obj.release ).to eq '0'
|
|
106
|
+
expect(@spec_obj.release).to eq '0'
|
|
107
|
+
expect(@m_spec_obj.release).to eq '0'
|
|
108
|
+
expect(@m_spec_obj.release('testpackage')).to eq '0'
|
|
109
|
+
expect(@m_spec_obj.release('testpackage-doc')).to eq '2'
|
|
110
|
+
expect(@rc0_spec_obj.release).to eq 'rc0'
|
|
111
111
|
end
|
|
112
112
|
|
|
113
113
|
it 'fails when invalid package specified' do
|
|
114
114
|
expect { @rpm_obj.release('oops') }.to raise_error(ArgumentError)
|
|
115
|
-
# expect { @signed_rpm_obj.release('oops') }.to raise_error(ArgumentError)
|
|
115
|
+
# expect { @signed_rpm_obj.release('oops') }.to raise_error(ArgumentError)
|
|
116
116
|
expect { @spec_obj.release('oops') }.to raise_error(ArgumentError)
|
|
117
117
|
expect { @m_spec_obj.release('oops') }.to raise_error(ArgumentError)
|
|
118
118
|
end
|
|
119
119
|
end
|
|
120
120
|
|
|
121
|
-
|
|
121
|
+
describe '#full_version' do
|
|
122
122
|
it 'returns full_version' do
|
|
123
|
-
expect(
|
|
124
|
-
# expect( @signed_rpm_obj.full_version ).to eq '1-0'
|
|
125
|
-
expect(
|
|
126
|
-
expect(
|
|
127
|
-
expect(
|
|
128
|
-
expect(
|
|
123
|
+
expect(@rpm_obj.full_version).to eq '1-0'
|
|
124
|
+
# expect( @signed_rpm_obj.full_version ).to eq '1-0'
|
|
125
|
+
expect(@spec_obj.full_version).to eq '1-0'
|
|
126
|
+
expect(@m_spec_obj.full_version).to eq '1-0'
|
|
127
|
+
expect(@m_spec_obj.full_version('testpackage')).to eq '1-0'
|
|
128
|
+
expect(@m_spec_obj.full_version('testpackage-doc')).to eq '1.0.1-2'
|
|
129
129
|
end
|
|
130
130
|
|
|
131
131
|
it 'fails when invalid package specified' do
|
|
132
132
|
expect { @rpm_obj.full_version('oops') }.to raise_error(ArgumentError)
|
|
133
|
-
# expect { @signed_rpm_obj.full_version('oops') }.to raise_error(ArgumentError)
|
|
133
|
+
# expect { @signed_rpm_obj.full_version('oops') }.to raise_error(ArgumentError)
|
|
134
134
|
expect { @spec_obj.full_version('oops') }.to raise_error(ArgumentError)
|
|
135
135
|
expect { @m_spec_obj.full_version('oops') }.to raise_error(ArgumentError)
|
|
136
136
|
end
|
|
137
137
|
end
|
|
138
138
|
|
|
139
|
-
|
|
139
|
+
describe '#name' do
|
|
140
140
|
it 'returns name' do
|
|
141
|
-
expect(
|
|
142
|
-
# expect( @signed_rpm_obj.name ).to eq 'testpackage-1-0'
|
|
143
|
-
expect(
|
|
144
|
-
expect(
|
|
145
|
-
expect(
|
|
146
|
-
expect(
|
|
141
|
+
expect(@rpm_obj.name).to eq 'testpackage-1-0'
|
|
142
|
+
# expect( @signed_rpm_obj.name ).to eq 'testpackage-1-0'
|
|
143
|
+
expect(@spec_obj.name).to eq 'testpackage-1-0'
|
|
144
|
+
expect(@m_spec_obj.name).to eq 'testpackage-1-0'
|
|
145
|
+
expect(@m_spec_obj.name('testpackage')).to eq 'testpackage-1-0'
|
|
146
|
+
expect(@m_spec_obj.name('testpackage-doc')).to eq 'testpackage-doc-1.0.1-2'
|
|
147
147
|
end
|
|
148
148
|
|
|
149
149
|
it 'fails when invalid package specified' do
|
|
150
150
|
expect { @rpm_obj.name('oops') }.to raise_error(ArgumentError)
|
|
151
|
-
# expect { @signed_rpm_obj.name('oops') }.to raise_error(ArgumentError)
|
|
151
|
+
# expect { @signed_rpm_obj.name('oops') }.to raise_error(ArgumentError)
|
|
152
152
|
expect { @spec_obj.name('oops') }.to raise_error(ArgumentError)
|
|
153
153
|
expect { @m_spec_obj.name('oops') }.to raise_error(ArgumentError)
|
|
154
154
|
end
|
|
155
155
|
end
|
|
156
156
|
|
|
157
|
-
|
|
157
|
+
describe '#arch' do
|
|
158
158
|
it 'returns arch' do
|
|
159
|
-
expect(
|
|
160
|
-
# expect( @signed_rpm_obj.arch ).to eq 'noarch'
|
|
161
|
-
expect(
|
|
162
|
-
expect(
|
|
163
|
-
expect(
|
|
164
|
-
expect(
|
|
159
|
+
expect(@rpm_obj.arch).to eq 'noarch'
|
|
160
|
+
# expect( @signed_rpm_obj.arch ).to eq 'noarch'
|
|
161
|
+
expect(@spec_obj.arch).to eq 'noarch'
|
|
162
|
+
expect(@m_spec_obj.arch).to eq 'noarch'
|
|
163
|
+
expect(@m_spec_obj.arch('testpackage')).to eq 'noarch'
|
|
164
|
+
expect(@m_spec_obj.arch('testpackage-doc')).to eq 'noarch'
|
|
165
165
|
end
|
|
166
166
|
|
|
167
167
|
it 'fails when invalid package specified' do
|
|
168
168
|
expect { @rpm_obj.arch('oops') }.to raise_error(ArgumentError)
|
|
169
|
-
# expect { @signed_rpm_obj.arch('oops') }.to raise_error(ArgumentError)
|
|
169
|
+
# expect { @signed_rpm_obj.arch('oops') }.to raise_error(ArgumentError)
|
|
170
170
|
expect { @spec_obj.arch('oops') }.to raise_error(ArgumentError)
|
|
171
171
|
expect { @m_spec_obj.arch('oops') }.to raise_error(ArgumentError)
|
|
172
172
|
end
|
|
173
173
|
end
|
|
174
174
|
|
|
175
|
-
|
|
175
|
+
describe '#signature' do
|
|
176
176
|
it 'returns signature' do
|
|
177
|
-
expect(
|
|
178
|
-
# expect( @signed_rpm_obj.signature ).to eq 'xxxx'
|
|
179
|
-
expect(
|
|
180
|
-
expect(
|
|
181
|
-
expect(
|
|
182
|
-
expect(
|
|
177
|
+
expect(@rpm_obj.signature).to be_nil
|
|
178
|
+
# expect( @signed_rpm_obj.signature ).to eq 'xxxx'
|
|
179
|
+
expect(@spec_obj.signature).to be_nil
|
|
180
|
+
expect(@m_spec_obj.signature).to be_nil
|
|
181
|
+
expect(@m_spec_obj.signature('testpackage')).to be_nil
|
|
182
|
+
expect(@m_spec_obj.signature('testpackage-doc')).to be_nil
|
|
183
183
|
end
|
|
184
184
|
|
|
185
185
|
it 'fails when invalid package specified' do
|
|
186
186
|
expect { @rpm_obj.signature('oops') }.to raise_error(ArgumentError)
|
|
187
|
-
# expect { @signed_rpm_obj.signature('oops') }.to raise_error(ArgumentError)
|
|
187
|
+
# expect { @signed_rpm_obj.signature('oops') }.to raise_error(ArgumentError)
|
|
188
188
|
expect { @spec_obj.signature('oops') }.to raise_error(ArgumentError)
|
|
189
189
|
expect { @m_spec_obj.signature('oops') }.to raise_error(ArgumentError)
|
|
190
190
|
end
|
|
191
191
|
end
|
|
192
192
|
|
|
193
|
-
|
|
193
|
+
describe '#rpm_name' do
|
|
194
194
|
it 'returns rpm_name' do
|
|
195
|
-
expect(
|
|
196
|
-
# expect( @signed_rpm_obj.rpm_name ).to eq 'testpackage-1-0.noarch.rpm'
|
|
197
|
-
expect(
|
|
198
|
-
expect(
|
|
199
|
-
expect(
|
|
200
|
-
expect(
|
|
195
|
+
expect(@rpm_obj.rpm_name).to eq 'testpackage-1-0.noarch.rpm'
|
|
196
|
+
# expect( @signed_rpm_obj.rpm_name ).to eq 'testpackage-1-0.noarch.rpm'
|
|
197
|
+
expect(@spec_obj.rpm_name).to eq 'testpackage-1-0.noarch.rpm'
|
|
198
|
+
expect(@m_spec_obj.rpm_name).to eq 'testpackage-1-0.noarch.rpm'
|
|
199
|
+
expect(@m_spec_obj.rpm_name('testpackage')).to eq 'testpackage-1-0.noarch.rpm'
|
|
200
|
+
expect(@m_spec_obj.rpm_name('testpackage-doc')).to eq 'testpackage-doc-1.0.1-2.noarch.rpm'
|
|
201
201
|
end
|
|
202
202
|
|
|
203
203
|
it 'fails when invalid package specified' do
|
|
204
204
|
expect { @rpm_obj.rpm_name('oops') }.to raise_error(ArgumentError)
|
|
205
|
-
# expect { @signed_rpm_obj.rpm_name('oops') }.to raise_error(ArgumentError)
|
|
205
|
+
# expect { @signed_rpm_obj.rpm_name('oops') }.to raise_error(ArgumentError)
|
|
206
206
|
expect { @spec_obj.rpm_name('oops') }.to raise_error(ArgumentError)
|
|
207
207
|
expect { @m_spec_obj.rpm_name('oops') }.to raise_error(ArgumentError)
|
|
208
208
|
end
|
|
209
209
|
end
|
|
210
210
|
|
|
211
|
-
|
|
211
|
+
describe '#has_dist_tag?' do
|
|
212
212
|
it 'returns has_dist_tag?' do
|
|
213
|
-
expect(
|
|
214
|
-
# expect( @signed_rpm_obj.has_dist_tag?).to eq false
|
|
215
|
-
expect(
|
|
216
|
-
expect(
|
|
217
|
-
expect(
|
|
213
|
+
expect(@rpm_obj.has_dist_tag?).to be false
|
|
214
|
+
# expect( @signed_rpm_obj.has_dist_tag?).to eq false
|
|
215
|
+
expect(@d_rpm_obj.has_dist_tag?).to be true
|
|
216
|
+
expect(@spec_obj.has_dist_tag?).to be false
|
|
217
|
+
expect(@d_spec_obj.has_dist_tag?).to be true
|
|
218
218
|
end
|
|
219
219
|
|
|
220
220
|
it 'fails when invalid package specified' do
|
|
221
221
|
expect { @rpm_obj.has_dist_tag?('oops') }.to raise_error(ArgumentError)
|
|
222
|
-
# expect { @signed_rpm_obj.has_dist_tag?('oops') }.to raise_error(ArgumentError)
|
|
222
|
+
# expect { @signed_rpm_obj.has_dist_tag?('oops') }.to raise_error(ArgumentError)
|
|
223
223
|
expect { @d_rpm_obj.has_dist_tag?('oops') }.to raise_error(ArgumentError)
|
|
224
224
|
expect { @spec_obj.has_dist_tag?('oops') }.to raise_error(ArgumentError)
|
|
225
225
|
expect { @m_spec_obj.has_dist_tag?('oops') }.to raise_error(ArgumentError)
|
|
@@ -227,31 +227,32 @@ describe Simp::RPM do
|
|
|
227
227
|
end
|
|
228
228
|
end
|
|
229
229
|
|
|
230
|
-
|
|
230
|
+
describe '#dist' do
|
|
231
231
|
before :each do
|
|
232
|
-
@pre_env = ENV
|
|
232
|
+
@pre_env = ENV.fetch('SIMP_RPM_dist', nil)
|
|
233
233
|
ENV['SIMP_RPM_dist'] = nil
|
|
234
234
|
end
|
|
235
235
|
|
|
236
236
|
after :each do
|
|
237
237
|
ENV['SIMP_RPM_dist'] = @pre_env
|
|
238
238
|
end
|
|
239
|
+
|
|
239
240
|
it 'returns dist' do
|
|
240
|
-
allow(
|
|
241
|
-
rpm_obj =
|
|
242
|
-
d_rpm_obj =
|
|
243
|
-
spec_obj =
|
|
244
|
-
d_spec_obj =
|
|
245
|
-
|
|
246
|
-
expect(
|
|
247
|
-
expect(
|
|
248
|
-
expect(
|
|
249
|
-
expect(
|
|
241
|
+
allow(described_class).to receive(:system_dist).and_return('.testdist')
|
|
242
|
+
rpm_obj = described_class.new(@rpm_file)
|
|
243
|
+
d_rpm_obj = described_class.new(@d_rpm_file)
|
|
244
|
+
spec_obj = described_class.new(@spec_file)
|
|
245
|
+
d_spec_obj = described_class.new(@d_spec_file)
|
|
246
|
+
|
|
247
|
+
expect(rpm_obj.dist).to eq '.testdist'
|
|
248
|
+
expect(d_rpm_obj.dist).to eq '.el7'
|
|
249
|
+
expect(spec_obj.dist).to eq '.testdist'
|
|
250
|
+
expect(d_spec_obj.dist).to eq '.testdist'
|
|
250
251
|
end
|
|
251
252
|
|
|
252
253
|
context 'when ENV[SIMP_RPM_dist] is set' do
|
|
253
254
|
before :each do
|
|
254
|
-
@_pre_env = ENV
|
|
255
|
+
@_pre_env = ENV.fetch('SIMP_RPM_dist', nil)
|
|
255
256
|
ENV['SIMP_RPM_dist'] = 'foo'
|
|
256
257
|
end
|
|
257
258
|
|
|
@@ -260,31 +261,31 @@ describe Simp::RPM do
|
|
|
260
261
|
end
|
|
261
262
|
|
|
262
263
|
it 'returns target dist for spec files when SIMP_RPM_dist is set' do
|
|
263
|
-
rpm_obj =
|
|
264
|
-
spec_obj =
|
|
265
|
-
d_spec_obj =
|
|
266
|
-
|
|
267
|
-
d_rpm_obj
|
|
268
|
-
|
|
269
|
-
expect(
|
|
270
|
-
expect(
|
|
271
|
-
expect(
|
|
272
|
-
expect(
|
|
273
|
-
|
|
274
|
-
expect(
|
|
275
|
-
expect(
|
|
276
|
-
expect(
|
|
277
|
-
expect(
|
|
264
|
+
rpm_obj = described_class.new(@rpm_file)
|
|
265
|
+
spec_obj = described_class.new(@spec_file)
|
|
266
|
+
d_spec_obj = described_class.new(@d_spec_file)
|
|
267
|
+
described_class.new(@m_spec_file)
|
|
268
|
+
d_rpm_obj = described_class.new(@d_rpm_file)
|
|
269
|
+
|
|
270
|
+
expect(rpm_obj.has_dist_tag?).to be false
|
|
271
|
+
expect(spec_obj.has_dist_tag?).to be false
|
|
272
|
+
expect(d_rpm_obj.has_dist_tag?).to be true
|
|
273
|
+
expect(d_spec_obj.has_dist_tag?).to be true
|
|
274
|
+
|
|
275
|
+
expect(d_spec_obj.dist).to eq '.foo'
|
|
276
|
+
expect(d_spec_obj.full_version).to match(%r{\.foo$})
|
|
277
|
+
expect(d_spec_obj.name).to match(%r{\.foo$})
|
|
278
|
+
expect(d_spec_obj.release).to match(%r{\.foo$})
|
|
278
279
|
|
|
279
280
|
# The RPMs are already created as .el7; no env vars or hinting
|
|
280
281
|
# should affect them
|
|
281
|
-
expect(
|
|
282
|
+
expect(d_rpm_obj.dist).to eq '.el7'
|
|
282
283
|
end
|
|
283
284
|
end
|
|
284
285
|
|
|
285
286
|
it 'fails when invalid package specified' do
|
|
286
287
|
expect { @rpm_obj.dist('oops') }.to raise_error(ArgumentError)
|
|
287
|
-
# expect { @signed_rpm_obj.dist('oops') }.to raise_error(ArgumentError)
|
|
288
|
+
# expect { @signed_rpm_obj.dist('oops') }.to raise_error(ArgumentError)
|
|
288
289
|
expect { @d_rpm_obj.dist('oops') }.to raise_error(ArgumentError)
|
|
289
290
|
expect { @spec_obj.dist('oops') }.to raise_error(ArgumentError)
|
|
290
291
|
expect { @m_spec_obj.dist('oops') }.to raise_error(ArgumentError)
|
|
@@ -293,78 +294,73 @@ describe Simp::RPM do
|
|
|
293
294
|
end
|
|
294
295
|
end
|
|
295
296
|
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
end
|
|
308
|
-
=end
|
|
309
|
-
|
|
297
|
+
# describe '#newer? and #package_newer?' do
|
|
298
|
+
# end
|
|
299
|
+
#
|
|
300
|
+
# describe '#valid_package?' do
|
|
301
|
+
# end
|
|
302
|
+
#
|
|
303
|
+
# describe '.copy_wo_vcs?' do
|
|
304
|
+
# end
|
|
305
|
+
#
|
|
306
|
+
# describe '.execute?' do
|
|
307
|
+
# end
|
|
310
308
|
|
|
311
309
|
describe '.get_info' do
|
|
312
310
|
it 'extracts correct information from a .spec file' do
|
|
313
|
-
info =
|
|
314
|
-
expect(
|
|
315
|
-
expect(
|
|
316
|
-
expect(
|
|
317
|
-
expect(
|
|
318
|
-
expect(
|
|
319
|
-
expect(
|
|
320
|
-
expect(
|
|
321
|
-
expect(
|
|
311
|
+
info = described_class.get_info(@spec_file)
|
|
312
|
+
expect(info.fetch(:basename)).to eq 'testpackage'
|
|
313
|
+
expect(info.fetch(:version)).to eq '1'
|
|
314
|
+
expect(info.fetch(:release)).to eq '0'
|
|
315
|
+
expect(info.fetch(:full_version)).to eq '1-0'
|
|
316
|
+
expect(info.fetch(:name)).to eq 'testpackage-1-0'
|
|
317
|
+
expect(info.fetch(:arch)).to eq 'noarch'
|
|
318
|
+
expect(info[:signature]).to be_nil
|
|
319
|
+
expect(info.fetch(:rpm_name)).to eq 'testpackage-1-0.noarch.rpm'
|
|
322
320
|
end
|
|
323
321
|
|
|
324
322
|
it 'extracts correct information from an .rpm file' do
|
|
325
|
-
info =
|
|
326
|
-
expect(
|
|
327
|
-
expect(
|
|
328
|
-
expect(
|
|
329
|
-
expect(
|
|
330
|
-
expect(
|
|
331
|
-
expect(
|
|
332
|
-
expect(
|
|
333
|
-
expect(
|
|
323
|
+
info = described_class.get_info(@rpm_file)
|
|
324
|
+
expect(info.fetch(:basename)).to eq 'testpackage'
|
|
325
|
+
expect(info.fetch(:version)).to eq '1'
|
|
326
|
+
expect(info.fetch(:release)).to eq '0'
|
|
327
|
+
expect(info.fetch(:full_version)).to eq '1-0'
|
|
328
|
+
expect(info.fetch(:name)).to eq 'testpackage-1-0'
|
|
329
|
+
expect(info.fetch(:arch)).to eq 'noarch'
|
|
330
|
+
expect(info[:signature]).to be_nil
|
|
331
|
+
expect(info.fetch(:rpm_name)).to eq 'testpackage-1-0.noarch.rpm'
|
|
334
332
|
end
|
|
335
333
|
|
|
336
334
|
it 'extracts correct information for all entries from a multi-package .spec file' do
|
|
337
|
-
info =
|
|
338
|
-
expect(
|
|
339
|
-
expect(
|
|
340
|
-
expect(
|
|
341
|
-
expect(
|
|
342
|
-
expect(
|
|
343
|
-
expect(
|
|
344
|
-
expect(
|
|
345
|
-
expect(
|
|
346
|
-
expect(
|
|
347
|
-
|
|
348
|
-
expect(
|
|
349
|
-
expect(
|
|
350
|
-
expect(
|
|
351
|
-
expect(
|
|
352
|
-
expect(
|
|
353
|
-
expect(
|
|
354
|
-
expect(
|
|
355
|
-
expect(
|
|
335
|
+
info = described_class.get_info(@m_spec_file)
|
|
336
|
+
expect(info.size).to eq 2
|
|
337
|
+
expect(info[0].fetch(:basename)).to eq 'testpackage'
|
|
338
|
+
expect(info[0].fetch(:version)).to eq '1'
|
|
339
|
+
expect(info[0].fetch(:release)).to eq '0'
|
|
340
|
+
expect(info[0].fetch(:full_version)).to eq '1-0'
|
|
341
|
+
expect(info[0].fetch(:name)).to eq 'testpackage-1-0'
|
|
342
|
+
expect(info[0].fetch(:arch)).to eq 'noarch'
|
|
343
|
+
expect(info[0][:signature]).to be_nil
|
|
344
|
+
expect(info[0].fetch(:rpm_name)).to eq 'testpackage-1-0.noarch.rpm'
|
|
345
|
+
|
|
346
|
+
expect(info[1].fetch(:basename)).to eq 'testpackage-doc'
|
|
347
|
+
expect(info[1].fetch(:version)).to eq '1.0.1'
|
|
348
|
+
expect(info[1].fetch(:release)).to eq '2'
|
|
349
|
+
expect(info[1].fetch(:full_version)).to eq '1.0.1-2'
|
|
350
|
+
expect(info[1].fetch(:name)).to eq 'testpackage-doc-1.0.1-2'
|
|
351
|
+
expect(info[1].fetch(:arch)).to eq 'noarch'
|
|
352
|
+
expect(info[1][:signature]).to be_nil
|
|
353
|
+
expect(info[1].fetch(:rpm_name)).to eq 'testpackage-doc-1.0.1-2.noarch.rpm'
|
|
356
354
|
end
|
|
357
355
|
|
|
358
|
-
it 'fails to when rpm source cannot be opened
|
|
359
|
-
expect{
|
|
356
|
+
it 'fails to when rpm source cannot be opened' do
|
|
357
|
+
expect { described_class.get_info('/does/not/exist/') }.to raise_error(RuntimeError)
|
|
360
358
|
end
|
|
361
359
|
end
|
|
362
360
|
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
end
|
|
369
|
-
=end
|
|
361
|
+
# describe '.indent' do
|
|
362
|
+
# end
|
|
363
|
+
#
|
|
364
|
+
# describe '.create_rpm_build_metadata' do
|
|
365
|
+
# end
|
|
370
366
|
end
|
data/spec/spec_helper.rb
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
# This file was generated by the `rspec --init` command. Conventionally, all
|
|
2
4
|
# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
|
|
3
5
|
# Require this file using `require "spec_helper.rb"` to ensure that it is only
|
|
@@ -5,10 +7,10 @@
|
|
|
5
7
|
#
|
|
6
8
|
# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
|
|
7
9
|
RSpec.configure do |config|
|
|
8
|
-
# config.treat_symbols_as_metadata_keys_with_true_values = true
|
|
10
|
+
# config.treat_symbols_as_metadata_keys_with_true_values = true
|
|
9
11
|
config.run_all_when_everything_filtered = true
|
|
10
12
|
config.filter_run :focus
|
|
11
13
|
|
|
12
14
|
config.mock_framework = :rspec
|
|
13
|
-
#config.mock_with :rspec
|
|
15
|
+
# config.mock_with :rspec
|
|
14
16
|
end
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
require 'beaker-rspec'
|
|
2
4
|
require 'tmpdir'
|
|
3
5
|
require 'yaml'
|
|
@@ -5,7 +7,7 @@ require 'simp/beaker_helpers'
|
|
|
5
7
|
include Simp::BeakerHelpers
|
|
6
8
|
|
|
7
9
|
require 'acceptance/support/simp_rake_helpers'
|
|
8
|
-
$LOAD_PATH.unshift(File.expand_path('
|
|
10
|
+
$LOAD_PATH.unshift(File.expand_path('acceptance/support', __dir__))
|
|
9
11
|
|
|
10
12
|
unless ENV['BEAKER_provision'] == 'no'
|
|
11
13
|
hosts.each do |host|
|
|
@@ -18,7 +20,6 @@ unless ENV['BEAKER_provision'] == 'no'
|
|
|
18
20
|
end
|
|
19
21
|
end
|
|
20
22
|
|
|
21
|
-
|
|
22
23
|
RSpec.configure do |c|
|
|
23
24
|
# provide helper methods to individual examples AND example groups
|
|
24
25
|
c.include Simp::BeakerHelpers::SimpRakeHelpers
|
|
@@ -33,7 +34,4 @@ RSpec.configure do |c|
|
|
|
33
34
|
|
|
34
35
|
# Readable test descriptions
|
|
35
36
|
c.formatter = :documentation
|
|
36
|
-
|
|
37
|
-
c.before :suite do
|
|
38
|
-
end
|
|
39
37
|
end
|