From c8f38b7fee12eefb2bed00681b4952ac7ad3f14f Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Wed, 31 Jan 2007 19:38:02 +0000
Subject: Renaming "pelement" to "resource".  The old name is a holdover from
 before we had settled on "resource" as a term.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2137 980ebf18-57e1-0310-9a29-db15c13687c0
---
 lib/puppet/client/pelement.rb | 65 -------------------------------------------
 lib/puppet/client/resource.rb | 65 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 65 deletions(-)
 delete mode 100644 lib/puppet/client/pelement.rb
 create mode 100644 lib/puppet/client/resource.rb

(limited to 'lib/puppet/client')

diff --git a/lib/puppet/client/pelement.rb b/lib/puppet/client/pelement.rb
deleted file mode 100644
index 087b61ee4..000000000
--- a/lib/puppet/client/pelement.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-class Puppet::Client::PElement < Puppet::Client
-    @drivername = :PElementServer
-
-    @handler = Puppet::Server::PElement
-
-    def apply(bucket)
-
-        case bucket
-        when Puppet::TransObject
-            tmp = Puppet::TransBucket.new
-            tmp.push bucket
-            bucket = tmp
-            bucket.name = Facter["hostname"].value
-            bucket.type = "pelement"
-        when Puppet::TransBucket
-            # nothing
-        else
-            raise Puppet::DevError, "You must pass a transportable object, not a %s" %
-                bucket.class
-        end
-
-        unless @local
-            bucket = Base64.encode64(YAML::dump(bucket))
-        end
-        report = @driver.apply(bucket, "yaml")
-
-        return report
-    end
-
-    def describe(type, name, retrieve = false, ignore = false)
-        Puppet.info "Describing %s[%s]" % [type.to_s.capitalize, name]
-        text = @driver.describe(type, name, retrieve, ignore, "yaml")
-
-        object = nil
-        if @local
-            object = text
-        else
-            object = YAML::load(Base64.decode64(text))
-        end
-
-        return object
-    end
-
-    def initialize(hash = {})
-        if hash.include?(:PElementServer)
-            unless hash[:PElementServer].is_a?(Puppet::Server::PElement)
-                raise Puppet::DevError, "Must pass an actual PElement server object"
-            end
-        end
-
-        super(hash)
-    end
-
-    def list(type, ignore = false, base = false)
-        bucket = @driver.list(type, ignore, base, "yaml")
-
-        unless @local
-            bucket = YAML::load(Base64.decode64(bucket))
-        end
-
-        return bucket
-    end
-end
-
-# $Id$
diff --git a/lib/puppet/client/resource.rb b/lib/puppet/client/resource.rb
new file mode 100644
index 000000000..6081b2b66
--- /dev/null
+++ b/lib/puppet/client/resource.rb
@@ -0,0 +1,65 @@
+class Puppet::Client::Resource < Puppet::Client
+    @drivername = :ResourceServer
+
+    @handler = Puppet::Server::Resource
+
+    def apply(bucket)
+
+        case bucket
+        when Puppet::TransObject
+            tmp = Puppet::TransBucket.new
+            tmp.push bucket
+            bucket = tmp
+            bucket.name = Facter["hostname"].value
+            bucket.type = "resource"
+        when Puppet::TransBucket
+            # nothing
+        else
+            raise Puppet::DevError, "You must pass a transportable object, not a %s" %
+                bucket.class
+        end
+
+        unless @local
+            bucket = Base64.encode64(YAML::dump(bucket))
+        end
+        report = @driver.apply(bucket, "yaml")
+
+        return report
+    end
+
+    def describe(type, name, retrieve = false, ignore = false)
+        Puppet.info "Describing %s[%s]" % [type.to_s.capitalize, name]
+        text = @driver.describe(type, name, retrieve, ignore, "yaml")
+
+        object = nil
+        if @local
+            object = text
+        else
+            object = YAML::load(Base64.decode64(text))
+        end
+
+        return object
+    end
+
+    def initialize(hash = {})
+        if hash.include?(:ResourceServer)
+            unless hash[:ResourceServer].is_a?(Puppet::Server::Resource)
+                raise Puppet::DevError, "Must pass an actual PElement server object"
+            end
+        end
+
+        super(hash)
+    end
+
+    def list(type, ignore = false, base = false)
+        bucket = @driver.list(type, ignore, base, "yaml")
+
+        unless @local
+            bucket = YAML::load(Base64.decode64(bucket))
+        end
+
+        return bucket
+    end
+end
+
+# $Id$
-- 
cgit