puppet 2.7.24 → 2.7.25

data/Rakefile

@@ -20,7 +20,11 @@ end
 require 'rake'
 
 Dir['tasks/**/*.rake'].each { |t| load t }
-Dir['ext/packaging/tasks/**/*'].sort.each { |t| load t }
+
+begin
+  load File.join(File.dirname(__FILE__), 'ext', 'packaging', 'packaging.rake')
+rescue LoadError
+end
 
 build_defs_file = 'ext/build_defaults.yaml'
 if File.exist?(build_defs_file)
@@ -69,3 +73,8 @@ desc "Run the unit tests"
 task :unit do
   Dir.chdir("test") { sh "rake" }
 end
+
+desc "Run the spec tests on windows"
+task :windows_spec do
+  sh %{rspec --tag ~fails_on_windows #{ENV['TESTS'] || 'spec'}}
+end

data/ext/packaging/tasks/00_utils.rake

@@ -292,6 +292,9 @@ def set_cow_envs(cow)
   end
   ENV['DIST'] = dist
   ENV['ARCH'] = arch
+  if dist =~ /cumulus/
+    ENV['NETWORK_OS'] = 'cumulus'
+  end
 end
 
 def ln(target, name)

data/ext/packaging/tasks/jenkins.rake

@@ -108,7 +108,12 @@ namespace :pl do
       #
       # Determine the type of build we're doing to inform jenkins
       build_type = case build_task
-        when /deb/ then "deb"
+        when /deb/
+          if @build.default_cow.split('-')[1] =~ /cumulus/
+            "cumulus"
+          else
+            "deb"
+          end
         when /mock/ then "rpm"
         when /dmg|apple/ then "dmg"
         when /gem/ then "gem"

data/ext/packaging/tasks/pe_ship.rake

@@ -21,33 +21,46 @@ if @build.build_pe
       #   created for this specific deb ship. This enables us to escape the conflicts
       #   introduced with simultaneous deb ships.
       #
-      unless target_path
-        puts "Creating temporary incoming dir on #{@build.apt_host}"
-        target_path = %x{ssh -t #{@build.apt_host} 'mktemp -d -t incoming-XXXXXX'}.chomp
-      end
 
-      #   For reprepro, we ship just the debs into an incoming dir. On the remote end,
-      #   reprepro will pull these debs in and add them to the repositories based on the
-      #   dist, e.g. lucid, architecture notwithstanding.
-      #
-      #   The layout that the reprepro library will expect is:
-      #
-      #     incoming_dir/{$dists}/*.deb
-      #
-      #   ex:
-      #     incoming_dir|
-      #                 |_lucid/*.deb
-      #                 |_squeeze/*.deb
-      #                 |_precise/*.deb
-      #                 |_wheezy/*.deb
+      #   We are going to iterate over every set of packages, adding them to
+      #   the repository set by set. This enables us to handle different
+      #   repositories per distribution. "pkg/pe/deb/" contains directories
+      #   named for every distribution, e.g. "lucid," "squeeze," etc.
       #
-      puts "Shipping PE debs to apt repo 'incoming' dir on #{@build.apt_host}"
-      retry_on_fail(:times => 3) do
-        cd "pkg/pe/deb" do
-          Dir["**/*.deb"].each do |deb|
-            rsync_to(deb, @build.apt_host, "#{target_path}/#{File.dirname(deb)}/")
+      Dir["pkg/pe/deb/*"].each do |dist|
+        dist = File.basename(dist)
+        unless target_path
+          puts "Creating temporary incoming dir on #{@build.apt_host}"
+          target_path = %x{ssh -t #{@build.apt_host} 'mktemp -d -t incoming-XXXXXX'}.chomp
+        end
+
+        #   For reprepro, we ship just the debs into an incoming dir. On the remote end,
+        #   reprepro will pull these debs in and add them to the repositories based on the
+        #   dist, e.g. lucid, architecture notwithstanding.
+        #
+        #   The layout that the reprepro library will expect is:
+        #
+        #     incoming_dir/{$dists}/*.deb
+        #
+        #   ex:
+        #     incoming_dir|
+        #                 |_lucid/*.deb
+        #                 |_squeeze/*.deb
+        #                 |_precise/*.deb
+        #                 |_wheezy/*.deb
+        #
+        puts "Shipping PE debs to apt repo 'incoming' dir on #{@build.apt_host}"
+        retry_on_fail(:times => 3) do
+          Dir["pkg/pe/deb/#{dist}/*.deb"].each do |deb|
+            remote_ssh_cmd(@build.apt_host, "mkdir -p '#{target_path}/#{dist}'")
+            rsync_to(deb, @build.apt_host, "#{target_path}/#{dist}/#{File.basename(deb)}")
           end
         end
+
+        if @build.team == 'release'
+          Rake::Task["pe:remote:apt"].invoke(target_path, dist)
+        end
+
       end
 
       #   We also ship our PE artifacts to directories for archival purposes and to
@@ -81,10 +94,18 @@ if @build.build_pe
             rsync_to("pkg/pe/deb/#{dist}/pe-*_#{arch}.deb --ignore-existing", @build.apt_host, "#{archive_path}/" )
           end
 
-          # Ship all-arch debs to same place
+          # Ship all-arch debs to same dist-location, but to all known
+          # architectures for this distribution.
+          #
+          # I am not proud of this. MM - 1/3/2014.
+
           unless Dir["pkg/pe/deb/#{dist}/pe-*_all.deb"].empty?
-            rsync_to("pkg/pe/deb/#{dist}/pe-*_all.deb --ignore-existing", @build.apt_host, "#{base_path}/#{dist}-i386/")
-            rsync_to("pkg/pe/deb/#{dist}/pe-*_all.deb --ignore-existing", @build.apt_host, "#{base_path}/#{dist}-amd64/")
+            if dist =~ /cumulus/
+              rsync_to("pkg/pe/deb/#{dist}/pe-*_all.deb --ignore-existing", @build.apt_host, "#{base_path}/#{dist}-powerpc/")
+            else
+              rsync_to("pkg/pe/deb/#{dist}/pe-*_all.deb --ignore-existing", @build.apt_host, "#{base_path}/#{dist}-i386/")
+              rsync_to("pkg/pe/deb/#{dist}/pe-*_all.deb --ignore-existing", @build.apt_host, "#{base_path}/#{dist}-amd64/")
+            end
           end
 
           unless Dir["pkg/pe/deb/#{dist}/pe-*"].select { |i| i !~ /^.*\.deb$/ }.empty?
@@ -102,10 +123,6 @@ if @build.build_pe
         end
       end
 
-
-      if @build.team == 'release'
-        Rake::Task["pe:remote:apt"].invoke(target_path)
-      end
     end
 
     namespace :remote do
@@ -121,14 +138,25 @@ if @build.build_pe
       #   Per previous comments, the incoming directory must contain subdirectories named
       #   for debian distributions.
       desc "Remotely add shipped packages to apt repo on #{@build.apt_host}"
-      task :apt, :incoming do |t, args|
+      task :apt, :incoming, :dist do |t, args|
+        dist = args.dist
+        if dist =~ /cumulus/
+          reprepro_confdir = "/etc/reprepro/networking/#{@build.pe_version}/cumulus"
+          reprepro_basedir = "/opt/enterprise/networking/#{@build.pe_version}/cumulus"
+          reprepro_dbdir = "/var/lib/reprepro/networking/#{@build.pe_version}/cumulus"
+        else
+          reprepro_confdir = "/etc/reprepro/#{@build.pe_version}"
+          reprepro_basedir = "#{@build.apt_repo_path}/#{@build.pe_version}/repos/debian"
+          reprepro_dbdir = "/var/lib/reprepro/#{@build.pe_version}"
+        end
+
         incoming_dir = args.incoming
         incoming_dir or fail "Adding packages to apt repo requires an incoming directory"
         invoke_task("pl:fetch")
         remote_ssh_cmd(@build.apt_host, "/usr/bin/repsimple add_all \
-            --confdir /etc/reprepro/#{@build.pe_version} \
-            --basedir #{@build.apt_repo_path}/#{@build.pe_version}/repos/debian \
-            --databasedir /var/lib/reprepro/#{@build.pe_version} \
+            --confdir #{reprepro_confdir} \
+            --basedir #{reprepro_basedir} \
+            --databasedir #{reprepro_dbdir} \
             --incomingdir #{incoming_dir}")
 
         puts "Cleaning up apt repo 'incoming' dir on #{@build.apt_host}"

data/ext/packaging/tasks/ship.rake

@@ -4,9 +4,11 @@ namespace :pl do
     ["el", "fedora"].each do |dist|
       retry_on_fail(:times => 3) do
         pkgs = Dir["pkg/#{dist}/**/*.rpm"].map { |f| "'#{f.gsub("pkg/#{dist}/", "#{@build.yum_repo_path}/#{dist}/")}'"}
-        rsync_to("pkg/#{dist}", @build.yum_host, @build.yum_repo_path)
-        remote_set_immutable(@build.yum_host, pkgs)
-      end
+        unless pkgs.empty?
+          rsync_to("pkg/#{dist}", @build.yum_host, @build.yum_repo_path)
+          remote_set_immutable(@build.yum_host, pkgs)
+        end
+      end if File.directory?("pkg/#{dist}")
     end
   end
 
@@ -37,7 +39,9 @@ namespace :pl do
   desc "Ship cow-built debs to #{@build.apt_host}"
   task :ship_debs do
     retry_on_fail(:times => 3) do
-      rsync_to('pkg/deb/', @build.apt_host, @build.apt_repo_path)
+      if File.directory?("pkg/deb")
+        rsync_to('pkg/deb/', @build.apt_host, @build.apt_repo_path)
+      end
     end
   end
 

data/ext/packaging/templates/packaging.xml.erb

@@ -55,7 +55,13 @@ pl:jenkins:uber_build NOTIFY=foo@puppetlabs.com
   <properties>
     <jp.ikedam.jenkins.plugins.groovy__label__assignment.GroovyLabelAssignmentProperty plugin="groovy-label-assignment@1.0.0">
       <groovyScript>def labelMap = [
-        <% @build.cows.split(' ').each do |cow| %>&quot;pl_deb COW=<%= cow %>&quot;: &quot;deb&quot;,<% end %>
+        <% @build.cows.split(' ').each do |cow| %>
+          <% if cow =~ /cumulus/ %>
+        &quot;pl_deb COW=<%= cow %>&quot;: &quot;cumulus&quot;,
+          <% else %>
+        &quot;pl_deb COW=<%= cow %>&quot;: &quot;deb&quot;,
+          <% end %>
+        <% end %>
         <% @build.final_mocks.split(' ').each do |mock| %>&quot;pl_mock MOCK=<%= mock %>&quot;: &quot;rpm&quot;,<% end %>
         &quot;package_tar&quot;: &quot;rpm&quot;,
         <% if @build.build_gem then %>&quot;package_gem&quot;: &quot;gem&quot;,<% end %>

data/lib/puppet/type/file.rb

@@ -736,10 +736,8 @@ Puppet::Type.newtype(:file) do
   def write(property)
     remove_existing(:file)
 
-    assumed_default_mode = 0644
-
     mode = self.should(:mode) # might be nil
-    mode_int = mode ? symbolic_mode_to_int(mode, assumed_default_mode) : nil
+    mode_int = mode ? symbolic_mode_to_int(mode, Puppet::Util::DEFAULT_POSIX_MODE) : nil
 
     if write_temporary_file?
       Puppet::Util.replace_file(self[:path], mode_int) do |file|

data/lib/puppet/util.rb

@@ -538,9 +538,21 @@ module Util
   # The default_mode is the mode to use when the target file doesn't already
   # exist; if the file is present we copy the existing mode/owner/group values
   # across.
+
+  DEFAULT_POSIX_MODE = 0644
+  DEFAULT_WINDOWS_MODE = nil
+
   def replace_file(file, default_mode, &block)
     raise Puppet::DevError, "replace_file requires a block" unless block_given?
 
+    unless default_mode
+      if Puppet.features.microsoft_windows?
+        default_mode = DEFAULT_WINDOWS_MODE
+      else
+        default_mode = DEFAULT_POSIX_MODE
+      end
+    end
+
     file     = Pathname(file)
     tempfile = Tempfile.new(file.basename.to_s, file.dirname.to_s)
 

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.24'
+  PUPPETVERSION = '2.7.25'
 
   def self.version
     @puppet_version || PUPPETVERSION

data/spec/unit/type/file_spec.rb

@@ -1148,6 +1148,73 @@ describe Puppet::Type.type(:file) do
         expect { file.write :NOTUSED }.to_not raise_error(Puppet::Error)
       end
     end
+
+    describe "when resource mode is supplied" do
+      before { file.stubs(:property_fix) }
+
+      context "and writing temporary files" do
+        before { file.stubs(:write_temporary_file?).returns(true) }
+
+        it "should convert symbolic mode to int" do
+          file[:mode] = 'oga=r'
+          Puppet::Util.expects(:replace_file).with(file[:path], 0444)
+          file.write :NOTUSED
+        end
+
+        it "should support int modes" do
+          file[:mode] = '0444'
+          Puppet::Util.expects(:replace_file).with(file[:path], 0444)
+          file.write :NOTUSED
+        end
+      end
+
+      context "and not writing temporary files" do
+        before { file.stubs(:write_temporary_file?).returns(false) }
+
+        it "should set a umask of 0" do
+          file[:mode] = 'oga=r'
+          Puppet::Util.expects(:withumask).with(0)
+          file.write :NOTUSED
+        end
+
+        it "should convert symbolic mode to int" do
+          file[:mode] = 'oga=r'
+          File.expects(:open).with(file[:path], anything, 0444)
+          file.write :NOTUSED
+        end
+
+        it "should support int modes" do
+          file[:mode] = '0444'
+          File.expects(:open).with(file[:path], anything, 0444)
+          file.write :NOTUSED
+        end
+      end
+    end
+
+    describe "when resource mode is not supplied" do
+      context "and content is supplied" do
+        it "should default to 0644 mode" do
+          file = described_class.new(:path => path, :content => "file content")
+
+          file.write :NOTUSED
+
+          expect(File.stat(file[:path]).mode & 0777).to eq(0644)
+        end
+      end
+
+      context "and no content is supplied" do
+        it "should use puppet's default umask of 022" do
+          file = described_class.new(:path => path)
+
+          umask_from_the_user = 0777
+          Puppet::Util.withumask(umask_from_the_user) do
+            file.write :NOTUSED
+          end
+
+          expect(File.stat(file[:path]).mode & 0777).to eq(0644)
+        end
+      end
+    end
   end
 
   describe "#fail_if_checksum_is_wrong" do

metadata

@@ -1,50 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: puppet
-version: !ruby/object:Gem::Version 
-  hash: 35
-  prerelease: false
-  segments: 
-  - 2
-  - 7
-  - 24
-  version: 2.7.24
+version: !ruby/object:Gem::Version
+  version: 2.7.25
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-12-26 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-01-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: facter
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 description: Puppet, an automated configuration management tool
 email: puppet@puppetlabs.com
-executables: 
+executables:
 - filebucket
 - pi
 - puppet
-- puppetca
-- puppetd
 - puppetdoc
-- puppetmasterd
-- puppetqd
-- puppetrun
 - ralsh
 - puppetca
 - puppetd
@@ -52,10 +41,8 @@ executables:
 - puppetqd
 - puppetrun
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CHANGELOG
 - CONTRIBUTING.md
 - Gemfile
@@ -67,12 +54,7 @@ files:
 - bin/filebucket
 - bin/pi
 - bin/puppet
-- bin/puppetca
-- bin/puppetd
 - bin/puppetdoc
-- bin/puppetmasterd
-- bin/puppetqd
-- bin/puppetrun
 - bin/ralsh
 - lib/puppet.rb
 - lib/puppet/agent.rb
@@ -2030,43 +2012,38 @@ files:
 - spec/unit/util/zaml_spec.rb
 - spec/unit/util_spec.rb
 - spec/watchr.rb
-has_rdoc: true
+- bin/puppetca
+- bin/puppetd
+- bin/puppetmasterd
+- bin/puppetqd
+- bin/puppetrun
 homepage: http://puppetlabs.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - Puppet - Configuration Management
 - --main
 - README
 - --line-numbers
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: puppet
-rubygems_version: 1.3.7
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Puppet, an automated configuration management tool
 test_files: []
-