diff options
33 files changed, 0 insertions, 42 deletions
diff --git a/lib/chef/provider/deploy.rb b/lib/chef/provider/deploy.rb index 516aee6159..63ee8685df 100644 --- a/lib/chef/provider/deploy.rb +++ b/lib/chef/provider/deploy.rb @@ -174,7 +174,6 @@ class Chef restart end - def callback(what, callback_code=nil) @collection = Chef::ResourceCollection.new case callback_code diff --git a/lib/chef/provider/execute.rb b/lib/chef/provider/execute.rb index b494e6678e..d469bea769 100644 --- a/lib/chef/provider/execute.rb +++ b/lib/chef/provider/execute.rb @@ -23,7 +23,6 @@ class Chef class Provider class Execute < Chef::Provider - def load_current_resource true end diff --git a/lib/chef/provider/file.rb b/lib/chef/provider/file.rb index e1db4d00dc..031d0fb005 100644 --- a/lib/chef/provider/file.rb +++ b/lib/chef/provider/file.rb @@ -245,7 +245,6 @@ class Chef "Assuming symlink source would be created by a previous resource" ] end - def content @content ||= begin load_current_resource if @current_resource.nil? diff --git a/lib/chef/provider/git.rb b/lib/chef/provider/git.rb index 8499fe49b8..263014d229 100644 --- a/lib/chef/provider/git.rb +++ b/lib/chef/provider/git.rb @@ -16,7 +16,6 @@ # limitations under the License. # - require 'chef/exceptions' require 'chef/log' require 'chef/provider' @@ -26,7 +25,6 @@ class Chef class Provider class Git < Chef::Provider - def whyrun_supported? true end @@ -49,7 +47,6 @@ class Chef "Cannot clone #{@new_resource} to #{@new_resource.destination}, the enclosing directory #{dirname} does not exist") end - requirements.assert(:all_actions) do |a| a.assertion { !(@new_resource.revision =~ /^origin\//) } a.failure_message Chef::Exceptions::InvalidRemoteGitReference, @@ -105,7 +102,6 @@ class Chef end end - def existing_git_clone? ::File.exist?(::File.join(@new_resource.destination, ".git")) end diff --git a/lib/chef/provider/group/gpasswd.rb b/lib/chef/provider/group/gpasswd.rb index 2ac98f85ac..521affac11 100644 --- a/lib/chef/provider/group/gpasswd.rb +++ b/lib/chef/provider/group/gpasswd.rb @@ -23,7 +23,6 @@ class Chef class Group class Gpasswd < Chef::Provider::Group::Groupadd - def load_current_resource super end diff --git a/lib/chef/provider/group/groupmod.rb b/lib/chef/provider/group/groupmod.rb index ae89f3af93..7ad762af8d 100644 --- a/lib/chef/provider/group/groupmod.rb +++ b/lib/chef/provider/group/groupmod.rb @@ -16,13 +16,11 @@ # limitations under the License. # - class Chef class Provider class Group class Groupmod < Chef::Provider::Group - def load_current_resource super [ "group", "user" ].each do |binary| diff --git a/lib/chef/provider/group/suse.rb b/lib/chef/provider/group/suse.rb index 451af5fc45..7ac2831d02 100644 --- a/lib/chef/provider/group/suse.rb +++ b/lib/chef/provider/group/suse.rb @@ -23,7 +23,6 @@ class Chef class Group class Suse < Chef::Provider::Group::Groupadd - def load_current_resource super end diff --git a/lib/chef/provider/group/usermod.rb b/lib/chef/provider/group/usermod.rb index fac6afb9f9..e9dcc38b43 100644 --- a/lib/chef/provider/group/usermod.rb +++ b/lib/chef/provider/group/usermod.rb @@ -23,7 +23,6 @@ class Chef class Group class Usermod < Chef::Provider::Group::Groupadd - def load_current_resource super end diff --git a/lib/chef/provider/mdadm.rb b/lib/chef/provider/mdadm.rb index 4a34a5c2ce..d156e49d48 100644 --- a/lib/chef/provider/mdadm.rb +++ b/lib/chef/provider/mdadm.rb @@ -23,7 +23,6 @@ class Chef class Provider class Mdadm < Chef::Provider - def popen4 raise Exception, "deprecated" end diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb index adae880b7f..a4a056dfec 100644 --- a/lib/chef/provider/package.rb +++ b/lib/chef/provider/package.rb @@ -198,7 +198,6 @@ class Chef Chef::Log.debug("#{@new_resource} fetching preseed file to #{cache_seed_to}") - if template_available?(@new_resource.response_file) Chef::Log.debug("#{@new_resource} fetching preseed file via Template") remote_file = Chef::Resource::Template.new(cache_seed_to, run_context) diff --git a/lib/chef/provider/package/apt.rb b/lib/chef/provider/package/apt.rb index 82264c1acf..0d91d0d1f0 100644 --- a/lib/chef/provider/package/apt.rb +++ b/lib/chef/provider/package/apt.rb @@ -20,7 +20,6 @@ require 'chef/provider/package' require 'chef/mixin/command' require 'chef/resource/package' - class Chef class Provider class Package diff --git a/lib/chef/provider/package/easy_install.rb b/lib/chef/provider/package/easy_install.rb index 6cbe3b466a..2af8a72e61 100644 --- a/lib/chef/provider/package/easy_install.rb +++ b/lib/chef/provider/package/easy_install.rb @@ -25,7 +25,6 @@ class Chef class Package class EasyInstall < Chef::Provider::Package - def install_check(name) check = false diff --git a/lib/chef/provider/package/freebsd/base.rb b/lib/chef/provider/package/freebsd/base.rb index c993738488..b0f05667ff 100644 --- a/lib/chef/provider/package/freebsd/base.rb +++ b/lib/chef/provider/package/freebsd/base.rb @@ -62,7 +62,6 @@ class Chef end end - class Base < Chef::Provider::Package include Chef::Mixin::GetSourceFromPackage diff --git a/lib/chef/provider/package/freebsd/pkgng.rb b/lib/chef/provider/package/freebsd/pkgng.rb index da531facc1..0741a4d95f 100644 --- a/lib/chef/provider/package/freebsd/pkgng.rb +++ b/lib/chef/provider/package/freebsd/pkgng.rb @@ -52,8 +52,6 @@ class Chef @new_resource.source ? file_candidate_version : repo_candidate_version end - - private def file_candidate_version diff --git a/lib/chef/provider/package/freebsd/port.rb b/lib/chef/provider/package/freebsd/port.rb index 6f4471a6f7..4b3510f0e9 100644 --- a/lib/chef/provider/package/freebsd/port.rb +++ b/lib/chef/provider/package/freebsd/port.rb @@ -54,8 +54,6 @@ class Chef super(@new_resource.package_name) end - - private def supports_pkgng? diff --git a/lib/chef/provider/package/paludis.rb b/lib/chef/provider/package/paludis.rb index f2a574d6fc..24d256e0a1 100644 --- a/lib/chef/provider/package/paludis.rb +++ b/lib/chef/provider/package/paludis.rb @@ -24,7 +24,6 @@ class Chef class Package class Paludis < Chef::Provider::Package - def load_current_resource @current_resource = Chef::Resource::Package.new(@new_resource.package_name) @current_resource.package_name(@new_resource.package_name) diff --git a/lib/chef/provider/package/portage.rb b/lib/chef/provider/package/portage.rb index ea8e37e5d4..6a3587558a 100644 --- a/lib/chef/provider/package/portage.rb +++ b/lib/chef/provider/package/portage.rb @@ -55,7 +55,6 @@ class Chef @current_resource end - def parse_emerge(package, txt) availables = {} found_package_name = nil @@ -103,7 +102,6 @@ class Chef end - def install_package(name, version) pkg = "=#{name}-#{version}" diff --git a/lib/chef/provider/package/rpm.rb b/lib/chef/provider/package/rpm.rb index 74baddb062..d1e34527da 100644 --- a/lib/chef/provider/package/rpm.rb +++ b/lib/chef/provider/package/rpm.rb @@ -85,7 +85,6 @@ class Chef end end - @current_resource end diff --git a/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb index 0e404ca58b..f8b5011d3e 100644 --- a/lib/chef/provider/package/rubygems.rb +++ b/lib/chef/provider/package/rubygems.rb @@ -273,7 +273,6 @@ class Chef @platform_cache ||= {} end - attr_reader :gem_binary_location def initialize(gem_binary_location) @@ -351,7 +350,6 @@ class Chef end - attr_reader :gem_env attr_reader :cleanup_gem_env diff --git a/lib/chef/provider/package/smartos.rb b/lib/chef/provider/package/smartos.rb index 576899640a..19a6b9efef 100644 --- a/lib/chef/provider/package/smartos.rb +++ b/lib/chef/provider/package/smartos.rb @@ -29,7 +29,6 @@ class Chef class SmartOS < Chef::Provider::Package attr_accessor :is_virtual_package - def load_current_resource Chef::Log.debug("#{@new_resource} loading current resource") @current_resource = Chef::Resource::Package.new(@new_resource.name) diff --git a/lib/chef/provider/package/yum.rb b/lib/chef/provider/package/yum.rb index 64ccca30a5..d15f22ae16 100644 --- a/lib/chef/provider/package/yum.rb +++ b/lib/chef/provider/package/yum.rb @@ -23,7 +23,6 @@ require 'chef/resource/package' require 'singleton' require 'chef/mixin/get_source_from_package' - class Chef class Provider class Package diff --git a/lib/chef/provider/package/zypper.rb b/lib/chef/provider/package/zypper.rb index 5616cc1512..2639f18deb 100644 --- a/lib/chef/provider/package/zypper.rb +++ b/lib/chef/provider/package/zypper.rb @@ -29,7 +29,6 @@ class Chef class Package class Zypper < Chef::Provider::Package - def load_current_resource @current_resource = Chef::Resource::Package.new(@new_resource.name) @current_resource.package_name(@new_resource.package_name) diff --git a/lib/chef/provider/remote_directory.rb b/lib/chef/provider/remote_directory.rb index 129c5208f0..77e2754b08 100644 --- a/lib/chef/provider/remote_directory.rb +++ b/lib/chef/provider/remote_directory.rb @@ -40,7 +40,6 @@ class Chef name !~ /(?:^|#{Regexp.escape(::File::SEPARATOR)})\.\.?$/ end) - files_to_transfer.each do |cookbook_file_relative_path| create_cookbook_file(cookbook_file_relative_path) # the file is removed from the purge list diff --git a/lib/chef/provider/remote_file/fetcher.rb b/lib/chef/provider/remote_file/fetcher.rb index c3a098ed35..c789e94565 100644 --- a/lib/chef/provider/remote_file/fetcher.rb +++ b/lib/chef/provider/remote_file/fetcher.rb @@ -17,7 +17,6 @@ # limitations under the License. # - class Chef class Provider class RemoteFile diff --git a/lib/chef/provider/remote_file/ftp.rb b/lib/chef/provider/remote_file/ftp.rb index 7f3fdbf383..3f78286aa3 100644 --- a/lib/chef/provider/remote_file/ftp.rb +++ b/lib/chef/provider/remote_file/ftp.rb @@ -81,7 +81,6 @@ class Chef @filename end - def fetch with_connection do get diff --git a/lib/chef/provider/service/freebsd.rb b/lib/chef/provider/service/freebsd.rb index 7f382fe287..800cd4ec13 100644 --- a/lib/chef/provider/service/freebsd.rb +++ b/lib/chef/provider/service/freebsd.rb @@ -25,7 +25,6 @@ class Chef class Service class Freebsd < Chef::Provider::Service::Init - def load_current_resource @current_resource = Chef::Resource::Service.new(@new_resource.name) @current_resource.service_name(@new_resource.service_name) diff --git a/lib/chef/provider/service/init.rb b/lib/chef/provider/service/init.rb index 81c9442444..cf5da852c3 100644 --- a/lib/chef/provider/service/init.rb +++ b/lib/chef/provider/service/init.rb @@ -24,7 +24,6 @@ class Chef class Service class Init < Chef::Provider::Service::Simple - def initialize(new_resource, run_context) super @init_command = "/etc/init.d/#{@new_resource.service_name}" diff --git a/lib/chef/provider/service/simple.rb b/lib/chef/provider/service/simple.rb index 1bd74e32c9..f03b8a18a1 100644 --- a/lib/chef/provider/service/simple.rb +++ b/lib/chef/provider/service/simple.rb @@ -25,7 +25,6 @@ class Chef class Service class Simple < Chef::Provider::Service - def load_current_resource @current_resource = Chef::Resource::Service.new(@new_resource.name) @current_resource.service_name(@new_resource.service_name) diff --git a/lib/chef/provider/service/solaris.rb b/lib/chef/provider/service/solaris.rb index 39a52454cf..0c47a3462b 100644 --- a/lib/chef/provider/service/solaris.rb +++ b/lib/chef/provider/service/solaris.rb @@ -33,7 +33,6 @@ class Chef @maintenace = false end - def load_current_resource @current_resource = Chef::Resource::Service.new(@new_resource.name) @current_resource.service_name(@new_resource.service_name) diff --git a/lib/chef/provider/service/windows.rb b/lib/chef/provider/service/windows.rb index d14aaf02e9..2d478fa9fe 100644 --- a/lib/chef/provider/service/windows.rb +++ b/lib/chef/provider/service/windows.rb @@ -25,7 +25,6 @@ end class Chef::Provider::Service::Windows < Chef::Provider::Service - #Win32::Service.get_start_type AUTO_START = 'auto start' DISABLED = 'disabled' diff --git a/lib/chef/provider/subversion.rb b/lib/chef/provider/subversion.rb index 6ceb3e592a..81ed639c53 100644 --- a/lib/chef/provider/subversion.rb +++ b/lib/chef/provider/subversion.rb @@ -16,7 +16,6 @@ # limitations under the License. # - #TODO subversion and git should both extend from a base SCM provider. require 'chef/log' @@ -199,7 +198,6 @@ class Chef ['svn', *args].compact.join(" ") end - def target_dir_non_existent_or_empty? !::File.exist?(@new_resource.destination) || Dir.entries(@new_resource.destination).sort == ['.','..'] end diff --git a/lib/chef/provider/template.rb b/lib/chef/provider/template.rb index 555f4f14f0..05329d13d6 100644 --- a/lib/chef/provider/template.rb +++ b/lib/chef/provider/template.rb @@ -22,7 +22,6 @@ require 'chef/provider/file' require 'chef/deprecation/provider/template' require 'chef/deprecation/warnings' - class Chef class Provider class Template < Chef::Provider::File diff --git a/lib/chef/provider/user/useradd.rb b/lib/chef/provider/user/useradd.rb index 2b219320f1..cad9d58e7e 100644 --- a/lib/chef/provider/user/useradd.rb +++ b/lib/chef/provider/user/useradd.rb @@ -24,7 +24,6 @@ class Chef class User class Useradd < Chef::Provider::User - UNIVERSAL_OPTIONS = [[:comment, "-c"], [:gid, "-g"], [:password, "-p"], [:shell, "-s"], [:uid, "-u"]] def create_user |