Updated split function and add split function unit tests (courtesy of Thomas Bellman)

6 files changed, 73 insertions, 6 deletions

diff --git a/lib/puppet/parser/functions/split.rb b/lib/puppet/parser/functions/split.rb
index 8932bfe38..36dba7e68 100644
--- a/lib/puppet/parser/functions/split.rb
+++ b/lib/puppet/parser/functions/split.rb
@@ -1,13 +1,29 @@
 module Puppet::Parser::Functions
     newfunction(:split, :type => :rvalue,
-                :doc => "Split a string variable into an array using the specified split character.
+      :doc => "\
+Split a string variable into an array using the specified split regexp.
 
-Usage::
+  Usage::
 
-    $string    = 'value1,value2'
-    $array_var = split($string, ',')
+    $string     = 'v1.v2:v3.v4'
+    $array_var1 = split($string, ':')
+    $array_var2 = split($string, '[.]')
+    $array_var3 = split($string, '[.:]')
 
-$array_var holds the result ['value1', 'value2']") do |args|
-        return args[0].split(args[1])
+$array_var1 now holds the result ['v1.v2', 'v3.v4'],
+while $array_var2 holds ['v1', 'v2:v3', 'v4'], and
+$array_var3 holds ['v1', 'v2', 'v3', 'v4'].
+
+Note that in the second example, we split on a string that contains
+a regexp meta-character (.), and that needs protection.  A simple
+way to do that for a single character is to enclose it in square
+brackets.") do |args|
+
+     if args.length != 2
+         raise Puppet::ParseError, ("split(): wrong number of arguments" +
+				   " (#{args.length}; must be 2)")
+     end
+
+     return args[0].split(Regexp.compile(args[1]))
     end
 end
diff --git a/spec/unit/parser/functions/inline_template.rb b/spec/unit/parser/functions/inline_template.rb
index 19e1a3b2a..19e1a3b2a 100644..100755
--- a/spec/unit/parser/functions/inline_template.rb
+++ b/spec/unit/parser/functions/inline_template.rb
diff --git a/spec/unit/parser/functions/regsubst.rb b/spec/unit/parser/functions/regsubst.rb
index 0e80ec798..0e80ec798 100644..100755
--- a/spec/unit/parser/functions/regsubst.rb
+++ b/spec/unit/parser/functions/regsubst.rb
diff --git a/spec/unit/parser/functions/split.rb b/spec/unit/parser/functions/split.rb
new file mode 100755
index 000000000..8aa031d19
--- /dev/null
+++ b/spec/unit/parser/functions/split.rb
@@ -0,0 +1,51 @@
+#! /usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe "the split function" do
+
+    before :each do
+        @scope = Puppet::Parser::Scope.new()
+    end
+
+    it "should exist" do
+        Puppet::Parser::Functions.function("split").should == "function_split"
+    end
+
+    it "should raise a ParseError if there is less than 2 arguments" do
+        lambda { @scope.function_split(["foo"]) }.should(
+		raise_error(Puppet::ParseError))
+    end
+
+    it "should raise a ParseError if there is more than 2 arguments" do
+        lambda { @scope.function_split(["foo", "bar", "gazonk"]) }.should(
+		raise_error(Puppet::ParseError))
+    end
+
+    it "should raise a RegexpError if the regexp is malformed" do
+        lambda { @scope.function_split(["foo", "("]) }.should(
+		raise_error(RegexpError))
+    end
+
+
+    it "should handle simple string without metacharacters" do
+	result = @scope.function_split([ "130;236;254;10", ";"])
+	result.should(eql(["130", "236", "254", "10"]))
+    end
+
+    it "should handle simple regexps" do
+	result = @scope.function_split([ "130.236;254.;10", "[.;]+"])
+	result.should(eql(["130", "236", "254", "10"]))
+    end
+
+    it "should handle groups" do
+	result = @scope.function_split([ "130.236;254.;10", "([.;]+)"])
+	result.should(eql(["130", ".", "236", ";", "254", ".;", "10"]))
+    end
+
+    it "should handle simple string without metacharacters" do
+	result = @scope.function_split([ "130.236.254.10", ";"])
+	result.should(eql(["130.236.254.10"]))
+    end
+
+end
diff --git a/spec/unit/parser/functions/sprintf.rb b/spec/unit/parser/functions/sprintf.rb
index 949dc3fcc..949dc3fcc 100644..100755
--- a/spec/unit/parser/functions/sprintf.rb
+++ b/spec/unit/parser/functions/sprintf.rb
diff --git a/spec/unit/parser/functions/template.rb b/spec/unit/parser/functions/template.rb
index 8fc64d0c3..8fc64d0c3 100644..100755
--- a/spec/unit/parser/functions/template.rb
+++ b/spec/unit/parser/functions/template.rb