From 56b83fe1bd1b08ccd3cc8a857e3a993790d2a983 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Thu, 18 Oct 2007 14:38:12 -0500
Subject: Renaming the file serving indirection termini to match the standards
 I set in the TerminusSelector.

---
 lib/puppet/indirector/file_content/file.rb   | 14 --------------
 lib/puppet/indirector/file_content/local.rb  | 14 ++++++++++++++
 lib/puppet/indirector/file_metadata/local.rb | 16 +++++++++++++++
 lib/puppet/indirector/file_metadata/ral.rb   | 16 ---------------
 spec/unit/indirector/file_content/file.rb    | 29 ----------------------------
 spec/unit/indirector/file_content/local.rb   | 29 ++++++++++++++++++++++++++++
 spec/unit/indirector/file_metadata/local.rb  | 14 ++++++++++++++
 spec/unit/indirector/file_metadata/ral.rb    | 14 --------------
 8 files changed, 73 insertions(+), 73 deletions(-)
 delete mode 100644 lib/puppet/indirector/file_content/file.rb
 create mode 100644 lib/puppet/indirector/file_content/local.rb
 create mode 100644 lib/puppet/indirector/file_metadata/local.rb
 delete mode 100644 lib/puppet/indirector/file_metadata/ral.rb
 delete mode 100755 spec/unit/indirector/file_content/file.rb
 create mode 100755 spec/unit/indirector/file_content/local.rb
 create mode 100755 spec/unit/indirector/file_metadata/local.rb
 delete mode 100755 spec/unit/indirector/file_metadata/ral.rb

