Skip to content

Commit 33887f9

Browse files
author
Jeff McCune
committed
Merge branch 'issue/master/8797_puppetlabs-functions_merge'
Closes pull request #12 Reviewed-by: Jeff McCune Verified all spec tests pass using rspec **/*_spec.rb * issue/master/8797_puppetlabs-functions_merge: (164 commits) * Moved kwalify to puppetlabs-kwalify project * Re-arranged tests in line with puppetlabs-stdlib Prep for stdlib merge * Renamed load_yaml & load_json to parseyaml & parsejson * Renamed is_valid_* functions and remove the 'valid_' Fix some ruby 1.9.2 issues. (#3) Provide documentation for remaining functions. (#3) Apply missing documentation to more functions. Remove rand. Some improvements to values_at tests. (#1) provide some more detailed tests for a number of functions. Removed date stub since this functinality is available in strftime anyway. (#2) fix is_string finally so it also makes sure numbers return false. (#2) unstub is_valid_domain_name Added doc strings for first five functions Removed join_with_prefix. (#2) unstub is_valid_mac_address. Allow sort for strings. Count functionality overlaps with size - so removing it. Removed crontab functions instead of unstubbing them. Removed load_variables. load_yaml is sufficient to solve this problem on its own. Remove is_valid_netmask instead of unstubbing. Doesn't seem like a sensible function on its own. (#2) unstub is_numeric function. ...
2 parents e8fb691 + aa27fc7 commit 33887f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+3665
-208
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
pkg/
22
.DS_Store
33
metadata.json
4+
coverage/

LICENSE

+13-196
Original file line numberDiff line numberDiff line change
@@ -1,202 +1,19 @@
1-
Apache License
2-
Version 2.0, January 2004
3-
http://www.apache.org/licenses/
1+
Copyright (C) 2011 Puppet Labs Inc
42

5-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
3+
and some parts:
64

7-
1. Definitions.
5+
Copyright (C) 2011 Krzysztof Wilczynski
86

9-
"License" shall mean the terms and conditions for use, reproduction,
10-
and distribution as defined by Sections 1 through 9 of this document.
7+
Puppet Labs can be contacted at: [email protected]
118

12-
"Licensor" shall mean the copyright owner or entity authorized by
13-
the copyright owner that is granting the License.
9+
Licensed under the Apache License, Version 2.0 (the "License");
10+
you may not use this file except in compliance with the License.
11+
You may obtain a copy of the License at
1412

