puppet 2.7.23 → 2.7.24

data/lib/puppet/type/file/source.rb

@@ -101,7 +101,7 @@ module Puppet
       return @content if @content
       raise Puppet::DevError, "No source for content was stored with the metadata" unless metadata.source
 
-      unless tmp = Puppet::FileServing::Content.indirection.find(metadata.source)
+      unless tmp = Puppet::FileServing::Content.indirection.find(metadata.source, :links => resource[:links])
         fail "Could not find any content at %s" % metadata.source
       end
       @content = tmp.content
@@ -154,7 +154,7 @@ module Puppet
       return nil unless value
       value.each do |source|
         begin
-          if data = Puppet::FileServing::Metadata.indirection.find(source)
+          if data = Puppet::FileServing::Metadata.indirection.find(source, :links => resource[:links])
             @metadata = data
             @metadata.source = source
             break

data/lib/puppet/type/service.rb

@@ -198,8 +198,9 @@ module Puppet
     newparam :hasrestart do
       desc "Specify that an init script has a `restart` command.  If this is
         false and you do not specify a command in the `restart` attribute,
-        the init script's `stop` and `start` commands will be used. Defaults
-        to true; note that this is a change from earlier versions of Puppet."
+        the init script's `stop` and `start` commands will be used.
+
+        Defaults to false."
       newvalues(:true, :false)
     end
 

data/lib/puppet/util.rb

@@ -554,16 +554,21 @@ module Util
     # and specifically handle the platform, which has all sorts of magic.
     # So, unlike Unix, we don't pre-prep security; we use the default "quite
     # secure" tempfile permissions instead.  Magic happens later.
-    unless Puppet.features.microsoft_windows?
+    if !Puppet.features.microsoft_windows?
       # Grab the current file mode, and fall back to the defaults.
-      stat = file.lstat rescue OpenStruct.new(:mode => default_mode,
-                                              :uid  => Process.euid,
-                                              :gid  => Process.egid)
+      if file.exist?
+        stat = file.lstat
+        tempfile.chown(stat.uid, stat.gid)
+        effective_mode = stat.mode
+      else
+        effective_mode = default_mode
+      end
 
-      # We only care about the bottom four slots, which make the real mode,
-      # and not the rest of the platform stat call fluff and stuff.
-      tempfile.chmod(stat.mode & 07777)
-      tempfile.chown(stat.uid, stat.gid)
+      if effective_mode
+        # We only care about the bottom four slots, which make the real mode,
+        # and not the rest of the platform stat call fluff and stuff.
+        tempfile.chmod(effective_mode & 07777)
+      end
     end
 
     # OK, now allow the caller to write the content of the file.
@@ -586,41 +591,17 @@ module Util
     tempfile.close
 
     if Puppet.features.microsoft_windows?
-      # This will appropriately clone the file, but only if the file we are
-      # replacing exists.  Which is kind of annoying; thanks Microsoft.
-      #
-      # So, to avoid getting into an infinite loop we will retry once if the
-      # file doesn't exist, but only the once...
-      have_retried = false
-
-      begin
-        # Yes, the arguments are reversed compared to the rename in the rest
-        # of the world.
-        Puppet::Util::Windows::File.replace_file(file, tempfile.path)
-      rescue Puppet::Util::Windows::Error => e
-        # This might race, but there are enough possible cases that there
-        # isn't a good, solid "better" way to do this, and the next call
-        # should fail in the same way anyhow.
-        raise if have_retried or File.exist?(file)
-        have_retried = true
-
-        # OK, so, we can't replace a file that doesn't exist, so let us put
-        # one in place and set the permissions.  Then we can retry and the
-        # magic makes this all work.
-        #
-        # This is the least-worst option for handling Windows, as far as we
-        # can determine.
-        File.open(file, 'a') do |fh|
-          # this space deliberately left empty for auto-close behaviour,
-          # append mode, and not actually changing any of the content.
+      # Windows ReplaceFile needs a file to exist, so touch handles this
+      if !file.exist?
+        FileUtils.touch(file.to_s)
+        if default_mode
+          Puppet::Util::Windows::Security.set_mode(default_mode, file.to_s)
         end
-
-        # Set the permissions to what we want.
-        Puppet::Util::Windows::Security.set_mode(default_mode, file.to_s)
-
-        # ...and finally retry the operation.
-        retry
       end
