Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion lib/puppet/parser/functions/range.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ module Puppet::Parser::Functions
range("a", "c")

Will return: ["a","b","c"]

Passing a third argument will cause the generated range to step by that
interval, e.g.

range("0", "9", "2")

Will return: [0,2,4,6,8]
EOS
) do |arguments|

Expand All @@ -28,6 +35,7 @@ module Puppet::Parser::Functions
if arguments.size > 1
start = arguments[0]
stop = arguments[1]
step = arguments[2].nil? ? 1 : arguments[2].to_i.abs

type = '..' # We select simplest type for Range available in Ruby ...

Expand Down Expand Up @@ -62,7 +70,7 @@ module Puppet::Parser::Functions
when /^(\.\.\.)$/ then (start ... stop) # Exclusive of last element ...
end

result = range.collect { |i| i } # Get them all ... Pokemon ...
result = range.step(step).collect { |i| i } # Get them all ... Pokemon ...

return result
end
Expand Down
30 changes: 30 additions & 0 deletions spec/unit/puppet/parser/functions/range_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,39 @@
result.should(eq(['a','b','c','d']))
end

it "should return a letter range given a step of 1" do
result = @scope.function_range(["a","d","1"])
result.should(eq(['a','b','c','d']))
end

it "should return a stepped letter range" do
result = @scope.function_range(["a","d","2"])
result.should(eq(['a','c']))
end

it "should return a stepped letter range given a negative step" do
result = @scope.function_range(["1","4","-2"])
result.should(eq(['a','c']))
end

it "should return a number range" do
result = @scope.function_range(["1","4"])
result.should(eq([1,2,3,4]))
end

it "should return a number range given a step of 1" do
result = @scope.function_range(["1","4","1"])
result.should(eq([1,2,3,4]))
end

it "should return a stepped number range" do
result = @scope.function_range(["1","4","2"])
result.should(eq([1,3]))
end

it "should return a stepped number range given a negative step" do
result = @scope.function_range(["1","4","-2"])
result.should(eq([1,3]))
end

end