puppet 3.6.0.rc1 → 3.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 24620c21510d3a912529b5626cf0a1aa5f7ac100
+  data.tar.gz: ee123b144f3df2df256fb7e3516ceb620d4fa551
+SHA512:
+  metadata.gz: d66333da3d4da20ab53f6385727401c80d40e99d7bcfab61f6887f727ffc707f618c1b8953d89b55a6d099f052668248d09a04ac6835dce46df56f2d095b2727
+  data.tar.gz: 5bddfc520f0770ba52db0470b6061854098f2f00e77c395e1e9588fb8ce9a90ba41dba19a095fa4765a9df9d717feeb38e806578ccf792af64079ef188728386

data/ext/debian/control

@@ -99,7 +99,7 @@ Description: Centralized configuration management - master startup and compatibi
 
 Package: puppetmaster-passenger
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, puppetmaster-common (= ${source:Version}), facter (>= 1.7.0), lsb-base, libapache2-mod-passenger
+Depends: ${misc:Depends}, ruby | ruby-interpreter, puppetmaster-common (= ${source:Version}), facter (>= 1.7.0), lsb-base, apache2, libapache2-mod-passenger
 Conflicts: puppetmaster (<< 2.6.1~rc2-1)
 Replaces: puppetmaster (<< 2.6.1~rc2-1)
 Description: Centralised configuration management - master setup to run under mod passenger

data/ext/debian/puppetmaster-passenger.postinst

@@ -2,63 +2,109 @@
 
 set -e
 
+sitename="puppetmaster"
+
+# The debian provided a2* utils in Apache 2.4 uses "site name" as
+# argument, while the version in Apache 2.2 uses "file name".
+#
+# For added fun, the Apache 2.4 version requires files to have a
+# ".conf" suffix, but this must be stripped when using it as argument
+# for the a2* utilities.
+#
+# This will end in tears…
+# Can be removed when we only support apache >= 2.4
+apache2_puppetmaster_sitename() {
+    apache2_version="$(dpkg-query --showformat='${Version}\n' --show apache2)"
+    if dpkg --compare-versions "$apache2_version" gt "2.4~"; then
+        echo "${sitename}.conf"
+    else
+        echo "${sitename}"
+    fi
+}
+
+# Can be removed when we only support apache >= 2.4
+restart_apache2() {
+    if [ -x "/etc/init.d/apache2" ]; then
+        # Seems that a restart is needed. reload breaks ssl apparently.
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+            invoke-rc.d apache2 restart || exit $?
+        else
+            /etc/init.d/apache2 restart || exit $?
+        fi
+    fi
+}
+
+# We may need to update the passenger directives in the apache vhost because
+# RailsAutoDetect and RackAutoDetect were removed in passenger 4.0.0
+#       see http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsautodetect_rackautodetect_and_wsgiautodetect
+update_vhost_for_passenger4() {
+    # Get passenger version from dpkg.
+    # This will end in tears…
+    passenger_version="$(dpkg-query --showformat='${Version}\n' --show libapache2-mod-passenger)"
+    if dpkg --compare-versions "$passenger_version" gt "4.0~"; then
+        sed -r -i \
+            -e "/RailsAutoDetect/d" \
+            -e "/RackAutoDetect/d" \
+            $tempfile
+    fi
+}
+
 if [ "$1" = "configure" ]; then
-    
+
     # Change the owner of the rack config.ru to be the puppet user
     # because passenger will suid to that user, see #577366
     if ! dpkg-statoverride --list /usr/share/puppet/rack/puppetmasterd/config.ru >/dev/null 2>&1
     then
-	dpkg-statoverride --update --add puppet puppet 0644 /usr/share/puppet/rack/puppetmasterd/config.ru
+        dpkg-statoverride --update --add puppet puppet 0644 /usr/share/puppet/rack/puppetmasterd/config.ru
     fi
     # Setup passenger configuration
     if [ "$2" = "" ]; then