+      # Yes, the arguments are reversed compared to the rename in the rest
+      # of the world.
+      Puppet::Util::Windows::File.replace_file(file, tempfile.path)
+
     else
       File.rename(tempfile.path, file)
     end

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 #
 module Puppet
-  PUPPETVERSION = '2.7.23'
+  PUPPETVERSION = '2.7.24'
 
   def self.version
     @puppet_version || PUPPETVERSION

data/spec/integration/type/file_spec.rb

@@ -272,22 +272,20 @@ describe Puppet::Type.type(:file) do
 
             describe "that is readable" do
               it "should set the executable bits when creating the destination (#10315)" do
-                pending "bug #10315"
-
                 catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow)
                 catalog.apply
 
+                File.should be_directory(path)
                 (get_mode(path) & 07777).should == 0777
               end
 
               it "should set the executable bits when overwriting the destination (#10315)" do
-                pending "bug #10315"
-
                 FileUtils.touch(path)
 
-                catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow)
+                catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow, :backup => false)
                 catalog.apply
 
+                File.should be_directory(path)
                 (get_mode(path) & 07777).should == 0777
               end
             end
@@ -302,37 +300,41 @@ describe Puppet::Type.type(:file) do
                 set_mode(0700, target)
               end
 
-              it "should not set executable bits when creating the destination (#10315)" do
-                pending "bug #10315"
-
+              it "should set executable bits when creating the destination (#10315)" do
                 catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow)
                 catalog.apply
 
-                (get_mode(path) & 07777).should == 0666
+                File.should be_directory(path)
+                (get_mode(path) & 07777).should == 0777
               end
 
-              it "should not set executable bits when overwriting the destination" do
+              it "should set executable bits when overwriting the destination" do
                 FileUtils.touch(path)
 
-                catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow)
+                catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow, :backup => false)
                 catalog.apply
 
-                (get_mode(path) & 07777).should == 0666
+                File.should be_directory(path)
+                (get_mode(path) & 07777).should == 0777
               end
             end
           end
 
           describe "to a file" do
-            let(:target) { tmpfile('file_target') }
+            let(:link_target) { tmpfile('file_target') }
 
-            it "should create the file, not a symlink (#2817, #10315)" do
-              pending "bug #2817, #10315"
+            before :each do
+              FileUtils.touch(link_target)
+
+              File.symlink(link_target, link)
+            end
 
+            it "should create the file, not a symlink (#2817, #10315)" do
               catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0600, :links => :follow)
               catalog.apply
 
               File.should be_file(path)
-              (get_mode(path) & 07777) == 0600
+              (get_mode(path) & 07777).should == 0600
             end
 
             it "should overwrite the file" do
@@ -342,7 +344,7 @@ describe Puppet::Type.type(:file) do
               catalog.apply
 
               File.should be_file(path)
-              (get_mode(path) & 07777) == 0600
+              (get_mode(path) & 07777).should == 0600
             end
           end
 
@@ -364,13 +366,11 @@ describe Puppet::Type.type(:file) do
 
             describe "when following all links" do
               it "should create the destination and apply executable bits (#10315)" do
-                pending "bug #10315"
-
                 catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0600, :links => :follow)
                 catalog.apply
 
                 File.should be_directory(path)
-                (get_mode(path) & 07777) == 0777
+                (get_mode(path) & 07777).should == 0700
               end
 
               it "should overwrite the destination and apply executable bits" do
@@ -380,7 +380,7 @@ describe Puppet::Type.type(:file) do
                 catalog.apply
 
                 File.should be_directory(path)
-                (get_mode(path) & 07777) == 0777
+                (get_mode(path) & 0111).should == 0100
               end
             end
           end
@@ -494,20 +494,6 @@ describe Puppet::Type.type(:file) do
       bucket.bucket.getfile(foomd5).should == "fooyay"
       bucket.bucket.getfile(barmd5).should == "baryay"
     end
-
-    it "should propagate failures encountered when renaming the temporary file" do
-      file = described_class.new :path => path, :content => "foo"
-      file.stubs(:perform_backup).returns(true)
-
-      catalog.add_resource file
-
-      File.open(path, "w") { |f| f.print "bar" }
-
-      File.expects(:rename).raises ArgumentError
-
-      expect { file.write(:content) }.to raise_error(Puppet::Error, /Could not rename temporary file/)
-      File.read(path).should == "bar"
-    end
   end
 
   describe "when recursing" do