15-
"Legal Entity" shall mean the union of the acting entity and all
16-
other entities that control, are controlled by, or are under common
17-
control with that entity. For the purposes of this definition,
18-
"control" means (i) the power, direct or indirect, to cause the
19-
direction or management of such entity, whether by contract or
20-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21-
outstanding shares, or (iii) beneficial ownership of such entity.
22-
23-
"You" (or "Your") shall mean an individual or Legal Entity
24-
exercising permissions granted by this License.
25-
26-
"Source" form shall mean the preferred form for making modifications,
27-
including but not limited to software source code, documentation
28-
source, and configuration files.
29-
30-
"Object" form shall mean any form resulting from mechanical
31-
transformation or translation of a Source form, including but
32-
not limited to compiled object code, generated documentation,
33-
and conversions to other media types.
34-
35-
"Work" shall mean the work of authorship, whether in Source or
36-
Object form, made available under the License, as indicated by a
37-
copyright notice that is included in or attached to the work
38-
(an example is provided in the Appendix below).
39-
40-
"Derivative Works" shall mean any work, whether in Source or Object
41-
form, that is based on (or derived from) the Work and for which the
42-
editorial revisions, annotations, elaborations, or other modifications
43-
represent, as a whole, an original work of authorship. For the purposes
44-
of this License, Derivative Works shall not include works that remain
45-
separable from, or merely link (or bind by name) to the interfaces of,
46-
the Work and Derivative Works thereof.
47-
48-
"Contribution" shall mean any work of authorship, including
49-
the original version of the Work and any modifications or additions
50-
to that Work or Derivative Works thereof, that is intentionally
51-
submitted to Licensor for inclusion in the Work by the copyright owner
52-
or by an individual or Legal Entity authorized to submit on behalf of
53-
the copyright owner. For the purposes of this definition, "submitted"
54-
means any form of electronic, verbal, or written communication sent
55-
to the Licensor or its representatives, including but not limited to
56-
communication on electronic mailing lists, source code control systems,
57-
and issue tracking systems that are managed by, or on behalf of, the
58-
Licensor for the purpose of discussing and improving the Work, but
59-
excluding communication that is conspicuously marked or otherwise
60-
designated in writing by the copyright owner as "Not a Contribution."
61-
62-
"Contributor" shall mean Licensor and any individual or Legal Entity
63-
on behalf of whom a Contribution has been received by Licensor and
64-
subsequently incorporated within the Work.
65-
66-
2. Grant of Copyright License. Subject to the terms and conditions of
67-
this License, each Contributor hereby grants to You a perpetual,
68-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69-
copyright license to reproduce, prepare Derivative Works of,
70-
publicly display, publicly perform, sublicense, and distribute the
71-
Work and such Derivative Works in Source or Object form.
72-
73-
3. Grant of Patent License. Subject to the terms and conditions of
74-
this License, each Contributor hereby grants to You a perpetual,
75-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76-
(except as stated in this section) patent license to make, have made,
77-
use, offer to sell, sell, import, and otherwise transfer the Work,
78-
where such license applies only to those patent claims licensable
79-
by such Contributor that are necessarily infringed by their
80-
Contribution(s) alone or by combination of their Contribution(s)
81-
with the Work to which such Contribution(s) was submitted. If You
82-
institute patent litigation against any entity (including a
83-
cross-claim or counterclaim in a lawsuit) alleging that the Work
84-
or a Contribution incorporated within the Work constitutes direct
85-
or contributory patent infringement, then any patent licenses
86-
granted to You under this License for that Work shall terminate
87-
as of the date such litigation is filed.
88-
89-
4. Redistribution. You may reproduce and distribute copies of the
90-
Work or Derivative Works thereof in any medium, with or without
91-
modifications, and in Source or Object form, provided that You
92-
meet the following conditions:
93-
94-
(a) You must give any other recipients of the Work or
95-
Derivative Works a copy of this License; and
96-
97-
(b) You must cause any modified files to carry prominent notices
98-
stating that You changed the files; and
99-
100-
(c) You must retain, in the Source form of any Derivative Works
101-
that You distribute, all copyright, patent, trademark, and
102-
attribution notices from the Source form of the Work,
103-
excluding those notices that do not pertain to any part of
104-
the Derivative Works; and
105-
106-
(d) If the Work includes a "NOTICE" text file as part of its
107-
distribution, then any Derivative Works that You distribute must
108-
include a readable copy of the attribution notices contained
109-
within such NOTICE file, excluding those notices that do not
110-
pertain to any part of the Derivative Works, in at least one
111-
of the following places: within a NOTICE text file distributed
112-
as part of the Derivative Works; within the Source form or
113-
documentation, if provided along with the Derivative Works; or,
114-
within a display generated by the Derivative Works, if and
115-
wherever such third-party notices normally appear. The contents
116-
of the NOTICE file are for informational purposes only and
117-
do not modify the License. You may add Your own attribution
118-
notices within Derivative Works that You distribute, alongside
119-
or as an addendum to the NOTICE text from the Work, provided
120-
that such additional attribution notices cannot be construed
121-
as modifying the License.
122-
123-
You may add Your own copyright statement to Your modifications and
124-
may provide additional or different license terms and conditions
125-
for use, reproduction, or distribution of Your modifications, or
126-
for any such Derivative Works as a whole, provided Your use,
127-
reproduction, and distribution of the Work otherwise complies with
128-
the conditions stated in this License.
129-
130-
5. Submission of Contributions. Unless You explicitly state otherwise,
131-
any Contribution intentionally submitted for inclusion in the Work
132-
by You to the Licensor shall be under the terms and conditions of
133-
this License, without any additional terms or conditions.
134-
Notwithstanding the above, nothing herein shall supersede or modify
135-
the terms of any separate license agreement you may have executed
136-
with Licensor regarding such Contributions.
137-
138-
6. Trademarks. This License does not grant permission to use the trade
139-
names, trademarks, service marks, or product names of the Licensor,
140-
except as required for reasonable and customary use in describing the
141-
origin of the Work and reproducing the content of the NOTICE file.
142-
143-
7. Disclaimer of Warranty. Unless required by applicable law or
144-
agreed to in writing, Licensor provides the Work (and each
145-
Contributor provides its Contributions) on an "AS IS" BASIS,
146-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147-
implied, including, without limitation, any warranties or conditions
148-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149-
PARTICULAR PURPOSE. You are solely responsible for determining the
150-
appropriateness of using or redistributing the Work and assume any
151-
risks associated with Your exercise of permissions under this License.
152-
153-
8. Limitation of Liability. In no event and under no legal theory,
154-
whether in tort (including negligence), contract, or otherwise,
155-
unless required by applicable law (such as deliberate and grossly
156-
negligent acts) or agreed to in writing, shall any Contributor be
157-
liable to You for damages, including any direct, indirect, special,
158-
incidental, or consequential damages of any character arising as a
159-
result of this License or out of the use or inability to use the
160-
Work (including but not limited to damages for loss of goodwill,
161-
work stoppage, computer failure or malfunction, or any and all
162-
other commercial damages or losses), even if such Contributor
163-
has been advised of the possibility of such damages.
164-
165-
9. Accepting Warranty or Additional Liability. While redistributing
166-
the Work or Derivative Works thereof, You may choose to offer,
167-
and charge a fee for, acceptance of support, warranty, indemnity,
168-
or other liability obligations and/or rights consistent with this
169-
License. However, in accepting such obligations, You may act only
170-
on Your own behalf and on Your sole responsibility, not on behalf
171-
of any other Contributor, and only if You agree to indemnify,
172-
defend, and hold each Contributor harmless for any liability
173-
incurred by, or claims asserted against, such Contributor by reason
174-
of your accepting any such warranty or additional liability.
175-
176-
END OF TERMS AND CONDITIONS
177-
178-
APPENDIX: How to apply the Apache License to your work.
179-
180-
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "[]"
182-
replaced with your own identifying information. (Don't include
183-
the brackets!) The text should be enclosed in the appropriate
184-
comment syntax for the file format. We also recommend that a
185-
file or class name and description of purpose be included on the
186-
same "printed page" as the copyright notice for easier
187-
identification within third-party archives.
188-
189-
Copyright [yyyy] [name of copyright owner]
190-
191-
Licensed under the Apache License, Version 2.0 (the "License");
192-
you may not use this file except in compliance with the License.
193-
You may obtain a copy of the License at
194-
195-
http://www.apache.org/licenses/LICENSE-2.0
196-
197-
Unless required by applicable law or agreed to in writing, software
198-
distributed under the License is distributed on an "AS IS" BASIS,
199-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200-
See the License for the specific language governing permissions and
201-
limitations under the License.
13+
http://www.apache.org/licenses/LICENSE-2.0
20214

