omnibus 3.2.1 → 3.2.2

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Omnibus Ruby CHANGELOG
 ======================
 
+v3.2.2 (September 16, 2014)
+-------------------
+- Deprecate `max_build_jobs` in favor of `workers`
+- Ensure permissions are preserved on copy package. #336
+- Ensure default package user and group are `root`.
+
 v3.2.1 (July 26, 2014)
 ----------------------
 - Add support for overriding publish platform/version

data/lib/omnibus/builder.rb

@@ -143,17 +143,34 @@ module Omnibus
     # @todo Should this be moved to {Software}?
     #
     # @example
-    #   command "make install -j#{max_build_jobs}"
+    #   command "make install -j #{workers}"
     #
     # @return [Fixnum]
     #
-    def max_build_jobs
+    def workers
       if Ohai['cpu'] && Ohai['cpu']['total'] && Ohai['cpu']['total'].to_s =~ /^\d+$/
         Ohai['cpu']['total'].to_i + 1
       else
         3
       end
     end
+    expose :workers
+
+    #
+    # @deprecated Use {#max_build_jobs} instead.
+    #
+    # @example (see #max_build_jobs)
+    # @raise (see #max_build_jobs)
+    # @param (see #max_build_jobs)
+    # @return (see #max_build_jobs)
+    #
+    def max_build_jobs
+      log.deprecated(log_key) do
+        "max_build_jobs (DSL). Please use `workers' instead."
+      end
+
+      workers
+    end
     expose :max_build_jobs
 
     #

data/lib/omnibus/generator_files/software/c-example.rb.erb

@@ -37,6 +37,6 @@ build do
            "--with-ssl=#{install_dir}/embedded",
            "--with-zlib=#{install_dir}/embedded"].join(" "), :env => env
 
-  command "make -j #{max_build_jobs}", :env => env
+  command "make -j #{workers}", :env => env
 
 end

data/lib/omnibus/package.rb

@@ -135,7 +135,7 @@ module Omnibus
         #
         def truncate_platform_version(platform_version, platform)
           case platform
-          when 'centos', 'debian', 'fedora', 'freebsd', 'rhel', 'el'
+          when 'centos', 'debian', 'el', 'fedora', 'freebsd', 'rhel', 'sles'
             # Only want MAJOR (e.g. Debian 7)
             platform_version.split('.').first
           when 'aix', 'arch', 'gentoo', 'mac_os_x', 'openbsd', 'slackware', 'solaris2', 'suse', 'ubuntu'

data/lib/omnibus/project.rb

@@ -445,7 +445,8 @@ module Omnibus
     expose :mac_pkg_identifier
 
     #
-    # Set or retrieve the +{deb/rpm/solaris}-user+ fpm argument.
+    # Set or retrieve the +{deb/rpm/solaris}-user+ fpm argument. Defaults
+    # to +root+ if not otherwise set.
     #
     # @example
     #   package_user 'build'
@@ -457,7 +458,7 @@ module Omnibus
     #
     def package_user(val = NULL)
       if null?(val)
-        @package_user
+        @package_user ||= 'root'
       else
         @package_user = val
       end
@@ -487,7 +488,8 @@ module Omnibus
     expose :override
 
     #
-    # Set or retrieve the +{deb/rpm/solaris}+-group fpm argument.
+    # Set or retrieve the +{deb/rpm/solaris}+-group fpm argument. Defaults
+    # to +root+ if not otherwise set.
     #
     # @example
     #   package_group 'build'
@@ -499,7 +501,7 @@ module Omnibus
     #
     def package_group(val = NULL)
       if null?(val)
-        @package_group
+        @package_group ||= 'root'
       else
         @package_group = val
       end
@@ -1006,11 +1008,11 @@ module Omnibus
         render_metadata(pkg_type)
 
         if Ohai['platform'] == 'windows'
-          FileUtils.cp(Dir["#{Config.package_dir}/*.msi*"], destination)
+          FileUtils.cp(Dir["#{Config.package_dir}/*.msi*"], destination, preserve: true)
         elsif Ohai['platform'] == 'aix'