@@ -1034,6 +1020,7 @@ describe Puppet::Type.type(:file) do
     describe "on Windows systems", :if => Puppet.features.microsoft_windows? do
       it "should provide valid default values when ACLs are not supported" do
         Puppet::Util::Windows::Security.stubs(:supports_acl?).with(source).returns false
+        Puppet::Util::Windows::Security.stubs(:supports_acl?).with(path).returns true
 
         file = described_class.new(
           :path   => path,

data/spec/spec_helper.rb

@@ -19,6 +19,7 @@ end
 
 require 'pathname'
 require 'tmpdir'
+require 'fileutils'
 
 require 'puppet_spec/verbose'
 require 'puppet_spec/files'
@@ -42,6 +43,10 @@ RSpec.configure do |config|
 
   config.mock_with :mocha
 
+  tmpdir = Dir.mktmpdir("rspecrun")
+  oldtmpdir = Dir.tmpdir()
+  ENV['TMPDIR'] = tmpdir
+
   if Puppet::Util::Platform.windows?
     config.output_stream = $stdout
     config.error_stream = $stderr
@@ -105,4 +110,11 @@ RSpec.configure do |config|
     # just letting it run all the time.
     GC.enable
   end
+
+  config.after :suite do
+    # Clean up switch of TMPDIR, don't know if needed after this, so needs to reset it
+    # to old before removing it
+    ENV['TMPDIR'] = oldtmpdir
+    FileUtils.rm_rf(tmpdir) if File.exists?(tmpdir) && tmpdir.to_s.start_with?(oldtmpdir)
+  end
 end

data/spec/unit/application/kick_spec.rb

@@ -2,11 +2,11 @@
 require 'spec_helper'
 
 require 'puppet/application/kick'
+require 'puppet/run'
+require 'puppet/util/ldap/connection'
 
 describe Puppet::Application::Kick, :if => Puppet.features.posix? do
-
   before :each do
-    require 'puppet/util/ldap/connection'
     Puppet::Util::Ldap::Connection.stubs(:new).returns(stub_everything)
     @kick = Puppet::Application[:kick]
     Puppet::Util::Log.stubs(:newdestination)
@@ -227,6 +227,9 @@ describe Puppet::Application::Kick, :if => Puppet.features.posix? do
         @kick.options.stubs(:[]).with(:ignoreschedules).returns(false)
         @kick.options.stubs(:[]).with(:foreground).returns(false)
         @kick.options.stubs(:[]).with(:debug).returns(false)
+        @kick.options.stubs(:[]).with(:verbose).returns(false) # needed when logging is initialized
+        @kick.options.stubs(:[]).with(:setdest).returns(false) # needed when logging is initialized
+
         @kick.stubs(:print)
         @kick.preinit
         @kick.stubs(:parse_options)
@@ -256,7 +259,6 @@ describe Puppet::Application::Kick, :if => Puppet.features.posix? do
 
       describe "during call of run_for_host" do
         before do
-          require 'puppet/run'
           options = {
             :background => true, :ignoreschedules => false, :tags => []
           }
@@ -264,13 +266,16 @@ describe Puppet::Application::Kick, :if => Puppet.features.posix? do
           @agent_run = Puppet::Run.new( options.dup )
           @agent_run.stubs(:status).returns("success")
 
+          # ensure that we don't actually run the agent
+          @agent_run.stubs(:run).returns(@agent_run)
+
+          Puppet::Run.indirection.terminus_class = :local
           Puppet::Run.indirection.expects(:terminus_class=).with( :rest )
           Puppet::Run.expects(:new).with( options ).returns(@agent_run)
         end
 
         it "should call run on a Puppet::Run for the given host" do
           Puppet::Run.indirection.expects(:save).with(@agent_run, 'https://host:8139/production/run/host').returns(@agent_run)
-
           expect { @kick.run_for_host('host') }.to exit_with 0
         end
 

data/spec/unit/indirector/catalog/static_compiler_spec.rb

@@ -137,7 +137,7 @@ describe Puppet::Resource::Catalog::StaticCompiler do
     # a real fileserver initialized for testing.
     Puppet::FileServing::Metadata.
       indirection.stubs(:find).
-      with(options[:source].sub('puppet:///','')).
+      with(options[:source].sub('puppet:///',''), :links => :manage).
       returns(fake_fileserver_metadata)
 
     # I want a resource that all the file resources require and another

data/spec/unit/type/file/source_spec.rb

@@ -92,6 +92,7 @@ describe Puppet::Type.type(:file).attrclass(:source) do
   describe "when returning the metadata" do
     before do
       @metadata = stub 'metadata', :source= => nil
+      @resource.stubs(:[]).with(:links).returns :manage
     end
 
     it "should return already-available metadata" do
@@ -107,22 +108,22 @@ describe Puppet::Type.type(:file).attrclass(:source) do
 
     it "should collect its metadata using the Metadata class if it is not already set" do
       @source = source.new(:resource => @resource, :value => @foobar)
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri).returns @metadata
+      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri, :links => :manage).returns @metadata
       @source.metadata
     end
 
     it "should use the metadata from the first found source" do
       metadata = stub 'metadata', :source= => nil
       @source = source.new(:resource => @resource, :value => [@foobar, @feebooz])
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri).returns nil
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(@feebooz_uri).returns metadata
+      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri, :links => :manage).returns nil
+      Puppet::FileServing::Metadata.indirection.expects(:find).with(@feebooz_uri, :links => :manage).returns metadata
       @source.metadata.should equal(metadata)
     end
 
     it "should store the found source as the metadata's source" do
       metadata = mock 'metadata'
       @source = source.new(:resource => @resource, :value => @foobar)
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri).returns metadata
+      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri, :links => :manage).returns metadata
 
       metadata.expects(:source=).with(@foobar_uri)
       @source.metadata
