puppet 6.14.0-universal-darwin → 6.15.0-universal-darwin

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puppet might be problematic. Click here for more details.

Files changed (195) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +15 -15
  3. data/ext/windows/service/daemon.rb +3 -3
  4. data/lib/puppet.rb +1 -1
  5. data/lib/puppet/agent.rb +2 -10
  6. data/lib/puppet/application/agent.rb +2 -1
  7. data/lib/puppet/application/filebucket.rb +5 -14
  8. data/lib/puppet/application/ssl.rb +2 -2
  9. data/lib/puppet/configurer.rb +7 -3
  10. data/lib/puppet/configurer/plugin_handler.rb +1 -1
  11. data/lib/puppet/defaults.rb +22 -2
  12. data/lib/puppet/environments.rb +4 -5
  13. data/lib/puppet/face/plugin.rb +1 -1
  14. data/lib/puppet/file_system/file_impl.rb +13 -9
  15. data/lib/puppet/forge/repository.rb +1 -1
  16. data/lib/puppet/functions/call.rb +1 -1
  17. data/lib/puppet/functions/reduce.rb +2 -4
  18. data/lib/puppet/http.rb +2 -0
  19. data/lib/puppet/http/client.rb +191 -52
  20. data/lib/puppet/http/external_client.rb +96 -0
  21. data/lib/puppet/http/redirector.rb +34 -0
  22. data/lib/puppet/http/resolver.rb +46 -3
  23. data/lib/puppet/http/resolver/server_list.rb +75 -15
  24. data/lib/puppet/http/resolver/settings.rb +22 -2
  25. data/lib/puppet/http/resolver/srv.rb +28 -2
  26. data/lib/puppet/http/response.rb +63 -1
  27. data/lib/puppet/http/retry_after_handler.rb +39 -0
  28. data/lib/puppet/http/service.rb +67 -1
  29. data/lib/puppet/http/service/ca.rb +71 -9
  30. data/lib/puppet/http/service/compiler.rb +213 -11
  31. data/lib/puppet/http/service/file_server.rb +105 -4
  32. data/lib/puppet/http/service/report.rb +36 -3
  33. data/lib/puppet/http/session.rb +59 -8
  34. data/lib/puppet/indirector/catalog/rest.rb +2 -1
  35. data/lib/puppet/indirector/facts/rest.rb +2 -1
  36. data/lib/puppet/indirector/file_bucket_file/rest.rb +48 -0
  37. data/lib/puppet/indirector/file_metadata/rest.rb +4 -2
  38. data/lib/puppet/indirector/node/rest.rb +2 -1
  39. data/lib/puppet/indirector/report/yaml.rb +23 -0
  40. data/lib/puppet/indirector/status/rest.rb +2 -1
  41. data/lib/puppet/metatype/manager.rb +80 -80
  42. data/lib/puppet/network/http/base_pool.rb +6 -1
  43. data/lib/puppet/network/http/pool.rb +2 -4
  44. data/lib/puppet/network/http_pool.rb +1 -0
  45. data/lib/puppet/node/environment.rb +11 -1
  46. data/lib/puppet/pal/pal_impl.rb +1 -29
  47. data/lib/puppet/parser/compiler.rb +14 -7
  48. data/lib/puppet/parser/functions.rb +18 -13
  49. data/lib/puppet/pops/loaders.rb +7 -5
  50. data/lib/puppet/provider/group/windows_adsi.rb +3 -3
  51. data/lib/puppet/provider/package/apt.rb +61 -1
  52. data/lib/puppet/provider/package/dnfmodule.rb +39 -12
  53. data/lib/puppet/provider/package/gem.rb +41 -7
  54. data/lib/puppet/provider/package/pacman.rb +2 -5
  55. data/lib/puppet/provider/package/pip.rb +105 -33
  56. data/lib/puppet/provider/package/pip3.rb +0 -2
  57. data/lib/puppet/provider/package/pkgdmg.rb +1 -1
  58. data/lib/puppet/provider/package/pkgng.rb +16 -4
  59. data/lib/puppet/provider/package/puppet_gem.rb +6 -2
  60. data/lib/puppet/provider/package/rpm.rb +6 -213
  61. data/lib/puppet/provider/package/yum.rb +92 -19
  62. data/lib/puppet/provider/service/systemd.rb +2 -1
  63. data/lib/puppet/reports/http.rb +13 -11
  64. data/lib/puppet/resource/type_collection.rb +20 -16
  65. data/lib/puppet/ssl.rb +1 -0
  66. data/lib/puppet/ssl/host.rb +4 -4
  67. data/lib/puppet/ssl/oids.rb +1 -0
  68. data/lib/puppet/ssl/state_machine.rb +50 -33
  69. data/lib/puppet/transaction/report.rb +2 -2
  70. data/lib/puppet/type.rb +6 -1
  71. data/lib/puppet/type/file/source.rb +4 -2
  72. data/lib/puppet/type/package.rb +25 -2
  73. data/lib/puppet/type/user.rb +0 -19
  74. data/lib/puppet/util/at_fork.rb +1 -1
  75. data/lib/puppet/util/autoload.rb +3 -0
  76. data/lib/puppet/util/instance_loader.rb +14 -10
  77. data/lib/puppet/util/package/version/debian.rb +175 -0
  78. data/lib/puppet/util/package/version/gem.rb +15 -0
  79. data/lib/puppet/util/package/version/pip.rb +167 -0
  80. data/lib/puppet/util/package/version/range.rb +50 -0
  81. data/lib/puppet/util/package/version/range/gt.rb +14 -0
  82. data/lib/puppet/util/package/version/range/gt_eq.rb +14 -0
  83. data/lib/puppet/util/package/version/range/lt.rb +14 -0
  84. data/lib/puppet/util/package/version/range/lt_eq.rb +14 -0
  85. data/lib/puppet/util/package/version/range/min_max.rb +21 -0
  86. data/lib/puppet/util/package/version/range/simple.rb +11 -0
  87. data/lib/puppet/util/package/version/rpm.rb +73 -0
  88. data/lib/puppet/util/pidlock.rb +13 -7
  89. data/lib/puppet/util/platform.rb +5 -0
  90. data/lib/puppet/util/rpm_compare.rb +193 -0
  91. data/lib/puppet/util/windows/adsi.rb +2 -2
  92. data/lib/puppet/util/windows/process.rb +15 -14
  93. data/lib/puppet/util/windows/security.rb +1 -0
  94. data/lib/puppet/util/windows/sid.rb +3 -3
  95. data/lib/puppet/version.rb +1 -1
  96. data/locales/puppet.pot +207 -201
  97. data/man/man5/puppet.conf.5 +11 -3
  98. data/man/man8/puppet-agent.8 +1 -1
  99. data/man/man8/puppet-apply.8 +1 -1
  100. data/man/man8/puppet-catalog.8 +1 -1
  101. data/man/man8/puppet-config.8 +1 -1
  102. data/man/man8/puppet-describe.8 +1 -1
  103. data/man/man8/puppet-device.8 +1 -1
  104. data/man/man8/puppet-doc.8 +1 -1
  105. data/man/man8/puppet-epp.8 +1 -1
  106. data/man/man8/puppet-facts.8 +1 -1
  107. data/man/man8/puppet-filebucket.8 +1 -1
  108. data/man/man8/puppet-generate.8 +1 -1
  109. data/man/man8/puppet-help.8 +1 -1
  110. data/man/man8/puppet-key.8 +1 -1
  111. data/man/man8/puppet-lookup.8 +1 -1
  112. data/man/man8/puppet-man.8 +1 -1
  113. data/man/man8/puppet-module.8 +1 -1
  114. data/man/man8/puppet-node.8 +1 -1
  115. data/man/man8/puppet-parser.8 +1 -1
  116. data/man/man8/puppet-plugin.8 +1 -1
  117. data/man/man8/puppet-report.8 +1 -1
  118. data/man/man8/puppet-resource.8 +1 -1
  119. data/man/man8/puppet-script.8 +1 -1
  120. data/man/man8/puppet-ssl.8 +1 -1
  121. data/man/man8/puppet-status.8 +1 -1
  122. data/man/man8/puppet.8 +2 -2
  123. data/spec/fixtures/ssl/unknown-127.0.0.1-key.pem +67 -0
  124. data/spec/fixtures/ssl/unknown-127.0.0.1.pem +48 -0
  125. data/spec/fixtures/ssl/unknown-ca-key.pem +67 -0
  126. data/spec/fixtures/ssl/unknown-ca.pem +59 -0
  127. data/spec/fixtures/unit/provider/package/dnfmodule/{dnf-module-list-installed.txt → dnf-module-list-enabled.txt} +2 -0
  128. data/spec/fixtures/unit/provider/package/pkgng/pkg.version +2 -0
  129. data/spec/fixtures/unit/provider/package/yum/yum-check-update-subscription-manager.txt +9 -0
  130. data/spec/fixtures/unit/provider/service/systemd/list_unit_files_services +9 -0
  131. data/spec/integration/application/agent_spec.rb +329 -0
  132. data/spec/integration/application/apply_spec.rb +132 -3
  133. data/spec/integration/application/filebucket_spec.rb +190 -0
  134. data/spec/integration/application/plugin_spec.rb +50 -0
  135. data/spec/integration/http/client_spec.rb +34 -40
  136. data/spec/integration/indirector/report/yaml.rb +83 -0
  137. data/spec/integration/module_tool/forge_spec.rb +2 -15
  138. data/spec/integration/network/http_pool_spec.rb +11 -19
  139. data/spec/integration/node/environment_spec.rb +15 -0
  140. data/spec/integration/util/windows/adsi_spec.rb +1 -1
  141. data/spec/lib/puppet/test_ca.rb +2 -2
  142. data/spec/lib/puppet_spec/https.rb +10 -7
  143. data/spec/lib/puppet_spec/puppetserver.rb +119 -0
  144. data/spec/shared_contexts/https.rb +29 -0
  145. data/spec/unit/agent_spec.rb +33 -25
  146. data/spec/unit/application/agent_spec.rb +5 -1
  147. data/spec/unit/application/device_spec.rb +2 -2
  148. data/spec/unit/application/filebucket_spec.rb +22 -2
  149. data/spec/unit/configurer_spec.rb +1 -1
  150. data/spec/unit/defaults_spec.rb +24 -1
  151. data/spec/unit/environments_spec.rb +8 -0
  152. data/spec/unit/file_system_spec.rb +10 -0
  153. data/spec/unit/http/client_spec.rb +105 -46
  154. data/spec/unit/http/external_client_spec.rb +201 -0
  155. data/spec/unit/http/resolver_spec.rb +20 -0
  156. data/spec/unit/http/service/ca_spec.rb +25 -2
  157. data/spec/unit/http/service/compiler_spec.rb +184 -6
  158. data/spec/unit/http/service/file_server_spec.rb +35 -3
  159. data/spec/unit/http/service/report_spec.rb +3 -1
  160. data/spec/unit/http/service_spec.rb +3 -3
  161. data/spec/unit/http/session_spec.rb +56 -7
  162. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +82 -2
  163. data/spec/unit/network/http/pool_spec.rb +3 -3
  164. data/spec/unit/node/environment_spec.rb +16 -0
  165. data/spec/unit/provider/group/windows_adsi_spec.rb +43 -10
  166. data/spec/unit/provider/package/apt_spec.rb +30 -0
  167. data/spec/unit/provider/package/dnfmodule_spec.rb +33 -14
  168. data/spec/unit/provider/package/gem_spec.rb +40 -0
  169. data/spec/unit/provider/package/pacman_spec.rb +6 -21
  170. data/spec/unit/provider/package/pip_spec.rb +26 -3
  171. data/spec/unit/provider/package/pkgdmg_spec.rb +1 -1
  172. data/spec/unit/provider/package/pkgng_spec.rb +38 -0
  173. data/spec/unit/provider/package/puppet_gem_spec.rb +8 -0
  174. data/spec/unit/provider/package/rpm_spec.rb +0 -212
  175. data/spec/unit/provider/package/yum_spec.rb +235 -1
  176. data/spec/unit/provider/service/systemd_spec.rb +10 -1
  177. data/spec/unit/provider/user/windows_adsi_spec.rb +3 -3
  178. data/spec/unit/puppet_pal_2pec.rb +0 -29
  179. data/spec/unit/reports/http_spec.rb +70 -52
  180. data/spec/unit/ssl/host_spec.rb +4 -2
  181. data/spec/unit/ssl/oids_spec.rb +1 -0
  182. data/spec/unit/ssl/state_machine_spec.rb +38 -6
  183. data/spec/unit/transaction/report_spec.rb +4 -0
  184. data/spec/unit/util/at_fork_spec.rb +2 -2
  185. data/spec/unit/util/package/version/debian_spec.rb +83 -0
  186. data/spec/unit/util/package/version/pip_spec.rb +464 -0
  187. data/spec/unit/util/package/version/range_spec.rb +154 -0
  188. data/spec/unit/util/package/version/rpm_spec.rb +121 -0
  189. data/spec/unit/util/pidlock_spec.rb +83 -47
  190. data/spec/unit/util/rpm_compare_spec.rb +196 -0
  191. data/spec/unit/util/windows/adsi_spec.rb +4 -4
  192. data/spec/unit/util/windows/sid_spec.rb +2 -2
  193. data/tasks/generate_cert_fixtures.rake +15 -1
  194. metadata +51 -6
  195. data/spec/integration/faces/plugin_spec.rb +0 -63