-          FileUtils.cp(Dir["#{Config.package_dir}/*.bff*"], destination)
+          FileUtils.cp(Dir["#{Config.package_dir}/*.bff*"], destination, preserve: true)
         else
-          FileUtils.cp(Dir["#{Config.package_dir}/*"], destination)
+          FileUtils.cp(Dir["#{Config.package_dir}/*"], destination, preserve: true)
         end
       end
     end

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = '3.2.1'
+  VERSION = '3.2.2'
 end

data/spec/data/complicated/config/software/autoconf.rb

@@ -30,6 +30,6 @@ env = {
 
 build do
   command "./configure --prefix=#{install_dir}/embedded", :env => env
-  command "make -j #{max_build_jobs}"
+  command "make -j #{workers}"
   command "make install"
 end

data/spec/data/complicated/config/software/automake.rb

@@ -34,6 +34,6 @@ configure_env = {
 build do
   command "./bootstrap", :env => {"PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}"}
   command "./configure --prefix=#{install_dir}/embedded", :env => configure_env
-  command "make -j #{max_build_jobs}"
+  command "make -j #{workers}"
   command "make install"
 end

data/spec/data/complicated/config/software/couchdb.rb

@@ -48,6 +48,6 @@ build do
            "--with-erlang=#{install_dir}/embedded/lib/erlang/usr/include",
            "--with-js-include=#{install_dir}/embedded/include",
            "--with-js-lib=#{install_dir}/embedded/lib"].join(" "), :env => build_env
-  command "make -j #{max_build_jobs}", :env => build_env
+  command "make -j #{workers}", :env => build_env
   command "make install", :env => build_env
 end

data/spec/data/complicated/config/software/curl.rb

@@ -43,6 +43,6 @@ build do
            "--with-ssl=#{install_dir}/embedded",
            "--with-zlib=#{install_dir}/embedded"].join(" ")
 
-  command "make -j #{max_build_jobs}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
+  command "make -j #{workers}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
   command "make install"
 end

data/spec/data/complicated/config/software/erlang.rb

@@ -60,6 +60,6 @@ build do
            "--disable-debug"].join(" "),
           :env => env)
 
-  command "make -j #{max_build_jobs}", :env => env
+  command "make -j #{workers}", :env => env
   command "make install"
 end

data/spec/data/complicated/config/software/expat.rb

@@ -16,6 +16,6 @@ build do
   command ["./configure",
            "--prefix=#{install_dir}/embedded"].join(" "), :env => env
 
-  command "make -j #{max_build_jobs}", :env => env
+  command "make -j #{workers}", :env => env
   command "make install"
 end

data/spec/data/complicated/config/software/fcgi.rb

@@ -51,6 +51,6 @@ D
 
   # configure and build
   command "./configure --prefix=#{install_dir}/embedded", :env => configure_env
-  command "make -j #{max_build_jobs}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
+  command "make -j #{workers}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
   command "make install"
 end

data/spec/data/complicated/config/software/fcgiwrap.rb

@@ -36,6 +36,6 @@ env = {
 build do
   command "autoreconf -i", :env => env
   command "./configure --prefix=#{install_dir}/embedded", :env => env
-  command "make -j #{max_build_jobs}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
+  command "make -j #{workers}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
   command "make install"
 end

data/spec/data/complicated/config/software/gd.rb

@@ -51,6 +51,6 @@ build do
           :env => configure_env,
           :cwd => source_dir)
 
-  command "make -j #{max_build_jobs}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/bin", "LIBS" => "-liconv"}, :cwd => source_dir
+  command "make -j #{workers}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/bin", "LIBS" => "-liconv"}, :cwd => source_dir
   command "make install", :cwd => source_dir
 end

data/spec/data/complicated/config/software/gdbm.rb

@@ -35,6 +35,6 @@ build do
   end
 
   command configure_command.join(" ")
