From 56d815bcfc5f57d8dff974fd8bba192c6b141f89 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 19 Dec 2014 12:25:21 +0100
Subject: Rename private() to assert_private()

As mentioned in #270, private is a reserved keyword in the future parser
which is to be released with Puppet 4. As it stands, this function is
not useable with the future parser so it needs to renamed.

This is a breaking change.
---
 lib/puppet/parser/functions/assert_private.rb | 29 +++++++++++++++++++++++++++
 lib/puppet/parser/functions/private.rb        | 29 ---------------------------
 2 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 lib/puppet/parser/functions/assert_private.rb
 delete mode 100644 lib/puppet/parser/functions/private.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/assert_private.rb b/lib/puppet/parser/functions/assert_private.rb
new file mode 100644
index 0000000..66c79cc
--- /dev/null
+++ b/lib/puppet/parser/functions/assert_private.rb
@@ -0,0 +1,29 @@
+#
+# assert_private.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:assert_private, :doc => <<-'EOS'
+    Sets the current class or definition as private.
+    Calling the class or definition from outside the current module will fail.
+    EOS
+  ) do |args|
+
+    raise(Puppet::ParseError, "assert_private(): Wrong number of arguments "+
+      "given (#{args.size}}) for 0 or 1)") if args.size > 1
+
+    scope = self
+    if scope.lookupvar('module_name') != scope.lookupvar('caller_module_name')
+      message = nil
+      if args[0] and args[0].is_a? String
+        message = args[0]
+      else
+        manifest_name = scope.source.name
+        manifest_type = scope.source.type
+        message = (manifest_type.to_s == 'hostclass') ? 'Class' : 'Definition'
+        message += " #{manifest_name} is private"
+      end
+      raise(Puppet::ParseError, message)
+    end
+  end
+end
diff --git a/lib/puppet/parser/functions/private.rb b/lib/puppet/parser/functions/private.rb
deleted file mode 100644
index 60210d3..0000000
--- a/lib/puppet/parser/functions/private.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# private.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:private, :doc => <<-'EOS'
-    Sets the current class or definition as private.
-    Calling the class or definition from outside the current module will fail.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "private(): Wrong number of arguments "+
-      "given (#{args.size}}) for 0 or 1)") if args.size > 1
-
-    scope = self
-    if scope.lookupvar('module_name') != scope.lookupvar('caller_module_name')
-      message = nil
-      if args[0] and args[0].is_a? String
-        message = args[0]
-      else
-        manifest_name = scope.source.name
-        manifest_type = scope.source.type
-        message = (manifest_type.to_s == 'hostclass') ? 'Class' : 'Definition'
-        message += " #{manifest_name} is private"
-      end
-      raise(Puppet::ParseError, message)
-    end
-  end
-end
-- 
cgit v1.2.3


From 4a68b224c4a4a986be6b4bf9580fc4f23251e3c6 Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Thu, 5 Mar 2015 11:01:31 -0800
Subject: Add private function back and forward to assert_private with
 deprecation warning

---
 lib/puppet/parser/functions/private.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 lib/puppet/parser/functions/private.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/private.rb b/lib/puppet/parser/functions/private.rb
new file mode 100644
index 0000000..3b00ba1
--- /dev/null
+++ b/lib/puppet/parser/functions/private.rb
@@ -0,0 +1,17 @@
+#
+# private.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:private, :doc => <<-'EOS'
+    DEPRECATED: Sets the current class or definition as private.
+    Calling the class or definition from outside the current module will fail.
+  EOS
+  ) do |args|
+    warning("private() DEPRECATED: This function will cease to function on Puppet 4; please use assert_private() before upgrading to puppet 4 for backwards-compatibility, or migrate to the new parser's typing system.")
+    if !Puppet::Parser::Functions.autoloader.loaded?(:assert_private)
+      Puppet::Parser::Functions.autoloader.load(:assert_private)
+    end
+    function_assert_private([(args[0] unless args.size < 1)])
+  end
+end
-- 
cgit v1.2.3