puppet 7.0.0-x64-mingw32 → 7.5.0-x64-mingw32

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 (191) hide show
  1. checksums.yaml +4 -4
  2. data/CODEOWNERS +2 -16
  3. data/Gemfile +2 -3
  4. data/Gemfile.lock +45 -33
  5. data/ext/build_defaults.yaml +0 -1
  6. data/ext/project_data.yaml +1 -0
  7. data/lib/puppet/application.rb +10 -6
  8. data/lib/puppet/application/agent.rb +1 -0
  9. data/lib/puppet/application/apply.rb +3 -2
  10. data/lib/puppet/application/device.rb +1 -0
  11. data/lib/puppet/application/script.rb +1 -0
  12. data/lib/puppet/application/ssl.rb +11 -0
  13. data/lib/puppet/application_support.rb +7 -0
  14. data/lib/puppet/configurer.rb +16 -3
  15. data/lib/puppet/defaults.rb +14 -41
  16. data/lib/puppet/environments.rb +54 -55
  17. data/lib/puppet/face/facts.rb +26 -2
  18. data/lib/puppet/face/node/clean.rb +8 -0
  19. data/lib/puppet/ffi/posix.rb +10 -0
  20. data/lib/puppet/ffi/posix/constants.rb +14 -0
  21. data/lib/puppet/ffi/posix/functions.rb +24 -0
  22. data/lib/puppet/ffi/windows/api_types.rb +1 -1
  23. data/lib/puppet/ffi/windows/constants.rb +1 -1
  24. data/lib/puppet/file_serving/configuration/parser.rb +5 -2
  25. data/lib/puppet/file_system/memory_file.rb +8 -1
  26. data/lib/puppet/file_system/windows.rb +2 -0
  27. data/lib/puppet/http/factory.rb +4 -0
  28. data/lib/puppet/indirector/facts/facter.rb +1 -0
  29. data/lib/puppet/module_tool/applications/installer.rb +48 -2
  30. data/lib/puppet/module_tool/errors/shared.rb +17 -2
  31. data/lib/puppet/network/formats.rb +67 -0
  32. data/lib/puppet/network/http.rb +5 -2
  33. data/lib/puppet/network/http/api.rb +10 -6
  34. data/lib/puppet/network/http/api/master.rb +3 -2
  35. data/lib/puppet/network/http/api/master/v3.rb +2 -25
  36. data/lib/puppet/network/http/api/master/v3/environments.rb +2 -33
  37. data/lib/puppet/network/http/api/server.rb +10 -0
  38. data/lib/puppet/network/http/api/server/v3.rb +39 -0
  39. data/lib/puppet/network/http/api/server/v3/environments.rb +48 -0
  40. data/lib/puppet/parser/ast/leaf.rb +3 -2
  41. data/lib/puppet/parser/templatewrapper.rb +1 -1
  42. data/lib/puppet/pops/evaluator/deferred_resolver.rb +5 -3
  43. data/lib/puppet/pops/model/ast_transformer.rb +1 -1
  44. data/lib/puppet/pops/parser/lexer2.rb +0 -4
  45. data/lib/puppet/pops/validation/checker4_0.rb +0 -1
  46. data/lib/puppet/property/list.rb +1 -1
  47. data/lib/puppet/provider/group/groupadd.rb +13 -8
  48. data/lib/puppet/provider/package/apt.rb +34 -2
  49. data/lib/puppet/provider/package/aptitude.rb +6 -0
  50. data/lib/puppet/provider/service/debian.rb +2 -0
  51. data/lib/puppet/provider/user/aix.rb +2 -2
  52. data/lib/puppet/provider/user/useradd.rb +62 -8
  53. data/lib/puppet/reference/configuration.rb +6 -5
  54. data/lib/puppet/settings.rb +33 -28
  55. data/lib/puppet/settings/alias_setting.rb +37 -0
  56. data/lib/puppet/settings/environment_conf.rb +1 -0
  57. data/lib/puppet/type/package.rb +3 -3
  58. data/lib/puppet/type/user.rb +1 -1
  59. data/lib/puppet/util/autoload.rb +1 -8
  60. data/lib/puppet/util/monkey_patches.rb +7 -0
  61. data/lib/puppet/util/posix.rb +54 -5
  62. data/lib/puppet/util/windows/adsi.rb +46 -0
  63. data/lib/puppet/util/windows/principal.rb +9 -2
  64. data/lib/puppet/util/windows/sid.rb +4 -2
  65. data/lib/puppet/version.rb +1 -1
  66. data/locales/puppet.pot +166 -146
  67. data/man/man5/puppet.conf.5 +14 -6
  68. data/man/man8/puppet-agent.8 +2 -2
  69. data/man/man8/puppet-apply.8 +2 -2
  70. data/man/man8/puppet-catalog.8 +1 -1
  71. data/man/man8/puppet-config.8 +1 -1
  72. data/man/man8/puppet-describe.8 +1 -1
  73. data/man/man8/puppet-device.8 +2 -2
  74. data/man/man8/puppet-doc.8 +1 -1
  75. data/man/man8/puppet-epp.8 +1 -1
  76. data/man/man8/puppet-facts.8 +8 -2
  77. data/man/man8/puppet-filebucket.8 +1 -1
  78. data/man/man8/puppet-generate.8 +1 -1
  79. data/man/man8/puppet-help.8 +1 -1
  80. data/man/man8/puppet-lookup.8 +1 -1
  81. data/man/man8/puppet-module.8 +1 -1
  82. data/man/man8/puppet-node.8 +1 -1
  83. data/man/man8/puppet-parser.8 +1 -1
  84. data/man/man8/puppet-plugin.8 +1 -1
  85. data/man/man8/puppet-report.8 +1 -1
  86. data/man/man8/puppet-resource.8 +1 -1
  87. data/man/man8/puppet-script.8 +2 -2
  88. data/man/man8/puppet-ssl.8 +5 -1
  89. data/man/man8/puppet.8 +2 -2
  90. data/spec/fixtures/integration/application/agent/cached_deferred_catalog.json +91 -0
  91. data/spec/fixtures/unit/provider/user/aix/aix_passwd_file.out +4 -0
  92. data/spec/integration/application/agent_spec.rb +160 -3
  93. data/spec/integration/application/apply_spec.rb +19 -0
  94. data/spec/integration/application/plugin_spec.rb +1 -1
  95. data/spec/integration/defaults_spec.rb +0 -7
  96. data/spec/integration/http/client_spec.rb +12 -0
  97. data/spec/integration/indirector/direct_file_server_spec.rb +1 -3
  98. data/spec/integration/indirector/file_content/file_server_spec.rb +0 -2
  99. data/spec/integration/indirector/file_metadata/file_server_spec.rb +0 -2
  100. data/spec/integration/parser/collection_spec.rb +10 -0
  101. data/spec/integration/resource/type_collection_spec.rb +2 -6
  102. data/spec/integration/transaction_spec.rb +4 -9
  103. data/spec/integration/util/windows/adsi_spec.rb +21 -1
  104. data/spec/integration/util/windows/principal_spec.rb +21 -0
  105. data/spec/integration/util/windows/registry_spec.rb +6 -10
  106. data/spec/spec_helper.rb +1 -4
  107. data/spec/unit/agent_spec.rb +8 -6
  108. data/spec/unit/application/agent_spec.rb +0 -1
  109. data/spec/unit/application/facts_spec.rb +58 -7
  110. data/spec/unit/application/filebucket_spec.rb +0 -2
  111. data/spec/unit/application/ssl_spec.rb +23 -0
  112. data/spec/unit/application_spec.rb +51 -9
  113. data/spec/unit/confine/feature_spec.rb +1 -1
  114. data/spec/unit/confine_spec.rb +8 -2
  115. data/spec/unit/defaults_spec.rb +1 -56
  116. data/spec/unit/environments_spec.rb +221 -68
  117. data/spec/unit/face/node_spec.rb +14 -13
  118. data/spec/unit/file_serving/configuration/parser_spec.rb +8 -1
  119. data/spec/unit/file_serving/metadata_spec.rb +3 -3
  120. data/spec/unit/file_serving/terminus_helper_spec.rb +11 -4
  121. data/spec/unit/file_system_spec.rb +9 -0
  122. data/spec/unit/forge/module_release_spec.rb +2 -7
  123. data/spec/unit/http/factory_spec.rb +19 -0
  124. data/spec/unit/indirector/face_spec.rb +0 -1
  125. data/spec/unit/indirector/facts/facter_spec.rb +20 -5
  126. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +26 -8
  127. data/spec/unit/indirector/indirection_spec.rb +8 -12
  128. data/spec/unit/indirector_spec.rb +2 -2
  129. data/spec/unit/module_tool/applications/installer_spec.rb +66 -0
  130. data/spec/unit/network/formats_spec.rb +41 -0
  131. data/spec/unit/network/http/api/indirected_routes_spec.rb +0 -4
  132. data/spec/unit/network/http/api/master_spec.rb +38 -0
  133. data/spec/unit/network/http/api/{master → server}/v3/environments_spec.rb +2 -2
  134. data/spec/unit/network/http/api/{master → server}/v3_spec.rb +19 -19
  135. data/spec/unit/network/http/api_spec.rb +11 -11
  136. data/spec/unit/parser/compiler_spec.rb +3 -19
  137. data/spec/unit/parser/resource_spec.rb +14 -8
  138. data/spec/unit/parser/templatewrapper_spec.rb +4 -3
  139. data/spec/unit/pops/evaluator/deferred_resolver_spec.rb +20 -0
  140. data/spec/unit/pops/parser/lexer2_spec.rb +0 -4
  141. data/spec/unit/pops/validator/validator_spec.rb +20 -43
  142. data/spec/unit/property_spec.rb +1 -0
  143. data/spec/unit/provider/group/groupadd_spec.rb +5 -2
  144. data/spec/unit/provider/nameservice_spec.rb +66 -65
  145. data/spec/unit/provider/package/apt_spec.rb +28 -23
  146. data/spec/unit/provider/package/aptitude_spec.rb +1 -1
  147. data/spec/unit/provider/package/base_spec.rb +6 -5
  148. data/spec/unit/provider/package/pacman_spec.rb +18 -12
  149. data/spec/unit/provider/package/pip_spec.rb +6 -11
  150. data/spec/unit/provider/package/pkgdmg_spec.rb +0 -4
  151. data/spec/unit/provider/user/aix_spec.rb +5 -0
  152. data/spec/unit/provider/user/hpux_spec.rb +1 -1
  153. data/spec/unit/provider/user/pw_spec.rb +2 -0
  154. data/spec/unit/provider/user/useradd_spec.rb +56 -3
  155. data/spec/unit/provider_spec.rb +6 -8
  156. data/spec/unit/resource/type_spec.rb +1 -1
  157. data/spec/unit/resource_spec.rb +11 -10
  158. data/spec/unit/settings_spec.rb +13 -6
  159. data/spec/unit/ssl/base_spec.rb +0 -1
  160. data/spec/unit/ssl/certificate_request_spec.rb +4 -10
  161. data/spec/unit/ssl/ssl_provider_spec.rb +5 -2
  162. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -7
  163. data/spec/unit/transaction/event_manager_spec.rb +14 -11
  164. data/spec/unit/transaction_spec.rb +13 -4
  165. data/spec/unit/type/file/content_spec.rb +0 -1
  166. data/spec/unit/type/file/selinux_spec.rb +0 -2
  167. data/spec/unit/type/file_spec.rb +0 -6
  168. data/spec/unit/type/group_spec.rb +13 -6
  169. data/spec/unit/type/resources_spec.rb +7 -7
  170. data/spec/unit/type/service_spec.rb +1 -1
  171. data/spec/unit/type/tidy_spec.rb +0 -1
  172. data/spec/unit/type_spec.rb +2 -2
  173. data/spec/unit/util/at_fork_spec.rb +2 -2
  174. data/spec/unit/util/autoload_spec.rb +5 -1
  175. data/spec/unit/util/backups_spec.rb +1 -2
  176. data/spec/unit/util/execution_spec.rb +15 -11
  177. data/spec/unit/util/inifile_spec.rb +6 -14
  178. data/spec/unit/util/log_spec.rb +8 -7
  179. data/spec/unit/util/logging_spec.rb +3 -3
  180. data/spec/unit/util/posix_spec.rb +363 -15
  181. data/spec/unit/util/selinux_spec.rb +76 -52
  182. data/spec/unit/util/storage_spec.rb +3 -1
  183. data/spec/unit/util/suidmanager_spec.rb +44 -41
  184. data/spec/unit/util/windows/sid_spec.rb +6 -0
  185. data/spec/unit/util_spec.rb +13 -6
  186. metadata +33 -16
  187. data/spec/lib/matchers/include.rb +0 -27
  188. data/spec/lib/matchers/include_spec.rb +0 -32
  189. data/spec/unit/pops/parser/parse_application_spec.rb +0 -13
  190. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -23
  191. data/spec/unit/pops/parser/parse_site_spec.rb +0 -43
