summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Campbell <hikeit@gmail.com>2013-02-05 16:13:22 -0500
committerBryan McLellan <btm@opscode.com>2013-02-26 11:11:43 -0800
commit3dff33d68b43c67dac5b6f5b4bf27309f5c0a6ff (patch)
treeeba43d19c75b55ee25b3671b2e20a3115ddc6f50
parent7a2975342ea3e51d0875c125f0061d52bd559d6a (diff)
downloadchef-3dff33d68b43c67dac5b6f5b4bf27309f5c0a6ff.tar.gz
Fix remote_file namespacing
-rw-r--r--lib/chef/provider/remote_file.rb1
-rw-r--r--lib/chef/provider/remote_file/ftp.rb3
-rw-r--r--lib/chef/providers.rb2
3 files changed, 4 insertions, 2 deletions
diff --git a/lib/chef/provider/remote_file.rb b/lib/chef/provider/remote_file.rb
index 27ee95acd3..7e3816496b 100644
--- a/lib/chef/provider/remote_file.rb
+++ b/lib/chef/provider/remote_file.rb
@@ -19,7 +19,6 @@
require 'chef/provider/file'
require 'rest_client'
-require 'chef/provider/remote_file/ftp'
require 'uri'
require 'tempfile'
diff --git a/lib/chef/provider/remote_file/ftp.rb b/lib/chef/provider/remote_file/ftp.rb
index 9973822223..bc4e5a5183 100644
--- a/lib/chef/provider/remote_file/ftp.rb
+++ b/lib/chef/provider/remote_file/ftp.rb
@@ -19,10 +19,11 @@
require 'uri'
require 'tempfile'
require 'net/ftp'
+require 'chef/provider/remote_file'
class Chef
class Provider
- class RemoteFile < Chef::Provider::File
+ class RemoteFile
class FTP
# Fetches the file at uri using Net::FTP, returning a Tempfile
diff --git a/lib/chef/providers.rb b/lib/chef/providers.rb
index ae95632eaa..3a40c542ec 100644
--- a/lib/chef/providers.rb
+++ b/lib/chef/providers.rb
@@ -101,5 +101,7 @@ require 'chef/provider/mount/windows'
require 'chef/provider/deploy/revision'
require 'chef/provider/deploy/timestamped'
+require 'chef/provider/remote_file/ftp'
+
require "chef/provider/lwrp_base"
require 'chef/provider/registry_key'