[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit 576accd675e43c6bf7af1c8e0f66151f798a4820
Author: Luke Kanies <luke at madstop.com>
Date:   Fri Dec 4 16:49:57 2009 -0800

    Removing unused Checksum::File terminus
    
    Signed-off-by: Luke Kanies <luke at madstop.com>

diff --git a/lib/puppet/indirector/checksum/file.rb b/lib/puppet/indirector/checksum/file.rb
deleted file mode 100644
index 5489b40..0000000
--- a/lib/puppet/indirector/checksum/file.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'puppet/checksum'
-require 'puppet/indirector/file'
-
-class Puppet::Checksum::File < Puppet::Indirector::File
-    desc "Store files in a directory set based on their checksums."
-
-    def initialize
-        Puppet.settings.use(:filebucket)
-    end
-
-    def path(checksum)
-        path = []
-        path << Puppet[:bucketdir]                              # Start with the base directory
-        path << checksum[0..7].split("").join(File::SEPARATOR)  # Add sets of directories based on the checksum
-        path << checksum                                        # And the full checksum name itself
-        path << "contents"                                      # And the actual file name
-
-        path.join(File::SEPARATOR)
-    end
-
-    def save(request)
-        path = File.dirname(path(request.key))
-
-        # Make the directories if necessary.
-        unless FileTest.directory?(path)
-            Puppet::Util.withumask(0007) do
-                FileUtils.mkdir_p(path)
-            end
-        end
-
-        super
-    end
-end
diff --git a/spec/unit/indirector/checksum/file.rb b/spec/unit/indirector/checksum/file.rb
deleted file mode 100755
index 857d7b0..0000000
--- a/spec/unit/indirector/checksum/file.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  Created by Luke Kanies on 2007-9-22.
-#  Copyright (c) 2007. All rights reserved.
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-require 'puppet/indirector/checksum/file'
-
-describe Puppet::Checksum::File do
-    it "should be a subclass of the File terminus class" do
-        Puppet::Checksum::File.superclass.should equal(Puppet::Indirector::File)
-    end
-
-    it "should have documentation" do
-        Puppet::Checksum::File.doc.should be_instance_of(String)
-    end
-end
-
-describe Puppet::Checksum::File, " when initializing" do
-    it "should use the filebucket settings section" do
-        Puppet.settings.expects(:use).with(:filebucket)
-        Puppet::Checksum::File.new
-    end
-end
-
-
-describe Puppet::Checksum::File do
-    before :each do
-        Puppet.settings.stubs(:use)
-        @store = Puppet::Checksum::File.new
-
-        @value = "70924d6fa4b2d745185fa4660703a5c0"
-        @sum = stub 'sum', :name => @value
-
-        @dir = "/what/ever"
-
-        Puppet.stubs(:[]).with(:bucketdir).returns(@dir)
-
-        @path = @store.path(@value)
-
-        @request = stub 'request', :key => @value
-    end
-
-
-    describe Puppet::Checksum::File, " when determining file paths" do
-
-        # I was previously passing the object in.
-        it "should use the value passed in to path() as the checksum" do
-            @value.expects(:name).never
-            @store.path(@value)
-        end
-
-        it "should use the value of the :bucketdir setting as the root directory" do
-            @path.should =~ %r{^#{@dir}}
-        end
-
-        it "should choose a path 8 directories deep with each directory name being the respective character in the checksum" do
-            dirs = @value[0..7].split("").join(File::SEPARATOR)
-            @path.should be_include(dirs)
-        end
-
-        it "should use the full checksum as the final directory name" do
-            File.basename(File.dirname(@path)).should == @value
-        end
-
-        it "should use 'contents' as the actual file name" do
-            File.basename(@path).should == "contents"
-        end
-
-        it "should use the bucketdir, the 8 sum character directories, the full checksum, and 'contents' as the full file name" do
-            @path.should == [@dir, @value[0..7].split(""), @value, "contents"].flatten.join(File::SEPARATOR)
-        end
-    end
-
-    describe Puppet::Checksum::File, " when retrieving files" do
-
-        # The smallest test that will use the calculated path
-        it "should look for the calculated path" do
-            File.expects(:exist?).with(@path).returns(false)
-            @store.find(@request)
-        end
-
-        it "should return an instance of Puppet::Checksum created with the content if the file exists" do
-            content = "my content"
-            sum = stub 'file'
-            Puppet::Checksum.expects(:new).with(content).returns(sum)
-
-            File.expects(:exist?).with(@path).returns(true)
-            File.expects(:read).with(@path).returns(content)
-
-            @store.find(@request).should equal(sum)
-        end
-
-        it "should return nil if no file is found" do
-            File.expects(:exist?).with(@path).returns(false)
-            @store.find(@request).should be_nil
-        end
-
-        it "should fail intelligently if a found file cannot be read" do
-            File.expects(:exist?).with(@path).returns(true)
-            File.expects(:read).with(@path).raises(RuntimeError)
-            proc { @store.find(@request) }.should raise_error(Puppet::Error)
-        end
-    end
-
-    describe Puppet::Checksum::File, " when saving files" do
-
-        # LAK:FIXME I don't know how to include in the spec the fact that we're
-        # using the superclass's save() method and thus are acquiring all of
-        # it's behaviours.
-        it "should save the content to the calculated path" do
-            File.stubs(:directory?).with(File.dirname(@path)).returns(true)
-            File.expects(:open).with(@path, "w")
-
-            file = stub 'file', :name => @value
-            @store.save(@request)
-        end
-
-        it "should make any directories necessary for storage" do
-            FileUtils.expects(:mkdir_p).with do |arg|
-                File.umask == 0007 and arg == File.dirname(@path)
-            end
-            File.expects(:directory?).with(File.dirname(@path)).returns(true)
-            File.expects(:open).with(@path, "w")
-
-            @store.save(@request)
-        end
-    end
-
-    describe Puppet::Checksum::File, " when deleting files" do
-        it "should remove the file at the calculated path" do
-            File.expects(:exist?).with(@path).returns(true)
-            File.expects(:unlink).with(@path)
-
-            @store.destroy(@request)
-        end
-    end
-end

-- 
Puppet packaging for Debian