@@ -5,6 +5,7 @@ Puppet::Type.newtype(:property_test) do
5
5
  newparam(:name, isnamevar: true)
6
6
  end
7
7
  Puppet::Type.type(:property_test).provide(:property_test) do
8
+ attr_accessor :foo
8
9
  end
9
10
 
10
11
  describe Puppet::Property do
@@ -198,7 +198,10 @@ describe Puppet::Type.type(:group).provider(:groupadd) do
198
198
  end
199
199
 
200
200
  describe "#findgroup" do
201
- before { allow(File).to receive(:read).with('/etc/group').and_return(content) }
201
+ before do
202
+ allow(Puppet::FileSystem).to receive(:exist?).with('/etc/group').and_return(true)
203
+ allow(Puppet::FileSystem).to receive(:each_line).with('/etc/group').and_yield(content)
204
+ end
202
205
 
203
206
  let(:content) { "sample_group_name:sample_password:sample_gid:sample_user_list" }
204
207
  let(:output) do
@@ -221,7 +224,7 @@ describe Puppet::Type.type(:group).provider(:groupadd) do
221
224
  end
222
225
 
223
226
  it "reads the group file only once per resource" do
224
- expect(File).to receive(:read).with('/etc/group').once
227
+ expect(Puppet::FileSystem).to receive(:each_line).with('/etc/group').once
225
228
  5.times { provider.send(:findgroup, :group_name, 'sample_group_name') }