@@ -51,8 +51,10 @@ describe Puppet::SSL::Host, if: !Puppet::Util::Platform.jruby? do
51
51
  allow_any_instance_of(Puppet::SSL::Host).to receive(:generate)
52
52
  end
53
53
 
54
- it "should have a method for producing an instance to manage the local host's keys" do
55
- expect(Puppet::SSL::Host).to respond_to(:localhost)
54
+ it "is deprecated" do
55
+ Puppet::SSL::Host.localhost
56
+
57
+ expect(@logs).to include(an_object_having_attributes(message: /Puppet::SSL::Host is deprecated/))
56
58
  end
57
59
 
58
60
  it "should allow to reset localhost" do
@@ -33,6 +33,7 @@ describe Puppet::SSL::Oids do
33
33
  'pp_cloudplatform' => '1.3.6.1.4.1.34380.1.1.23',
34
34
  'pp_apptier' => '1.3.6.1.4.1.34380.1.1.24',
35
35
  'pp_hostname' => '1.3.6.1.4.1.34380.1.1.25',
36
+ 'pp_owner' => '1.3.6.1.4.1.34380.1.1.26',
36
37
  'ppPrivCertExt' => '1.3.6.1.4.1.34380.1.2',
37
38
  'ppAuthCertExt' => '1.3.6.1.4.1.34380.1.3',
