Merge branch '2.x' into 3.x

* 2.x:
  (#17797) min() and max() functions

4 files changed, 72 insertions, 0 deletions

diff --git a/lib/puppet/parser/functions/max.rb b/lib/puppet/parser/functions/max.rb
new file mode 100644
index 0000000..10b6f74
--- /dev/null
+++ b/lib/puppet/parser/functions/max.rb
@@ -0,0 +1,13 @@
+module Puppet::Parser::Functions
+  newfunction(:max, :type => :rvalue, :doc => <<-EOS
+    Returns the highest value of all arguments.
+    Requires at least one argument.
+    EOS
+  ) do |args|
+
+    raise(Puppet::ParseError, "max(): Wrong number of arguments " +
+          "need at least one") if args.size == 0
+
+    return args.max
+  end
+end
diff --git a/lib/puppet/parser/functions/min.rb b/lib/puppet/parser/functions/min.rb
new file mode 100644
index 0000000..abf1b62
--- /dev/null
+++ b/lib/puppet/parser/functions/min.rb
@@ -0,0 +1,13 @@
+module Puppet::Parser::Functions
+  newfunction(:min, :type => :rvalue, :doc => <<-EOS
+    Returns the lowest value of all arguments.
+    Requires at least one argument.
+    EOS
+  ) do |args|
+
+    raise(Puppet::ParseError, "min(): Wrong number of arguments " +
+          "need at least one") if args.size == 0
+
+    return args.min
+  end
+end
diff --git a/spec/unit/puppet/parser/functions/max_spec.rb b/spec/unit/puppet/parser/functions/max_spec.rb
new file mode 100755
index 0000000..604927e
--- /dev/null
+++ b/spec/unit/puppet/parser/functions/max_spec.rb
@@ -0,0 +1,23 @@
+#! /usr/bin/env ruby -S rspec
+
+require 'spec_helper'
+
+describe "the max function" do
+  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
+
+  it "should exist" do
+    Puppet::Parser::Functions.function("max").should == "function_max"
+  end
+
+  it "should raise a ParseError if there is less than 1 arguments" do
+    lambda { scope.function_max([]) }.should( raise_error(Puppet::ParseError))
+  end
+
+  it "should be able to compare strings" do
+    scope.function_max(["albatross","dog","horse"]).should(eq("horse"))
+  end
+
+  it "should be able to compare numbers" do
+    scope.function_max([6,8,4]).should(eq(8))
+  end
+end
diff --git a/spec/unit/puppet/parser/functions/min_spec.rb b/spec/unit/puppet/parser/functions/min_spec.rb
new file mode 100755
index 0000000..781422c
--- /dev/null
+++ b/spec/unit/puppet/parser/functions/min_spec.rb
@@ -0,0 +1,23 @@
+#! /usr/bin/env ruby -S rspec
+
+require 'spec_helper'
+
+describe "the min function" do
+  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
+
+  it "should exist" do
+    Puppet::Parser::Functions.function("min").should == "function_min"
+  end
+
+  it "should raise a ParseError if there is less than 1 arguments" do
+    lambda { scope.function_min([]) }.should( raise_error(Puppet::ParseError))
+  end
+
+  it "should be able to compare strings" do
+    scope.function_min(["albatross","dog","horse"]).should(eq("albatross"))
+  end
+
+  it "should be able to compare numbers" do
+    scope.function_min([6,8,4]).should(eq(4))
+  end
+end