226
229
  end
227
230
  end
@@ -3,11 +3,28 @@ require 'puppet/provider/nameservice'
3
3
  require 'puppet/etc'
4
4
  require 'puppet_spec/character_encoding'
5
5
 
6
+ Puppet::Type.newtype(:nameservice_dummytype) do
7
+ newparam(:name)
8
+ ensurable
9
+ newproperty(:foo)
10
+ newproperty(:bar)
11
+ end
12
+
13
+ Puppet::Type.type(:nameservice_dummytype).provide(:nameservice_dummyprovider, parent: Puppet::Provider::NameService) do
14
+ def posixmethod(param)
15
+ param
16
+ end
17
+
18
+ def modifycmd(param, value)
19
+ []
20
+ end
21
+ end
22
+
6
23
  describe Puppet::Provider::NameService do
7
24
 
8
25
  before :each do
9
- described_class.initvars
10
- described_class.resource_type = faketype
26
+ provider.class.initvars
27
+ provider.class.resource_type = faketype
11
28
  end
12
29
 
13
30
  # These are values getpwent might give you
@@ -41,16 +58,12 @@ describe Puppet::Provider::NameService do
41
58
  # The provider sometimes relies on @resource for valid properties so let's
42
59
  # create a fake type with properties that match our fake struct.
