diff options
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | Modulefile | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/range.rb | 9 | ||||
| -rw-r--r-- | spec/unit/puppet/parser/functions/range_spec.rb | 19 |
4 files changed, 28 insertions, 6 deletions
@@ -1,3 +1,7 @@ +2012-03-29 Puppet Labs <support@puppetlabs.com> - 2.1.3 +* (#11607) Add Rakefile to enable spec testing +* (#12377) Avoid infinite loop when retrying require json + 2012-03-13 Puppet Labs <support@puppetlabs.com> - 2.3.1 * (#13091) Fix LoadError bug with puppet apply and puppet_vardir fact @@ -1,5 +1,5 @@ name 'puppetlabs-stdlib' -version '2.3.1' +version '2.3.2' source 'git://github.com/puppetlabs/puppetlabs-stdlib' author 'puppetlabs' license 'Apache 2.0' diff --git a/lib/puppet/parser/functions/range.rb b/lib/puppet/parser/functions/range.rb index 6e85422..825617b 100644 --- a/lib/puppet/parser/functions/range.rb +++ b/lib/puppet/parser/functions/range.rb @@ -15,9 +15,18 @@ an array. Will return: [0,1,2,3,4,5,6,7,8,9] + range("00", "09") + +Will return: [0,1,2,3,4,5,6,7,8,9] (Zero padded strings are converted to +integers automatically) + range("a", "c") Will return: ["a","b","c"] + + range("host01", "host10") + +Will return: ["host01", "host02", ..., "host09", "host10"] EOS ) do |arguments| diff --git a/spec/unit/puppet/parser/functions/range_spec.rb b/spec/unit/puppet/parser/functions/range_spec.rb index 8c2446a..060423a 100644 --- a/spec/unit/puppet/parser/functions/range_spec.rb +++ b/spec/unit/puppet/parser/functions/range_spec.rb @@ -6,8 +6,8 @@ describe "the range function" do Puppet::Parser::Functions.autoloader.loadall end - before :each do - @scope = Puppet::Parser::Scope.new + let :scope do + Puppet::Parser::Scope.new end it "should exist" do @@ -15,17 +15,26 @@ describe "the range function" do end it "should raise a ParseError if there is less than 1 arguments" do - lambda { @scope.function_range([]) }.should( raise_error(Puppet::ParseError)) + lambda { scope.function_range([]) }.should( raise_error(Puppet::ParseError)) end it "should return a letter range" do - result = @scope.function_range(["a","d"]) + result = scope.function_range(["a","d"]) result.should(eq(['a','b','c','d'])) end it "should return a number range" do - result = @scope.function_range(["1","4"]) + result = scope.function_range(["1","4"]) result.should(eq([1,2,3,4])) end + it "should work with padded hostname like strings" do + expected = ("host01".."host10").to_a + scope.function_range(["host01","host10"]).should eq expected + end + + it "should coerce zero padded digits to integers" do + expected = (0..10).to_a + scope.function_range(["00", "10"]).should eq expected + end end |