-        # Initialize puppetmaster CA and generate the master certificate 
+
+        # Check that puppet master --configprint works properly
+        # If it doesn't the following steps to update the vhost will produce a very unhelpful and broken vhost
+        if [ $(puppet master --configprint all 2>&1 | grep "Could not parse" | wc -l) != "0" ]; then
+            echo "Puppet config print not working properly, exiting"
+            exit 1
+        fi
+
+        # Initialize puppetmaster CA and generate the master certificate
         # only if the host doesn't already have any puppet ssl certificate.
         # The ssl key and cert need to be available (eg generated) before
-        # apache2 is configured and started since apache2 ssl configuration 
+        # apache2 is configured and started since apache2 ssl configuration
         # uses the puppetmaster ssl files.
-	if [ ! -e "$(puppet master --configprint hostcert)" ]; then
-		puppet cert generate $(puppet master --configprint certname)
-	fi
+        if [ ! -e "$(puppet master --configprint hostcert)" ]; then
+            puppet cert generate $(puppet master --configprint certname)
+        fi
+
         # Setup apache2 configuration files
-        APACHE2_SITE_FILE="/etc/apache2/sites-available/puppetmaster" 
+        APACHE2_SITE_FILE="/etc/apache2/sites-available/$(apache2_puppetmaster_sitename)"
         if  [ ! -e "${APACHE2_SITE_FILE}" ]; then
-            cp /usr/share/puppetmaster-passenger/apache2.site.conf.tmpl "${APACHE2_SITE_FILE}"
-            # Fix path to SSL files
-            sed -r -i "s|(SSLCertificateFile\s+).+$|\1$(puppet master --configprint hostcert)|" "${APACHE2_SITE_FILE}"
-            sed -r -i "s|(SSLCertificateKeyFile\s+).+$|\1$(puppet master --configprint hostprivkey)|" "${APACHE2_SITE_FILE}"
-            sed -r -i "s|(SSLCACertificateFile\s+).+$|\1$(puppet master --configprint localcacert)|" "${APACHE2_SITE_FILE}"
-            sed -r -i "s|(SSLCertificateChainFile\s+).+$|\1$(puppet master --configprint localcacert)|" "${APACHE2_SITE_FILE}"
-            sed -r -i "s|(SSLCARevocationFile\s+).+$|\1$(puppet master --configprint cacrl)|" "${APACHE2_SITE_FILE}"
-
-            # Fix path to rack docroot and directory
-            sed -r -i "s|DocumentRoot /etc/puppet/rack/public|DocumentRoot /usr/share/puppet/rack/puppetmasterd/public|g" "${APACHE2_SITE_FILE}"
-            sed -r -i "s|<Directory /etc/puppet/rack/>|<Directory /usr/share/puppet/rack/puppetmasterd/>|g" "${APACHE2_SITE_FILE}"
+            tempfile=$(mktemp)
+            sed -r \
+                -e "s|(SSLCertificateFile\s+).+$|\1$(puppet master --configprint hostcert)|" \
+                -e "s|(SSLCertificateKeyFile\s+).+$|\1$(puppet master --configprint hostprivkey)|" \
+                -e "s|(SSLCACertificateFile\s+).+$|\1$(puppet master --configprint localcacert)|" \
+                -e "s|(SSLCertificateChainFile\s+).+$|\1$(puppet master --configprint localcacert)|" \
+                -e "s|(SSLCARevocationFile\s+).+$|\1$(puppet master --configprint cacrl)|" \
+                -e "s|DocumentRoot /etc/puppet/rack/public|DocumentRoot /usr/share/puppet/rack/puppetmasterd/public|" \
+                -e "s|<Directory /etc/puppet/rack/>|<Directory /usr/share/puppet/rack/puppetmasterd/>|" \
+                /usr/share/puppetmaster-passenger/apache2.site.conf.tmpl > $tempfile
+            update_vhost_for_passenger4
+            mv $tempfile "${APACHE2_SITE_FILE}"
         fi
+
+        # Enable needed modules
         a2enmod ssl
         a2enmod headers
-        a2ensite puppetmaster
-        if [ -x "/etc/init.d/apache2" ]; then
-            # Seems that a restart is needed. reload breaks ssl apparently.
-            if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                invoke-rc.d apache2 restart || exit $?
-            else
-                /etc/init.d/apache2 restart || exit $?
-            fi
-        fi
+        a2ensite ${sitename}
+        restart_apache2
     fi