diff --git a/lib/puppet/indirector/file_content/file.rb b/lib/puppet/indirector/file_content/file.rb
deleted file mode 100644
index bb9dc6998..000000000
--- a/lib/puppet/indirector/file_content/file.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#  Created by Luke Kanies on 2007-10-16.
-#  Copyright (c) 2007. All rights reserved.
-
-require 'puppet/file_serving/content'
-require 'puppet/indirector/file_content'
-require 'puppet/indirector/file'
-
-class Puppet::Indirector::FileContent::File < Puppet::Indirector::File
-    desc "Retrieve file contents from disk."
-
-    def find(path)
-    end
-end
diff --git a/lib/puppet/indirector/file_content/local.rb b/lib/puppet/indirector/file_content/local.rb
new file mode 100644
index 000000000..bb9dc6998
--- /dev/null
+++ b/lib/puppet/indirector/file_content/local.rb
@@ -0,0 +1,14 @@
+#
+#  Created by Luke Kanies on 2007-10-16.
+#  Copyright (c) 2007. All rights reserved.
+
+require 'puppet/file_serving/content'
+require 'puppet/indirector/file_content'
+require 'puppet/indirector/file'
+
+class Puppet::Indirector::FileContent::File < Puppet::Indirector::File
+    desc "Retrieve file contents from disk."
+
+    def find(path)
+    end
+end
diff --git a/lib/puppet/indirector/file_metadata/local.rb b/lib/puppet/indirector/file_metadata/local.rb
new file mode 100644
index 000000000..5777b1774
--- /dev/null
+++ b/lib/puppet/indirector/file_metadata/local.rb
@@ -0,0 +1,16 @@
+#
+#  Created by Luke Kanies on 2007-10-16.
+#  Copyright (c) 2007. All rights reserved.
+
+require 'puppet/file_serving/metadata'
+require 'puppet/indirector/file_metadata'
+require 'puppet/indirector/code'
+
+class Puppet::Indirector::FileMetadata::Ral < Puppet::Indirector::Code
+    desc "Retrieve file metadata using Puppet's Resource Abstraction Layer.
+        Returns everything about the file except its content."
+
+    def find(file)
+        Puppet::Node::Facts.new(key, Facter.to_hash)
+    end
+end
diff --git a/lib/puppet/indirector/file_metadata/ral.rb b/lib/puppet/indirector/file_metadata/ral.rb
deleted file mode 100644
index 5777b1774..000000000
--- a/lib/puppet/indirector/file_metadata/ral.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#  Created by Luke Kanies on 2007-10-16.
-#  Copyright (c) 2007. All rights reserved.
-
-require 'puppet/file_serving/metadata'
-require 'puppet/indirector/file_metadata'
-require 'puppet/indirector/code'
-
-class Puppet::Indirector::FileMetadata::Ral < Puppet::Indirector::Code
-    desc "Retrieve file metadata using Puppet's Resource Abstraction Layer.
-        Returns everything about the file except its content."
-
-    def find(file)
-        Puppet::Node::Facts.new(key, Facter.to_hash)
-    end
-end
diff --git a/spec/unit/indirector/file_content/file.rb b/spec/unit/indirector/file_content/file.rb
deleted file mode 100755
index 08f66acb6..000000000
--- a/spec/unit/indirector/file_content/file.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  Created by Luke Kanies on 2007-10-18.
-#  Copyright (c) 2007. All rights reserved.
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-require 'puppet/indirector/file_content/file'
-
-describe Puppet::Indirector::FileContent::File do
-    it "should be registered with the file_content indirection" do
-        Puppet::Indirector::Terminus.terminus_class(:file_content, :file).should equal(Puppet::Indirector::FileContent::File)
-    end
-
-    it "should be a subclass of the File terminus" do
-        Puppet::Indirector::FileContent::File.superclass.should equal(Puppet::Indirector::File)
-    end
-end
-
-describe Puppet::Indirector::FileContent::File, "when finding a single file" do
-    before do
-        @content = Puppet::Indirector::FileContent::File.new
-        @path = "/my/file"
-    end
-
-    it "should return nil if the file does not exist"
-
-    it "should return a Content instance with the path set to the file if the file exists"
-end
diff --git a/spec/unit/indirector/file_content/local.rb b/spec/unit/indirector/file_content/local.rb
new file mode 100755
index 000000000..08f66acb6
--- /dev/null
+++ b/spec/unit/indirector/file_content/local.rb
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2007-10-18.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/file_content/file'
+
+describe Puppet::Indirector::FileContent::File do
+    it "should be registered with the file_content indirection" do
+        Puppet::Indirector::Terminus.terminus_class(:file_content, :file).should equal(Puppet::Indirector::FileContent::File)
+    end
+
+    it "should be a subclass of the File terminus" do
+        Puppet::Indirector::FileContent::File.superclass.should equal(Puppet::Indirector::File)
+    end
+end
+
+describe Puppet::Indirector::FileContent::File, "when finding a single file" do
+    before do
+        @content = Puppet::Indirector::FileContent::File.new
+        @path = "/my/file"
+    end
+
+    it "should return nil if the file does not exist"
+
+    it "should return a Content instance with the path set to the file if the file exists"
+end
diff --git a/spec/unit/indirector/file_metadata/local.rb b/spec/unit/indirector/file_metadata/local.rb
new file mode 100755
index 000000000..0b0219980
--- /dev/null
+++ b/spec/unit/indirector/file_metadata/local.rb
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2007-10-18.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/file_metadata/ral'
+
+describe Puppet::Indirector::FileMetadata::Ral do
+    it "should be registered with the file_metadata indirection" do
+        Puppet::Indirector::Terminus.terminus_class(:file_metadata, :ral).should equal(Puppet::Indirector::FileMetadata::Ral)
+    end
+end
diff --git a/spec/unit/indirector/file_metadata/ral.rb b/spec/unit/indirector/file_metadata/ral.rb
deleted file mode 100755
index 0b0219980..000000000
--- a/spec/unit/indirector/file_metadata/ral.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  Created by Luke Kanies on 2007-10-18.
-#  Copyright (c) 2007. All rights reserved.
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-require 'puppet/indirector/file_metadata/ral'
-
-describe Puppet::Indirector::FileMetadata::Ral do
-    it "should be registered with the file_metadata indirection" do
-        Puppet::Indirector::Terminus.terminus_class(:file_metadata, :ral).should equal(Puppet::Indirector::FileMetadata::Ral)
-    end
-end
-- 
cgit