remove functions that are either covered with builtin functions or stdlib functions
authormh <mh@immerda.ch>
Fri, 25 Apr 2014 16:06:34 +0000 (18:06 +0200)
committermh <mh@immerda.ch>
Fri, 25 Apr 2014 16:06:34 +0000 (18:06 +0200)
lib/puppet/parser/functions/array_include.rb [deleted file]
lib/puppet/parser/functions/array_join.rb [deleted file]
lib/puppet/parser/functions/array_union.rb [deleted file]
spec/unit/parser/functions/array_include.rb [deleted file]
spec/unit/parser/functions/array_union.rb [deleted file]

diff --git a/lib/puppet/parser/functions/array_include.rb b/lib/puppet/parser/functions/array_include.rb
deleted file mode 100644 (file)
index ce4748d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Puppet::Parser::Functions::newfunction(
-  :array_include,
-  :type => :rvalue,
-  :doc => "Checks whether an item is included or not
-
-    Example: array_include(['a','b'],'b') -> true
-    Example: array_include(['a','b'],'c') -> false"
-) do |args|
-  raise Puppet::ParseError, 'array_include() needs two arguments' if args.length != 2
-  args[0].include?(args[1])
-end
diff --git a/lib/puppet/parser/functions/array_join.rb b/lib/puppet/parser/functions/array_join.rb
deleted file mode 100644 (file)
index c5fa1c8..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-Puppet::Parser::Functions::newfunction(:array_join,
-    :type => :rvalue,
-    :doc  => "Join a list of strings with an optional delimiter.") do |args|
-  unless (1..2).include?(args.length)
-    raise Puppet::ParseError, 'array_join() takes 1 or 2 arguments'
-  end
-  args.first.join args.last
-end
diff --git a/lib/puppet/parser/functions/array_union.rb b/lib/puppet/parser/functions/array_union.rb
deleted file mode 100644 (file)
index 1ccad3f..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Puppet::Parser::Functions::newfunction(
-  :array_union,
-  :type => :rvalue,
-  :doc => "Unions two arrays
-
-    Example: array_union(['a','b'],['c']) -> ['a','b','c']"
-) do |args|
-  raise Puppet::ParseError, 'array_union() needs two arguments' if args.length != 2
-  args[0].to_a | args[1].to_a
-end
diff --git a/spec/unit/parser/functions/array_include.rb b/spec/unit/parser/functions/array_include.rb
deleted file mode 100644 (file)
index fecf495..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe "the array_include function" do
-
-  before :each do
-    @scope = Puppet::Parser::Scope.new
-  end
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("array_include").should == "function_array_include"
-  end
-
-  it "should raise a ParseError if there is less than 2 arguments" do
-    lambda { @scope.function_array_include(["foo"]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there is more than 2 arguments" do
-    lambda { @scope.function_array_include(["foo", "bar", "gazonk"]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if an item is present in the array" do
-    result = @scope.function_array_include(['a','b'],'b')
-    result.should == true
-  end
-
-  it "should return false if an item is not present" do
-    result = @scope.function_array_include(['a','b'],'c')
-    result.should == false
-  end
-
-end
diff --git a/spec/unit/parser/functions/array_union.rb b/spec/unit/parser/functions/array_union.rb
deleted file mode 100644 (file)
index 37df2b3..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe "the array_union function" do
-
-  before :each do
-    @scope = Puppet::Parser::Scope.new
-  end
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("array_union").should == "function_array_union"
-  end
-
-  it "should raise a ParseError if there is less than 2 arguments" do
-    lambda { @scope.function_array_union([["foo"]]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there is more than 2 arguments" do
-    lambda { @scope.function_array_union([["foo", "bar", "gazonk"]]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should union to arrays" do
-    result = @scope.function_array_union([['a','b'],['c']])
-    result.should(eql(['a','b','c']))
-  end
-
-  it "should do nothing if an item is present" do
-    result = @scope.function_array_union([['a','b'],['b']])
-    result.should(eql(['a','b']))
-  end
-
-  it "should leave the argument untouched" do
-    a = ['a','b']
-    result = @scope.function_array_union([a,['c']])
-    a.should(eql(['a','b']))
-  end
-
-end