+
     # Fix CRL file on upgrade to use the CA crl file instead of the host crl.
     if dpkg --compare-versions "$2" lt-nl "2.6.1-1"; then
         if [ -e /etc/apache2/sites-available/puppetmaster ]; then
             sed -r -i 's|SSLCARevocationFile[[:space:]]+/var/lib/puppet/ssl/crl.pem$|SSLCARevocationFile /var/lib/puppet/ssl/ca/ca_crl.pem|' /etc/apache2/sites-available/puppetmaster
-            if [ -x "/etc/init.d/apache2" ]; then
-                # Seems that a restart is needed. reload breaks ssl apparently.
-                if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                    invoke-rc.d apache2 restart || exit $?
-                else
-                    /etc/init.d/apache2 restart || exit $?
-                fi
-            fi
+            restart_apache2
         fi
     fi
 fi

data/ext/debian/puppetmaster-passenger.postrm

@@ -1,25 +1,53 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
+
+sitename="puppetmaster"
+
+# The debian provided a2* utils in Apache 2.4 uses "site name" as
+# argument, while the version in Apache 2.2 uses "file name".
+#
+# For added fun, the Apache 2.4 version requires files to have a
+# ".conf" suffix, but this must be stripped when using it as argument
+# for the a2* utilities.
+#
+# This will end in tears…
+# Can be removed when we only support apache >= 2.4
+apache2_puppetmaster_sitename() {
+    apache2_version="$(dpkg-query --showformat='${Version}\n' --show apache2)"
+    if dpkg --compare-versions "$apache2_version" gt "2.4~"; then
+        echo "${sitename}.conf"
+    else
+        echo "${sitename}"
+    fi
+}
+
+# Can be removed when we only support apache >= 2.4
+restart_apache2() {
+    if [ -x "/etc/init.d/apache2" ]; then
+        # Seems that a restart is needed. reload breaks ssl apparently.
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+            invoke-rc.d apache2 restart || exit $?
+        else
+            /etc/init.d/apache2 restart || exit $?
+        fi
+    fi
+}
 
 case "$1" in
     purge)
-	if dpkg-statoverride --list /usr/share/puppet/rack/puppetmasterd/config.ru >/dev/null 2>&1
-	then
-	    dpkg-statoverride --remove /usr/share/puppet/rack/puppetmasterd/config.ru
-	fi
-	# Remove the puppetmaster site configuration on purge
-	rm -f /etc/apache2/sites-available/puppetmaster
-	;;
+        if dpkg-statoverride --list /usr/share/puppet/rack/puppetmasterd/config.ru >/dev/null 2>&1
+        then
+            dpkg-statoverride --remove /usr/share/puppet/rack/puppetmasterd/config.ru
+        fi
+        # Remove the puppetmaster site configuration on purge
+        rm -f /etc/apache2/sites-available/$(apache2_puppetmaster_sitename)
+    ;;
     remove)
         # Disable the puppetmaster apache2 site configuration on package removal
-        a2dissite puppetmaster
-        if [ -x "/etc/init.d/apache2" ]; then
-            if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                invoke-rc.d apache2 force-reload || exit $?
-            else
-                /etc/init.d/apache2 force-reload || exit $?
-            fi
-        fi
-	;;
+        a2dissite ${sitename}
+        restart_apache2
+    ;;
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
         ;;
     *)

data/lib/puppet/forge.rb

@@ -117,14 +117,11 @@ class Puppet::Forge < Semantic::Dependency::Source
 
       name = meta['name'].tr('/', '-')
       version = Semantic::Version.parse(meta['version'])
+      release = "#{name}@#{version}"
 
       dependencies = (meta['dependencies'] || [])
       dependencies.map! do |dep|
-        range = dep['version_requirement'] || dep['versionRequirement'] || '>=0'
-        [
-          dep['name'].tr('/', '-'),
-          (Semantic::VersionRange.parse(range) rescue Semantic::VersionRange::EMPTY_RANGE),
-        ]
+        Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
       end
 
       super(source, name, version, Hash[dependencies])

data/lib/puppet/module_tool.rb