-  command "make -j #{max_build_jobs}"
+  command "make -j #{workers}"
   command "make install"
 end

data/spec/data/complicated/config/software/gecode.rb

@@ -43,6 +43,6 @@ build do
            "--disable-qt",
            "--disable-examples"].join(" "),
           :env => configure_env)
-  command "make -j #{max_build_jobs}", :env => { "LD_RUN_PATH" => "#{install_dir}/embedded/lib" }
+  command "make -j #{workers}", :env => { "LD_RUN_PATH" => "#{install_dir}/embedded/lib" }
   command "make install"
 end

data/spec/data/complicated/config/software/git.rb

@@ -35,6 +35,6 @@ env = {
 }
 
 build do
-  command "make -j #{max_build_jobs} prefix=#{install_dir}/embedded", :env => env
+  command "make -j #{workers} prefix=#{install_dir}/embedded", :env => env
   command "make install prefix=#{install_dir}/embedded", :env => env
 end

data/spec/data/complicated/config/software/icu.rb

@@ -31,7 +31,7 @@ build do
             "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include"
           },
           :cwd => working_dir)
-  command("make -j #{max_build_jobs}",
+  command("make -j #{workers}",
           :env => {
             "LD_RUN_PATH" => "#{install_dir}/embedded/lib"
           },

data/spec/data/complicated/config/software/keepalived.rb

@@ -38,6 +38,6 @@ build do
   # branch), and should be no longer necessary after 1.2.9.
   patch :source => "keepalived-1.2.9_opscode_centos_5.patch"
   command "./configure --prefix=#{install_dir}/embedded --disable-iconv", :env => env
-  command "make -j #{max_build_jobs}", :env => env
+  command "make -j #{workers}", :env => env
   command "make install"
 end

data/spec/data/complicated/config/software/libedit.rb

@@ -64,6 +64,6 @@ build do
   command ["./configure",
            "--prefix=#{install_dir}/embedded"
            ].join(" "), :env => env
-  command "make -j #{max_build_jobs}", :env => env
-  command "make -j #{max_build_jobs} install"
+  command "make -j #{workers}", :env => env
+  command "make -j #{workers} install"
 end

data/spec/data/complicated/config/software/libffi.rb

@@ -57,8 +57,8 @@ configure_env =
 
 build do
   command "./configure --prefix=#{install_dir}/embedded", :env => configure_env
-  command "make -j #{max_build_jobs}"
-  command "make -j #{max_build_jobs} install"
+  command "make -j #{workers}"
+  command "make -j #{workers} install"
   # libffi's default install location of header files is aweful...
   command "cp -f #{install_dir}/embedded/lib/libffi-3.0.13/include/* #{install_dir}/embedded/include"
 

data/spec/data/complicated/config/software/libiconv.rb

@@ -50,6 +50,6 @@ end
 
 build do
   command "./configure --prefix=#{install_dir}/embedded", :env => env
-  command "make -j #{max_build_jobs}", :env => env
-  command "make -j #{max_build_jobs} install-lib libdir=#{install_dir}/embedded/lib includedir=#{install_dir}/embedded/include", :env => env
+  command "make -j #{workers}", :env => env
+  command "make -j #{workers} install-lib libdir=#{install_dir}/embedded/lib includedir=#{install_dir}/embedded/include", :env => env
 end

data/spec/data/complicated/config/software/libjpeg.rb

@@ -33,7 +33,7 @@ configure_env = {
 build do
   command "./configure --prefix=#{install_dir}/embedded --enable-shared --enable-static", :env => configure_env
   command "mkdir -p #{install_dir}/embedded/man/man1"
-  command "make -j #{max_build_jobs}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
+  command "make -j #{workers}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
   command "make install"
   command "rm -rf #{install_dir}/embedded/man"
 end

data/spec/data/complicated/config/software/libpng.rb

@@ -33,6 +33,6 @@ configure_env = {
 
 build do
   command "./configure --prefix=#{install_dir}/embedded --with-zlib-prefix=#{install_dir}/embedded", :env => configure_env
-  command "make -j #{max_build_jobs}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
+  command "make -j #{workers}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
   command "make install"
 end

data/spec/data/complicated/config/software/libxml2.rb

@@ -46,6 +46,6 @@ build do
     "LD_RUN_PATH" => "#{install_dir}/embedded/lib"
   }
   command cmd, :env => env
-  command "make -j #{max_build_jobs}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
+  command "make -j #{workers}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
   command "make install", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
 end

data/spec/data/complicated/config/software/libxslt.rb

@@ -47,6 +47,6 @@ build do
            "--without-python",
            "--without-crypto"].join(" "),
           :env => env)
-  command "make -j #{max_build_jobs}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/bin"}
+  command "make -j #{workers}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/bin"}
   command "make install", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/bin"}
 end

data/spec/data/complicated/config/software/libyaml.rb

@@ -57,6 +57,6 @@ configure_env =
 
 build do
   command "./configure --prefix=#{install_dir}/embedded", :env => configure_env
-  command "make -j #{max_build_jobs}", :env => configure_env
-  command "make -j #{max_build_jobs} install", :env => configure_env
+  command "make -j #{workers}", :env => configure_env
+  command "make -j #{workers} install", :env => configure_env
 end

data/spec/data/complicated/config/software/logrotate.rb

@@ -36,6 +36,6 @@ env = {
 
 build do
   patch :source => "logrotate_basedir_override.patch", :plevel => 0
-  command "make -j #{max_build_jobs}", :env => env
+  command "make -j #{workers}", :env => env
   command "make install"
 end

data/spec/data/complicated/config/software/makedepend.rb

@@ -68,6 +68,6 @@ configure_env["PATH"] = "#{install_dir}/embedded/bin" + File::PATH_SEPARATOR + E
 
 build do
   command "./configure --prefix=#{install_dir}/embedded", :env => configure_env
-  command "make -j #{max_build_jobs}", :env => configure_env
-  command "make -j #{max_build_jobs} install", :env => configure_env
+  command "make -j #{workers}", :env => configure_env
+  command "make -j #{workers} install", :env => configure_env
 end

data/spec/data/complicated/config/software/nagios-plugins.rb

@@ -48,6 +48,6 @@ build do
           :env => configure_env)
 
   # build it
-  command "make -j #{max_build_jobs}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
+  command "make -j #{workers}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
   command "sudo make install"
 end

data/spec/data/complicated/config/software/nagios.rb

@@ -56,7 +56,7 @@ build do
   command "bash -c \"find . -name 'Makefile' | xargs sed -i 's:-o opscode-nagios -g opscode-nagios:-o root -g root:g'\""
 
   # build it
-  command "make -j #{max_build_jobs} all", :env => { "LD_RUN_PATH" => "#{install_dir}/embedded/lib" }
+  command "make -j #{workers} all", :env => { "LD_RUN_PATH" => "#{install_dir}/embedded/lib" }
   command "sudo make install"
   command "sudo make install-config"
   command "sudo make install-exfoliation"

data/spec/data/complicated/config/software/ncurses.rb

@@ -120,8 +120,8 @@ build do
   cmd_array << "--with-libtool" if platform == 'aix'
   command(cmd_array.join(" "),
           :env => env)
-  command "make -j #{max_build_jobs}", :env => env
-  command "make -j #{max_build_jobs} install", :env => env
+  command "make -j #{workers}", :env => env
+  command "make -j #{workers} install", :env => env
 
   # build non-wide-character libraries
   command "make distclean"
@@ -135,12 +135,12 @@ build do
   cmd_array << "--with-libtool" if platform == 'aix'
   command(cmd_array.join(" "),
           :env => env)
-  command "make -j #{max_build_jobs}", :env => env
+  command "make -j #{workers}", :env => env
 
   # installing the non-wide libraries will also install the non-wide
   # binaries, which doesn't happen to be a problem since we don't
   # utilize the ncurses binaries in private-chef (or oss chef)