15+
Unless required by applicable law or agreed to in writing, software
16+
distributed under the License is distributed on an "AS IS" BASIS,
17+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
See the License for the specific language governing permissions and
19+
limitations under the License.

Rakefile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
require 'rake'
2+
require 'rspec/core/rake_task'
3+
4+
task :default => [:test]
5+
6+
desc 'Run RSpec'
7+
RSpec::Core::RakeTask.new(:test) do |t|
8+
t.pattern = 'spec/{unit}/**/*.rb'
9+
t.rspec_opts = ['--color']
10+
end
11+
12+
desc 'Generate code coverage'
13+
RSpec::Core::RakeTask.new(:coverage) do |t|
14+
t.rcov = true
15+
t.rcov_opts = ['--exclude', 'spec']
16+
end

lib/puppet/parser/functions/abs.rb

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#
2+
# abs.rb
3+
#
4+
5+
module Puppet::Parser::Functions
6+
newfunction(:abs, :type => :rvalue, :doc => <<-EOS
7+
Returns the absolute value of a number, for example -34.56 becomes
8+
34.56. Takes a single integer and float value as an argument.
9+
EOS
10+
) do |arguments|
11+
12+
raise(Puppet::ParseError, "abs(): Wrong number of arguments " +
13+
"given (#{arguments.size} for 1)") if arguments.size < 1
14+
15+
value = arguments[0]
16+
17+
# Numbers in Puppet are often string-encoded which is troublesome ...
18+
if value.is_a?(String)
19+
if value.match(/^-?(?:\d+)(?:\.\d+){1}$/)
20+
value = value.to_f
21+
elsif value.match(/^-?\d+$/)
22+
value = value.to_i
23+
else
24+
raise(Puppet::ParseError, 'abs(): Requires float or ' +
25+
'integer to work with')
26+
end
27+
end
28+
29+
# We have numeric value to handle ...
30+
result = value.abs
31+
32+
return result
33+
end
34+
end
35+
36+
# vim: set ts=2 sw=2 et :
+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#
2+
# bool2num.rb
3+
#
4+
5+
module Puppet::Parser::Functions
6+
newfunction(:bool2num, :type => :rvalue, :doc => <<-EOS
7+
Converts a boolean to a number. Converts the values:
8+
false, f, 0, n, and no to 0
9+
true, t, 1, y, and yes to 1
10+
Requires a single boolean or string as an input.
11+
EOS
12+
) do |arguments|
13+
14+
raise(Puppet::ParseError, "bool2num(): Wrong number of arguments " +
15+
"given (#{arguments.size} for 1)") if arguments.size < 1
16+
17+
value = arguments[0]
18+
klass = value.class
19+
20+
# We can have either true or false, or string which resembles boolean ...
21+
unless [FalseClass, TrueClass, String].include?(klass)
22+
raise(Puppet::ParseError, 'bool2num(): Requires either ' +
23+
'boolean or string to work with')
24+
end
25+
26+
if value.is_a?(String)
27+
# We consider all the yes, no, y, n and so on too ...
28+
value = case value
29+
#
30+
# This is how undef looks like in Puppet ...
31+
# We yield 0 (or false if you wish) in this case.
32+
#
33+
when /^$/, '' then false # Empty string will be false ...
34+
when /^(1|t|y|true|yes)$/ then true
35+
when /^(0|f|n|false|no)$/ then false
36+
when /^(undef|undefined)$/ then false # This is not likely to happen ...
37+
else
38+
raise(Puppet::ParseError, 'bool2num(): Unknown type of boolean given')
39+
end
40+
end
41+
42+
# We have real boolean values as well ...
43+
result = value ? 1 : 0
44+
45+
return result
46+
end
47+
end
48+
49+
# vim: set ts=2 sw=2 et :
+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# capitalize.rb
3+
#
4+
5+
module Puppet::Parser::Functions
6+
newfunction(:capitalize, :type => :rvalue, :doc => <<-EOS
7+
Capitalizes the first letter of a string or array of strings.
8+
Requires either a single string or an array as an input.
9+
EOS
10+
) do |arguments|
11+
12+
raise(Puppet::ParseError, "capitalize(): Wrong number of arguments " +
13+
"given (#{arguments.size} for 1)") if arguments.size < 1
14+
15+
value = arguments[0]
16+
klass = value.class
17+
18+
unless [Array, String].include?(klass)
19+
raise(Puppet::ParseError, 'capitalize(): Requires either ' +
20+
'array or string to work with')
21+
end
22+
23+
if value.is_a?(Array)
24+
# Numbers in Puppet are often string-encoded which is troublesome ...
25+
result = value.collect { |i| i.is_a?(String) ? i.capitalize : i }
26+
else
27+
result = value.capitalize
28+
end
29+
30+
return result
31+
end
32+
end
33+
34+
# vim: set ts=2 sw=2 et :

lib/puppet/parser/functions/chomp.rb

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#
2+
# chomp.rb
3+
#
4+
5+
module Puppet::Parser::Functions
6+
newfunction(:chomp, :type => :rvalue, :doc => <<-'EOS'
7+
Removes the record separator from the end of a string or an array of
8+
strings, for example `hello\n` becomes `hello`.
9+
Requires a single string or array as an input.
10+
EOS
11+
) do |arguments|
12+
13+
raise(Puppet::ParseError, "chomp(): Wrong number of arguments " +
14+
"given (#{arguments.size} for 1)") if arguments.size < 1
15+
16+
value = arguments[0]
17+
klass = value.class
18+
19+
unless [Array, String].include?(klass)
20+
raise(Puppet::ParseError, 'chomp(): Requires either ' +
21+
'array or string to work with')
22+
end
23+
24+
if value.is_a?(Array)
25+
# Numbers in Puppet are often string-encoded which is troublesome ...
26+
result = value.collect { |i| i.is_a?(String) ? i.chomp : i }
27+
else
28+
result = value.chomp
29+
end
30+
31+
return result
32+
end
33+
end
34+
35+
# vim: set ts=2 sw=2 et :

0 commit comments

Comments
 (0)