@@ -154,6 +154,29 @@ module Puppet
         Puppet.lookup(:current_environment)
       end
     end
+
+    # Handles parsing of module dependency expressions into proper
+    # {Semantic::VersionRange}s, including reasonable error handling.
+    #
+    # @param where [String] a description of the thing we're parsing the
+    #        dependency expression for
+    # @param dep [Hash] the dependency description to parse
+    # @return [Array(String, Semantic::VersionRange, String)] an tuple of the
+    #         dependent module's name, the version range dependency, and the
+    #         unparsed range expression.
+    def self.parse_module_dependency(where, dep)
+      dep_name = dep['name'].tr('/', '-')
+      range = dep['version_requirement'] || dep['versionRequirement'] || '>= 0.0.0'
+
+      begin
+        parsed_range = Semantic::VersionRange.parse(range)
+      rescue ArgumentError => e
+        Puppet.debug "Error in #{where} parsing dependency #{dep_name} (#{e.message}); using empty range."
+        parsed_range = Semantic::VersionRange::EMPTY_RANGE
+      end
+
+      [ dep_name, parsed_range, range ]
+    end
   end
 end
 

data/lib/puppet/module_tool/applications/application.rb

@@ -43,14 +43,6 @@ module Puppet::ModuleTool
         modulefile_path = File.join(@path, 'Modulefile')
         metadata_path   = File.join(@path, 'metadata.json')
 
-        if File.file?(modulefile_path)
-          if File.file?(metadata_path)
-            Puppet.warning "Modulefile is deprecated. Using metadata.json."
-          else
-            Puppet.warning "Modulefile is deprecated. Building metadata.json from Modulefile."
-          end
-        end
-
         if File.file?(metadata_path)
           File.open(metadata_path) do |f|
             begin
@@ -59,11 +51,20 @@ module Puppet::ModuleTool
               raise ArgumentError, "Could not parse JSON #{metadata_path}", ex.backtrace
             end
           end
+        end
+
+        if File.file?(modulefile_path)
+          if File.file?(metadata_path)
+            Puppet.warning "Modulefile is deprecated. Merging your Modulefile and metadata.json."
+          else
+            Puppet.warning "Modulefile is deprecated. Building metadata.json from Modulefile."
+          end
 
-        elsif File.file?(modulefile_path)
           Puppet::ModuleTool::ModulefileReader.evaluate(@metadata, modulefile_path)
+        end
 
-        elsif require_metadata
+        has_metadata = File.file?(modulefile_path) || File.file?(metadata_path)
+        if !has_metadata && require_metadata
           raise ArgumentError, "No metadata found for module #{@path}"
         end
 

data/lib/puppet/module_tool/applications/builder.rb

@@ -69,11 +69,11 @@ module Puppet::ModuleTool
       def write_json
         metadata_path = File.join(build_path, 'metadata.json')
 
-        unless File.exist?(metadata_path)
-          # Legacy build: Metadata was parsed from Modulefile; write it out
-          File.open(metadata_path, 'w') do |f|
-            f.write(metadata.to_json)
-          end
+        # TODO: This may necessarily change the order in which the metadata.json
+        # file is packaged from what was written by the user.  This is a
+        # regretable, but required for now.
+        File.open(metadata_path, 'w') do |f|
+          f.write(metadata.to_json)
         end
 
         File.open(File.join(build_path, 'checksums.json'), 'w') do |f|

data/lib/puppet/module_tool/dependency.rb

@@ -5,6 +5,7 @@ module Puppet::ModuleTool
 
   class Dependency
     include Puppet::Network::FormatSupport
+    alias :to_json :to_pson
 
     attr_reader :full_module_name, :username, :name, :version_requirement, :repository
 

data/lib/puppet/module_tool/installed_modules.rb

@@ -59,17 +59,18 @@ module Puppet::ModuleTool
         @metadata = mod.metadata
         name = mod.forge_name.tr('/', '-')
         version = Semantic::Version.parse(mod.version)
+        release = "#{name}@#{version}"
 
         super(source, name, version, {})
 
         if mod.dependencies
           mod.dependencies.each do |dep|
