pdk 1.11.1 → 1.12.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +34 -0
- data/lib/pdk/analytics/client/google_analytics.rb +2 -2
- data/lib/pdk/cli/bundle.rb +1 -6
- data/lib/pdk/cli/exec.rb +12 -207
- data/lib/pdk/cli/exec/command.rb +233 -0
- data/lib/pdk/cli/exec/interactive_command.rb +110 -0
- data/lib/pdk/cli/exec_group.rb +1 -1
- data/lib/pdk/cli/new.rb +1 -0
- data/lib/pdk/cli/new/transport.rb +25 -0
- data/lib/pdk/cli/util.rb +1 -1
- data/lib/pdk/cli/util/option_validator.rb +4 -0
- data/lib/pdk/config.rb +8 -1
- data/lib/pdk/config/validator.rb +1 -1
- data/lib/pdk/config/value.rb +1 -1
- data/lib/pdk/generate.rb +1 -0
- data/lib/pdk/generate/module.rb +17 -7
- data/lib/pdk/generate/provider.rb +0 -5
- data/lib/pdk/generate/puppet_object.rb +16 -3
- data/lib/pdk/generate/transport.rb +87 -0
- data/lib/pdk/module/build.rb +25 -3
- data/lib/pdk/module/metadata.rb +6 -6
- data/lib/pdk/module/templatedir.rb +4 -2
- data/lib/pdk/util/git.rb +2 -2
- data/lib/pdk/util/puppet_version.rb +1 -1
- data/lib/pdk/validate/puppet/puppet_epp.rb +137 -0
- data/lib/pdk/validate/puppet_validator.rb +2 -1
- data/lib/pdk/validate/tasks/name.rb +1 -1
- data/lib/pdk/validate/yaml/syntax.rb +2 -0
- data/lib/pdk/version.rb +1 -1
- data/locales/pdk.pot +133 -83
- metadata +7 -2
data/lib/pdk/module/metadata.rb
CHANGED
@@ -20,7 +20,7 @@ module PDK
|
|
20
20
|
},
|
21
21
|
{
|
22
22
|
'operatingsystem' => 'RedHat',
|
23
|
-
'operatingsystemrelease' => ['
|
23
|
+
'operatingsystemrelease' => ['8'],
|
24
24
|
},
|
25
25
|
{
|
26
26
|
'operatingsystem' => 'Scientific',
|
@@ -30,16 +30,16 @@ module PDK
|
|
30
30
|
'Debian based Linux' => [
|
31
31
|
{
|
32
32
|
'operatingsystem' => 'Debian',
|
33
|
-
'operatingsystemrelease' => ['
|
33
|
+
'operatingsystemrelease' => ['9'],
|
34
34
|
},
|
35
35
|
{
|
36
36
|
'operatingsystem' => 'Ubuntu',
|
37
|
-
'operatingsystemrelease' => ['
|
37
|
+
'operatingsystemrelease' => ['18.04'],
|
38
38
|
},
|
39
39
|
],
|
40
40
|
'Fedora' => {
|
41
41
|
'operatingsystem' => 'Fedora',
|
42
|
-
'operatingsystemrelease' => ['
|
42
|
+
'operatingsystemrelease' => ['29'],
|
43
43
|
},
|
44
44
|
'OSX' => {
|
45
45
|
'operatingsystem' => 'Darwin',
|
@@ -47,7 +47,7 @@ module PDK
|
|
47
47
|
},
|
48
48
|
'SLES' => {
|
49
49
|
'operatingsystem' => 'SLES',
|
50
|
-
'operatingsystemrelease' => ['
|
50
|
+
'operatingsystemrelease' => ['15'],
|
51
51
|
},
|
52
52
|
'Solaris' => {
|
53
53
|
'operatingsystem' => 'Solaris',
|
@@ -55,7 +55,7 @@ module PDK
|
|
55
55
|
},
|
56
56
|
'Windows' => {
|
57
57
|
'operatingsystem' => 'windows',
|
58
|
-
'operatingsystemrelease' => [
|
58
|
+
'operatingsystemrelease' => %w[2019 10],
|
59
59
|
},
|
60
60
|
}.freeze
|
61
61
|
|
@@ -160,6 +160,7 @@ module PDK
|
|
160
160
|
def object_template_for(object_type)
|
161
161
|
object_path = File.join(@object_dir, "#{object_type}.erb")
|
162
162
|
type_path = File.join(@object_dir, "#{object_type}_type.erb")
|
163
|
+
device_path = File.join(@object_dir, "#{object_type}_device.erb")
|
163
164
|
spec_path = File.join(@object_dir, "#{object_type}_spec.erb")
|
164
165
|
type_spec_path = File.join(@object_dir, "#{object_type}_type_spec.erb")
|
165
166
|
|
@@ -167,6 +168,7 @@ module PDK
|
|
167
168
|
result = { object: object_path }
|
168
169
|
result[:type] = type_path if File.file?(type_path) && File.readable?(type_path)
|
169
170
|
result[:spec] = spec_path if File.file?(spec_path) && File.readable?(spec_path)
|
171
|
+
result[:device] = device_path if File.file?(device_path) && File.readable?(device_path)
|
170
172
|
result[:type_spec] = type_spec_path if File.file?(type_spec_path) && File.readable?(type_spec_path)
|
171
173
|
result
|
172
174
|
else
|
@@ -350,10 +352,10 @@ module PDK
|
|
350
352
|
|
351
353
|
PDK.logger.error reset_result[:stdout]
|
352
354
|
PDK.logger.error reset_result[:stderr]
|
353
|
-
raise PDK::CLI::FatalError, _("Unable to
|
355
|
+
raise PDK::CLI::FatalError, _("Unable to checkout '%{ref}' of git repository at '%{path}'.") % { ref: ref, path: path }
|
354
356
|
end
|
355
357
|
else
|
356
|
-
PDK.logger.warn _("Uncommitted changes found when attempting to
|
358
|
+
PDK.logger.warn _("Uncommitted changes found when attempting to checkout '%{ref}' of git repository at '%{path}'; skipping git reset.") % { ref: ref, path: path }
|
357
359
|
end
|
358
360
|
end
|
359
361
|
|
data/lib/pdk/util/git.rb
CHANGED
@@ -81,8 +81,8 @@ module PDK
|
|
81
81
|
end
|
82
82
|
|
83
83
|
def self.work_dir_clean?(repo)
|
84
|
-
raise PDK::CLI::ExitWithError, _('Unable to locate git work dir "%{workdir}') % { workdir: repo } unless File.directory?(repo)
|
85
|
-
raise PDK::CLI::ExitWithError, _('Unable to locate git dir "%{gitdir}') % { gitdir: repo } unless File.directory?(File.join(repo, '.git'))
|
84
|
+
raise PDK::CLI::ExitWithError, _('Unable to locate git work dir "%{workdir}"') % { workdir: repo } unless File.directory?(repo)
|
85
|
+
raise PDK::CLI::ExitWithError, _('Unable to locate git dir "%{gitdir}"') % { gitdir: repo } unless File.directory?(File.join(repo, '.git'))
|
86
86
|
|
87
87
|
git('--work-tree', repo, '--git-dir', File.join(repo, '.git'), 'status', '--untracked-files=no', '--porcelain', repo)[:stdout].empty?
|
88
88
|
end
|
@@ -56,7 +56,7 @@ module PDK
|
|
56
56
|
|
57
57
|
PDK.logger.error clone_result[:stdout]
|
58
58
|
PDK.logger.error clone_result[:stderr]
|
59
|
-
raise PDK::CLI::FatalError, _("Unable to clone git repository
|
59
|
+
raise PDK::CLI::FatalError, _("Unable to clone git repository from '%{repo}'.") % { repo: DEFAULT_PUPPET_DEV_URL }
|
60
60
|
end
|
61
61
|
|
62
62
|
# Fetch Updates from remote repository
|
@@ -0,0 +1,137 @@
|
|
1
|
+
require 'pdk'
|
2
|
+
require 'pdk/cli/exec'
|
3
|
+
require 'pdk/validate/base_validator'
|
4
|
+
require 'fileutils'
|
5
|
+
require 'tmpdir'
|
6
|
+
|
7
|
+
module PDK
|
8
|
+
module Validate
|
9
|
+
class PuppetEPP < BaseValidator
|
10
|
+
# In Puppet >= 5.3.4, the error context formatting was changed to facilitate localization
|
11
|
+
ERROR_CONTEXT = %r{(?:file:\s(?<file>.+?)|line:\s(?<line>.+?)|column:\s(?<column>.+?))}
|
12
|
+
# In Puppet < 5.3.3, the error context was formatted in these variations:
|
13
|
+
# - "at file_path:line_num:col_num"
|
14
|
+
# - "at file_path:line_num"
|
15
|
+
# - "at line line_num"
|
16
|
+
# - "in file_path"
|
17
|
+
ERROR_CONTEXT_LEGACY = %r{(?:at\sline\s(?<line>\d+)|at\s(?<file>.+?):(?<line>\d+):(?<column>\d+)|at\s(?<file>.+?):(?<line>\d+)|in\s(?<file>.+?))}
|
18
|
+
|
19
|
+
PUPPET_LOGGER_PREFIX = %r{^(debug|info|notice|warning|error|alert|critical):\s.+?$}i
|
20
|
+
PUPPET_SYNTAX_PATTERN = %r{^
|
21
|
+
(?<severity>.+?):\s
|
22
|
+
(?<message>.+?)
|
23
|
+
(?:
|
24
|
+
\s\(#{ERROR_CONTEXT}(,\s#{ERROR_CONTEXT})*\)| # attempt to match the new localisation friendly location
|
25
|
+
\s#{ERROR_CONTEXT_LEGACY}| # attempt to match the old " at file:line:column" location
|
26
|
+
$ # handle cases where the output has no location
|
27
|
+
)
|
28
|
+
$}x
|
29
|
+
|
30
|
+
def self.name
|
31
|
+
'puppet-epp'
|
32
|
+
end
|
33
|
+
|
34
|
+
def self.cmd
|
35
|
+
'puppet'
|
36
|
+
end
|
37
|
+
|
38
|
+
def self.pattern
|
39
|
+
'**/*.epp'
|
40
|
+
end
|
41
|
+
|
42
|
+
def self.pattern_ignore
|
43
|
+
''
|
44
|
+
end
|
45
|
+
|
46
|
+
def self.spinner_text(_targets = nil)
|
47
|
+
_('Checking Puppet EPP syntax (%{pattern}).') % { pattern: pattern }
|
48
|
+
end
|
49
|
+
|
50
|
+
def self.parse_options(_options, targets)
|
51
|
+
# Due to PDK-1266 we need to run `puppet parser validate` with an empty
|
52
|
+
# modulepath. On *nix, Ruby treats `/dev/null` as an empty directory
|
53
|
+
# however it doesn't do so with `NUL` on Windows. The workaround for
|
54
|
+
# this to ensure consistent behaviour is to create an empty temporary
|
55
|
+
# directory and use that as the modulepath.
|
56
|
+
['epp', 'validate', '--config', null_file, '--modulepath', validate_tmpdir].concat(targets)
|
57
|
+
end
|
58
|
+
|
59
|
+
def self.invoke(report, options)
|
60
|
+
super
|
61
|
+
ensure
|
62
|
+
remove_validate_tmpdir
|
63
|
+
end
|
64
|
+
|
65
|
+
def self.validate_tmpdir
|
66
|
+
@validate_tmpdir ||= Dir.mktmpdir('puppet-epp-validate')
|
67
|
+
end
|
68
|
+
|
69
|
+
def self.remove_validate_tmpdir
|
70
|
+
return unless @validate_tmpdir
|
71
|
+
return unless File.directory?(@validate_tmpdir)
|
72
|
+
|
73
|
+
FileUtils.remove_entry_secure(@validate_tmpdir)
|
74
|
+
@validate_tmpdir = nil
|
75
|
+
end
|
76
|
+
|
77
|
+
def self.null_file
|
78
|
+
Gem.win_platform? ? 'NUL' : '/dev/null'
|
79
|
+
end
|
80
|
+
|
81
|
+
def self.parse_output(report, result, targets)
|
82
|
+
# Due to PUP-7504, we will have to programmatically construct the json
|
83
|
+
# object from the text output for now.
|
84
|
+
output = result[:stderr].split("\n").reject { |entry| entry.empty? }
|
85
|
+
|
86
|
+
results_data = []
|
87
|
+
output.each do |offense|
|
88
|
+
offense_data = parse_offense(offense)
|
89
|
+
results_data << offense_data
|
90
|
+
end
|
91
|
+
|
92
|
+
# puppet parser validate does not include files without problems in its
|
93
|
+
# output, so we need to go through the list of targets and add passing
|
94
|
+
# events to the report for any target not listed in the output.
|
95
|
+
targets.reject { |target| results_data.any? { |j| j[:file] =~ %r{#{target}} } }.each do |target|
|
96
|
+
report.add_event(
|
97
|
+
file: target,
|
98
|
+
source: name,
|
99
|
+
severity: :ok,
|
100
|
+
state: :passed,
|
101
|
+
)
|
102
|
+
end
|
103
|
+
|
104
|
+
results_data.each do |offense|
|
105
|
+
report.add_event(offense)
|
106
|
+
end
|
107
|
+
end
|
108
|
+
|
109
|
+
def self.parse_offense(offense)
|
110
|
+
sanitize_console_output(offense)
|
111
|
+
|
112
|
+
offense_data = {
|
113
|
+
source: name,
|
114
|
+
state: :failure,
|
115
|
+
}
|
116
|
+
|
117
|
+
if offense.match(PUPPET_LOGGER_PREFIX)
|
118
|
+
attributes = offense.match(PUPPET_SYNTAX_PATTERN)
|
119
|
+
|
120
|
+
unless attributes.nil?
|
121
|
+
attributes.names.each do |name|
|
122
|
+
offense_data[name.to_sym] = attributes[name] unless attributes[name].nil?
|
123
|
+
end
|
124
|
+
end
|
125
|
+
else
|
126
|
+
offense_data[:message] = offense
|
127
|
+
end
|
128
|
+
|
129
|
+
offense_data
|
130
|
+
end
|
131
|
+
|
132
|
+
def self.sanitize_console_output(line)
|
133
|
+
line.gsub!(%r{\e\[([;\d]+)?m}, '')
|
134
|
+
end
|
135
|
+
end
|
136
|
+
end
|
137
|
+
end
|
@@ -3,6 +3,7 @@ require 'pdk/cli/exec'
|
|
3
3
|
require 'pdk/validate/base_validator'
|
4
4
|
require 'pdk/validate/puppet/puppet_lint'
|
5
5
|
require 'pdk/validate/puppet/puppet_syntax'
|
6
|
+
require 'pdk/validate/puppet/puppet_epp'
|
6
7
|
|
7
8
|
module PDK
|
8
9
|
module Validate
|
@@ -12,7 +13,7 @@ module PDK
|
|
12
13
|
end
|
13
14
|
|
14
15
|
def self.puppet_validators
|
15
|
-
[PuppetSyntax, PuppetLint]
|
16
|
+
[PuppetSyntax, PuppetLint, PuppetEPP]
|
16
17
|
end
|
17
18
|
|
18
19
|
def self.invoke(report, options = {})
|
@@ -7,7 +7,7 @@ module PDK
|
|
7
7
|
class Tasks
|
8
8
|
class Name < BaseValidator
|
9
9
|
INVALID_TASK_MSG = _(
|
10
|
-
'Invalid task name. Task names must start with a lowercase letter' \
|
10
|
+
'Invalid task name. Task names must start with a lowercase letter ' \
|
11
11
|
'and can only contain lowercase letters, numbers, and underscores.',
|
12
12
|
)
|
13
13
|
|
data/lib/pdk/version.rb
CHANGED
data/locales/pdk.pot
CHANGED
@@ -6,11 +6,11 @@
|
|
6
6
|
#, fuzzy
|
7
7
|
msgid ""
|
8
8
|
msgstr ""
|
9
|
-
"Project-Id-Version: puppet development kit v1.11.
|
9
|
+
"Project-Id-Version: puppet development kit v1.11.1-46-g675b567\n"
|
10
10
|
"\n"
|
11
11
|
"Report-Msgid-Bugs-To: docs@puppet.com\n"
|
12
|
-
"POT-Creation-Date: 2019-07-
|
13
|
-
"PO-Revision-Date: 2019-07-
|
12
|
+
"POT-Creation-Date: 2019-07-31 20:31+1000\n"
|
13
|
+
"PO-Revision-Date: 2019-07-31 20:31+1000\n"
|
14
14
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
15
15
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
16
16
|
"Language: \n"
|
@@ -19,6 +19,10 @@ msgstr ""
|
|
19
19
|
"Content-Transfer-Encoding: 8bit\n"
|
20
20
|
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
|
21
21
|
|
22
|
+
#: ../lib/pdk/analytics/client/google_analytics.rb:42 ../lib/pdk/analytics/client/google_analytics.rb:57
|
23
|
+
msgid "Unknown analytics key '%{key}'"
|
24
|
+
msgstr ""
|
25
|
+
|
22
26
|
#: ../lib/pdk/answer_file.rb:59
|
23
27
|
msgid "Answer file can be updated only with a Hash"
|
24
28
|
msgstr ""
|
@@ -163,11 +167,9 @@ msgstr ""
|
|
163
167
|
msgid ""
|
164
168
|
"[experimental] For advanced users, pdk bundle runs arbitrary commands in the bundler environment that pdk manages.\n"
|
165
169
|
"Careless use of this command can lead to errors that pdk can't help recover from.\n"
|
166
|
-
"\n"
|
167
|
-
"Note that for PowerShell the '--' needs to be escaped using a backtick: '`--' to avoid it being parsed by the shell.\n"
|
168
170
|
msgstr ""
|
169
171
|
|
170
|
-
#: ../lib/pdk/cli/bundle.rb:
|
172
|
+
#: ../lib/pdk/cli/bundle.rb:15
|
171
173
|
msgid "`pdk bundle` can only be run from inside a valid module directory."
|
172
174
|
msgstr ""
|
173
175
|
|
@@ -207,62 +209,80 @@ msgstr ""
|
|
207
209
|
msgid "An unexpected error has occurred. Try running the command again with --debug"
|
208
210
|
msgstr ""
|
209
211
|
|
210
|
-
#: ../lib/pdk/cli/exec.rb:
|
212
|
+
#: ../lib/pdk/cli/exec.rb:35
|
211
213
|
msgid "Unable to find `%{name}`. Check that it is installed and try again."
|
212
214
|
msgstr ""
|
213
215
|
|
214
|
-
#: ../lib/pdk/cli/exec.rb:
|
216
|
+
#: ../lib/pdk/cli/exec.rb:57
|
215
217
|
msgid "PDK package installation not found. Trying '%{fallback}' from the system PATH instead."
|
216
218
|
msgstr ""
|
217
219
|
|
218
|
-
#: ../lib/pdk/cli/exec.rb:
|
220
|
+
#: ../lib/pdk/cli/exec.rb:66
|
219
221
|
msgid "Could not find '%{vendored_bin}' in PDK package. Trying '%{fallback}' from the system PATH instead."
|
220
222
|
msgstr ""
|
221
223
|
|
222
|
-
#: ../lib/pdk/cli/exec.rb:
|
224
|
+
#: ../lib/pdk/cli/exec.rb:73
|
223
225
|
msgid "Using '%{vendored_bin}' from PDK package."
|
224
226
|
msgstr ""
|
225
227
|
|
226
|
-
#: ../lib/pdk/cli/exec.rb:
|
228
|
+
#: ../lib/pdk/cli/exec/command.rb:46
|
227
229
|
msgid "Expected execution context to be :system or :module but got '%{context}'."
|
228
230
|
msgstr ""
|
229
231
|
|
230
|
-
#: ../lib/pdk/cli/exec.rb:
|
231
|
-
msgid "
|
232
|
+
#: ../lib/pdk/cli/exec/command.rb:85 ../lib/pdk/cli/exec/interactive_command.rb:44
|
233
|
+
msgid "Current working directory is not part of a module. (No metadata.json was found.)"
|
232
234
|
msgstr ""
|
233
235
|
|
234
|
-
#: ../lib/pdk/cli/exec.rb:
|
235
|
-
msgid "
|
236
|
+
#: ../lib/pdk/cli/exec/command.rb:112
|
237
|
+
msgid "STDOUT: %{output}"
|
236
238
|
msgstr ""
|
237
239
|
|
238
|
-
#: ../lib/pdk/cli/exec.rb:
|
239
|
-
msgid "
|
240
|
+
#: ../lib/pdk/cli/exec/command.rb:115
|
241
|
+
msgid "STDERR: %{output}"
|
240
242
|
msgstr ""
|
241
243
|
|
242
|
-
#: ../lib/pdk/cli/exec.rb:
|
243
|
-
msgid "
|
244
|
+
#: ../lib/pdk/cli/exec/command.rb:129
|
245
|
+
msgid "PUPPET_GEM_VERSION is not supported by PDK. Use the --puppet-version option on your PDK command or set the PDK_PUPPET_VERSION environment variable instead"
|
244
246
|
msgstr ""
|
245
247
|
|
246
|
-
#: ../lib/pdk/cli/exec.rb:
|
247
|
-
msgid "
|
248
|
+
#: ../lib/pdk/cli/exec/command.rb:138
|
249
|
+
msgid "%{varname} is not supported by PDK."
|
248
250
|
msgstr ""
|
249
251
|
|
250
|
-
#: ../lib/pdk/cli/exec.rb:
|
252
|
+
#: ../lib/pdk/cli/exec/command.rb:197
|
251
253
|
msgid "Executing '%{command}'"
|
252
254
|
msgstr ""
|
253
255
|
|
254
|
-
#: ../lib/pdk/cli/exec.rb:
|
256
|
+
#: ../lib/pdk/cli/exec/command.rb:200 ../lib/pdk/cli/exec/interactive_command.rb:76
|
255
257
|
msgid "Command environment:"
|
256
258
|
msgstr ""
|
257
259
|
|
258
|
-
#: ../lib/pdk/cli/exec.rb:
|
260
|
+
#: ../lib/pdk/cli/exec/command.rb:211
|
259
261
|
msgid "Failed to execute '%{command}': %{message}"
|
260
262
|
msgstr ""
|
261
263
|
|
262
|
-
#: ../lib/pdk/cli/exec.rb:
|
264
|
+
#: ../lib/pdk/cli/exec/command.rb:227
|
263
265
|
msgid "Execution of '%{command}' complete (duration: %{duration_in_seconds}s; exit code: %{exit_code})"
|
264
266
|
msgstr ""
|
265
267
|
|
268
|
+
#: ../lib/pdk/cli/exec/interactive_command.rb:18 ../lib/pdk/cli/exec/interactive_command.rb:22 ../lib/pdk/cli/exec/interactive_command.rb:26 ../lib/pdk/cli/exec/interactive_command.rb:30 ../lib/pdk/cli/exec/interactive_command.rb:34 ../lib/pdk/cli/exec/interactive_command.rb:105
|
269
|
+
msgid "This method is not implemented for PDK::CLI::Exec::InteractiveCommand"
|
270
|
+
msgstr ""
|
271
|
+
|
272
|
+
#: ../lib/pdk/cli/exec/interactive_command.rb:73
|
273
|
+
msgid "Executing '%{command}' interactively"
|
274
|
+
msgstr ""
|
275
|
+
|
276
|
+
#: ../lib/pdk/cli/exec/interactive_command.rb:89
|
277
|
+
msgid ""
|
278
|
+
"Execution of '%{command}' complete (duration: \\\n"
|
279
|
+
" %{duration_in_seconds}s; exit code: %{exit_code})"
|
280
|
+
msgstr ""
|
281
|
+
|
282
|
+
#: ../lib/pdk/cli/exec_group.rb:30
|
283
|
+
msgid "No block registered"
|
284
|
+
msgstr ""
|
285
|
+
|
266
286
|
#: ../lib/pdk/cli/module.rb:4
|
267
287
|
msgid "module [options]"
|
268
288
|
msgstr ""
|
@@ -395,6 +415,18 @@ msgstr ""
|
|
395
415
|
msgid "'%{name}' is not a valid task name"
|
396
416
|
msgstr ""
|
397
417
|
|
418
|
+
#: ../lib/pdk/cli/new/transport.rb:4
|
419
|
+
msgid "transport [options] <name>"
|
420
|
+
msgstr ""
|
421
|
+
|
422
|
+
#: ../lib/pdk/cli/new/transport.rb:5
|
423
|
+
msgid "[experimental] Create a new ruby transport named <name> using given options"
|
424
|
+
msgstr ""
|
425
|
+
|
426
|
+
#: ../lib/pdk/cli/new/transport.rb:19
|
427
|
+
msgid "'%{name}' is not a valid transport name"
|
428
|
+
msgstr ""
|
429
|
+
|
398
430
|
#: ../lib/pdk/cli/test.rb:4
|
399
431
|
msgid "test [subcommand] [options]"
|
400
432
|
msgstr ""
|
@@ -519,11 +551,7 @@ msgstr ""
|
|
519
551
|
msgid "Using %{gem} %{version}"
|
520
552
|
msgstr ""
|
521
553
|
|
522
|
-
#: ../lib/pdk/cli/util.rb:167
|
523
|
-
msgid "You cannot specify a %{first} and %{second} at the same time"
|
524
|
-
msgstr ""
|
525
|
-
|
526
|
-
#: ../lib/pdk/cli/util.rb:179
|
554
|
+
#: ../lib/pdk/cli/util.rb:167 ../lib/pdk/cli/util.rb:179
|
527
555
|
msgid "You cannot specify a %{first} and %{second} at the same time."
|
528
556
|
msgstr ""
|
529
557
|
|
@@ -608,20 +636,24 @@ msgstr ""
|
|
608
636
|
msgid "Validating module using %{num_of_threads} threads"
|
609
637
|
msgstr ""
|
610
638
|
|
611
|
-
#: ../lib/pdk/config.rb:
|
639
|
+
#: ../lib/pdk/config.rb:40
|
640
|
+
msgid "Unable to load %{file}: %{message}"
|
641
|
+
msgstr ""
|
642
|
+
|
643
|
+
#: ../lib/pdk/config.rb:62
|
612
644
|
msgid ""
|
613
645
|
"PDK collects anonymous usage information to help us understand how it is being used and make decisions on how to improve it. You can find out more about what data we collect and how it is used in the PDK documentation at %{url}.\n"
|
614
646
|
msgstr ""
|
615
647
|
|
616
|
-
#: ../lib/pdk/config.rb:
|
648
|
+
#: ../lib/pdk/config.rb:68
|
617
649
|
msgid "You can opt in or out of the usage data collection at any time by editing the analytics configuration file at %{path} and changing the '%{key}' value."
|
618
650
|
msgstr ""
|
619
651
|
|
620
|
-
#: ../lib/pdk/config.rb:
|
652
|
+
#: ../lib/pdk/config.rb:80
|
621
653
|
msgid "Do you consent to the collection of anonymous PDK usage information?"
|
622
654
|
msgstr ""
|
623
655
|
|
624
|
-
#: ../lib/pdk/config.rb:
|
656
|
+
#: ../lib/pdk/config.rb:92
|
625
657
|
msgid "No answer given, opting out of analytics collection."
|
626
658
|
msgstr ""
|
627
659
|
|
@@ -638,7 +670,7 @@ msgid "Unable to open %{file} for writing"
|
|
638
670
|
msgstr ""
|
639
671
|
|
640
672
|
#: ../lib/pdk/config/validator.rb:16
|
641
|
-
msgid "must be a boolean true or false"
|
673
|
+
msgid "must be a boolean: true or false"
|
642
674
|
msgstr ""
|
643
675
|
|
644
676
|
#: ../lib/pdk/config/validator.rb:26
|
@@ -646,7 +678,7 @@ msgid "must be a version 4 UUID"
|
|
646
678
|
msgstr ""
|
647
679
|
|
648
680
|
#: ../lib/pdk/config/value.rb:42
|
649
|
-
msgid "validator must be a Hash"
|
681
|
+
msgid "`validator` must be a Hash"
|
650
682
|
msgstr ""
|
651
683
|
|
652
684
|
#: ../lib/pdk/config/value.rb:43
|
@@ -795,35 +827,37 @@ msgstr ""
|
|
795
827
|
msgid "If there is a public issue tracker for this module, enter its URL here."
|
796
828
|
msgstr ""
|
797
829
|
|
798
|
-
#: ../lib/pdk/generate/module.rb:
|
799
|
-
msgid "
|
830
|
+
#: ../lib/pdk/generate/module.rb:262
|
831
|
+
msgid ""
|
832
|
+
"\n"
|
833
|
+
"We need to update the metadata.json file for this module, so we\\'re going to ask you %{count} questions.\n"
|
800
834
|
msgstr ""
|
801
835
|
|
802
|
-
#: ../lib/pdk/generate/module.rb:
|
803
|
-
msgid "
|
836
|
+
#: ../lib/pdk/generate/module.rb:269
|
837
|
+
msgid ""
|
838
|
+
"\n"
|
839
|
+
"We need to create the metadata.json file for this module, so we\\'re going to ask you %{count} questions.\n"
|
804
840
|
msgstr ""
|
805
841
|
|
806
|
-
#: ../lib/pdk/generate/module.rb:
|
842
|
+
#: ../lib/pdk/generate/module.rb:277
|
807
843
|
msgid ""
|
808
|
-
"\n"
|
809
|
-
"We need to %{action} the metadata.json file for this module, so we\\'re going to ask you %{count} questions.\n"
|
810
844
|
"If the question is not applicable to this module, accept the default option shown after each question. You can modify any answers at any time by manually updating the metadata.json file.\n"
|
811
845
|
"\n"
|
812
846
|
msgstr ""
|
813
847
|
|
814
|
-
#: ../lib/pdk/generate/module.rb:
|
848
|
+
#: ../lib/pdk/generate/module.rb:286
|
815
849
|
msgid "No answers given, interview cancelled."
|
816
850
|
msgstr ""
|
817
851
|
|
818
|
-
#: ../lib/pdk/generate/module.rb:
|
852
|
+
#: ../lib/pdk/generate/module.rb:310
|
819
853
|
msgid "Metadata will be generated based on this information, continue?"
|
820
854
|
msgstr ""
|
821
855
|
|
822
|
-
#: ../lib/pdk/generate/module.rb:
|
856
|
+
#: ../lib/pdk/generate/module.rb:312
|
823
857
|
msgid "Interview cancelled; exiting."
|
824
858
|
msgstr ""
|
825
859
|
|
826
|
-
#: ../lib/pdk/generate/module.rb:
|
860
|
+
#: ../lib/pdk/generate/module.rb:316
|
827
861
|
msgid "Process cancelled; exiting."
|
828
862
|
msgstr ""
|
829
863
|
|
@@ -831,71 +865,71 @@ msgstr ""
|
|
831
865
|
msgid "%{error}: Creating a provider needs some local configuration in your module. Please follow the docs at https://github.com/puppetlabs/puppet-resource_api#getting-started."
|
832
866
|
msgstr ""
|
833
867
|
|
834
|
-
#: ../lib/pdk/generate/provider.rb:33
|
868
|
+
#: ../lib/pdk/generate/provider.rb:33 ../lib/pdk/generate/transport.rb:33
|
835
869
|
msgid ".sync.yml not found"
|
836
870
|
msgstr ""
|
837
871
|
|
838
|
-
#: ../lib/pdk/generate/provider.rb:37
|
872
|
+
#: ../lib/pdk/generate/provider.rb:37 ../lib/pdk/generate/transport.rb:37
|
839
873
|
msgid ".sync.yml contents is not a Hash"
|
840
874
|
msgstr ""
|
841
875
|
|
842
|
-
#: ../lib/pdk/generate/provider.rb:39
|
876
|
+
#: ../lib/pdk/generate/provider.rb:39 ../lib/pdk/generate/transport.rb:39
|
843
877
|
msgid "Gemfile configuration not found"
|
844
878
|
msgstr ""
|
845
879
|
|
846
|
-
#: ../lib/pdk/generate/provider.rb:41
|
880
|
+
#: ../lib/pdk/generate/provider.rb:41 ../lib/pdk/generate/transport.rb:41
|
847
881
|
msgid "Gemfile.optional configuration not found"
|
848
882
|
msgstr ""
|
849
883
|
|
850
|
-
#: ../lib/pdk/generate/provider.rb:43
|
884
|
+
#: ../lib/pdk/generate/provider.rb:43 ../lib/pdk/generate/transport.rb:43
|
851
885
|
msgid "Gemfile.optional.:development configuration not found"
|
852
886
|
msgstr ""
|
853
887
|
|
854
|
-
#: ../lib/pdk/generate/provider.rb:45
|
888
|
+
#: ../lib/pdk/generate/provider.rb:45 ../lib/pdk/generate/transport.rb:45
|
855
889
|
msgid "puppet-resource_api not found in the Gemfile config"
|
856
890
|
msgstr ""
|
857
891
|
|
858
|
-
#: ../lib/pdk/generate/provider.rb:47
|
892
|
+
#: ../lib/pdk/generate/provider.rb:47 ../lib/pdk/generate/transport.rb:47
|
859
893
|
msgid "spec/spec_helper.rb configuration not found"
|
860
894
|
msgstr ""
|
861
895
|
|
862
|
-
#: ../lib/pdk/generate/provider.rb:49
|
896
|
+
#: ../lib/pdk/generate/provider.rb:49 ../lib/pdk/generate/transport.rb:49
|
863
897
|
msgid "spec/spec_helper.rb.mock_with configuration not found"
|
864
898
|
msgstr ""
|
865
899
|
|
866
|
-
#: ../lib/pdk/generate/provider.rb:51
|
900
|
+
#: ../lib/pdk/generate/provider.rb:51 ../lib/pdk/generate/transport.rb:51
|
867
901
|
msgid "spec/spec_helper.rb.mock_with not set to ':rspec'"
|
868
902
|
msgstr ""
|
869
903
|
|
870
|
-
#: ../lib/pdk/generate/puppet_object.rb:
|
904
|
+
#: ../lib/pdk/generate/puppet_object.rb:112
|
871
905
|
msgid "Unable to generate %{object_type}; '%{file}' already exists."
|
872
906
|
msgstr ""
|
873
907
|
|
874
|
-
#: ../lib/pdk/generate/puppet_object.rb:
|
908
|
+
#: ../lib/pdk/generate/puppet_object.rb:179
|
875
909
|
msgid "Creating '%{file}' from template."
|
876
910
|
msgstr ""
|
877
911
|
|
878
|
-
#: ../lib/pdk/generate/puppet_object.rb:
|
912
|
+
#: ../lib/pdk/generate/puppet_object.rb:186
|
879
913
|
msgid "Unable to create directory '%{path}': %{message}"
|
880
914
|
msgstr ""
|
881
915
|
|
882
|
-
#: ../lib/pdk/generate/puppet_object.rb:
|
916
|
+
#: ../lib/pdk/generate/puppet_object.rb:194
|
883
917
|
msgid "Unable to write to file '%{path}': %{message}"
|
884
918
|
msgstr ""
|
885
919
|
|
886
|
-
#: ../lib/pdk/generate/puppet_object.rb:
|
920
|
+
#: ../lib/pdk/generate/puppet_object.rb:217
|
887
921
|
msgid "No %{dir_type} template found; trying next template directory."
|
888
922
|
msgstr ""
|
889
923
|
|
890
|
-
#: ../lib/pdk/generate/puppet_object.rb:
|
924
|
+
#: ../lib/pdk/generate/puppet_object.rb:230
|
891
925
|
msgid "Unable to find a %{type} template in %{url}; trying next template directory."
|
892
926
|
msgstr ""
|
893
927
|
|
894
|
-
#: ../lib/pdk/generate/puppet_object.rb:
|
928
|
+
#: ../lib/pdk/generate/puppet_object.rb:232
|
895
929
|
msgid "Unable to find the %{type} template in %{url}."
|
896
930
|
msgstr ""
|
897
931
|
|
898
|
-
#: ../lib/pdk/generate/puppet_object.rb:
|
932
|
+
#: ../lib/pdk/generate/puppet_object.rb:287
|
899
933
|
msgid "'%{dir}' does not contain valid Puppet module metadata: %{msg}"
|
900
934
|
msgstr ""
|
901
935
|
|
@@ -903,8 +937,12 @@ msgstr ""
|
|
903
937
|
msgid "A task named '%{name}' already exists in this module; defined in %{file}"
|
904
938
|
msgstr ""
|
905
939
|
|
940
|
+
#: ../lib/pdk/generate/transport.rb:23
|
941
|
+
msgid "%{error}: Creating a transport needs some local configuration in your module. Please follow the docs at https://github.com/puppetlabs/puppet-resource_api#getting-started."
|
942
|
+
msgstr ""
|
943
|
+
|
906
944
|
#: ../lib/pdk/module/build.rb:127
|
907
|
-
msgid "%{message}
|
945
|
+
msgid "%{message} Rename the file or exclude it from the package by adding it to the .pdkignore file in your module."
|
908
946
|
msgstr ""
|
909
947
|
|
910
948
|
#: ../lib/pdk/module/build.rb:155
|
@@ -919,6 +957,10 @@ msgstr ""
|
|
919
957
|
msgid "'%{path}' could not be split at a directory separator into two parts, the first having a maximum length of 155 bytes and the second having a maximum length of 100 bytes."
|
920
958
|
msgstr ""
|
921
959
|
|
960
|
+
#: ../lib/pdk/module/build.rb:237
|
961
|
+
msgid "Updated permissions of packaged '%{entry}' to %{new_mode}"
|
962
|
+
msgstr ""
|
963
|
+
|
922
964
|
#: ../lib/pdk/module/convert.rb:23 ../lib/pdk/module/update.rb:20
|
923
965
|
msgid "No changes required."
|
924
966
|
msgstr ""
|
@@ -1033,40 +1075,40 @@ msgid ""
|
|
1033
1075
|
"%{exception}: %{message}"
|
1034
1076
|
msgstr ""
|
1035
1077
|
|
1036
|
-
#: ../lib/pdk/module/templatedir.rb:
|
1078
|
+
#: ../lib/pdk/module/templatedir.rb:206
|
1037
1079
|
msgid "The built-in template has substantially changed. Please run \"pdk convert\" on your module to continue."
|
1038
1080
|
msgstr ""
|
1039
1081
|
|
1040
|
-
#: ../lib/pdk/module/templatedir.rb:
|
1082
|
+
#: ../lib/pdk/module/templatedir.rb:208
|
1041
1083
|
msgid "The specified template '%{path}' is not a directory."
|
1042
1084
|
msgstr ""
|
1043
1085
|
|
1044
|
-
#: ../lib/pdk/module/templatedir.rb:
|
1086
|
+
#: ../lib/pdk/module/templatedir.rb:213
|
1045
1087
|
msgid "The template at '%{path}' does not contain a 'moduleroot/' directory."
|
1046
1088
|
msgstr ""
|
1047
1089
|
|
1048
|
-
#: ../lib/pdk/module/templatedir.rb:
|
1090
|
+
#: ../lib/pdk/module/templatedir.rb:218
|
1049
1091
|
msgid "The template at '%{path}' does not contain a 'moduleroot_init/' directory, which indicates you are using an older style of template. Before continuing please use the --template-url flag when running the pdk new commands to pass a new style template."
|
1050
1092
|
msgstr ""
|
1051
1093
|
|
1052
|
-
#: ../lib/pdk/module/templatedir.rb:
|
1094
|
+
#: ../lib/pdk/module/templatedir.rb:234
|
1053
1095
|
msgid "The directory '%{dir}' doesn't exist"
|
1054
1096
|
msgstr ""
|
1055
1097
|
|
1056
|
-
#: ../lib/pdk/module/templatedir.rb:
|
1098
|
+
#: ../lib/pdk/module/templatedir.rb:303
|
1057
1099
|
msgid "'%{file}' is not a valid YAML file: %{problem} %{context} at line %{line} column %{column}"
|
1058
1100
|
msgstr ""
|
1059
1101
|
|
1060
|
-
#: ../lib/pdk/module/templatedir.rb:
|
1102
|
+
#: ../lib/pdk/module/templatedir.rb:338
|
1061
1103
|
msgid "Unable to clone git repository at '%{repo}' into '%{dest}'."
|
1062
1104
|
msgstr ""
|
1063
1105
|
|
1064
|
-
#: ../lib/pdk/module/templatedir.rb:
|
1065
|
-
msgid "Unable to
|
1106
|
+
#: ../lib/pdk/module/templatedir.rb:355
|
1107
|
+
msgid "Unable to checkout '%{ref}' of git repository at '%{path}'."
|
1066
1108
|
msgstr ""
|
1067
1109
|
|
1068
|
-
#: ../lib/pdk/module/templatedir.rb:
|
1069
|
-
msgid "Uncommitted changes found when attempting to
|
1110
|
+
#: ../lib/pdk/module/templatedir.rb:358
|
1111
|
+
msgid "Uncommitted changes found when attempting to checkout '%{ref}' of git repository at '%{path}'; skipping git reset."
|
1070
1112
|
msgstr ""
|
1071
1113
|
|
1072
1114
|
#: ../lib/pdk/module/update.rb:14
|
@@ -1272,11 +1314,11 @@ msgid "Git command failed: git %{args}"
|
|
1272
1314
|
msgstr ""
|
1273
1315
|
|
1274
1316
|
#: ../lib/pdk/util/git.rb:84
|
1275
|
-
msgid "Unable to locate git work dir \"%{workdir}"
|
1317
|
+
msgid "Unable to locate git work dir \"%{workdir}\""
|
1276
1318
|
msgstr ""
|
1277
1319
|
|
1278
1320
|
#: ../lib/pdk/util/git.rb:85
|
1279
|
-
msgid "Unable to locate git dir \"%{gitdir}"
|
1321
|
+
msgid "Unable to locate git dir \"%{gitdir}\""
|
1280
1322
|
msgstr ""
|
1281
1323
|
|
1282
1324
|
#: ../lib/pdk/util/git.rb:100
|
@@ -1292,7 +1334,7 @@ msgid "Unable to find a Puppet gem in current Ruby environment or from Rubygems.
|
|
1292
1334
|
msgstr ""
|
1293
1335
|
|
1294
1336
|
#: ../lib/pdk/util/puppet_version.rb:59
|
1295
|
-
msgid "Unable to clone git repository
|
1337
|
+
msgid "Unable to clone git repository from '%{repo}'."
|
1296
1338
|
msgstr ""
|
1297
1339
|
|
1298
1340
|
#: ../lib/pdk/util/puppet_version.rb:68
|
@@ -1423,10 +1465,14 @@ msgstr ""
|
|
1423
1465
|
msgid "Checking metadata syntax (%{targets})."
|
1424
1466
|
msgstr ""
|
1425
1467
|
|
1426
|
-
#: ../lib/pdk/validate/metadata/metadata_syntax.rb:69 ../lib/pdk/validate/tasks/metadata_lint.rb:77 ../lib/pdk/validate/yaml/syntax.rb:
|
1468
|
+
#: ../lib/pdk/validate/metadata/metadata_syntax.rb:69 ../lib/pdk/validate/tasks/metadata_lint.rb:77 ../lib/pdk/validate/yaml/syntax.rb:76
|
1427
1469
|
msgid "Could not be read."
|
1428
1470
|
msgstr ""
|
1429
1471
|
|
1472
|
+
#: ../lib/pdk/validate/puppet/puppet_epp.rb:47
|
1473
|
+
msgid "Checking Puppet EPP syntax (%{pattern})."
|
1474
|
+
msgstr ""
|
1475
|
+
|
1430
1476
|
#: ../lib/pdk/validate/puppet/puppet_lint.rb:22
|
1431
1477
|
msgid "Checking Puppet manifest style (%{pattern})."
|
1432
1478
|
msgstr ""
|
@@ -1452,7 +1498,7 @@ msgid "Unable to validate Task Metadata. %{error}."
|
|
1452
1498
|
msgstr ""
|
1453
1499
|
|
1454
1500
|
#: ../lib/pdk/validate/tasks/name.rb:9
|
1455
|
-
msgid "Invalid task name. Task names must start with a lowercase
|
1501
|
+
msgid "Invalid task name. Task names must start with a lowercase letter and can only contain lowercase letters, numbers, and underscores."
|
1456
1502
|
msgstr ""
|
1457
1503
|
|
1458
1504
|
#: ../lib/pdk/validate/tasks/name.rb:23
|
@@ -1463,10 +1509,14 @@ msgstr ""
|
|
1463
1509
|
msgid "Checking YAML syntax (%{targets})."
|
1464
1510
|
msgstr ""
|
1465
1511
|
|
1466
|
-
#: ../lib/pdk/validate/yaml/syntax.rb:
|
1512
|
+
#: ../lib/pdk/validate/yaml/syntax.rb:65
|
1513
|
+
msgid "Validating yaml content of %{parsed_targets}"
|
1514
|
+
msgstr ""
|
1515
|
+
|
1516
|
+
#: ../lib/pdk/validate/yaml/syntax.rb:99
|
1467
1517
|
msgid "%{problem} %{context}"
|
1468
1518
|
msgstr ""
|
1469
1519
|
|
1470
|
-
#: ../lib/pdk/validate/yaml/syntax.rb:
|
1520
|
+
#: ../lib/pdk/validate/yaml/syntax.rb:111
|
1471
1521
|
msgid "Unsupported class: %{message}"
|
1472
1522
|
msgstr ""
|