omnibus 5.6.1 → 5.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d528e6f65a006c07fab5ba8eb1274a8f8960e19f
-  data.tar.gz: 6f434ffc471faddb0fda4a0ed5cf9520ae201115
+SHA256:
+  metadata.gz: 71f2ae10f52145f7642fc97328ef8dbe9a2124aeae94d4f937285d8a0c433237
+  data.tar.gz: 96984676c415146364c059c68097247ef05c5b82198bce8fe241276509b921ff
 SHA512:
-  metadata.gz: d37ccec9688a74a78dbd847a1096daa29e75a2d41f8fa57e7ba0e5fa2ffe1afc3ba72dde544c82a35d8c98a6da1220f2863ff12fe0656715ea80c0d0d53d2189
-  data.tar.gz: 2cd1aa5e70388fde16a4e600b69decbac1c1bd5184dcf54d9530cd088c1d885ab97ace3f090127a21531efdfc5d1d16ad3be6539fce5c05076b353f96b097a00
+  metadata.gz: f5c09bce7a955067eb2e487a4e5debc44f2cbf57fb29a62cb1f331130b9170228845098f9acc615122cacac4b7e51b296c66401c64f7bbf8819681b101693ede
+  data.tar.gz: c9be0cfa0ec4fb0b59a6f1741a240a7a1ade7664e462dd6bec5eba2bbfbb967bb6d0fb6932544b6628b39864e187e1456521086b599e049a6d39c4c4bd824584

data/.expeditor/config.yml

@@ -0,0 +1,31 @@
+slack:
+  notify_channel: omnibus-rfr
+
+github:
+  maintainer_group: chef/omnibus-maintainers
+  version_tag_format: "v{{version}}"
+  minor_bump_labels:
+    - "Version: Bump Minor"
+
+rubygems:
+  - omnibus
+
+merge_actions:
+  - built_in:bump_version:
+      ignore_labels:
+        - "Version: Skip Bump"
+        - "Expeditor: Skip All"
+  - bash:.expeditor/update_version.sh:
+      only_if:
+        - built_in:bump_version
+  - built_in:update_changelog:
+      ignore_labels:
+        - "Changelog: Skip Update"
+        - "Expeditor: Skip All"
+  - built_in:build_gem:
+      only_if:
+        - built_in:bump_version
+
+promote:
+  action:
+    - built_in:publish_rubygems

data/.expeditor/update_version.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# After a PR merge, Chef Expeditor will bump the PATCH version in the VERSION file.
+# It then executes this file to update any other files/components with that new version.
+#
+
+set -evx
+
+sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" lib/omnibus/version.rb
+
+# Once Expeditor finshes executing this script, it will commit the changes and push
+# the commit as a new tag corresponding to the value in the VERSION file.

data/.github/CODEOWNERS

@@ -0,0 +1,3 @@
+# Order is important. The last matching pattern has the most precedence.
+
+* @chef/omnibus-maintainers

data/.github/ISSUE_TEMPLATE.md

@@ -22,5 +22,3 @@ The relevant output of the Omnibus build or a link to a gist of the entire build
 The verbose build output (`omnibus build <PROJECT> -l internal`) may be useful, but please link to a gist, or truncate it.
 
 --------------------------------------------------
-/cc @chef/omnibus-maintainers <- This ensures the Omnibus Maintainers team are notified to review this PR.
-

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -3,7 +3,6 @@
 Briefly describe the new feature or fix here
 
 --------------------------------------------------
-/cc @chef/omnibus-maintainers <- This ensures the Omnibus Maintainers team are notified to review this PR.
 
 #### Maintainers
 

data/.gitignore

@@ -52,6 +52,7 @@ $RECYCLE.BIN/
 /test/version_tmp/
 /tmp/
 /spec/tmp
+gem_graph.png
 
 ## Specific to RubyMotion:
 .dat*

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.2.7
+  - 2.3.4
   - 2.4.1
 bundler_args: "--jobs 7 --without docs local"
 branches:

data/CHANGELOG.md