-            range = dep['version_requirement'] || dep['versionRequirement'] || '>=0'
-            range = Semantic::VersionRange.parse(range) rescue Semantic::VersionRange::EMPTY_RANGE
+            results = Puppet::ModuleTool.parse_module_dependency(release, dep)
+            dep_name, parsed_range, range = results
 
             dep.tap do |dep|
-              add_constraint('initialize', dep['name'].tr('/', '-'), range.to_s) do |node|
-                range === node.version
+              add_constraint('initialize', dep_name, range.to_s) do |node|
+                parsed_range === node.version
               end
             end
           end

data/lib/puppet/module_tool/local_tarball.rb

@@ -48,12 +48,11 @@ module Puppet::ModuleTool
         @metadata = mod.metadata
         name = mod.forge_name.tr('/', '-')
         version = Semantic::Version.parse(mod.version)
+        release = "#{name}@#{version}"
 
         if mod.dependencies
           dependencies = mod.dependencies.map do |dep|
-            range = dep['version_requirement'] || dep['versionRequirement'] || '>=0'
-            range = Semantic::VersionRange.parse(range) rescue Semantic::VersionRange::EMPTY_RANGE
-            [ dep['name'].tr('/', '-'), range ]
+            Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
           end
           dependencies = Hash[dependencies]
         end

data/lib/puppet/module_tool/tar/gnu.rb

@@ -1,28 +1,19 @@
+require 'shellwords'
+
 class Puppet::ModuleTool::Tar::Gnu
   def unpack(sourcefile, destdir, owner)
     sourcefile = File.expand_path(sourcefile)
     destdir = File.expand_path(destdir)
 
     Dir.chdir(destdir) do
-      tarball = Puppet::Util::Execution.execute(['gzip', '-dc', sourcefile])
-      Puppet::Util::Execution.execpipe(['tar', 'xof', '-'], true, 'w+') do |pipe|
-        pipe.write(tarball)
-      end
-
-      Puppet::Util::Execution.execute(['find', destdir] + %w[-type d -exec chmod 755 {} +])
-      Puppet::Util::Execution.execute(['find', destdir] + %w[-type f -exec chmod a-wst {} +])
-      Puppet::Util::Execution.execute(['chown', '-R', owner, destdir])
+      Puppet::Util::Execution.execute("gzip -dc #{Shellwords.shellescape(sourcefile)} | tar xof -")
+      Puppet::Util::Execution.execute("find . -type d -exec chmod 755 {} +")
+      Puppet::Util::Execution.execute("find . -type f -exec chmod a-wst {} +")
+      Puppet::Util::Execution.execute("chown -R #{owner} .")
     end
   end
 
   def pack(sourcedir, destfile)
-    tarball = Puppet::Util::Execution.execute(['tar', 'cf', '-', sourcedir])
-    Puppet::Util::Execution.execpipe(['gzip', '-c'], true, 'w+') do |pipe|
-      pipe.write(tarball)
-      pipe.close_write
-      File.open(destfile, 'w+') do |file|
-        file.write(pipe.read)
-      end
-    end
+    Puppet::Util::Execution.execute("tar cf - #{sourcedir} | gzip -c > #{File.basename(destfile)}")
   end
 end

data/lib/puppet/util/execution.rb

@@ -33,9 +33,8 @@ module Puppet::Util::Execution
   # which is treated as a set of command arguments to pass through.
   #
   # In either case, the command is passed directly to the shell, STDOUT and
-  # STDERR are connected together, and STDOUT and STDIN are available via the
-  # yielded pipe. (Bear in mind that reading from or writing to a pipe that has
-  # not been opened in read or write mode respectively will block indefinitely.)
+  # STDERR are connected together, and STDOUT will be streamed to the yielded
+  # pipe.
   #
   # @param command [String, Array<String>] the command to execute as one string,
   #   or as parts in an array. The parts of the array are joined with one
@@ -43,7 +42,6 @@ module Puppet::Util::Execution
   #   string to execute.
   # @param failonfail [Boolean] (true) if the execution should fail with
   #   Exception on failure or not.
-  # @param mode [String] ('r') the mode to open the pipe with
   # @yield [pipe] to a block executing a subprocess
   # @yieldparam pipe [IO] the opened pipe
   # @yieldreturn [String] the output to return