-  command "make -j #{max_build_jobs} install", :env => env
+  command "make -j #{workers} install", :env => env
 
   # Ensure embedded ncurses wins in the LD search path
   if platform == "smartos"

data/spec/data/complicated/config/software/nginx.rb

@@ -35,6 +35,6 @@ build do
            "--with-debug",
            "--with-ld-opt=-L#{install_dir}/embedded/lib",
            "--with-cc-opt=\"-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include\""].join(" ")
-  command "make -j #{max_build_jobs}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
+  command "make -j #{workers}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
   command "make install"
 end

data/spec/data/complicated/config/software/nodejs.rb

@@ -39,6 +39,6 @@ end
 
 build do
   command "#{python} ./configure --prefix=#{install_dir}/embedded"
-  command "make -j #{max_build_jobs}"
+  command "make -j #{workers}"
   command "make install"
 end

data/spec/data/complicated/config/software/openresty.rb

@@ -62,6 +62,6 @@ build do
            #'--with-libatomic'
           ].join(" "), :env => env
 
-  command "make -j #{max_build_jobs}", :env => env
+  command "make -j #{workers}", :env => env
   command "make install"
 end

data/spec/data/complicated/config/software/pcre.rb

@@ -34,7 +34,7 @@ build do
   command ["./configure",
            "--prefix=#{install_dir}/embedded",
            "--enable-pcretest-libedit"].join(" "), :env => configure_env
-  command("make -j #{max_build_jobs}",
+  command("make -j #{workers}",
           :env => {
             "PATH" => "#{install_dir}/embedded/bin:#{ENV["PATH"]}"
           })

data/spec/data/complicated/config/software/perl.rb

@@ -21,7 +21,7 @@ build do
             "-Dusethreads", ## Compile ithread support
             "-Dnoextensions='DB_File GDBM_File NDBM_File ODBM_File'"
            ].join(" "), :env => env
-  command "make -j #{max_build_jobs}"
+  command "make -j #{workers}"
   command "make install", :env => env
 
   # Ensure we have a sane omnibus-friendly CPAN config. This should be passed

data/spec/data/complicated/config/software/php.rb

@@ -36,6 +36,6 @@ build do
            "--with-fpm-group=opscode"].join(" "),
           :env => env)
 
-  command "make -j #{max_build_jobs}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
+  command "make -j #{workers}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
   command "make install"
 end

data/spec/data/complicated/config/software/pkg-config.rb

@@ -61,6 +61,6 @@ paths = [ "#{install_dir}/embedded/bin/pkgconfig" ]
 
 build do
   command "./configure --prefix=#{install_dir}/embedded --disable-debug --disable-host-tool --with-internal-glib --with-pc-path=#{paths*':'}", :env => configure_env
-  command "make -j #{max_build_jobs}", :env => configure_env
-  command "make -j #{max_build_jobs} install", :env => configure_env
+  command "make -j #{workers}", :env => configure_env
+  command "make -j #{workers} install", :env => configure_env
 end

data/spec/data/complicated/config/software/popt.rb

@@ -42,6 +42,6 @@ env =
 build do
   # --disable-nls => Disable localization support.
   command "./configure --prefix=#{install_dir}/embedded --disable-nls", :env => env
-  command "make -j #{max_build_jobs}", :env => env
+  command "make -j #{workers}", :env => env
   command "make install"
 end

data/spec/data/complicated/config/software/postgresql.rb

@@ -46,6 +46,6 @@ build do
            "--with-libedit-preferred",
            "--with-openssl --with-includes=#{install_dir}/embedded/include",
            "--with-libraries=#{install_dir}/embedded/lib"].join(" "), :env => configure_env
-  command "make -j #{max_build_jobs}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
+  command "make -j #{workers}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
   command "make install"
 end

data/spec/data/complicated/config/software/redis.rb

@@ -28,6 +28,6 @@ make_args = ["PREFIX=#{install_dir}/embedded",
              "LD_RUN_PATH=#{install_dir}/embedded/lib"].join(" ")
 
 build do