38
39
  'pp_authorization' => '1.3.6.1.4.1.34380.1.3.1',
@@ -197,7 +197,7 @@ describe Puppet::SSL::StateMachine, unless: Puppet::Util::Platform.jruby? do
197
197
  end
198
198
 
199
199
  context 'when locking' do
200
- let(:lockfile) { double('ssllockfile') }
200
+ let(:lockfile) { Puppet::Util::Pidlock.new(Puppet[:ssl_lockfile]) }
201
201
  let(:machine) { described_class.new(cert_provider: cert_provider, ssl_provider: ssl_provider, lockfile: lockfile) }
202
202
 
203
203
  # lockfile is deleted before `ensure_ca_certificates` returns, so
@@ -210,7 +210,7 @@ describe Puppet::SSL::StateMachine, unless: Puppet::Util::Platform.jruby? do
210
210
  end
211
211
 
212
212
  it 'locks the file prior to running the state machine and unlocks when done' do
213
- expect(lockfile).to receive(:lock).and_return(true).ordered
213
+ expect(lockfile).to receive(:lock).and_call_original.ordered
214
214
  expect(cert_provider).to receive(:load_cacerts).and_return(cacerts).ordered
215
215
  expect(cert_provider).to receive(:load_crls).and_return(crls).ordered
216
216
  expect(lockfile).to receive(:unlock).ordered
@@ -837,7 +837,7 @@ describe Puppet::SSL::StateMachine, unless: Puppet::Util::Platform.jruby? do
837
837
  }.to output(/Exiting now because the waitforcert setting is set to 0./).to_stdout
838
838
  end
839
839
 
840
- it 'sleeps and transitions to NeedCACerts' do
840
+ it 'sleeps and transitions to NeedLock' do
841
841
  machine = described_class.new(waitforcert: 15)
842
842
 
843
843
  state = Puppet::SSL::StateMachine::Wait.new(machine)
@@ -845,10 +845,10 @@ describe Puppet::SSL::StateMachine, unless: Puppet::Util::Platform.jruby? do
845
845
 
846
846
  expect(Puppet).to receive(:info).with(/Will try again in 15 seconds./)
847
847
 
848
- expect(state.next_state).to be_an_instance_of(Puppet::SSL::StateMachine::NeedCACerts)
848
+ expect(state.next_state).to be_an_instance_of(Puppet::SSL::StateMachine::NeedLock)
849
849
  end
850
850
 
851
- it 'sleeps and transitions to NeedCACerts when maxwaitforcert is set' do
851
+ it 'sleeps and transitions to NeedLock when maxwaitforcert is set' do
852
852
  machine = described_class.new(waitforcert: 15, maxwaitforcert: 30)
853
853
 
854
854
  state = Puppet::SSL::StateMachine::Wait.new(machine)