@@ -130,7 +131,7 @@ describe Puppet::Type.type(:file).attrclass(:source) do
 
     it "should fail intelligently if an exception is encountered while querying for metadata" do
       @source = source.new(:resource => @resource, :value => @foobar)
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri).raises RuntimeError
+      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri, :links => :manage).raises RuntimeError
 
       @source.expects(:fail).raises ArgumentError
       lambda { @source.metadata }.should raise_error(ArgumentError)
@@ -138,7 +139,7 @@ describe Puppet::Type.type(:file).attrclass(:source) do
 
     it "should fail if no specified sources can be found" do
       @source = source.new(:resource => @resource, :value => @foobar)
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri).returns nil
+      Puppet::FileServing::Metadata.indirection.expects(:find).with(@foobar_uri, :links => :manage).returns nil
 
       @source.expects(:fail).raises RuntimeError
 
@@ -319,7 +320,7 @@ describe Puppet::Type.type(:file).attrclass(:source) do
       before(:each) do
         metadata = Puppet::FileServing::Metadata.new(path, :source => uri, 'type' => 'file')
         #metadata = stub('remote', :ftype => "file", :source => uri)
-        Puppet::FileServing::Metadata.indirection.stubs(:find).with(uri).returns metadata
+        Puppet::FileServing::Metadata.indirection.stubs(:find).with(uri, :links => :manage).returns metadata
         resource[:source] = uri
       end
 

data/spec/unit/type/file_spec.rb

@@ -1121,35 +1121,6 @@ describe Puppet::Type.type(:file) do
   end
 
   describe "#write" do
-    it "should propagate failures encountered when renaming the temporary file" do
-      File.stubs(:open)
-      File.expects(:rename).raises ArgumentError
-
-      file[:backup] = 'puppet'
-
-      file.stubs(:validate_checksum?).returns(false)
-
-      property = stub('content_property', :actual_content => "something", :length => "something".length)
-      file.stubs(:property).with(:content).returns(property)
-
-      expect { file.write(:content) }.to raise_error(Puppet::Error)
-    end
-
-    it "should delegate writing to the content property" do
-      filehandle = stub_everything 'fh'
-      File.stubs(:open).yields(filehandle)
-      File.stubs(:rename)
-      property = stub('content_property', :actual_content => "something", :length => "something".length)
-      file[:backup] = 'puppet'
-
-      file.stubs(:validate_checksum?).returns(false)
-      file.stubs(:property).with(:content).returns(property)
-
-      property.expects(:write).with(filehandle)
-
-      file.write(:content)
-    end
-
     describe "when validating the checksum" do
       before { file.stubs(:validate_checksum?).returns(true) }