@@ -54,7 +52,7 @@ module Puppet::Util::Execution
   #
   # @see Kernel#open for `mode` values
   # @api public
-  def self.execpipe(command, failonfail = true, mode = 'r')
+  def self.execpipe(command, failonfail = true)
     # Paste together an array with spaces.  We used to paste directly
     # together, no spaces, which made for odd invocations; the user had to
     # include whitespace between arguments.
@@ -76,7 +74,7 @@ module Puppet::Util::Execution
     # a predictable output
     english_env = ENV.to_hash.merge( {'LANG' => 'C', 'LC_ALL' => 'C'} )
     output = Puppet::Util.withenv(english_env) do
-      open("| #{command_str} 2>&1", mode) do |pipe|
+      open("| #{command_str} 2>&1") do |pipe|
         yield pipe
       end
     end

data/lib/puppet/vendor/semantic/lib/semantic/dependency/source.rb

@@ -14,7 +14,7 @@ module Semantic
       def create_release(name, version, dependencies = {})
         version = Version.parse(version) if version.is_a? String
         dependencies = dependencies.inject({}) do |hash, (key, value)|
-          hash[key] = VersionRange.parse(value || '>= 0')
+          hash[key] = VersionRange.parse(value || '>= 0.0.0')
           hash[key] ||= VersionRange::EMPTY_RANGE
           hash
         end

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '3.6.0-rc1'
+  PUPPETVERSION = '3.6.0'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/unit/environments_spec.rb

@@ -198,7 +198,7 @@ config_version=/some/script
             with_config_version(File.expand_path('/some/script'))
         end
 