@@ -856,7 +856,7 @@ describe Puppet::SSL::StateMachine, unless: Puppet::Util::Platform.jruby? do
856
856
 
857
857
  expect(Puppet).to receive(:info).with(/Will try again in 15 seconds./)
858
858
 
859
- expect(state.next_state).to be_an_instance_of(Puppet::SSL::StateMachine::NeedCACerts)
859
+ expect(state.next_state).to be_an_instance_of(Puppet::SSL::StateMachine::NeedLock)
860
860
  end
861
861
 
862
862
  it 'waits indefinitely by default' do
@@ -887,6 +887,38 @@ describe Puppet::SSL::StateMachine, unless: Puppet::Util::Platform.jruby? do
887
887
 
888
888
  state.next_state
889
889
  end
890
+
891
+ it 'releases the lock while sleeping' do
892
+ lockfile = Puppet::Util::Pidlock.new(Puppet[:ssl_lockfile])
893
+ machine = described_class.new(lockfile: lockfile)
894
+ state = Puppet::SSL::StateMachine::Wait.new(machine)
895
+
896
+ # pidlock should be unlocked while sleeping
897
+ allow(Kernel).to receive(:sleep) do
898
+ expect(lockfile).to_not be_locked
899
+ end
900
+
901
+ # lock before running the state
902
+ lockfile.lock
903
+ state.next_state
904
+ end
905
+ end
906
+
907
+ context 'in state NeedLock' do
908
+ let(:ssl_context) { Puppet::SSL::SSLContext.new(cacerts: []) }
909
+ let(:lockfile) { Puppet::Util::Pidlock.new(Puppet[:ssl_lockfile]) }
910
+ let(:machine) { described_class.new(lockfile: lockfile) }
911
+ let(:state) { Puppet::SSL::StateMachine::NeedLock.new(machine) }
912
+
913
+ it 'acquires the lock and transitions to NeedCACerts' do
914
+ expect(state.next_state).to be_an_instance_of(Puppet::SSL::StateMachine::NeedCACerts)
915
+ expect(lockfile).to be_locked
916
+ end
917
+
918
+ it 'transitions to LockFailure if it fails to acquire the lock' do
919
+ expect(lockfile).to receive(:lock).and_return(false)
920
+ expect(state.next_state).to be_an_instance_of(Puppet::SSL::StateMachine::LockFailure)
921
+ end
890
922
  end
891
923
  end
892
924
  end
@@ -39,6 +39,10 @@ describe Puppet::Transaction::Report do
39
39
  expect(Puppet::Transaction::Report.new('cv', 'env', 'tid', 'some job id').job_id).to eq('some job id')
40
40
  end
41
41
 
42
+ it "should take a 'start_time' as an argument" do
43
+ expect(Puppet::Transaction::Report.new('cv', 'env', 'tid', 'some job id', 'my start time').time).to eq('my start time')
44
+ end
45
+
42
46
  it "should be able to set configuration_version" do
43
47
  report = Puppet::Transaction::Report.new
44
48
  report.configuration_version = "some version"
@@ -19,7 +19,7 @@ describe 'Puppet::Util::AtFork' do
19
19
  describe '.get_handler' do
20
20
  context 'when on Solaris' do
21
21
  before :each do
22
- expect(Facter).to receive(:value).with(:operatingsystem).and_return('Solaris')
22
+ expect(Puppet::Util::Platform).to receive(:solaris?).and_return(true)
23
23
  end
24
24
 
25
25
  after :each do
@@ -114,7 +114,7 @@ describe 'Puppet::Util::AtFork' do
114
114
 
115
115
  context 'when NOT on Solaris' do
116
116
  before :each do
117
- expect(Facter).to receive(:value).with(:operatingsystem).and_return(nil)
117
+ expect(Puppet::Util::Platform).to receive(:solaris?).and_return(false)
118
118
  end
119
119
 
120
120
  def stub_noop_handler(namespace_only = false)
