From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 2 Mar 2011 18:26:23 +0000 (+0100)
Subject: One function per file?
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=163312bc182dd43d0f615714ad87e381ce93e99f;p=mirror%2Fdsa-puppet.git

One function per file?
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/filter.rb b/modules/puppetmaster/lib/puppet/parser/functions/filter.rb
deleted file mode 100644
index e0dd34cdb..000000000
--- a/modules/puppetmaster/lib/puppet/parser/functions/filter.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-module Puppet::Parser::Functions
-
-  # given an array of network addresses, return only the ipv4 addresses
-  newfunction(:filter_ipv4, :type => :rvalue) do |args|
-    x = args.shift
-
-    raise Puppet::ParseError, "Argument is not an array." unless x.kind_of?(Array)
-    return x.reject{ |x| x =~ /:/}
-  end
-
-  # given an array of network addresses, return only the ipv6 addresses
-  newfunction(:filter_ipv6, :type => :rvalue) do |args|
-    x = args.shift
-
-    raise Puppet::ParseError, "Argument is not an array." unless x.kind_of?(Array)
-    return x.reject{ |x| x !~ /:/}
-  end
-
-  # given an list, join with spaces
-  newfunction(:join_spc, :type => :rvalue) do |args|
-    x = args.shift
-
-    raise Puppet::ParseError, "Argument is not an array." unless x.kind_of?(Array)
-    return x.join(' ')
-  end
-end
-# vim:set et:
-# vim:set sts=2 ts=2:
-# vim:set shiftwidth=2:
diff --git a/modules/puppetmaster/lib/puppet/parser/functions/filter_ipv4.rb b/modules/puppetmaster/lib/puppet/parser/functions/filter_ipv4.rb
new file mode 100644
index 000000000..823d2727e
--- /dev/null
+++ b/modules/puppetmaster/lib/puppet/parser/functions/filter_ipv4.rb
@@ -0,0 +1,12 @@
+module Puppet::Parser::Functions
+  # given an array of network addresses, return only the ipv4 addresses
+  newfunction(:filter_ipv4, :type => :rvalue) do |args|
+    x = args.shift
+
+    raise Puppet::ParseError, "Argument is not an array." unless x.kind_of?(Array)
+    return x.reject{ |x| x =~ /:/}
+  end
+end
+# vim:set et:
+# vim:set sts=2 ts=2:
+# vim:set shiftwidth=2:
diff --git a/modules/puppetmaster/lib/puppet/parser/functions/filter_ipv6.rb b/modules/puppetmaster/lib/puppet/parser/functions/filter_ipv6.rb
new file mode 100644
index 000000000..f268cc596
--- /dev/null
+++ b/modules/puppetmaster/lib/puppet/parser/functions/filter_ipv6.rb
@@ -0,0 +1,12 @@
+module Puppet::Parser::Functions
+  # given an array of network addresses, return only the ipv6 addresses
+  newfunction(:filter_ipv6, :type => :rvalue) do |args|
+    x = args.shift
+
+    raise Puppet::ParseError, "Argument is not an array." unless x.kind_of?(Array)
+    return x.reject{ |x| x !~ /:/}
+  end
+end
+# vim:set et:
+# vim:set sts=2 ts=2:
+# vim:set shiftwidth=2:
diff --git a/modules/puppetmaster/lib/puppet/parser/functions/join_spc.rb b/modules/puppetmaster/lib/puppet/parser/functions/join_spc.rb
new file mode 100644
index 000000000..85b534a95
--- /dev/null
+++ b/modules/puppetmaster/lib/puppet/parser/functions/join_spc.rb
@@ -0,0 +1,12 @@
+module Puppet::Parser::Functions
+  # given an list, join with spaces
+  newfunction(:join_spc, :type => :rvalue) do |args|
+    x = args.shift
+
+    raise Puppet::ParseError, "Argument is not an array." unless x.kind_of?(Array)
+    return x.join(' ')
+  end
+end
+# vim:set et:
+# vim:set sts=2 ts=2:
+# vim:set shiftwidth=2: