From de5d91e2036de2934a4eec79d35a714f3ed24b10 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Mon, 22 Oct 2007 22:37:52 -0500
Subject: Renaming the :local termini for metadata and content to :file.

---
 lib/puppet/file_serving/terminus_selector.rb |  4 ++--
 lib/puppet/indirector/file_content/file.rb   | 28 ++++++++++++++++++++++++
 lib/puppet/indirector/file_content/local.rb  | 28 ------------------------
 lib/puppet/indirector/file_metadata/file.rb  | 32 ++++++++++++++++++++++++++++
 lib/puppet/indirector/file_metadata/local.rb | 32 ----------------------------
 5 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100644 lib/puppet/indirector/file_content/file.rb
 delete mode 100644 lib/puppet/indirector/file_content/local.rb
 create mode 100644 lib/puppet/indirector/file_metadata/file.rb
 delete mode 100644 lib/puppet/indirector/file_metadata/local.rb

(limited to 'lib')

diff --git a/lib/puppet/file_serving/terminus_selector.rb b/lib/puppet/file_serving/terminus_selector.rb
index aa08f087e..06b53ddb1 100644
--- a/lib/puppet/file_serving/terminus_selector.rb
+++ b/lib/puppet/file_serving/terminus_selector.rb
@@ -9,11 +9,11 @@ require 'puppet/file_serving'
 # in file-serving indirections.  This is necessary because
 # the terminus varies based on the URI asked for.
 module Puppet::FileServing::TerminusSelector
-    PROTOCOL_MAP = {"puppet" => :rest, "file" => :local, "puppetmounts" => :file_server}
+    PROTOCOL_MAP = {"puppet" => :rest, "file" => :file, "puppetmounts" => :file_server}
 
     # Pick an appropriate terminus based on the protocol.
     def select_terminus(full_uri, options = {})
-        # Short-circuit to :local if it's a fully-qualified path.
+        # Short-circuit to :file if it's a fully-qualified path.
         return PROTOCOL_MAP["file"] if full_uri =~ /^#{::File::SEPARATOR}/
         begin
             uri = URI.parse(URI.escape(full_uri))
diff --git a/lib/puppet/indirector/file_content/file.rb b/lib/puppet/indirector/file_content/file.rb
new file mode 100644
index 000000000..4503a7919
--- /dev/null
+++ b/lib/puppet/indirector/file_content/file.rb
@@ -0,0 +1,28 @@
+#
+#  Created by Luke Kanies on 2007-10-16.
+#  Copyright (c) 2007. All rights reserved.
+
+require 'puppet/file_serving/content'
+require 'puppet/file_serving/terminus_helper'
+require 'puppet/util/uri_helper'
+require 'puppet/indirector/file_content'
+require 'puppet/indirector/file'
+
+class Puppet::Indirector::FileContent::File < Puppet::Indirector::File
+    desc "Retrieve file contents from disk."
+
+    include Puppet::Util::URIHelper
+    include Puppet::FileServing::TerminusHelper
+
+    def find(key, options = {})
+        uri = key2uri(key)
+        return nil unless FileTest.exists?(uri.path)
+        model.new(uri.path, :links => options[:links])
+    end
+
+    def search(key, options = {})
+        uri = key2uri(key)
+        return nil unless FileTest.exists?(uri.path)
+        path2instances(uri.path, options)
+    end
+end
diff --git a/lib/puppet/indirector/file_content/local.rb b/lib/puppet/indirector/file_content/local.rb
deleted file mode 100644
index a9c45d59e..000000000
--- a/lib/puppet/indirector/file_content/local.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#  Created by Luke Kanies on 2007-10-16.
-#  Copyright (c) 2007. All rights reserved.
-
-require 'puppet/file_serving/content'
-require 'puppet/file_serving/terminus_helper'
-require 'puppet/util/uri_helper'
-require 'puppet/indirector/file_content'
-require 'puppet/indirector/file'
-
-class Puppet::Indirector::FileContent::Local < Puppet::Indirector::File
-    desc "Retrieve file contents from disk."
-
-    include Puppet::Util::URIHelper
-    include Puppet::FileServing::TerminusHelper
-
-    def find(key, options = {})
-        uri = key2uri(key)
-        return nil unless FileTest.exists?(uri.path)
-        model.new(uri.path, :links => options[:links])
-    end
-
-    def search(key, options = {})
-        uri = key2uri(key)
-        return nil unless FileTest.exists?(uri.path)
-        path2instances(uri.path, options)
-    end
-end
diff --git a/lib/puppet/indirector/file_metadata/file.rb b/lib/puppet/indirector/file_metadata/file.rb
new file mode 100644
index 000000000..823c26c36
--- /dev/null
+++ b/lib/puppet/indirector/file_metadata/file.rb
@@ -0,0 +1,32 @@
+#
+#  Created by Luke Kanies on 2007-10-16.
+#  Copyright (c) 2007. All rights reserved.
+
+require 'puppet/file_serving/metadata'
+require 'puppet/file_serving/terminus_helper'
+require 'puppet/indirector/file_metadata'
+require 'puppet/util/uri_helper'
+require 'puppet/indirector/code'
+
+class Puppet::Indirector::FileMetadata::File < Puppet::Indirector::Code
+    desc "Retrieve file metadata directly from the local filesystem."
+
+    include Puppet::Util::URIHelper
+    include Puppet::FileServing::TerminusHelper
+
+    def find(key, options = {})
+        uri = key2uri(key)
+
+        return nil unless FileTest.exists?(uri.path)
+        data = model.new(uri.path, :links => options[:links])
+        data.collect_attributes
+
+        return data
+    end
+
+    def search(key, options = {})
+        uri = key2uri(key)
+        return nil unless FileTest.exists?(uri.path)
+        path2instances(uri.path, options).each { |instance| instance.collect_attributes }
+    end
+end
diff --git a/lib/puppet/indirector/file_metadata/local.rb b/lib/puppet/indirector/file_metadata/local.rb
deleted file mode 100644
index d696bc769..000000000
--- a/lib/puppet/indirector/file_metadata/local.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#  Created by Luke Kanies on 2007-10-16.
-#  Copyright (c) 2007. All rights reserved.
-
-require 'puppet/file_serving/metadata'
-require 'puppet/file_serving/terminus_helper'
-require 'puppet/indirector/file_metadata'
-require 'puppet/util/uri_helper'
-require 'puppet/indirector/code'
-
-class Puppet::Indirector::FileMetadata::Local < Puppet::Indirector::Code
-    desc "Retrieve file metadata directly from the local filesystem."
-
-    include Puppet::Util::URIHelper
-    include Puppet::FileServing::TerminusHelper
-
-    def find(key, options = {})
-        uri = key2uri(key)
-
-        return nil unless FileTest.exists?(uri.path)
-        data = model.new(uri.path, :links => options[:links])
-        data.collect_attributes
-
-        return data
-    end
-
-    def search(key, options = {})
-        uri = key2uri(key)
-        return nil unless FileTest.exists?(uri.path)
-        path2instances(uri.path, options).each { |instance| instance.collect_attributes }
-    end
-end
-- 
cgit