From ba430647940c1cfbf3e220f032804da325da94a7 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 28 Oct 2010 00:19:44 +0200 Subject: add a new function & tests for that function --- lib/puppet/parser/functions/array_del.rb | 11 +++++++++ spec/spec.opts | 6 +++++ spec/spec_helper.rb | 16 +++++++++++++ spec/unit/parser/functions/array_del.rb | 39 ++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 lib/puppet/parser/functions/array_del.rb create mode 100644 spec/spec.opts create mode 100644 spec/spec_helper.rb create mode 100644 spec/unit/parser/functions/array_del.rb diff --git a/lib/puppet/parser/functions/array_del.rb b/lib/puppet/parser/functions/array_del.rb new file mode 100644 index 0000000..e604916 --- /dev/null +++ b/lib/puppet/parser/functions/array_del.rb @@ -0,0 +1,11 @@ +Puppet::Parser::Functions::newfunction( + :array_del, + :type => :rvalue, + :doc => "Deletes items from an array + + Example: array_del(['a','b'],'b') -> ['a']" +) do |args| + raise Puppet::ParseError, 'array_del() needs two arguments' if args.length != 2 + (res=args[0].dup).to_a.delete(args[1]) + res +end diff --git a/spec/spec.opts b/spec/spec.opts new file mode 100644 index 0000000..91cd642 --- /dev/null +++ b/spec/spec.opts @@ -0,0 +1,6 @@ +--format +s +--colour +--loadby +mtime +--backtrace diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb new file mode 100644 index 0000000..6ba62e1 --- /dev/null +++ b/spec/spec_helper.rb @@ -0,0 +1,16 @@ +require 'pathname' +dir = Pathname.new(__FILE__).parent +$LOAD_PATH.unshift(dir, dir + 'lib', dir + '../lib') +require 'puppet' +gem 'rspec', '>= 1.2.9' +require 'spec/autorun' + +Dir[File.join(File.dirname(__FILE__), 'support', '*.rb')].each do |support_file| + require support_file +end + +# We need this because the RAL uses 'should' as a method. This +# allows us the same behaviour but with a different method name. +class Object + alias :must :should +end diff --git a/spec/unit/parser/functions/array_del.rb b/spec/unit/parser/functions/array_del.rb new file mode 100644 index 0000000..b375862 --- /dev/null +++ b/spec/unit/parser/functions/array_del.rb @@ -0,0 +1,39 @@ +#! /usr/bin/env ruby + +require File.dirname(__FILE__) + '/../../../spec_helper' + +describe "the array_del function" do + + before :each do + @scope = Puppet::Parser::Scope.new + end + + it "should exist" do + Puppet::Parser::Functions.function("array_del").should == "function_array_del" + end + + it "should raise a ParseError if there is less than 2 arguments" do + lambda { @scope.function_array_del(["foo"]) }.should( raise_error(Puppet::ParseError)) + end + + it "should raise a ParseError if there is more than 2 arguments" do + lambda { @scope.function_array_del(["foo", "bar", "gazonk"]) }.should( raise_error(Puppet::ParseError)) + end + + it "should remove an item if it's present" do + result = @scope.function_array_del(['a','b'],'b') + result.should(eql(['a'])) + end + + it "should do nothing if an item is not present" do + result = @scope.function_array_del(['a','b'],'c') + result.should(eql(['a','b'])) + end + + it "should leave the argument untouched" do + a = ['a','b'] + result = @scope.function_array_del(a,'b') + a.should(eql(['a','b'])) + end + +end -- cgit v1.2.3