puppet 0.24.6 → 0.24.7

data/lib/puppet/util/storage.rb

@@ -1,6 +1,8 @@
 require 'yaml'
 require 'sync'
 
+require 'puppet/util/file_locking'
+
 # a class for storing state
 class Puppet::Util::Storage
     include Singleton
@@ -59,7 +61,7 @@ class Puppet::Util::Storage
             return
         end
         Puppet::Util.benchmark(:debug, "Loaded state") do
-            Puppet::Util.readlock(Puppet[:statefile]) do |file|
+            Puppet::Util::FileLocking.readlock(Puppet[:statefile]) do |file|
                 begin
                     @@state = YAML.load(file)
                 rescue => detail
@@ -97,7 +99,7 @@ class Puppet::Util::Storage
         end
 
         Puppet::Util.benchmark(:debug, "Stored state") do
-            Puppet::Util.writelock(Puppet[:statefile], 0660) do |file|
+            Puppet::Util::FileLocking.writelock(Puppet[:statefile], 0660) do |file|
                 file.print YAML.dump(@@state)
             end
         end

data/spec/Rakefile

@@ -0,0 +1,91 @@
+require File.join(File.dirname(__FILE__), "spec_helper.rb")
+require 'rake'
+require 'spec/rake/spectask'
+
+basedir = File.dirname(__FILE__)
+puppetlibdir = File.join(basedir, "../lib")
+puppettestlibdir = File.join(basedir, "../test/lib")
+speclibdir = File.join(basedir, "lib")
+
+require 'find'
+
+include Find
+include FileTest
+
+$exclusions = %W(lib)
+
+filemap = Hash.new { |hash, key| hash[key] = [] }
+
+allfiles = []
+
+# First collect the entire file list.
+find(".") do |f|
+    # Get rid of the leading ./
+    f = f.sub(/^\.\//, '')
+
+    file = File.basename(f)
+    dir = File.dirname(f)
+
+    # Prune . directories and excluded dirs
+    if (file =~ /^\./ and f != ".") or $exclusions.include?(File.basename(file))
+        prune
+        next
+    end
+    next if f == "."
+    next if dir == "."
+
+    # If we're a ruby script, then add it to the list of files for that dir
+    if file =~ /\.rb$/
+        allfiles << f
+        # Add it to all of the parent dirs, not just our own
+        parts = File.split(dir)
+        if parts[0] == "."
+            parts.shift
+        end
+        parts.each_with_index { |part, i|
+            path = File.join(parts[0..i])
+            filemap[path] << f
+        }
+    end
+end
+
+
+libs = [puppetlibdir, puppettestlibdir, speclibdir]
+desc "Run all specs"
+Spec::Rake::SpecTask.new('all') do |t|
+    t.spec_files = FileList['integration/**/*.rb', 'unit/**/*.rb']
+    t.libs = libs
+    t.spec_opts = ['--options', 'spec.opts']
+end
+
+task :default => [:all]
+
+# Now create a task for every directory
+filemap.each do |dir, files|
+    ns = dir.gsub "/", ":"
+
+    # First create a separate task for each file in the namespace.
+    namespace ns do
+        files.each do |file|
+            Spec::Rake::SpecTask.new(file) do |t|
+                t.spec_files = File.basename(file, '.rb')
+                t.libs = libs
+                t.spec_opts = ['--options', 'spec.opts']
+            end
+        end
+    end
+
+    # Then create a task that matches the directory itself.
+    Spec::Rake::SpecTask.new(dir) do |t|
+       if ENV["TESTFILES"]
+           t.spec_files = ENV["TESTFILES"].split(/\s+/)
+       else
+           t.spec_files = files.sort
+       end
+       t.libs = libs
+       t.spec_opts = ['--options', 'spec.opts']
+    end
+
+    # And alias it with a slash on the end
+    task(dir + "/" => dir)
+end

data/spec/integration/checksum.rb

@@ -0,0 +1,47 @@
+#!/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/checksum'
+
+describe Puppet::Checksum, " when using the file terminus" do
+    before do
+        Puppet::Checksum.terminus_class = :file
+        @content = "this is some content"
+        @sum = Puppet::Checksum.new(@content)
+
+        @file = Puppet::Checksum.indirection.terminus.path(@sum.checksum)
+    end
+
+    it "should store content at a path determined by its checksum" do
+        File.stubs(:directory?).returns(true)
+        filehandle = mock 'filehandle'
+        filehandle.expects(:print).with(@content)
+        File.expects(:open).with(@file, "w").yields(filehandle)
+
+        @sum.save
+    end
+
+    it "should retrieve stored content when the checksum is provided as the key" do
+        File.stubs(:exist?).returns(true)
+        File.expects(:read).with(@file).returns(@content)
+
+        newsum = Puppet::Checksum.find(@sum.checksum)
+
+        newsum.content.should == @content
+    end
+
+    it "should remove specified files when asked" do
+        File.stubs(:exist?).returns(true)
+        File.expects(:unlink).with(@file)
+
+        Puppet::Checksum.destroy(@sum.name)
+    end
+
+    after do
+        Puppet.settings.clear
+    end
+end

data/spec/integration/defaults.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+require 'puppet/defaults'
+
+describe "Puppet defaults" do
+    after { Puppet.settings.clear }
+
+    describe "when setting the :factpath" do
+
+        it "should add the :factpath to Facter's search paths" do
+            Facter.expects(:search).with("/my/fact/path")
+
+            Puppet.settings[:factpath] = "/my/fact/path"
+        end
+    end
+    describe "when setting the :certname" do
+        it "should fail if the certname is not downcased" do
+            lambda { Puppet.settings[:certname] = "Host.Domain.Com" }.should raise_error(ArgumentError)
+        end
+    end
+
+    it "should have a clientyamldir setting" do
+        Puppet.settings[:clientyamldir].should_not be_nil
+    end
+
+    it "should have different values for the yamldir and clientyamldir" do
+        Puppet.settings[:yamldir].should_not == Puppet.settings[:clientyamldir]
+    end
+
+    # See #1232
+    it "should not specify a user or group for the clientyamldir" do
+        Puppet.settings.element(:clientyamldir).owner.should be_nil
+        Puppet.settings.element(:clientyamldir).group.should be_nil
+    end
+
+    # See #1232
+    it "should not specify a user or group for the rundir" do
+        Puppet.settings.element(:rundir).owner.should be_nil
+        Puppet.settings.element(:rundir).group.should be_nil
+    end
+
+    it "should default to yaml as the catalog format" do
+        Puppet.settings[:catalog_format].should == "yaml"
+    end
+end

data/spec/integration/file_serving/configuration.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2007-10-18.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'puppet/file_serving/configuration'
+
+describe Puppet::FileServing::Configuration, " when finding files with Puppet::FileServing::Mount" do
+    before do
+        # Just in case it already exists.
+        Puppet::FileServing::Configuration.clear_cache
+
+        @mount = Puppet::FileServing::Mount.new("mymount")
+        FileTest.stubs(:exists?).with("/my/path").returns(true)
+        FileTest.stubs(:readable?).with("/my/path").returns(true)
+        FileTest.stubs(:directory?).with("/my/path").returns(true)
+        @mount.path = "/my/path"
+
+        FileTest.stubs(:exists?).with(Puppet[:fileserverconfig]).returns(true)
+        @parser = mock 'parser'
+        @parser.stubs(:parse).returns("mymount" => @mount)
+        @parser.stubs(:changed?).returns(true)
+        Puppet::FileServing::Configuration::Parser.stubs(:new).returns(@parser)
+
+        @config = Puppet::FileServing::Configuration.create
+    end
+
+    it "should return nil if the file does not exist" do
+        FileTest.expects(:exists?).with("/my/path/my/file").returns(false)
+        @config.file_path("/mymount/my/file").should be_nil
+    end
+
+    it "should return the full file path if the file exists" do
+        FileTest.expects(:exists?).with("/my/path/my/file").returns(true)
+        @config.file_path("/mymount/my/file").should == "/my/path/my/file"
+    end
+
+    after do
+        Puppet::FileServing::Configuration.clear_cache
+    end
+end

data/spec/integration/file_serving/content.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2007-10-18.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'puppet/file_serving/content'
+require 'shared_behaviours/file_serving'
+
+describe Puppet::FileServing::Content, " when finding files" do
+    it_should_behave_like "Puppet::FileServing::Files"
+
+    before do
+        @test_class = Puppet::FileServing::Content
+        @indirection = Puppet::FileServing::Content.indirection
+    end
+end

data/spec/integration/file_serving/metadata.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2007-10-18.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'puppet/file_serving/metadata'
+require 'shared_behaviours/file_serving'
+
+describe Puppet::FileServing::Metadata, " when finding files" do
+    it_should_behave_like "Puppet::FileServing::Files"
+
+    before do
+        @test_class = Puppet::FileServing::Metadata
+        @indirection = Puppet::FileServing::Metadata.indirection
+    end
+end

data/spec/integration/indirector/direct_file_server.rb

@@ -0,0 +1,80 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2007-10-19.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'puppet/indirector/file_content/file'
+require 'puppet/indirector/module_files'
+
+describe Puppet::Indirector::DirectFileServer, " when interacting with the filesystem and the model" do
+    before do
+        # We just test a subclass, since it's close enough.
+        @terminus = Puppet::Indirector::FileContent::File.new
+
+        @filepath = "/path/to/my/file"
+    end
+
+    it "should return an instance of the model" do
+        FileTest.expects(:exists?).with(@filepath).returns(true)
+
+        @terminus.find(@terminus.indirection.request(:find, "file://host#{@filepath}")).should be_instance_of(Puppet::FileServing::Content)
+    end
+
+    it "should return an instance capable of returning its content" do
+        FileTest.expects(:exists?).with(@filepath).returns(true)
+        File.stubs(:lstat).with(@filepath).returns(stub("stat", :ftype => "file"))
+        File.expects(:read).with(@filepath).returns("my content")
+
+        instance = @terminus.find(@terminus.indirection.request(:find, "file://host#{@filepath}"))
+
+        instance.content.should == "my content"
+    end
+end
+
+describe Puppet::Indirector::DirectFileServer, " when interacting with FileServing::Fileset and the model" do
+    before do
+        @terminus = Puppet::Indirector::FileContent::File.new
+
+        @filepath = "/my/file"
+        FileTest.stubs(:exists?).with(@filepath).returns(true)
+
+        stat = stub 'stat', :directory? => true
+        File.stubs(:lstat).with(@filepath).returns(stat)
+
+        @subfiles = %w{one two}
+        @subfiles.each do |f|
+            path = File.join(@filepath, f)
+            FileTest.stubs(:exists?).with(@path).returns(true)
+        end
+
+        Dir.expects(:entries).with(@filepath).returns @subfiles
+
+        @request = @terminus.indirection.request(:search, "file:///my/file", :recurse => true)
+    end
+
+    it "should return an instance for every file in the fileset" do
+        result = @terminus.search(@request)
+        result.should be_instance_of(Array)
+        result.length.should == 3
+        result.each { |r| r.should be_instance_of(Puppet::FileServing::Content) }
+    end
+
+    it "should return instances capable of returning their content" do
+        @subfiles.each do |name|
+            File.stubs(:lstat).with(File.join(@filepath, name)).returns stub("#{name} stat", :ftype => "file", :directory? => false)
+            File.expects(:read).with(File.join(@filepath, name)).returns("#{name} content")
+        end
+
+        @terminus.search(@request).each do |instance|
+            case instance.key
+            when /one/: instance.content.should == "one content"
+            when /two/: instance.content.should == "two content"
+            when /\.$/: 
+            else
+                raise "No valid key for %s" % instance.key.inspect
+            end
+        end
+    end
+end

data/spec/integration/indirector/file_content/file_server.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2007-10-18.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/file_content/file_server'
+require 'shared_behaviours/file_server_terminus'
+
+describe Puppet::Indirector::FileContent::FileServer, " when finding files" do
+    it_should_behave_like "Puppet::Indirector::FileServerTerminus"
+
+    before do
+        @terminus = Puppet::Indirector::FileContent::FileServer.new
+        @test_class = Puppet::FileServing::Content
+    end
+end

data/spec/integration/indirector/file_metadata/file_server.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2007-10-18.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/file_metadata/file_server'
+require 'shared_behaviours/file_server_terminus'
+
+describe Puppet::Indirector::FileMetadata::FileServer, " when finding files" do
+    it_should_behave_like "Puppet::Indirector::FileServerTerminus"
+
+    before do
+        @terminus = Puppet::Indirector::FileMetadata::FileServer.new
+        @test_class = Puppet::FileServing::Metadata
+    end
+end

data/spec/integration/indirector/module_files.rb

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2007-10-19.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'puppet/indirector/file_content/modules'
+require 'puppet/indirector/module_files'
+
+describe Puppet::Indirector::ModuleFiles, " when interacting with Puppet::Module and FileServing::Content" do
+    it "should look for files in the module's 'files' directory" do
+        Puppet::Node::Environment.stubs(:new).returns(stub('env', :name => "myenv"))
+        # We just test a subclass, since it's close enough.
+        @terminus = Puppet::Indirector::FileContent::Modules.new
+        @module = Puppet::Module.new("mymod", "/some/path/mymod")
+        Puppet::Module.expects(:find).with("mymod", "myenv").returns(@module)
+
+        filepath = "/some/path/mymod/files/myfile"
+
+        FileTest.expects(:exists?).with(filepath).returns(true)
+
+        @request = Puppet::Indirector::Request.new(:content, :find, "puppetmounts://host/modules/mymod/myfile")
+
+        @terminus.find(@request).should be_instance_of(Puppet::FileServing::Content)
+    end
+end
+
+describe Puppet::Indirector::ModuleFiles, " when interacting with FileServing::Fileset and FileServing::Content" do
+    it "should return an instance for every file in the fileset" do
+        Puppet::Node::Environment.stubs(:new).returns(stub('env', :name => "myenv"))
+        @terminus = Puppet::Indirector::FileContent::Modules.new
+        @module = Puppet::Module.new("mymod", "/some/path/mymod")
+        Puppet::Module.expects(:find).with("mymod", "myenv").returns(@module)
+
+        filepath = "/some/path/mymod/files/myfile"
+        FileTest.stubs(:exists?).with(filepath).returns(true)
+
+        stat = stub 'stat', :directory? => true
+        File.stubs(:lstat).with(filepath).returns(stat)
+
+        subfiles = %w{one two}
+        subfiles.each do |f|
+            path = File.join(filepath, f)
+            FileTest.stubs(:exists?).with(path).returns(true)
+        end
+
+        Dir.expects(:entries).with(filepath).returns(%w{one two})
+
+        @request = Puppet::Indirector::Request.new(:content, :search, "puppetmounts://host/modules/mymod/myfile", :recurse => true)
+
+        result = @terminus.search(@request)
+        result.should be_instance_of(Array)
+        result.length.should == 3
+        result.each { |r| r.should be_instance_of(Puppet::FileServing::Content) }
+    end
+end