43
60
  let :faketype do
44
- Puppet::Type.newtype(:nameservice_dummytype) do
45
- newparam(:name)
46
- ensurable
47
- newproperty(:foo)
48
- newproperty(:bar)
49
- end
61
+ Puppet::Type.type(:nameservice_dummytype)
50
62
  end
51
63
 
52
64
  let :provider do
53
- described_class.new(:name => 'bob', :foo => 'fooval', :bar => 'barval')
65
+ Puppet::Type.type(:nameservice_dummytype).provider(:nameservice_dummyprovider)
66
+ .new(:name => 'bob', :foo => 'fooval', :bar => 'barval')
54
67
  end
55
68
 
56
69
  let :resource do
@@ -91,61 +104,61 @@ describe Puppet::Provider::NameService do
91
104
 
92
105
  describe "#options" do
93
106
  it "should add options for a valid property" do
94
- described_class.options :foo, :key1 => 'val1', :key2 => 'val2'
95
- described_class.options :bar, :key3 => 'val3'
96
- expect(described_class.option(:foo, :key1)).to eq('val1')
97
- expect(described_class.option(:foo, :key2)).to eq('val2')
98
- expect(described_class.option(:bar, :key3)).to eq('val3')
107
+ provider.class.options :foo, :key1 => 'val1', :key2 => 'val2'
108
+ provider.class.options :bar, :key3 => 'val3'
109
+ expect(provider.class.option(:foo, :key1)).to eq('val1')
110
+ expect(provider.class.option(:foo, :key2)).to eq('val2')
111
+ expect(provider.class.option(:bar, :key3)).to eq('val3')
99
112
  end
100
113
 
101
114
  it "should raise an error for an invalid property" do