@@ -1,5 +1,31 @@
-Omnibus CHANGELOG
-=================
+<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
+
+<!-- latest_release 5.6.6 -->
+## [v5.6.6](https://github.com/chef/omnibus/tree/v5.6.6) (2018-01-30)
+
+#### Merged Pull Requests
+- Empty commit to force release trigger [#817](https://github.com/chef/omnibus/pull/817) ([scotthain](https://github.com/scotthain))
+<!-- latest_release -->
+
+## [v5.6.5](https://github.com/chef/omnibus/tree/v5.6.5) (2018-01-30)
+
+#### Merged Pull Requests
+- Add config to allow rubygems publish and promote [#816](https://github.com/chef/omnibus/pull/816) ([scotthain](https://github.com/scotthain))
+
+## [v5.6.4](https://github.com/chef/omnibus/tree/v5.6.4) (2018-01-29)
+
+#### Merged Pull Requests
+- Update custom action and support MSIFASTINSTALL property [#815](https://github.com/chef/omnibus/pull/815) ([stuartpreston](https://github.com/stuartpreston))
+
+## [v5.6.3](https://github.com/chef/omnibus/tree/v5.6.3) (2018-01-26)
+
+#### Merged Pull Requests
+- sometimes we just need to gorram make a link [#814](https://github.com/chef/omnibus/pull/814) ([thommay](https://github.com/thommay))
+
+## [v5.6.2](https://github.com/chef/omnibus/tree/v5.6.2) (2018-01-25)
+
+#### Merged Pull Requests
+- Whitelist Foundation framework [#813](https://github.com/chef/omnibus/pull/813) ([thommay](https://github.com/thommay))
 
 v5.6.1 (June 22, 2017)
 ----------------------
@@ -773,4 +799,4 @@ BUG FIXES:
 [@ohlol]: https://github.com/ohlol
 [@schisamo]: https://github.com/schisamo
 [@sl4mmy]: https://github.com/sl4mmy
-[@totally]: https://github.com/totally
+[@totally]: https://github.com/totally

data/Gemfile

@@ -9,7 +9,7 @@ gem "license_scout", git: "https://github.com/chef/license_scout"
 gem "net-ssh", "3.2.0"
 
 group :docs do
-  gem "yard",          "~> 0.8"
+  gem "yard",          "~> 0.9"
   gem "redcarpet",     "~> 2.2.2"
   gem "github-markup", "~> 0.7"
 end

data/README.md

@@ -83,7 +83,7 @@ s3_secret_key  ENV['S3_SECRET_KEY']
 s3_bucket      ENV['S3_BUCKET']
 ```
 
-For more information, please see the [`Config` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Config).
+For more information, please see the [`Config` documentation](http://www.rubydoc.info/github/chef/omnibus/Omnibus/Config).
 
 You can tell Omnibus to load a different configuration file by passing the `--config` option to any command:
 
@@ -129,7 +129,7 @@ DSL Method        | Description
 
 By default a timestamp is appended to the build_version. You can turn this behavior off by setting `append_timestamp` to `false` in your configuration file or using `--override append_timestamp:false` at the command line.
 
-For more information, please see the [`Project` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Project).
+For more information, please see the [`Project` documentation](http://www.rubydoc.info/github/chef/omnibus/Omnibus/Project).
 
 ### Software
 

data/VERSION

@@ -0,0 +1 @@
+5.6.6

data/appveyor.yml

@@ -1,11 +1,12 @@
 version: "{build}"
 
-os: Windows Server 2012
+os: Windows Server 2012 R2
 platform:
   - x64
 
 environment:
   matrix:
+    - RUBY_VERSION: 24
     - RUBY_VERSION: 23
     - RUBY_VERSION: 22
 
@@ -21,7 +22,7 @@ install:
   - echo %PATH%
   - ruby --version
   - gem --version
-  - gem install bundler -v 1.10.6 --quiet --no-ri --no-rdoc
+  - gem install bundler -v 1.10.6 --quiet --no-ri --no-rdoc --force
   - bundler --version
   - cp C:\Ruby23-x64\DevKit\mingw\bin\bsdtar.exe C:\Ruby23-x64\DevKit\mingw\bin\tar.exe
   - appveyor DownloadFile http://curl.haxx.se/ca/cacert.pem -FileName C:\cacert.pem

data/docs/Building on Debian.md

@@ -9,7 +9,7 @@ Building a .deb
 Omnibus assumes the existence of the `fakeroot` and `dpkg-deb` command on the build system. The [omnibus cookbook](https://supermarket.getchef.com/cookbooks/omnibus) automatically handles this installation. If you are not using the Omnibus cookbook, you must install these packages manually or using another tool.
 
 ### Configurables
-A number of project configuration values are taken into consideration for building Debian packages. These options are further described in the [`Project` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Project).
+A number of project configuration values are taken into consideration for building Debian packages. These options are further described in the [`Project` documentation](http://www.rubydoc.info/github/chef/omnibus/Omnibus/Project).
 
 These values are interpolated and evaluated using Omnibus' internal DEB templates. For 99% of users, these templates should be satisfactory. If you encounter an instance where Omnibus' ERB templates do not satisfy a use case, please open an issue.
 
@@ -39,6 +39,7 @@ package :deb do
   license 'Apache 2.0'
   priority 'extra'
   section 'databases'
+  signing_passphrase 'acbd1234'
 end
 ```
 
@@ -46,14 +47,15 @@ Some DSL methods available include:
 
 | DSL Method           | Description                                 |
 | :------------------: | --------------------------------------------|
+| `signing_passphrase` | The passphrase to sign the RPM with         |
 | `vendor`             | The name of the package producer            |
 | `license`            | The default license for the package         |
 | `priority`           | The priority for the package                |
 | `section`            | The section for this package                |
 
-If you are unfamilar with any of these terms, you should just accept the defaults. For more information on the purpose of any of these configuration options, please see the DEB spec.
+If you are unfamiliar with any of these terms, you should just accept the defaults. For more information on the purpose of any of these configuration options, please see the DEB spec.
 
-For more information, please see the [`Packager::DEB` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Packager/DEB).
+For more information, please see the [`Packager::DEB` documentation](http://www.rubydoc.info/github/chef/omnibus/Omnibus/Packager/DEB).
 
 ### Notes on DEB-signing
-At this time, signing Debian packages is not supported.
+To sign an DEB, you will need a GPG keypair. You can [create your own signing key](http://www.madboa.com/geek/gpg-quickstart/) or [import an existing one](http://irtfweb.ifa.hawaii.edu/~lockhart/gpg/gpg-cs.html). Omnibus will automatically call `gpg` with arguments that assume the real name associated to the GPG key is the same as the name of the project maintainer as specified in your Omnibus config.

data/docs/Building on OSX.md

@@ -5,7 +5,7 @@ This document details the steps and configurables for building omnibus packages
 
 Building a .pkg
 ---------------
-In Mac OS X, a `.pkg` is a special file that is read by Installer.app that contains the set of instructions for installating a piece of software on a target system.
+In Mac OS X, a `.pkg` is a special file that is read by Installer.app that contains the set of instructions for installing a piece of software on a target system.
 
 ### Requirements
 By default, Omnibus does not generate pkg-related assets. To generate the pkg assets, run the Omnibus new command with the `--pkg-assets` flag:
@@ -89,4 +89,4 @@ Some DSL methods available include:
 | `window_bounds`    | The size and location of the DMG window     |
 | `pkg_position`     | The position of the pkg inside the DMG      |
 
-For more information, please see the [`Compressor::DMG` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Compressor/DMG).
+For more information, please see the [`Compressor::DMG` documentation](http://www.rubydoc.info/github/chef/omnibus/Omnibus/Compressor/DMG).

data/docs/Building on RHEL.md

@@ -27,7 +27,7 @@ The following Project values are taken into consideration when building RPMs:
 - `runtime_dependency`
 - `url`
 
-These options are further described in the [`Project` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Project).
+These options are further described in the [`Project` documentation](http://www.rubydoc.info/github/chef/omnibus/Omnibus/Project).
 
 These values are interpolated and evaluated using Omnibus' internal RPM templates. For 99% of users, these templates should be satisfactory. If you encounter an instance where Omnibus' RPM templates do not satisfy a use case, please open an issue.
 
@@ -67,9 +67,9 @@ Some DSL methods available include:
 | `priority`           | The priority for the package                |
 | `category`           | The category for this package               |
 
-If you are unfamilar with any of these terms, you should just accept the defaults. For more information on the purpose of any of these configuration options, please see the RPM spec.
+If you are unfamiliar with any of these terms, you should just accept the defaults. For more information on the purpose of any of these configuration options, please see the RPM spec.
 
-For more information, please see the [`Packager::RPM` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Packager/RPM).
+For more information, please see the [`Packager::RPM` documentation](http://www.rubydoc.info/github/chef/omnibus/Omnibus/Packager/RPM).
 
 ### Notes on RPM-signing
 To sign an RPM, you will need a GPG keypair. You can [create your own signing key](http://www.madboa.com/geek/gpg-quickstart/) or [import an existing one](http://irtfweb.ifa.hawaii.edu/~lockhart/gpg/gpg-cs.html). Omnibus automatically generates an `.rpmmacros` config file for `rpmbuild` that assumes that the real name associated to the GPG key is the same as the name of the project maintainer as specified in your Omnibus config. You can override this by creating your own `.rpmmacros` using the steps above.

data/docs/Building on Windows.md

@@ -54,4 +54,4 @@ Some DSL methods available include:
 | **`upgrade_code`** | The unique GUID for this package                |
 | `parameters`       | And arbirtary list of key-value pairs to render |
 
-For more information, please see the [`Packager::MSI` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Packager/MSI).
+For more information, please see the [`Packager::MSI` documentation](http://www.rubydoc.info/github/chef/omnibus/Omnibus/Packager/MSI).

data/lib/omnibus.rb

@@ -67,6 +67,7 @@ module Omnibus
   autoload :NetFetcher,  "omnibus/fetchers/net_fetcher"
   autoload :NullFetcher, "omnibus/fetchers/null_fetcher"
   autoload :PathFetcher, "omnibus/fetchers/path_fetcher"
+  autoload :FileFetcher, "omnibus/fetchers/file_fetcher"
 
   autoload :ArtifactoryPublisher, "omnibus/publishers/artifactory_publisher"
   autoload :NullPublisher,        "omnibus/publishers/null_publisher"

data/lib/omnibus/build_version.rb

@@ -124,12 +124,21 @@ module Omnibus
       build_tag
     end
 
-    # We'll attempt to retrive the timestamp from the Jenkin's set BUILD_ID
-    # environment variable. This will ensure platform specfic packages for the
-    # same build will share the same timestamp.
+    # We'll attempt to retrieve the timestamp from the Jenkin's set BUILD_TIMESTAMP
+    # or fall back to BUILD_ID environment variable. This will ensure platform specfic
+    # packages for the same build will share the same timestamp.
     def build_start_time
       @build_start_time ||= begin
-                              if ENV["BUILD_ID"]
+                              if ENV["BUILD_TIMESTAMP"]
+                                begin
+                                  Time.strptime(ENV["BUILD_TIMESTAMP"], "%Y-%m-%d_%H-%M-%S")
+                                rescue ArgumentError
+                                  error_message =  "BUILD_TIMESTAMP environment variable "
+                                  error_message << "should be in YYYY-MM-DD_hh-mm-ss "
+                                  error_message << "format."
+                                  raise ArgumentError, error_message
+                                end
+                              elsif ENV["BUILD_ID"]
                                 begin
                                   Time.strptime(ENV["BUILD_ID"], "%Y-%m-%d_%H-%M-%S")
                                 rescue ArgumentError

data/lib/omnibus/builder.rb

@@ -660,12 +660,16 @@ module Omnibus
       command = "link `#{source}' to `#{destination}'"
       build_commands << BuildCommand.new(command) do
         Dir.chdir(software.project_dir) do
-          files = FileSyncer.glob(source)
-          if files.empty?
-            log.warn(log_key) { "no matched files for glob #{command}" }
+          if options.delete(:unchecked)
+            FileUtils.ln_s(source, destination, options)
           else
-            files.each do |file|
-              FileUtils.ln_s(file, destination, options)
+            files = FileSyncer.glob(source)
+            if files.empty?
+              log.warn(log_key) { "no matched files for glob #{command}" }
+            else
+              files.each do |file|
+                FileUtils.ln_s(file, destination, options)
+              end
             end
           end
         end
@@ -928,6 +932,7 @@ module Omnibus
       original = ENV.to_hash
 
       ENV.delete("_ORIGINAL_GEM_PATH")
+      ENV.delete_if { |k, _| k.start_with?("BUNDLER_") }
       ENV.delete_if { |k, _| k.start_with?("BUNDLE_") }
       ENV.delete_if { |k, _| k.start_with?("GEM_") }
       ENV.delete_if { |k, _| k.start_with?("RUBY") }

data/lib/omnibus/config.rb

@@ -101,9 +101,9 @@ module Omnibus
     # @return [String]
     default(:base_dir) do
       if Ohai["platform"] == "windows"
-        "C:/omnibus-ruby"
+        File.join(*["C:/omnibus-ruby", cache_suffix].compact)
       else
-        "/var/cache/omnibus"
+        File.join(*["/var/cache/omnibus", cache_suffix].compact)
       end
     end
 
@@ -113,6 +113,12 @@ module Omnibus
     # @return [String]
     default(:cache_dir) { File.join(base_dir, "cache") }
 
+    # The suffix added (typically the software name) to create a wholly
+    # separate base cache directory for the software.
+    #
+    # @return [String]
+    default(:cache_suffix, nil)
+
     # The absolute path to the directory on the virtual machine where
     # git caching will occur and software's will be progressively cached.
     #
@@ -277,7 +283,7 @@ module Omnibus
 
     # The S3 access key to use with S3 caching.
     #
-    # @return [String]
+    # @return [String, nil]
     default(:s3_access_key) do
       if s3_profile
         nil
@@ -299,7 +305,7 @@ module Omnibus
 
     # The AWS credentials profile to use with S3 caching.
     #
-    # @return [String]
+    # @return [String, nil]
     default(:s3_profile, nil)
 
     # The region of the S3 bucket you want to cache software artifacts in.
@@ -315,6 +321,11 @@ module Omnibus
     # @return [String, nil]
     default(:s3_endpoint, nil)
 
+    # Use path style URLs instead of subdomains for S3 URLs
+    #
+    # @return [true, false]
+    default(:s3_force_path_style, false)
+
     # Enable or disable S3 Accelerate support
     #
     # @return [true, false]
@@ -371,6 +382,14 @@ module Omnibus
       raise MissingRequiredAttribute.new(self, :artifactory_base_path, "'com/mycompany'")
     end
 
+    # Directory pattern for the Artifactory publisher.
+    # Interpolation of metadata keys is supported.
+    #
+    # @example '%{platform}/%{platform_version}/%{arch}/%{basename}'
+    #
+    # @return [String]
+    default(:artifactory_publish_pattern, "%{name}/%{version}/%{platform}/%{platform_version}/%{basename}")
+
     # The path on disk to an SSL pem file to sign requests with.
     #
     # @return [String, nil]
@@ -411,9 +430,9 @@ module Omnibus
 
     # The S3 access key to use for S3 artifact release.
     #
-    # @return [String]
+    # @return [String, nil]
     default(:publish_s3_access_key) do
-      if s3_profile
+      if publish_s3_profile
         nil
       else
         raise MissingRequiredAttribute.new(self, :publish_s3_access_key, "'ABCD1234'")
@@ -422,15 +441,28 @@ module Omnibus
 
     # The S3 secret key to use for S3 artifact release
     #
-    # @return [String]
+    # @return [String, nil]
     default(:publish_s3_secret_key) do
-      if s3_profile
+      if publish_s3_profile
         nil
       else
         raise MissingRequiredAttribute.new(self, :publish_s3_secret_key, "'EFGH5678'")
       end
     end
 
+    # The AWS credentials profile to use with S3 publisher.
+    #
+    # @return [String, nil]
+    default(:publish_s3_profile, nil)
+
+    # Directory pattern for the S3 publisher.
+    # Interpolation of metadata keys is supported.
+    #
+    # @example '%{platform}/%{platform_version}/%{arch}/%{basename}'
+    #
+    # @return [String]
+    default(:s3_publish_pattern, "%{platform}/%{platform_version}/%{arch}/%{basename}")
+
     # --------------------------------------------------
     # @!endgroup
     #