summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Ethier <alex@fx-tools.com>2014-05-03 00:02:09 -0700
committerAlex Ethier <alex@fx-tools.com>2014-05-03 00:11:38 -0700
commit5b7d733cec8ed8e7cb61d92637e033b970506cbd (patch)
treea4a918aacb8150103620533ca0f91dbe4f9a4947
parentfdca4b76efc9ce258ef59918caf7dade49a1ccef (diff)
downloadchef-5b7d733cec8ed8e7cb61d92637e033b970506cbd.tar.gz
[CHEF-4636] Removed dead code
- Chef::Checksum::Storage::Filesystem
-rw-r--r--lib/chef/checksum/storage.rb18
-rw-r--r--lib/chef/checksum/storage/filesystem.rb56
-rw-r--r--spec/unit/checksum/storage/filesystem_spec.rb70
3 files changed, 0 insertions, 144 deletions
diff --git a/lib/chef/checksum/storage.rb b/lib/chef/checksum/storage.rb
deleted file mode 100644
index 4a1b3d38df..0000000000
--- a/lib/chef/checksum/storage.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Author:: Andrea Campi (<andrea.campi@zephirworks.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'chef/checksum/storage/filesystem'
diff --git a/lib/chef/checksum/storage/filesystem.rb b/lib/chef/checksum/storage/filesystem.rb
deleted file mode 100644
index 94257f518b..0000000000
--- a/lib/chef/checksum/storage/filesystem.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Author:: Tim Hinderliter (<tim@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-class Chef
- class Checksum
- class Storage
- class Filesystem
- def initialize(base_dir, checksum)
- @base_dir = base_dir
- @checksum = checksum
- end
-
- def file_location
- File.join(checksum_repo_directory, @checksum)
- end
- alias :to_s :file_location
-
- def checksum_repo_directory
- File.join(Chef::Config.checksum_path, @checksum[0..1])
- end
-
- def commit(sandbox_file)
- FileUtils.mkdir_p(checksum_repo_directory)
- File.rename(sandbox_file, file_location)
- end
-
- def revert(original_committed_file_location)
- File.rename(file_location, original_committed_file_location)
- end
-
- # Deletes the file backing this checksum from the on-disk repo.
- # Purging the checksums is how users can get back to a valid state if
- # they've deleted files, so we silently swallow Errno::ENOENT here.
- def purge
- FileUtils.rm(file_location)
- rescue Errno::ENOENT
- true
- end
- end
- end
- end
-end
diff --git a/spec/unit/checksum/storage/filesystem_spec.rb b/spec/unit/checksum/storage/filesystem_spec.rb
deleted file mode 100644
index 755a64fe07..0000000000
--- a/spec/unit/checksum/storage/filesystem_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'spec_helper'
-require 'chef/checksum/storage/filesystem'
-
-describe Chef::Checksum::Storage::Filesystem do
-
- before do
- Chef::Log.logger = Logger.new(StringIO.new)
-
- @now = Time.now
-
- Time.stub(:now).and_return(@now)
- Chef::Config.stub(:checksum_path).and_return("/var/chef/checksums")
-
- @checksum_of_the_file = "3fafecfb15585ede6b840158cbc2f399"
- @storage = Chef::Checksum::Storage::Filesystem.new("/not/used/path", @checksum_of_the_file)
- end
-
- it "has the path to the file in the checksum repo" do
- @storage.file_location.should == "/var/chef/checksums/3f/3fafecfb15585ede6b840158cbc2f399"
- end
-
- it "has the path the file's subdirectory in the checksum repo" do
- @storage.checksum_repo_directory.should == "/var/chef/checksums/3f"
- end
-
- it "commits a file from a given location to the checksum repo location" do
- File.should_receive(:rename).with("/tmp/arbitrary_file_location", @storage.file_location)
- FileUtils.should_receive(:mkdir_p).with("/var/chef/checksums/3f")
-
- @storage.commit("/tmp/arbitrary_file_location")
- end
-
- it "reverts committing a file" do
- File.should_receive(:rename).with("/tmp/arbitrary_file_location", @storage.file_location)
- FileUtils.should_receive(:mkdir_p).with("/var/chef/checksums/3f")
- @storage.commit("/tmp/arbitrary_file_location")
-
- File.should_receive(:rename).with(@storage.file_location, "/tmp/arbitrary_file_location")
- @storage.revert("/tmp/arbitrary_file_location")
- end
-
- it "deletes the file" do
- FileUtils.should_receive(:rm).with(@storage.file_location)
- @storage.purge
- end
-
- it "successfully purges even if its file has been deleted from the repo" do
- FileUtils.should_receive(:rm).with(@storage.file_location).and_raise(Errno::ENOENT)
- lambda {@storage.purge}.should_not raise_error
- end
-
-end