102
- expect { described_class.options :baz, :key1 => 'val1' }.to raise_error(
115
+ expect { provider.class.options :baz, :key1 => 'val1' }.to raise_error(
103
116
  Puppet::Error, 'baz is not a valid attribute for nameservice_dummytype')
104
117
  end
105
118
  end
106
119
 
107
120
  describe "#option" do
108
121
  it "should return the correct value" do
109
- described_class.options :foo, :key1 => 'val1', :key2 => 'val2'
110
- expect(described_class.option(:foo, :key2)).to eq('val2')
122
+ provider.class.options :foo, :key1 => 'val1', :key2 => 'val2'
123
+ expect(provider.class.option(:foo, :key2)).to eq('val2')
111
124
  end
112
125
 
113
126
  it "should symbolize the name first" do
114
- described_class.options :foo, :key1 => 'val1', :key2 => 'val2'
115
- expect(described_class.option('foo', :key2)).to eq('val2')
127
+ provider.class.options :foo, :key1 => 'val1', :key2 => 'val2'
128
+ expect(provider.class.option('foo', :key2)).to eq('val2')
116
129
  end
117
130
 
118
131
  it "should return nil if no option has been specified earlier" do
119
- expect(described_class.option(:foo, :key2)).to be_nil
132
+ expect(provider.class.option(:foo, :key2)).to be_nil
120
133
  end
121
134
 
122
135
  it "should return nil if no option for that property has been specified earlier" do
123
- described_class.options :bar, :key2 => 'val2'
124
- expect(described_class.option(:foo, :key2)).to be_nil
136
+ provider.class.options :bar, :key2 => 'val2'
137
+ expect(provider.class.option(:foo, :key2)).to be_nil
125
138
  end
126
139
 
127
140
  it "should return nil if no matching key can be found for that property" do
128
- described_class.options :foo, :key3 => 'val2'
129
- expect(described_class.option(:foo, :key2)).to be_nil
141
+ provider.class.options :foo, :key3 => 'val2'
142
+ expect(provider.class.option(:foo, :key2)).to be_nil
130
143
  end
131
144
  end
132
145
 
133
146
  describe "#section" do
134
147
  it "should raise an error if resource_type has not been set" do
135
- expect(described_class).to receive(:resource_type).and_return(nil)
136
- expect { described_class.section }.to raise_error Puppet::Error, 'Cannot determine Etc section without a resource type'
148
+ expect(provider.class).to receive(:resource_type).and_return(nil)
149
+ expect { provider.class.section }.to raise_error Puppet::Error, 'Cannot determine Etc section without a resource type'
137
150
  end
138
151
 
139
152
  # the return values are hard coded so I am using types that actually make
140
153
  # use of the nameservice provider
141
154
  it "should return pw for users" do
142
- described_class.resource_type = Puppet::Type.type(:user)
143
- expect(described_class.section).to eq('pw')
155
+ provider.class.resource_type = Puppet::Type.type(:user)
156
+ expect(provider.class.section).to eq('pw')
144
157
  end
145
158
 
146
159
  it "should return gr for groups" do
147
- described_class.resource_type = Puppet::Type.type(:group)
148
- expect(described_class.section).to eq('gr')
160
+ provider.class.resource_type = Puppet::Type.type(:group)
161
+ expect(provider.class.section).to eq('gr')
149
162
  end
150
163
  end
151
164
 
@@ -156,7 +169,7 @@ describe Puppet::Provider::NameService do
156
169
  # encoding
157
170
  allow(Etc).to receive(:getpwent).and_return(*utf_8_mixed_users)
158
171
  result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::UTF_8) do
159
- described_class.instances
172
+ provider.class.instances
160
173
  end
