summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.markdown2
-rw-r--r--lib/puppet/parser/functions/base64.rb12
-rw-r--r--lib/puppet/parser/functions/delete_undef_values.rb10
-rw-r--r--lib/puppet/parser/functions/delete_values.rb2
-rw-r--r--lib/puppet/parser/functions/range.rb2
-rw-r--r--lib/puppet/parser/functions/str2bool.rb2
-rwxr-xr-xspec/unit/puppet/parser/functions/delete_at_spec.rb4
-rwxr-xr-xspec/unit/puppet/parser/functions/delete_spec.rb6
-rw-r--r--spec/unit/puppet/parser/functions/delete_undef_values_spec.rb10
-rw-r--r--spec/unit/puppet/parser/functions/delete_values_spec.rb6
-rw-r--r--spec/unit/puppet/parser/functions/str2bool_spec.rb2
11 files changed, 29 insertions, 29 deletions
diff --git a/README.markdown b/README.markdown
index 822b8af..273c47a 100644
--- a/README.markdown
+++ b/README.markdown
@@ -225,7 +225,7 @@ delete_undef_values
Deletes all instances of the undef value from an array or hash.
*Examples:*
-
+
$hash = delete_undef_values({a=>'A', b=>'', c=>undef, d => false})
Would return: {a => 'A', b => '', d => false}
diff --git a/lib/puppet/parser/functions/base64.rb b/lib/puppet/parser/functions/base64.rb
index d9a590a..617ba31 100644
--- a/lib/puppet/parser/functions/base64.rb
+++ b/lib/puppet/parser/functions/base64.rb
@@ -1,5 +1,5 @@
module Puppet::Parser::Functions
-
+
newfunction(:base64, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
Base64 encode or decode a string based on the command and the string submitted
@@ -10,9 +10,9 @@ module Puppet::Parser::Functions
$decodestring = base64('decode','dGhlc3RyaW5n')
ENDHEREDOC
-
+
require 'base64'
-
+
raise Puppet::ParseError, ("base64(): Wrong number of arguments (#{args.length}; must be = 2)") unless args.length == 2
actions = ['encode','decode']
@@ -20,18 +20,18 @@ module Puppet::Parser::Functions
unless actions.include?(args[0])
raise Puppet::ParseError, ("base64(): the first argument must be one of 'encode' or 'decode'")
end
-
+
unless args[1].is_a?(String)
raise Puppet::ParseError, ("base64(): the second argument must be a string to base64")
end
-
+
case args[0]
when 'encode'
result = Base64.encode64(args[1])
when 'decode'
result = Base64.decode64(args[1])
end
-
+
return result
end
end
diff --git a/lib/puppet/parser/functions/delete_undef_values.rb b/lib/puppet/parser/functions/delete_undef_values.rb
index 532639e..f94d4da 100644
--- a/lib/puppet/parser/functions/delete_undef_values.rb
+++ b/lib/puppet/parser/functions/delete_undef_values.rb
@@ -3,7 +3,7 @@ module Puppet::Parser::Functions
Returns a copy of input hash or array with all undefs deleted.
*Examples:*
-
+
$hash = delete_undef_values({a=>'A', b=>'', c=>undef, d => false})
Would return: {a => 'A', b => '', d => false}
@@ -11,19 +11,19 @@ Would return: {a => 'A', b => '', d => false}
$array = delete_undef_values(['A','',undef,false])
Would return: ['A','',false]
-
+
EOS
) do |args|
raise(Puppet::ParseError,
"delete_undef_values(): Wrong number of arguments given " +
"(#{args.size})") if args.size < 1
-
- unless args[0].is_a? Array or args[0].is_a? Hash
+
+ unless args[0].is_a? Array or args[0].is_a? Hash
raise(Puppet::ParseError,
"delete_undef_values(): expected an array or hash, got #{args[0]} type #{args[0].class} ")
end
- result = args[0].dup
+ result = args[0].dup
if result.is_a?(Hash)
result.delete_if {|key, val| val.equal? :undef}
elsif result.is_a?(Array)
diff --git a/lib/puppet/parser/functions/delete_values.rb b/lib/puppet/parser/functions/delete_values.rb
index ca8eef5..f6c8c0e 100644
--- a/lib/puppet/parser/functions/delete_values.rb
+++ b/lib/puppet/parser/functions/delete_values.rb
@@ -19,7 +19,7 @@ Would return: {'a'=>'A','c'=>'C','B'=>'D'}
if not hash.is_a?(Hash)
raise(TypeError, "delete_values(): First argument must be a Hash. " + \
- "Given an argument of class #{hash.class}.")
+ "Given an argument of class #{hash.class}.")
end
hash.dup.delete_if { |key, val| item == val }
end
diff --git a/lib/puppet/parser/functions/range.rb b/lib/puppet/parser/functions/range.rb
index 0849491..ffbdf84 100644
--- a/lib/puppet/parser/functions/range.rb
+++ b/lib/puppet/parser/functions/range.rb
@@ -28,7 +28,7 @@ Will return: ["a","b","c"]
Will return: ["host01", "host02", ..., "host09", "host10"]
-Passing a third argument will cause the generated range to step by that
+Passing a third argument will cause the generated range to step by that
interval, e.g.
range("0", "9", "2")
diff --git a/lib/puppet/parser/functions/str2bool.rb b/lib/puppet/parser/functions/str2bool.rb
index fece7a6..446732e 100644
--- a/lib/puppet/parser/functions/str2bool.rb
+++ b/lib/puppet/parser/functions/str2bool.rb
@@ -14,7 +14,7 @@ like: 0, f, n, false, no to 'false'.
"given (#{arguments.size} for 1)") if arguments.size < 1
string = arguments[0]
-
+
# If string is already Boolean, return it
if !!string == string
return string
diff --git a/spec/unit/puppet/parser/functions/delete_at_spec.rb b/spec/unit/puppet/parser/functions/delete_at_spec.rb
index cfc0a29..593cf45 100755
--- a/spec/unit/puppet/parser/functions/delete_at_spec.rb
+++ b/spec/unit/puppet/parser/functions/delete_at_spec.rb
@@ -17,9 +17,9 @@ describe "the delete_at function" do
result.should(eq(['a','c']))
end
- it "should not change origin array passed as argument" do
+ it "should not change origin array passed as argument" do
origin_array = ['a','b','c','d']
result = scope.function_delete_at([origin_array, 1])
origin_array.should(eq(['a','b','c','d']))
- end
+ end
end
diff --git a/spec/unit/puppet/parser/functions/delete_spec.rb b/spec/unit/puppet/parser/functions/delete_spec.rb
index 06238f1..1508a63 100755
--- a/spec/unit/puppet/parser/functions/delete_spec.rb
+++ b/spec/unit/puppet/parser/functions/delete_spec.rb
@@ -35,7 +35,7 @@ describe "the delete function" do
result.should(eq({ 'a' => 1, 'c' => 3 }))
end
- it "should not change origin array passed as argument" do
+ it "should not change origin array passed as argument" do
origin_array = ['a','b','c','d']
result = scope.function_delete([origin_array, 'b'])
origin_array.should(eq(['a','b','c','d']))
@@ -47,8 +47,8 @@ describe "the delete function" do
origin_string.should(eq('foobarbabarz'))
end
- it "should not change origin hash passed as argument" do
- origin_hash = { 'a' => 1, 'b' => 2, 'c' => 3 }
+ it "should not change origin hash passed as argument" do
+ origin_hash = { 'a' => 1, 'b' => 2, 'c' => 3 }
result = scope.function_delete([origin_hash, 'b'])
origin_hash.should(eq({ 'a' => 1, 'b' => 2, 'c' => 3 }))
end
diff --git a/spec/unit/puppet/parser/functions/delete_undef_values_spec.rb b/spec/unit/puppet/parser/functions/delete_undef_values_spec.rb
index 404aeda..b341d88 100644
--- a/spec/unit/puppet/parser/functions/delete_undef_values_spec.rb
+++ b/spec/unit/puppet/parser/functions/delete_undef_values_spec.rb
@@ -27,15 +27,15 @@ describe "the delete_undef_values function" do
result.should(eq({'a'=>'A','c'=>'C','d'=>'undef'}))
end
- it "should not change origin array passed as argument" do
+ it "should not change origin array passed as argument" do
origin_array = ['a',:undef,'c','undef']
result = scope.function_delete_undef_values([origin_array])
origin_array.should(eq(['a',:undef,'c','undef']))
- end
+ end
- it "should not change origin hash passed as argument" do
- origin_hash = { 'a' => 1, 'b' => :undef, 'c' => 'undef' }
+ it "should not change origin hash passed as argument" do
+ origin_hash = { 'a' => 1, 'b' => :undef, 'c' => 'undef' }
result = scope.function_delete_undef_values([origin_hash])
origin_hash.should(eq({ 'a' => 1, 'b' => :undef, 'c' => 'undef' }))
- end
+ end
end
diff --git a/spec/unit/puppet/parser/functions/delete_values_spec.rb b/spec/unit/puppet/parser/functions/delete_values_spec.rb
index 180cc30..8d7f231 100644
--- a/spec/unit/puppet/parser/functions/delete_values_spec.rb
+++ b/spec/unit/puppet/parser/functions/delete_values_spec.rb
@@ -27,10 +27,10 @@ describe "the delete_values function" do
result.should(eq({ 'a'=>'A', 'B'=>'C' }))
end
- it "should not change origin hash passed as argument" do
- origin_hash = { 'a' => 1, 'b' => 2, 'c' => 3 }
+ it "should not change origin hash passed as argument" do
+ origin_hash = { 'a' => 1, 'b' => 2, 'c' => 3 }
result = scope.function_delete_values([origin_hash, 2])
origin_hash.should(eq({ 'a' => 1, 'b' => 2, 'c' => 3 }))
- end
+ end
end
diff --git a/spec/unit/puppet/parser/functions/str2bool_spec.rb b/spec/unit/puppet/parser/functions/str2bool_spec.rb
index ef6350f..73c09c7 100644
--- a/spec/unit/puppet/parser/functions/str2bool_spec.rb
+++ b/spec/unit/puppet/parser/functions/str2bool_spec.rb
@@ -21,7 +21,7 @@ describe "the str2bool function" do
result = scope.function_str2bool(["undef"])
result.should(eq(false))
end
-
+
it "should return the boolean it was called with" do
result = scope.function_str2bool([true])
result.should(eq(true))