summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrien Thebo <git@somethingsinistral.net>2013-05-28 11:03:51 -0700
committerAdrien Thebo <git@somethingsinistral.net>2013-05-28 11:07:41 -0700
commit0f2d69fdfd9563aeef1bae0aadb1d12aab0d25c0 (patch)
tree88519e78cc056dbdacf059d7f785a2b3f8d76b20
parent9c8c8275abd76878d38a0f6f3af52dc468656283 (diff)
parent4732676548f91a43bc67ea0b70abdd34cae093c1 (diff)
downloadpuppet-stdlib-0f2d69fdfd9563aeef1bae0aadb1d12aab0d25c0.tar.gz
puppet-stdlib-0f2d69fdfd9563aeef1bae0aadb1d12aab0d25c0.tar.bz2
Merge remote-tracking branch 'pr/56' into pull-56
Conflicts: lib/puppet/parser/functions/range.rb spec/unit/puppet/parser/functions/range_spec.rb
-rw-r--r--lib/puppet/parser/functions/range.rb10
-rw-r--r--spec/unit/puppet/parser/functions/range_spec.rb31
2 files changed, 40 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/range.rb b/lib/puppet/parser/functions/range.rb
index 825617b..0849491 100644
--- a/lib/puppet/parser/functions/range.rb
+++ b/lib/puppet/parser/functions/range.rb
@@ -27,6 +27,13 @@ Will return: ["a","b","c"]
range("host01", "host10")
Will return: ["host01", "host02", ..., "host09", "host10"]
+
+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|
@@ -37,6 +44,7 @@ Will return: ["host01", "host02", ..., "host09", "host10"]
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 ...
@@ -71,7 +79,7 @@ Will return: ["host01", "host02", ..., "host09", "host10"]
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
diff --git a/spec/unit/puppet/parser/functions/range_spec.rb b/spec/unit/puppet/parser/functions/range_spec.rb
index 42751f4..5eb290f 100644
--- a/spec/unit/puppet/parser/functions/range_spec.rb
+++ b/spec/unit/puppet/parser/functions/range_spec.rb
@@ -17,6 +17,21 @@ describe "the range function" do
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(["a","d","-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]))
@@ -31,4 +46,20 @@ describe "the range function" do
expected = (0..10).to_a
scope.function_range(["00", "10"]).should eq expected
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