161
174
  expect(result.map(&:name)).to eq(
162
175
  [
@@ -171,7 +184,7 @@ describe Puppet::Provider::NameService do
171
184
  it "should have object names in their original encoding/bytes if they would not be valid UTF-8" do
172
185
  allow(Etc).to receive(:getpwent).and_return(*latin_1_mixed_users)
173
186
  result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::ISO_8859_1) do
174
- described_class.instances
187
+ provider.class.instances
175
188
  end
176
189
  expect(result.map(&:name)).to eq(
177
190
  [
@@ -186,40 +199,40 @@ describe Puppet::Provider::NameService do
186
199
  it "should pass the Puppet::Etc :canonical_name Struct member to the constructor" do
187
200
  users = [ Struct::Passwd.new(invalid_utf_8_jose, invalid_utf_8_jose, 1002, 2000), nil ]
188
201
  allow(Etc).to receive(:getpwent).and_return(*users)
189
- expect(described_class).to receive(:new).with(:name => escaped_utf_8_jose, :canonical_name => invalid_utf_8_jose, :ensure => :present)
190
- described_class.instances
202
+ expect(provider.class).to receive(:new).with(:name => escaped_utf_8_jose, :canonical_name => invalid_utf_8_jose, :ensure => :present)
203
+ provider.class.instances
191
204
  end
192
205
  end
193
206
 
194
207
  describe "validate" do
195
208
  it "should pass if no check is registered at all" do
196
- expect { described_class.validate(:foo, 300) }.to_not raise_error
197
- expect { described_class.validate('foo', 300) }.to_not raise_error
209
+ expect { provider.class.validate(:foo, 300) }.to_not raise_error
210
+ expect { provider.class.validate('foo', 300) }.to_not raise_error
198
211
  end
199
212
 
200
213
  it "should pass if no check for that property is registered" do
201
- described_class.verify(:bar, 'Must be 100') { |val| val == 100 }
202
- expect { described_class.validate(:foo, 300) }.to_not raise_error
203
- expect { described_class.validate('foo', 300) }.to_not raise_error
214
+ provider.class.verify(:bar, 'Must be 100') { |val| val == 100 }
215
+ expect { provider.class.validate(:foo, 300) }.to_not raise_error
216
+ expect { provider.class.validate('foo', 300) }.to_not raise_error
204
217
  end
205
218
 
206
219
  it "should pass if the value is valid" do
207
- described_class.verify(:foo, 'Must be 100') { |val| val == 100 }
208
- expect { described_class.validate(:foo, 100) }.to_not raise_error
209
- expect { described_class.validate('foo', 100) }.to_not raise_error
220
+ provider.class.verify(:foo, 'Must be 100') { |val| val == 100 }
221
+ expect { provider.class.validate(:foo, 100) }.to_not raise_error
222
+ expect { provider.class.validate('foo', 100) }.to_not raise_error
210
223
  end
211
224
 
212
225
  it "should raise an error if the value is invalid" do
213
- described_class.verify(:foo, 'Must be 100') { |val| val == 100 }
214
- expect { described_class.validate(:foo, 200) }.to raise_error(ArgumentError, 'Invalid value 200: Must be 100')
215
- expect { described_class.validate('foo', 200) }.to raise_error(ArgumentError, 'Invalid value 200: Must be 100')
226
+ provider.class.verify(:foo, 'Must be 100') { |val| val == 100 }
227
+ expect { provider.class.validate(:foo, 200) }.to raise_error(ArgumentError, 'Invalid value 200: Must be 100')
228
+ expect { provider.class.validate('foo', 200) }.to raise_error(ArgumentError, 'Invalid value 200: Must be 100')
216
229
  end
217
230
  end
218
231
 
219
232
  describe "getinfo" do
220
233
  before :each do
221
234
  # with section=foo we'll call Etc.getfoonam instead of getpwnam or getgrnam
222
- allow(described_class).to receive(:section).and_return('foo')
235
+ allow(provider.class).to receive(:section).and_return('foo')
223
236
  resource # initialize the resource so our provider has a @resource instance variable
224
237
  end
225
238
 
@@ -239,13 +252,13 @@ describe Puppet::Provider::NameService do
239
252
  # overriding to UTF-8, in @canonical_name for querying that state on disk
240
253
  # again if needed
241
254
  it "should use the instance's @canonical_name to query the system" do
242
- provider_instance = described_class.new(:name => 'foo', :canonical_name => 'original_foo', :ensure => :present)
255
+ provider_instance = provider.class.new(:name => 'foo', :canonical_name => 'original_foo', :ensure => :present)
243
256
  expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'original_foo')
244
257
  provider_instance.getinfo(true)
245
258
  end
246
259
 
247
260
  it "should use the instance's name instead of canonical_name if not supplied during instantiation" do
248
- provider_instance = described_class.new(:name => 'foo', :ensure => :present)
261
+ provider_instance = provider.class.new(:name => 'foo', :ensure => :present)
249
262
  expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'foo')
250
263
  provider_instance.getinfo(true)
251
264
  end
@@ -253,16 +266,6 @@ describe Puppet::Provider::NameService do
253
266
 
254
267
  describe "info2hash" do
255
268
  it "should return a hash with all properties" do
256
- # we have to have an implementation of posixmethod which has to
257
- # convert a propertyname (e.g. comment) into a fieldname of our
258
- # Struct (e.g. gecos). I do not want to test posixmethod here so
259
- # let's fake an implementation which does not do any translation. We
260
- # expect two method invocations because info2hash calls the method
261
- # twice if the Struct responds to the propertyname (our fake Struct
262
- # provides values for :foo and :bar) TODO: Fix that
263
- expect(provider).to receive(:posixmethod).with(:foo).and_return(:foo).twice
264
- expect(provider).to receive(:posixmethod).with(:bar).and_return(:bar).twice
265
- expect(provider).to receive(:posixmethod).with(:ensure).and_return(:ensure)
266
269
  expect(provider.info2hash(fakeetcobject)).to eq({ :foo => 'fooval', :bar => 'barval' })
267
270
  end
268
271
  end
@@ -273,7 +276,7 @@ describe Puppet::Provider::NameService do
273
276
  end
274
277
 
275
278
  it "should return the munged value otherwise" do
276
- described_class.options(:foo, :munge => proc { |x| x*2 })
279
+ provider.class.options(:foo, :munge => proc { |x| x*2 })
277
280
  expect(provider.munge(:foo, 100)).to eq(200)
278
281
  end
279
282
  end
@@ -284,7 +287,7 @@ describe Puppet::Provider::NameService do
284
287
  end
285
288
 
286
289
  it "should return the unmunged value otherwise" do
287
- described_class.options(:foo, :unmunge => proc { |x| x/2 })
290
+ provider.class.options(:foo, :unmunge => proc { |x| x/2 })
288
291
  expect(provider.unmunge(:foo, 200)).to eq(100)
289
292
  end
290
293
  end
@@ -302,15 +305,13 @@ describe Puppet::Provider::NameService do
302
305
  end
303
306
 
304
307
  describe "get" do
305
- before(:each) {described_class.resource_type = faketype }
306
-
307
308
  it "should return the correct getinfo value" do
308
309
  expect(provider).to receive(:getinfo).with(false).and_return(:foo => 'fooval', :bar => 'barval')
309
310
  expect(provider.get(:bar)).to eq('barval')
310
311
  end
311
312
 
312
313
  it "should unmunge the value first" do
313
- described_class.options(:bar, :munge => proc { |x| x*2}, :unmunge => proc {|x| x/2})
314
+ provider.class.options(:bar, :munge => proc { |x| x*2}, :unmunge => proc {|x| x/2})
314
315
  expect(provider).to receive(:getinfo).with(false).and_return(:foo => 200, :bar => 500)
315
316
  expect(provider.get(:bar)).to eq(250)
316
317
  end
@@ -325,7 +326,7 @@ describe Puppet::Provider::NameService do
325
326
  describe "set" do
326
327
  before :each do
327
328
  resource # initialize resource so our provider has a @resource object
328
- described_class.verify(:foo, 'Must be 100') { |val| val == 100 }
329
+ provider.class.verify(:foo, 'Must be 100') { |val| val == 100 }
329
330
  end
330
331
 
331
332
  it "should raise an error on invalid values" do
@@ -339,7 +340,7 @@ describe Puppet::Provider::NameService do
339
340
  end
340
341
 
341
342
  it "should munge the value first" do
342
- described_class.options(:foo, :munge => proc { |x| x*2}, :unmunge => proc {|x| x/2})
343
+ provider.class.options(:foo, :munge => proc { |x| x*2}, :unmunge => proc {|x| x/2})
343
344
  expect(provider).to receive(:modifycmd).with(:foo, 200).and_return(['/bin/modify', '-f', '200' ])
344
345
  expect(provider).to receive(:execute).with(['/bin/modify', '-f', '200'], hash_including(custom_environment: {}))
345
346
  provider.set(:foo, 100)
@@ -11,9 +11,7 @@ describe Puppet::Type.type(:package).provider(:apt) do
11
11
  end
12
12
 
13
13
  let(:provider) do
14
- provider = subject()
15
- provider.resource = resource
16
- provider
14
+ resource.provider
17
15
  end
18
16
 
19
17
  it "should be the default provider on :osfamily => Debian" do
@@ -88,7 +86,7 @@ Version table:
88
86
 
89
87
  describe ".instances" do
90
88
  before do
91
- allow(Puppet::Type::Package::ProviderDpkg).to receive(:instances).and_return([resource])
89
+ allow(Puppet::Type::Package::ProviderDpkg).to receive(:instances).and_return([provider])
92
90
  end
93
91
 
94
92
  context "when package is manual marked" do
@@ -97,8 +95,7 @@ Version table:
97
95
  end
98
96
 
99
97
  it 'sets mark to manual' do
100
- expect(resource).to receive(:mark=).with(:manual)
101
- described_class.instances
98
+ expect(described_class.instances.map(&:mark)).to eq([:manual])
102
99
  end
103
100
  end
104
101
 
@@ -108,8 +105,7 @@ Version table:
108
105
  end
109
106
 
110
107
  it 'does not set mark to manual' do
111
- expect(resource).not_to receive(:mark=).with(:manual)
112
- described_class.instances
108
+ expect(described_class.instances.map(&:mark)).to eq([nil])
113
109
  end
114
110
  end
115
111
  end
@@ -119,24 +115,12 @@ Version table:
119
115
  allow(provider).to receive(:dpkgquery).and_return("name: #{resource.name}" )
120
116
  end
121
117
 
122
- context "when package is manual marked" do
123
- before do
124
- allow(described_class).to receive(:aptmark).with('showmanual').and_return("#{resource.name}\n")
125
- end
126
-
127
- it 'sets mark to manual' do
128
- result = provider.query
129
- expect(result[:mark]).to eql(:manual)
130
- end
131
- end
132
-
133
- context 'when package is not manual marked ' do
134
- before do
135
- allow(described_class).to receive(:aptmark).with('showmanual').and_return('')
136
- end
137
118
 
119
+ context 'when package is not installed on the system' do
138
120
  it 'does not set mark to manual' do
139
121
  result = provider.query
122
+
123
+ expect(described_class).not_to receive(:aptmark)
140
124
  expect(result[:mark]).to be_nil
141
125
  end
142
126
  end
@@ -293,5 +277,26 @@ Version table:
293
277
 
294
278
  provider.install
295
279
  end
280
+
281
+ it "should install using the source attribute if present" do
282
+ resource[:ensure] = :installed
283
+ resource[:source] = '/my/local/package/file'
284
+
285
+ expect(provider).to receive(:aptget).with(any_args, :install, resource[:source])
286
+ expect(provider).to receive(:properties).and_return({:mark => :none})
287
+
288
+ provider.install
289
+ end
290
+
291
+ it "should install specific version using the source attribute if present" do
292
+ resource[:ensure] = '1.2.3'
293
+ resource[:source] = '/my/local/package/file'
294
+
295
+ expect(provider).to receive(:aptget).with(any_args, :install, resource[:source])
296
+ expect(provider).to receive(:properties).and_return({:mark => :none})
297
+ expect(provider).to receive(:query).and_return({:ensure => '1.2.3'})
298
+
299
+ provider.install
300
+ end
296
301
  end
297
302
  end
@@ -13,7 +13,7 @@ describe Puppet::Type.type(:package).provider(:aptitude) do
13
13
 
14
14
  before do
15
15
  allow(Puppet::Util).to receive(:which).with('/usr/bin/dpkg-query').and_return(dpkgquery_path)
16
- allow(described_class).to receive(:aptmark).with('showmanual').and_return("")
16
+ allow(described_class).to receive(:aptmark).with('showmanual', 'faff').and_return("")
17
17
  end
18
18
 
19
19
  { :absent => "deinstall ok config-files faff 1.2.3-1\n",
@@ -1,17 +1,18 @@
1
1
  require 'spec_helper'
2
2
  require 'puppet/provider/package'
3
3
 
4
+ Puppet::Type.type(:package).provide(:test_base_provider, parent: Puppet::Provider::Package) do
5
+ def query; end
6
+ end
7
+
4
8
  describe Puppet::Provider::Package do
9
+ let(:provider) { Puppet::Type.type(:package).provider(:test_base_provider).new }
10
+
5
11
  it 'returns absent for uninstalled packages when not purgeable' do
6
- provider = Puppet::Provider::Package.new
7
- expect(provider).to receive(:query).and_return(nil)
8
- expect(provider.class).to receive(:feature?).with(:purgeable).and_return(false)
9
12
  expect(provider.properties[:ensure]).to eq(:absent)
10
13
  end
11
14
 
12
15
  it 'returns purged for uninstalled packages when purgeable' do
13
- provider = Puppet::Provider::Package.new
14
- expect(provider).to receive(:query).and_return(nil)
15
16
  expect(provider.class).to receive(:feature?).with(:purgeable).and_return(true)
16
17
  expect(provider.properties[:ensure]).to eq(:purged)
17
18
  end
@@ -32,10 +32,12 @@ describe Puppet::Type.type(:package).provider(:pacman) do
32
32
  end
33
33
 
34
34
  it "should call yaourt to install the right package quietly when yaourt is installed" do
35
- allow(described_class).to receive(:yaourt?).and_return(true)
36
- args = ['--noconfirm', '--needed', '--noprogressbar', '-S', resource[:name]]
37
- expect(provider).to receive(:yaourt).at_least(:once).with(*args).and_return('')
38
- provider.install
35
+ without_partial_double_verification do
36
+ allow(described_class).to receive(:yaourt?).and_return(true)
37
+ args = ['--noconfirm', '--needed', '--noprogressbar', '-S', resource[:name]]
38
+ expect(provider).to receive(:yaourt).at_least(:once).with(*args).and_return('')
39
+ provider.install
40
+ end
39
41
  end
40
42
 
41
43
  it "should raise an Puppet::Error if the installation failed" do
@@ -74,10 +76,12 @@ describe Puppet::Type.type(:package).provider(:pacman) do
74
76
  end
75
77
 
76
78
  it "should call yaourt to install the right package quietly when yaourt is installed" do
77
- expect(described_class).to receive(:yaourt?).and_return(true)
78
- args = ['--noconfirm', '--needed', '--noprogressbar', '-x', '--arg=value', '-S', resource[:name]]
79
- expect(provider).to receive(:yaourt).at_least(:once).with(*args).and_return('')
80
- provider.install
79
+ without_partial_double_verification do
80
+ expect(described_class).to receive(:yaourt?).and_return(true)
81
+ args = ['--noconfirm', '--needed', '--noprogressbar', '-x', '--arg=value', '-S', resource[:name]]
82
+ expect(provider).to receive(:yaourt).at_least(:once).with(*args).and_return('')
83
+ provider.install
84
+ end
81
85
  end
82
86
  end
83
87
 
@@ -172,10 +176,12 @@ describe Puppet::Type.type(:package).provider(:pacman) do
172
176
  end
173
177
 
174
178
  it "should call yaourt to remove the right package quietly" do
175
- allow(described_class).to receive(:yaourt?).and_return(true)
176
- args = ["--noconfirm", "--noprogressbar", "-R", resource[:name]]
177
- expect(provider).to receive(:yaourt).with(*args)
178
- provider.uninstall
179
+ without_partial_double_verification do
180
+ allow(described_class).to receive(:yaourt?).and_return(true)
181
+ args = ["--noconfirm", "--noprogressbar", "-R", resource[:name]]
182
+ expect(provider).to receive(:yaourt).with(*args)
183
+ provider.uninstall
184
+ end
179
185
  end
180
186
 
181
187
  it "adds any uninstall_options" do