summaryrefslogtreecommitdiff
path: root/lib/chef/cookbook_version.rb
diff options
context:
space:
mode:
authorBryan McLellan <btm@opscode.com>2013-01-24 19:12:43 -0800
committerBryan McLellan <btm@opscode.com>2013-06-18 13:46:04 -0700
commitfebf9c2be9a35ac5f756c207f4dad9853839951a (patch)
tree8700777d85b714ef1facdaa4774842521aac2186 /lib/chef/cookbook_version.rb
parent184f8b91ae7758a709fa18ce4322f800aa868d48 (diff)
downloadchef-febf9c2be9a35ac5f756c207f4dad9853839951a.tar.gz
Remove dead code from Chef::CookbookVersion
Removed in f880869c93548bbcded6e53d3d98dce61e8d7fa3, but apparently accidently slipped back by mistake in merge b36f636267d74e1004c043501f652448f02ee747
Diffstat (limited to 'lib/chef/cookbook_version.rb')
-rw-r--r--lib/chef/cookbook_version.rb109
1 files changed, 0 insertions, 109 deletions
diff --git a/lib/chef/cookbook_version.rb b/lib/chef/cookbook_version.rb
index 6e1a72ccb0..31ccbabe59 100644
--- a/lib/chef/cookbook_version.rb
+++ b/lib/chef/cookbook_version.rb
@@ -79,115 +79,6 @@ class Chef
Chef::FileCache
end
- # Synchronizes all the cookbooks from the chef-server.
- #
- # === Returns
- # true:: Always returns true
- def self.sync_cookbooks(cookbook_hash)
- Chef::Log.info("Loading cookbooks [#{cookbook_hash.keys.sort.join(', ')}]")
- Chef::Log.debug("Cookbooks detail: #{cookbook_hash.inspect}")
-
- clear_obsoleted_cookbooks(cookbook_hash)
-
- # Synchronize each of the node's cookbooks, and add to the
- # valid_cache_entries hash.
- cookbook_hash.values.each do |cookbook|
- sync_cookbook_file_cache(cookbook)
- end
-
- true
- end
-
- # Iterates over cached cookbooks' files, removing files belonging to
- # cookbooks that don't appear in +cookbook_hash+
- def self.clear_obsoleted_cookbooks(cookbook_hash)
- # Remove all cookbooks no longer relevant to this node
- cache.find(File.join(%w{cookbooks ** *})).each do |cache_file|
- cache_file =~ /^cookbooks\/([^\/]+)\//
- unless cookbook_hash.has_key?($1)
- Chef::Log.info("Removing #{cache_file} from the cache; its cookbook is no longer needed on this client.")
- cache.delete(cache_file)
- end
- end
- end
-
- # Update the file caches for a given cache segment. Takes a segment name
- # and a hash that matches one of the cookbooks/_attribute_files style
- # remote file listings.
- #
- # === Parameters
- # cookbook<Chef::Cookbook>:: The cookbook to update
- # valid_cache_entries<Hash>:: Out-param; Added to this hash are the files that
- # were referred to by this cookbook
- def self.sync_cookbook_file_cache(cookbook)
- Chef::Log.debug("Synchronizing cookbook #{cookbook.name}")
-
- # files and templates are lazily loaded, and will be done later.
- eager_segments = COOKBOOK_SEGMENTS.dup
-
- unless Chef::Config[:no_lazy_load] then
- eager_segments.delete(:files)
- eager_segments.delete(:templates)
- end
-
- eager_segments.each do |segment|
- segment_filenames = Array.new
- cookbook.manifest[segment].each do |manifest_record|
- # segment = cookbook segment
- # remote_list = list of file hashes
- #
- # We need the list of known good attribute files, so we can delete any that are
- # just laying about.
-
- cache_filename = File.join("cookbooks", cookbook.name, manifest_record['path'])
- valid_cache_entries[cache_filename] = true
-
- current_checksum = nil
- if cache.has_key?(cache_filename)
- current_checksum = checksum_cookbook_file(cache.load(cache_filename, false))
- end
-
- # If the checksums are different between on-disk (current) and on-server
- # (remote, per manifest), do the update. This will also execute if there
- # is no current checksum.
- if current_checksum != manifest_record['checksum']
- raw_file = chef_server_rest.get_rest(manifest_record[:url], true)
-
- Chef::Log.info("Storing updated #{cache_filename} in the cache.")
- cache.move_to(raw_file.path, cache_filename)
- else
- Chef::Log.debug("Not storing #{cache_filename}, as the cache is up to date.")
- end
-
- # make the segment filenames a full path.
- full_path_cache_filename = cache.load(cache_filename, false)
- segment_filenames << full_path_cache_filename
- end
-
- # replace segment filenames with a full-path one.
- if segment.to_sym == :recipes
- cookbook.recipe_filenames = segment_filenames
- elsif segment.to_sym == :attributes
- cookbook.attribute_filenames = segment_filenames
- else
- cookbook.segment_filenames(segment).replace(segment_filenames)
- end
- end
- end
-
- def self.cleanup_file_cache
- unless Chef::Config[:solo]
- # Delete each file in the cache that we didn't encounter in the
- # manifest.
- cache.find(File.join(%w{cookbooks ** *})).each do |cache_filename|
- unless valid_cache_entries[cache_filename]
- Chef::Log.info("Removing #{cache_filename} from the cache; it is no longer needed by chef-client.")
- cache.delete(cache_filename)
- end
- end
- end
- end
-
# Creates a new Chef::CookbookVersion object.
#
# === Returns