-        expect(@logs.map(&:to_s).join).to match(/Invalid.*at.*#{envdir}\/env1.*may not have sections.*ignored: 'foo'/)
+        expect(@logs.map(&:to_s).join).to match(/Invalid.*at.*\/env1.*may not have sections.*ignored: 'foo'/)
       end
 
       it "logs a warning, but processes the main settings if there are any extraneous settings" do
@@ -214,7 +214,7 @@ config_version=/some/script
             with_config_version(File.expand_path('/some/script'))
         end
 
-        expect(@logs.map(&:to_s).join).to match(/Invalid.*at.*#{envdir}\/env1.*unknown setting.*dog, cat/)
+        expect(@logs.map(&:to_s).join).to match(/Invalid.*at.*\/env1.*unknown setting.*dog, cat/)
       end
 
       it "interpretes relative paths from the environment's directory" do

data/spec/unit/module_tool/tar/gnu_spec.rb

@@ -9,17 +9,15 @@ describe Puppet::ModuleTool::Tar::Gnu do
 
   it "unpacks a tar file" do
     Dir.expects(:chdir).with(File.expand_path(destdir)).yields(mock)
-    Puppet::Util::Execution.expects(:execute).with(["gzip", "-dc", File.expand_path(sourcefile)])
-    Puppet::Util::Execution.expects(:execpipe).with(["tar", "xof", "-"], true, 'w+')
-    Puppet::Util::Execution.expects(:execute).with(["find", File.expand_path(destdir), "-type", "d", "-exec", "chmod", "755", "{}", "+"])
-    Puppet::Util::Execution.expects(:execute).with(["find", File.expand_path(destdir), "-type", "f", "-exec", "chmod", "a-wst", "{}", "+"])
-    Puppet::Util::Execution.expects(:execute).with(["chown", "-R", "<owner:group>", File.expand_path(destdir)])
+    Puppet::Util::Execution.expects(:execute).with("gzip -dc #{Shellwords.shellescape(File.expand_path(sourcefile))} | tar xof -")
+    Puppet::Util::Execution.expects(:execute).with("find . -type d -exec chmod 755 {} +")
+    Puppet::Util::Execution.expects(:execute).with("find . -type f -exec chmod a-wst {} +")
+    Puppet::Util::Execution.expects(:execute).with("chown -R <owner:group> .")
     subject.unpack(sourcefile, destdir, '<owner:group>')
   end
 
   it "packs a tar file" do
-    Puppet::Util::Execution.expects(:execute).with(["tar", "cf", "-", sourcedir])
-    Puppet::Util::Execution.expects(:execpipe).with(["gzip", "-c"], true, 'w+')
+    Puppet::Util::Execution.expects(:execute).with("tar cf - #{sourcedir} | gzip -c > #{File.basename(destfile)}")
     subject.pack(sourcedir, destfile)
   end
 end

data/spec/unit/module_tool_spec.rb

@@ -297,4 +297,34 @@ TREE
       end
     end
   end
+
+  describe '.parse_module_dependency' do
+    it 'parses a dependency without a version range expression' do
+      name, range, expr = subject.parse_module_dependency('source', 'name' => 'foo-bar')
+      expect(name).to eql('foo-bar')
+      expect(range).to eql(Semantic::VersionRange.parse('>= 0.0.0'))
+      expect(expr).to eql('>= 0.0.0')
+    end
+
+    it 'parses a dependency with a version range expression' do
+      name, range, expr = subject.parse_module_dependency('source', 'name' => 'foo-bar', 'version_requirement' => '1.2.x')
+      expect(name).to eql('foo-bar')
+      expect(range).to eql(Semantic::VersionRange.parse('1.2.x'))
+      expect(expr).to eql('1.2.x')
+    end
+
+    it 'parses a dependency with a version range expression in the (deprecated) versionRange key' do
+      name, range, expr = subject.parse_module_dependency('source', 'name' => 'foo-bar', 'versionRequirement' => '1.2.x')
+      expect(name).to eql('foo-bar')
+      expect(range).to eql(Semantic::VersionRange.parse('1.2.x'))
+      expect(expr).to eql('1.2.x')
+    end
+
+    it 'does not raise an error on invalid version range expressions' do
+      name, range, expr = subject.parse_module_dependency('source', 'name' => 'foo-bar', 'version_requirement' => 'nope')
+      expect(name).to eql('foo-bar')
+      expect(range).to eql(Semantic::VersionRange::EMPTY_RANGE)
+      expect(expr).to eql('nope')
+    end
+  end
 end

data/spec/unit/util/execution_spec.rb

@@ -596,27 +596,27 @@ describe Puppet::Util::Execution do
 
   describe "#execpipe" do
     it "should execute a string as a string" do
-      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1', 'r').returns('hello')
+      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1').returns('hello')
       $CHILD_STATUS.expects(:==).with(0).returns(true)
       Puppet::Util::Execution.execpipe('echo hello').should == 'hello'
     end
 
     it "should print meaningful debug message for string argument" do
       Puppet::Util::Execution.expects(:debug).with("Executing 'echo hello'")
-      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1', 'r').returns('hello')
+      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1').returns('hello')
       $CHILD_STATUS.expects(:==).with(0).returns(true)
       Puppet::Util::Execution.execpipe('echo hello')
     end
 
     it "should print meaningful debug message for array argument" do
       Puppet::Util::Execution.expects(:debug).with("Executing 'echo hello'")
-      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1', 'r').returns('hello')
+      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1').returns('hello')
       $CHILD_STATUS.expects(:==).with(0).returns(true)
       Puppet::Util::Execution.execpipe(['echo','hello'])
     end
 
     it "should execute an array by pasting together with spaces" do
-      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1', 'r').returns('hello')
+      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1').returns('hello')
       $CHILD_STATUS.expects(:==).with(0).returns(true)
       Puppet::Util::Execution.execpipe(['echo', 'hello']).should == 'hello'
     end

metadata

@@ -1,22 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 3.6.0.rc1
-  prerelease: 6
+  version: 3.6.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '1.6'
     - - <
@@ -25,9 +23,8 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '1.6'
     - - <
@@ -36,7 +33,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hiera
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -44,7 +40,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -52,7 +47,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rgen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -60,7 +54,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -68,17 +61,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Puppet, an automated configuration management tool
@@ -2356,6 +2347,7 @@ files:
 - spec/watchr.rb
 homepage: https://github.com/puppetlabs/puppet
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -2366,22 +2358,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: puppet
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Puppet, an automated configuration management tool
 test_files:
 - spec/fixtures/faulty_face/puppet/face/syntax.rb