@@ -0,0 +1,83 @@
1
+ require 'spec_helper'
2
+ require 'puppet/util/package/version/debian'
3
+
4
+ describe Puppet::Util::Package::Version::Debian do
5
+ context "when creating new version should fail" do
6
+ it "if is parsing symbols" do
7
+ expect { described_class.parse(:absent) }.to raise_error(described_class::ValidationFailure)
8
+ end
9
+ end
10
+ context "when creating new version" do
11
+ it "is parsing basic version" do
12
+ v = described_class.parse('1:20191210.1-0ubuntu0.19.04.2')
13
+ expect(v.epoch).to eql(1)
14
+ expect(v.upstream_version).to eql('20191210.1')
15
+ expect(v.debian_revision).to eql('0ubuntu0.19.04.2')
16
+ end
17
+
18
+ it "is parsing no epoch basic version" do
19
+ v = described_class.parse('20191210.1-0ubuntu0.19.04.2')
20
+ expect(v.epoch).to eql(0)
21
+ expect(v.upstream_version).to eql('20191210.1')
22
+ expect(v.debian_revision).to eql('0ubuntu0.19.04.2')
23
+ end
24
+
25
+ it "is parsing no debian revision basic version" do
26
+ v = described_class.parse('2.42.1+19.04')
27
+ expect(v.epoch).to eql(0)
28
+ expect(v.upstream_version).to eql('2.42.1+19.04')
29
+ expect(v.debian_revision).to eql(nil)
30
+ end
31
+
32
+ it "is parsing no epoch complex version" do
33
+ v = described_class.parse('3.32.2+git20190711-2ubuntu1~19.04.1')
34
+ expect(v.epoch).to eql(0)
35
+ expect(v.upstream_version).to eql('3.32.2+git20190711')
36
+ expect(v.debian_revision).to eql('2ubuntu1~19.04.1')
37
+ end
38
+
39
+ it "is parsing even more complex version" do
40
+ v = described_class.parse('5:1.0.0+git-20190109.133f4c4-0ubuntu2')
41
+ expect(v.epoch).to eql(5)
42
+ expect(v.upstream_version).to eql('1.0.0+git-20190109.133f4c4')
43
+ expect(v.debian_revision).to eql('0ubuntu2')
44
+ end
45
+ end
46
+ context "when comparing two versions" do
47
+ it "epoch has precedence" do
48
+ first = described_class.parse('9:99-99')
49
+ second = described_class.parse('10:01-01')
50
+ expect(first < second).to eql(true)
51
+ end
52
+ it "handles equals letters-only versions" do
53
+ lower = described_class.parse('abd-def')
54
+ higher = described_class.parse('abd-def')
55
+ expect(lower == higher).to eql(true)
56
+ end
57
+ it "shorter version is smaller" do
58
+ lower = described_class.parse('abd-de')
59
+ higher = described_class.parse('abd-def')
60
+ expect(lower < higher).to eql(true)
61
+ end
62
+ it "shorter version is smaller even with digits" do
63
+ lower = described_class.parse('a1b2d-d3e')
64
+ higher = described_class.parse('a1b2d-d3ef')
65
+ expect(lower < higher).to eql(true)
66
+ end
67
+ it "shorter version is smaller when number is less" do
68
+ lower = described_class.parse('a1b2d-d9')
69
+ higher = described_class.parse('a1b2d-d13')
70
+ expect(lower < higher).to eql(true)
71
+ end
72
+ it "handles ~ version" do
73
+ lower = described_class.parse('a1b2d-d10~')
74
+ higher = described_class.parse('a1b2d-d10')
75
+ expect(lower < higher).to eql(true)
76
+ end
77
+ it "handles letters versus -" do
78
+ lower = described_class.parse('a1b2d-d1a')
79
+ higher = described_class.parse('a1b2d-d1-')
80
+ expect(lower < higher).to eql(true)
81
+ end
82
+ end
83
+ end
@@ -0,0 +1,464 @@
1
+ require 'spec_helper'
2
+ require 'puppet/util/package/version/pip'
3
+
4
+ describe Puppet::Util::Package::Version::Pip do
5
+ describe "initialization" do
6
+ shared_examples_for 'a valid version' do |input_version, output = input_version|
7
+ [input_version, input_version.swapcase].each do |input|
8
+ it "transforms #{input} back to string(#{output}) succesfully" do
9
+ version = described_class.parse(input)
10
+ expect(version.to_s).to eq(output)
11
+ end
12
+ end
13
+
14
+ describe "comparison" do
15
+ version = described_class.parse(input_version)
16
+
17
+ # rubocop:disable UselessComparison
18
+ it "#{input_version} shouldn't be lesser than itself" do
19
+ expect(version < version).to eq(false)
20
+ end
21
+
22
+ it "#{input_version} shouldn't be greater than itself" do
23
+ expect(version > version).to eq(false)
24
+ end
25
+
26
+ it "#{input_version} shouldn't be equal with itself" do
27
+ expect(version != version).to eq(false)
28
+ end
29
+
30
+ it "#{input_version} should be equal to itself" do
31
+ expect(version == version).to eq(true)
32
+ end
33
+ end
34
+ end
35
+
36
+ shared_examples_for 'an invalid version' do |invalid_input|
37
+ [invalid_input, invalid_input.swapcase].each do |input|
38
+ it "should not be able to transform #{invalid_input} to string" do
39
+ expect{ described_class.parse(input) }.to raise_error(described_class::ValidationFailure)
40
+ end
41
+ end
42
+
43
+ describe "comparison" do
44
+ valid_version = described_class.parse("1.0")
45
+
46
+ it "should raise error when checking if #{invalid_input} is lesser than a valid version" do
47
+ expect{ valid_version < invalid_input }.to raise_error(described_class::ValidationFailure)
48
+ end
49
+
50
+ it "should raise error when checking if #{invalid_input} is greater than a valid version" do
51
+ expect{ valid_version > invalid_input }.to raise_error(described_class::ValidationFailure)
52
+ end
53
+
54
+ it "should raise error when checking if #{invalid_input} is greater or equal than a valid version" do
55
+ expect{ valid_version >= invalid_input }.to raise_error(described_class::ValidationFailure)
56
+ end
57
+
58
+ it "should raise error when checking if #{invalid_input} is lesser or equal than a valid version" do
59
+ expect{ valid_version <= invalid_input }.to raise_error(described_class::ValidationFailure)
60
+ end
61
+ end
62
+ end
63
+
64
+ describe "when only release segment is present in provided version" do
65
+ context "should work with any number of integer elements" do
66
+ context "when it has 1 element" do
67
+ it_should_behave_like 'a valid version', "1"
68
+ end
69
+ context "when it has 2 elements" do
70
+ it_should_behave_like 'a valid version', "1.1"
71
+ end
72
+
73
+ context "when it has 3 elements" do
74
+ it_should_behave_like 'a valid version', "1.1.1"
75
+ end
76
+
77
+ context "when it has 4 elements" do
78
+ it_should_behave_like 'a valid version', "1.1.1.1"
79
+ end
80
+
81
+ context "when it has 10 elements" do
82
+ it_should_behave_like 'a valid version', "1.1.1.1.1.1.1.1.1.1"
83
+ end
84
+ end
85
+
86
+ describe "should work with elements which are zero" do
87
+ context "when it ends with 1 zero" do
88
+ it_should_behave_like 'a valid version', "1.0"
89
+ end
90
+
91
+ context "when it ends with 2 zeros" do
92
+ it_should_behave_like 'a valid version', "1.0.0"
93
+ end
94
+
95
+ context "when it ends with 3 zeros" do
96
+ it_should_behave_like 'a valid version', "1.0.0.0"
97
+ end
98
+
99
+ context "when it starts with 1 zero" do
100
+ it_should_behave_like 'a valid version', "0.1"
101
+ end
102
+
103
+ context "when it starts with 2 zeros" do
104
+ it_should_behave_like 'a valid version', "0.0.1"
105
+ end
106
+
107
+ context "when it starts with 3 zeros" do
108
+ it_should_behave_like 'a valid version', "0.0.0.1"
109
+ end
110
+
111
+ context "when it is just a zero" do
112
+ it_should_behave_like 'a valid version', "0"
113
+ end
114
+
115
+ context "when it is full of just zeros" do
116
+ it_should_behave_like 'a valid version', "0.0.0"
117
+ end
118
+ end
119
+
120
+ describe "should work with elements containing multiple digits" do
121
+ context "when it has two digit elements" do
122
+ it_should_behave_like 'a valid version', "1.10.1"
123
+ end
124
+
125
+ context "when it has three digit elements" do
126
+ it_should_behave_like 'a valid version', "1.101.1.11"
127
+ end
128
+
129
+ context "when it has four digit elements" do
130
+ it_should_behave_like 'a valid version', "2019.0.11"
131
+ end
132
+
133
+ context "when it has a numerical element starting with zero" do
134
+ # the zero will dissapear
135
+ it_should_behave_like 'a valid version', "1.09.10", "1.9.10"
136
+ end
137
+
138
+ context "when it starts with multiple zeros" do
139
+ # the zeros will dissapear
140
+ it_should_behave_like 'a valid version', "0010.0000.0011", "10.0.11"
141
+ end
142
+ end
143
+
144
+ context "should fail because of misplaced letters" do
145
+ context "when it starts with letters" do
146
+ it_should_behave_like 'an invalid version', "d.2"
147
+ it_should_behave_like 'an invalid version', "ee.2"
148
+ end
149
+
150
+ context "when it has only letters" do
151
+ it_should_behave_like 'an invalid version', "d.c"
152
+ it_should_behave_like 'an invalid version', "dd.c"
153
+ end
154
+ end
155
+ end
156
+
157
+ describe "when the epoch segment is present in provided version" do
158
+ context "should work when epoch is an integer" do
159
+ context "when epoch has 1 digit" do
160
+ it_should_behave_like 'a valid version', "1!1.0.0"
161
+ end
162
+
163
+ context "when epoch has 2 digits" do
164
+ it_should_behave_like 'a valid version', "10!1.0.0"
165
+ end
166
+
167
+ context "when epoch is zero" do
168
+ # versions without epoch specified are considered to have epoch 0
169
+ # it is accepted as input but it should be ignored at output
170
+ it_should_behave_like 'a valid version', "0!1.0.0", "1.0.0"
171
+ end
172
+ end
173
+
174
+ context "should fail when epoch contains letters" do
175
+ context "when epoch starts with a letter" do
176
+ it_should_behave_like 'an invalid version', "a9!1.0.0"
177
+ end
178
+
179
+ context "when epoch ends with a letter" do
180
+ it_should_behave_like 'an invalid version', "9a!1.0.0"
181
+ end
182
+ end
183
+ end
184
+
185
+ describe "when the pre-release segment is present in provided version" do
186
+ context "when pre-release contains the letter a" do
187
+ it_should_behave_like 'a valid version', "1.0a", "1.0a0"
188
+ it_should_behave_like 'a valid version', "1.0a0"
189
+ end
190
+
191
+ context "when pre-release contains the letter b" do
192
+ it_should_behave_like 'a valid version', "1.0b", "1.0b0"
193
+ it_should_behave_like 'a valid version', "1.0b0"
194
+ end
195
+
196
+ context "when pre-release contains the letter c" do
197
+ it_should_behave_like 'a valid version', "1.0c", "1.0rc0"
198
+ it_should_behave_like 'a valid version', "1.0c0", "1.0rc0"
199
+ end
200
+
201
+ context "when pre-release contains the string alpha" do
202
+ it_should_behave_like 'a valid version', "1.0alpha", "1.0a0"
203
+ it_should_behave_like 'a valid version', "1.0alpha0", "1.0a0"
204
+ end
205
+
206
+ context "when pre-release contains the string beta" do
207
+ it_should_behave_like 'a valid version', "1.0beta", "1.0b0"
208
+ it_should_behave_like 'a valid version', "1.0beta0", "1.0b0"
209
+ end
210
+
211
+ context "when pre-release contains the string rc" do
212
+ it_should_behave_like 'a valid version', "1.0rc", "1.0rc0"
213
+ it_should_behave_like 'a valid version', "1.0rc0", "1.0rc0"
214
+ end
215
+
216
+ context "when pre-release contains the string pre" do
217
+ it_should_behave_like 'a valid version', "1.0pre", "1.0rc0"
218
+ it_should_behave_like 'a valid version', "1.0pre0", "1.0rc0"
219
+ end
220
+
221
+ context "when pre-release contains the string preview" do
222
+ it_should_behave_like 'a valid version', "1.0preview", "1.0rc0"
223
+ it_should_behave_like 'a valid version', "1.0preview0", "1.0rc0"
224
+ end
225
+
226
+ context "when pre-release contains multiple zeros at the beginning" do
227
+ it_should_behave_like 'a valid version', "1.0.beta.00", "1.0b0"
228
+ it_should_behave_like 'a valid version', "1.0.beta.002", "1.0b2"
229
+ end
230
+
231
+ context "when pre-release elements are separated by dots" do
232
+ it_should_behave_like 'a valid version', "1.0.alpha", "1.0a0"
233
+ it_should_behave_like 'a valid version', "1.0.alpha.0", "1.0a0"
234
+ it_should_behave_like 'a valid version', "1.0.alpha.2", "1.0a2"
235
+ end
236
+
237
+ context "when pre-release elements are separated by dashes" do
238
+ it_should_behave_like 'a valid version', "1.0-alpha", "1.0a0"
239
+ it_should_behave_like 'a valid version', "1.0-alpha-0", "1.0a0"
240
+ it_should_behave_like 'a valid version', "1.0-alpha-2", "1.0a2"
241
+ end
242
+
243
+ context "when pre-release elements are separated by underscores" do
244
+ it_should_behave_like 'a valid version', "1.0_alpha", "1.0a0"
245
+ it_should_behave_like 'a valid version', "1.0_alpha_0", "1.0a0"
246
+ it_should_behave_like 'a valid version', "1.0_alpha_2", "1.0a2"
247
+ end
248
+
249
+ context "when pre-release elements are separated by mixed symbols" do
250
+ it_should_behave_like 'a valid version', "1.0-alpha_5", "1.0a5"
251
+ it_should_behave_like 'a valid version', "1.0-alpha.5", "1.0a5"
252
+ it_should_behave_like 'a valid version', "1.0_alpha-5", "1.0a5"
253
+ it_should_behave_like 'a valid version', "1.0_alpha.5", "1.0a5"
254
+ it_should_behave_like 'a valid version', "1.0.alpha-5", "1.0a5"
255
+ it_should_behave_like 'a valid version', "1.0.alpha_5", "1.0a5"
256
+ end
257
+ end
258
+
259
+ describe "when the post-release segment is present in provided version" do
260
+ context "when post-release is just an integer" do
261
+ it_should_behave_like 'a valid version', "1.0-9", "1.0.post9"
262
+ it_should_behave_like 'a valid version', "1.0-10", "1.0.post10"
263
+ end
264
+
265
+ context "when post-release is just an integer and starts with zero" do
266
+ it_should_behave_like 'a valid version', "1.0-09", "1.0.post9"
267
+ it_should_behave_like 'a valid version', "1.0-009", "1.0.post9"
268
+ end
269
+
270
+ context "when post-release contains the string post" do
271
+ it_should_behave_like 'a valid version', "1.0post", "1.0.post0"
272
+ it_should_behave_like 'a valid version', "1.0post0", "1.0.post0"
273
+ it_should_behave_like 'a valid version', "1.0post1", "1.0.post1"
274
+ it_should_behave_like 'an invalid version', "1.0-0.post1"
275
+ end
276
+
277
+ context "when post-release contains the string rev" do
278
+ it_should_behave_like 'a valid version', "1.0rev", "1.0.post0"
279
+ it_should_behave_like 'a valid version', "1.0rev0", "1.0.post0"
280
+ it_should_behave_like 'a valid version', "1.0rev1", "1.0.post1"
281
+ it_should_behave_like 'an invalid version', "1.0-0.rev1"
282
+ end
283
+
284
+ context "when post-release contains the letter r" do
285
+ it_should_behave_like 'a valid version', "1.0r", "1.0.post0"
286
+ it_should_behave_like 'a valid version', "1.0r0", "1.0.post0"
287
+ it_should_behave_like 'a valid version', "1.0r1", "1.0.post1"
288
+ it_should_behave_like 'an invalid version', "1.0-0.r1"
289
+ end
290
+
291
+ context "when post-release elements are separated by dashes" do
292
+ it_should_behave_like 'a valid version', "1.0-post-22", "1.0.post22"
293
+ it_should_behave_like 'a valid version', "1.0-rev-22", "1.0.post22"
294
+ it_should_behave_like 'a valid version', "1.0-r-22", "1.0.post22"
295
+ end
296
+
297
+ context "when post-release elements are separated by underscores" do
298
+ it_should_behave_like 'a valid version', "1.0_post_22", "1.0.post22"
299
+ it_should_behave_like 'a valid version', "1.0_rev_22", "1.0.post22"
300
+ it_should_behave_like 'a valid version', "1.0_r_22", "1.0.post22"
301
+ end
302
+
303
+ context "when post-release elements are separated by dots" do
304
+ it_should_behave_like 'a valid version', "1.0.post.22", "1.0.post22"
305
+ it_should_behave_like 'a valid version', "1.0.rev.22", "1.0.post22"
306
+ it_should_behave_like 'a valid version', "1.0.r.22", "1.0.post22"
307
+ end
308
+
309
+ context "when post-release elements are separated by mixed symbols" do
310
+ it_should_behave_like 'a valid version', "1.0-r_5", "1.0.post5"
311
+ it_should_behave_like 'a valid version', "1.0-r.5", "1.0.post5"
312
+ it_should_behave_like 'a valid version', "1.0_r-5", "1.0.post5"
313
+ it_should_behave_like 'a valid version', "1.0_r.5", "1.0.post5"
314
+ it_should_behave_like 'a valid version', "1.0.r-5", "1.0.post5"
315
+ it_should_behave_like 'a valid version', "1.0.r_5", "1.0.post5"
316
+ end
317
+ end
318
+
319
+ describe "when the dev release segment is present in provided version" do
320
+ context "when dev release is only the keyword dev" do
321
+ it_should_behave_like 'a valid version', "1.0dev", "1.0.dev0"
322
+ it_should_behave_like 'a valid version', "1.0-dev", "1.0.dev0"
323
+ it_should_behave_like 'a valid version', "1.0_dev", "1.0.dev0"
324
+ it_should_behave_like 'a valid version', "1.0.dev", "1.0.dev0"
325
+ end
326
+
327
+ context "when dev release contains the keyword dev and a number" do
328
+ it_should_behave_like 'a valid version', "1.0dev2", "1.0.dev2"
329
+ it_should_behave_like 'a valid version', "1.0-dev33", "1.0.dev33"
330
+ it_should_behave_like 'a valid version', "1.0.dev11", "1.0.dev11"
331
+ it_should_behave_like 'a valid version', "1.0_dev101", "1.0.dev101"
332
+ end
333
+
334
+ context "when dev release's number element starts with 0" do
335
+ it_should_behave_like 'a valid version', "1.0dev02", "1.0.dev2"
336
+ it_should_behave_like 'a valid version', "1.0-dev033", "1.0.dev33"
337
+ it_should_behave_like 'a valid version', "1.0_dev0101", "1.0.dev101"
338
+ it_should_behave_like 'a valid version', "1.0.dev00011", "1.0.dev11"
339
+ end
340
+
341
+ context "when dev release elements are separated by dashes" do
342
+ it_should_behave_like 'a valid version', "1.0-dev", "1.0.dev0"
343
+ it_should_behave_like 'a valid version', "1.0-dev-2", "1.0.dev2"
344
+ it_should_behave_like 'a valid version', "1.0-dev-22", "1.0.dev22"
345
+ end
346
+
347
+ context "when dev release elements are separated by underscores" do
348
+ it_should_behave_like 'a valid version', "1.0_dev", "1.0.dev0"
349
+ it_should_behave_like 'a valid version', "1.0_dev_2", "1.0.dev2"
350
+ it_should_behave_like 'a valid version', "1.0_dev_22", "1.0.dev22"
351
+ end
352
+
353
+ context "when dev release elements are separated by dots" do
354
+ it_should_behave_like 'a valid version', "1.0.dev", "1.0.dev0"
355
+ it_should_behave_like 'a valid version', "1.0.dev.2", "1.0.dev2"
356
+ it_should_behave_like 'a valid version', "1.0.dev.22", "1.0.dev22"
357
+ end
358
+
359
+ context "when dev release elements are separated by mixed symbols" do
360
+ it_should_behave_like 'a valid version', "1.0-dev_5", "1.0.dev5"
361
+ it_should_behave_like 'a valid version', "1.0-dev.5", "1.0.dev5"
362
+ it_should_behave_like 'a valid version', "1.0_dev-5", "1.0.dev5"
363
+ it_should_behave_like 'a valid version', "1.0_dev.5", "1.0.dev5"
364
+ it_should_behave_like 'a valid version', "1.0.dev-5", "1.0.dev5"
365
+ it_should_behave_like 'a valid version', "1.0.dev_5", "1.0.dev5"
366
+ end
367
+ end
368
+
369
+ describe "when the local version segment is present in provided version" do
370
+ it_should_behave_like 'an invalid version', "1.0+"
371
+
372
+ context "when local version is just letters" do
373
+ it_should_behave_like 'a valid version', "1.0+local"
374
+ it_should_behave_like 'a valid version', "1.0+Local", "1.0+local"
375
+ end
376
+
377
+ context "when local version contains numbers" do
378
+ it_should_behave_like 'a valid version', "1.0+10"
379
+ it_should_behave_like 'a valid version', "1.0+01", "1.0+1"
380
+ it_should_behave_like 'a valid version', "1.0+01L", "1.0+01l"
381
+ it_should_behave_like 'a valid version', "1.0+L101L", "1.0+l101l"
382
+ end
383
+
384
+ context "when local version contains multiple elements" do
385
+ it_should_behave_like 'a valid version', "1.0+10.local"
386
+ it_should_behave_like 'a valid version', "1.0+abc.def.ghi"
387
+ it_should_behave_like 'a valid version', "1.0+01.abc", "1.0+1.abc"
388
+ it_should_behave_like 'a valid version', "1.0+01L.0001", "1.0+01l.1"
389
+ it_should_behave_like 'a valid version', "1.0+L101L.local", "1.0+l101l.local"
390
+ it_should_behave_like 'a valid version', "1.0+dash-undrsc_dot.5", "1.0+dash.undrsc.dot.5"
391
+ end
392
+ end
393
+ end
394
+
395
+ describe "comparison of versions" do
396
+ # This array must remain sorted (smallest to highest version).
397
+ versions = [
398
+ "0.1",
399
+ "0.10",
400
+ "0.10.1",
401
+ "0.10.1.0.1",
402
+ "1.0.dev456",
403
+ "1.0a1",
404
+ "1.0a2.dev456",
405
+ "1.0a12.dev456",
406
+ "1.0a12",
407
+ "1.0b1.dev456",
408
+ "1.0b2",
409
+ "1.0b2.post345.dev456",
410
+ "1.0b2.post345",
411
+ "1.0b2-346",
412
+ "1.0c1.dev456",
413
+ "1.0c1",
414
+ "1.0rc2",
415
+ "1.0c3",
416
+ "1.0",
417
+ "1.0.post456.dev34",
418
+ "1.0.post456",
419
+ "1.1.dev1",
420
+ "1.2",
421
+ "1.2+123abc",
422
+ "1.2+123abc456",
423
+ "1.2+abc",
424
+ "1.2+abc123",
425
+ "1.2+abc123-def2",
426
+ "1.2+abc123-def2-0",
427
+ "1.2+abc123def",
428
+ "1.2+1234.abc",
429
+ "1.2+123456",
430
+ "1.2.r32+123456",
431
+ "1.2.rev33+123456",
432
+ "1!1.0b2.post345.dev456",
433
+ "1!1.0",
434
+ "1!1.0.post456.dev34",
435
+ "1!1.0.post456",
436
+ "1!1.2.rev33+123456",
437
+ "2!2.3.4.alpha5.rev6.dev7+abc89"
438
+ ]
439
+
440
+ it "should find versions list to be already sorted" do
441
+ sorted_versions = versions.sort do |x,y|
442
+ described_class.compare(x, y)
443
+ end
444
+ expect(versions).to eq(sorted_versions)
445
+ end
446
+
447
+ versions.combination(2).to_a.each do |version_pair|
448
+ lower_version = described_class.parse(version_pair.first)
449
+ greater_version = described_class.parse(version_pair.last)
450
+
451
+ it "#{lower_version} should be equal to #{lower_version}" do
452
+ expect(lower_version == lower_version).to eq(true)
453
+ end
454
+
455
+ it "#{lower_version} should not be equal to #{greater_version}" do
456
+ expect(lower_version != greater_version).to eq(true)
457
+ end
458
+
459
+ it "#{lower_version} should be lower than #{greater_version}" do
460
+ expect(lower_version < greater_version).to eq(true)
461
+ end
462
+ end
463
+ end
464
+ end