-  command ["make -j #{max_build_jobs}", make_args].join(" ")
+  command ["make -j #{workers}", make_args].join(" ")
   command ["make install", make_args].join(" ")
 end

data/spec/data/complicated/config/software/rsync.rb

@@ -43,6 +43,6 @@ env =
 
 build do
   command "./configure --prefix=#{install_dir}/embedded --disable-iconv", :env => env
-  command "make -j #{max_build_jobs}", :env => env
+  command "make -j #{workers}", :env => env
   command "make install"
 end

data/spec/data/complicated/config/software/ruby.rb

@@ -157,6 +157,6 @@ build do
   end
 
   command configure_command.join(" "), :env => env
-  command "#{make_binary} -j #{max_build_jobs}", :env => env
-  command "#{make_binary} -j #{max_build_jobs} install", :env => env
+  command "#{make_binary} -j #{workers}", :env => env
+  command "#{make_binary} -j #{workers} install", :env => env
 end

data/spec/data/complicated/config/software/spawn-fcgi.rb

@@ -35,6 +35,6 @@ configure_env = {
 
 build do
   command "./configure --prefix=#{install_dir}/embedded", :env => configure_env
-  command "make -j #{max_build_jobs}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
+  command "make -j #{workers}", :env => {"LD_RUN_PATH" => "#{install_dir}/embedded/lib"}
   command "make install"
 end

data/spec/data/complicated/config/software/util-macros.rb

@@ -41,6 +41,6 @@ configure_env =
 
 build do
   command "./configure --prefix=#{install_dir}/embedded", :env => configure_env
-  command "make -j #{max_build_jobs}", :env => configure_env
-  command "make -j #{max_build_jobs} install", :env => configure_env
+  command "make -j #{workers}", :env => configure_env
+  command "make -j #{workers} install", :env => configure_env
 end

data/spec/data/complicated/config/software/xproto.rb

@@ -41,6 +41,6 @@ configure_env =
 
 build do
   command "./configure --prefix=#{install_dir}/embedded", :env => configure_env
-  command "make -j #{max_build_jobs}", :env => configure_env
-  command "make -j #{max_build_jobs} install", :env => configure_env
+  command "make -j #{workers}", :env => configure_env
+  command "make -j #{workers} install", :env => configure_env
 end

data/spec/data/complicated/config/software/zlib.rb

@@ -62,6 +62,6 @@ configure_env =
 
 build do
   command "./configure --prefix=#{install_dir}/embedded", :env => configure_env
-  command "make -j #{max_build_jobs}"
-  command "make -j #{max_build_jobs} install"
+  command "make -j #{workers}"
+  command "make -j #{workers} install"
 end

data/spec/data/software/zlib.rb

@@ -62,6 +62,6 @@ configure_env =
 
 build do
   command "./configure --prefix=#{install_dir}/embedded", env: configure_env
-  command "make -j #{max_build_jobs}"
-  command "make -j #{max_build_jobs} install"
+  command "make -j #{workers}"
+  command "make -j #{workers} install"
 end

data/spec/unit/builder_spec.rb

@@ -19,6 +19,7 @@ module Omnibus
 
       it_behaves_like 'a cleanroom setter', :command, %|command 'echo "hello"'|
       it_behaves_like 'a cleanroom setter', :patch, %|patch source: 'diff.patch'|
+      it_behaves_like 'a cleanroom getter', :workers
       it_behaves_like 'a cleanroom getter', :max_build_jobs
       it_behaves_like 'a cleanroom setter', :ruby, %|ruby '-e "puts"'|
       it_behaves_like 'a cleanroom setter', :gem, %|gem 'install bacon'|
@@ -47,5 +48,19 @@ module Omnibus
       it_behaves_like 'a cleanroom getter', :project_dir
       it_behaves_like 'a cleanroom getter', :install_dir
     end
+
+    describe '#max_build_jobs' do
+      before { allow(subject).to receive(:workers).and_return(5) }
+
+      it 'prints a deprecation' do
+        output = capture_logging { subject.max_build_jobs }
+        expect(output).to include("Please use `workers' instead.")
+      end
+
+      it 'delegates to #workers' do
+        expect(subject).to receive(:workers).once
+        subject.max_build_jobs
+      end
+    end
   end
 end

data/spec/unit/git_cache_spec.rb

@@ -68,7 +68,7 @@ module Omnibus
 
     describe '#tag' do
       it 'returns the correct tag' do
-        expect(ipc.tag).to eql('zlib-25a09c83aca0f38a6e9d0d555358e772cde7ae7c40214edf108f1d1fded96bc7')
+        expect(ipc.tag).to eql('zlib-cd7af52fa55e629e79960ba744e4b8a00913a330903489c36a86b6432f1ba8ba')
       end
 
       describe 'with no deps' do
@@ -77,7 +77,7 @@ module Omnibus
         end
 
         it 'returns the correct tag' do
-          expect(ipc.tag).to eql('zlib-4315c8f2f9a0850b6fabeeaffe1f2dde4a3b52a234cc5e9bfaaf37f2280c6829')
+          expect(ipc.tag).to eql('zlib-89bac4cbe2ebae5e75b67ef88ef8d91289c0b655f130fef57b580fc05a83c686')
         end
       end
     end

data/spec/unit/package_spec.rb

@@ -145,13 +145,20 @@ module Omnibus
         expect(instance[:platform]).to eq('ubuntu')
       end
 
-     it 'ensures platform version is properly truncated' do
+      it 'ensures platform version is properly truncated' do
         allow(File).to receive(:read).and_return('{ "platform": "el", "platform_version": "5.10" }')
         instance = described_class.for_package(package)
 
         expect(instance[:platform_version]).to eq('5')
       end
 
+      it 'correctly truncates sles platform versions' do
+        allow(File).to receive(:read).and_return('{ "platform": "sles", "platform_version": "11.2" }')
+        instance = described_class.for_package(package)
+
+        expect(instance[:platform_version]).to eq('11')
+      end
+
       it 'ensures an iteration exists' do
         allow(File).to receive(:read).and_return('{}')
         instance = described_class.for_package(package)

data/spec/unit/project_spec.rb

@@ -73,6 +73,20 @@ module Omnibus
       end
     end
 
+    describe '#package_user' do
+      it 'returns root by default' do
+        subject.instance_variable_set(:@package_user, nil)
+        expect(subject.package_user).to eq('root')
+      end
+    end
+
+    describe '#package_group' do
+      it 'returns root by default' do
+        subject.instance_variable_set(:@package_group, nil)
+        expect(subject.package_group).to eq('root')
+      end
+    end
+
     describe '#dirty!' do
       it 'dirties the cache' do
         subject.instance_variable_set(:@dirty, nil)

metadata

@@ -1,195 +1,222 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
+  prerelease: 
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-sugar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '7.2'
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: uber-s3
   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'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: artifactory
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: fauxhai
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Omnibus is a framework for building self-installing, full-stack software
@@ -200,9 +227,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rubocop.yml
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -475,26 +502,30 @@ files:
 homepage: https://github.com/opscode/omnibus
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3276913266018303200
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Omnibus is a framework for building self-installing, full-stack software
   builds.
 test_files:

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 918d6850bef241b13e3ff6665654df11a2ae6a2b
-  data.tar.gz: 05f1d0d1328afd8c59f9662a8e400ff409de4d5c
-SHA512:
-  metadata.gz: 05c1df0c773e1dbce6e2de4e6e2019dc5a8c135c61121134af9959b6c742e6c9d3e7c7f274607bf64f724d4c4967a133af2c55ed00ac15887803e71ed66c2d05
-  data.tar.gz: a6acb3352284b375ac8359ad060eaabc75d18e0871b8c3eda968a3434d7088fbc58dab8336e2bd635b7124366782caa38a56eb75b404378956b36797ee154322