omnibus 7.0.13 → 8.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8e292781fd46583f4195ce255dbec39378b8d992b3e631d252c5b910c0ddb39
-  data.tar.gz: aea8d5eadd707ea46c044b6daba1ccbfe0e8e773a11a6fe370f5a26889e37aab
+  metadata.gz: af309d0053f4ea4f740cbf3268c4e4d0087e014ab9abfaca3899c279b41a7a88
+  data.tar.gz: f7c125f7f25811d2b74a7aa03b7065594e4b887f520ff7432e7409b7855ab898
 SHA512:
-  metadata.gz: 7216812fbdc500947bbdc3f9c8143304937e6abbcc063b4afb404b2f1971018239fe3125327fbcd6622ca082736fe729f28f2fafbaf62d4d4e706f62259fcd91
-  data.tar.gz: f93962e1f2d9c90e67c4c549937573fb9812c19fddc5f2ad09219214892e2f0b3818d2d206d6eb5138962b2697679ff785a831a41f551f967084de9f1c9e7b81
+  metadata.gz: 1227ee4ad5223279042ed600811c2348f10d78abe08859b27a4552a4dd81bdd554842b007ed43ee7aa79403cc9512117733a5db50b9f16dd104d0033a63ef45b
+  data.tar.gz: 8683b174eeb40459b16bf337c7d1e0421b9642172e34e4a61d93348296d45b0fcf9d1272971ac43cdfeee4eb899659c8856ffc2fc0cbc84138b57f481e231107

data/Gemfile

@@ -11,10 +11,5 @@ end
 group :debug do
   gem "pry"
   gem "pry-byebug"
-  gem "pry-stack_explorer", "~> 0.4.0" # 0.4 allows us to still test Ruby 2.5
-end
-
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5")
-  gem "ohai", "<15"
-  gem "activesupport", "~> 5.0"
+  gem "pry-stack_explorer"
 end

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](http://img.shields.io/gem/v/omnibus.svg)][gem]
 [![Build Status](https://badge.buildkite.com/446fd6049a9a5eeab50112aba117d3b7670ec085acb91f78dd.svg?branch=master)](https://buildkite.com/chef-oss/chef-omnibus-master-verify)
-[![AppVeyor Build Status](http://img.shields.io/appveyor/ci/chef/omnibus.svg?label=AppVeyor)][appveyor]
 
 **Umbrella Project**: [Chef Foundation](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-foundation.md)
 
@@ -16,7 +15,6 @@ Easily create full-stack installers for your project across a variety of platfor
 
 Seth Chisamore and Christopher Maier of CHEF gave an introductory talk on Omnibus at ChefConf 2013, entitled **Eat the Whole Bowl: Building a Full-Stack Installer with Omnibus**:
 
-- [Video](http://www.youtube.com/watch?v=q8iJAntXCNY)
 - [Slides](https://speakerdeck.com/schisamo/eat-the-whole-bowl-building-a-full-stack-installer-with-omnibus)
 
 This project is managed by the CHEF Release Engineering team. For more information on the Release Engineering team's contribution, triage, and release process, please consult the [CHEF Release Engineering OSS Management Guide](https://docs.google.com/a/opscode.com/document/d/1oJB0vZb_3bl7_ZU2YMDBkMFdL-EWplW1BJv_FXTUOzg/edit).
@@ -25,8 +23,7 @@ This project is managed by the CHEF Release Engineering team. For more informati
 
 Omnibus is designed to run with a minimal set of prerequisites. You will need the following:
 
-- Ruby 2.4+
-- Bundler
+- Ruby 2.6+
 
 ## Get Started
 
@@ -46,10 +43,11 @@ $ omnibus new $MY_PROJECT_NAME
 
 This will generate a complete project skeleton in the directory `omnibus-$MY_PROJECT_NAME`
 
+By default this will make a directory called `omnibus-$MY_PROJECT_NAME` assuming you're keeping your omnibus config separate from the repo. However, keeping it *in* your repo is a common practice, so feel to rename this directory to `omnibus` and place it in the top level of your projects source repo.
+
 ```bash
 $ cd omnibus-$MY_PROJECT_NAME
 $ bundle install --binstubs
-$ bin/omnibus build $MY_PROJECT_NAME
 ```
 
 More details can be found in the generated project's README file.
@@ -143,7 +141,7 @@ DSL Method        | Description
 `package`         | Invoke a packager-specific DSL
 `compress`        | Invoke a compressor-specific DSL
 
-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.
+By default a timestamp is appended to the build_version. You can turn this behavior off by setting `append_timestamp` to `false` in your `omnibus.rb` or using `--override append_timestamp:false` at the command line.
 
 For more information, please see the [`Project` documentation](http://www.rubydoc.info/github/chef/omnibus/Omnibus/Project).
 
@@ -267,6 +265,40 @@ $PWD/config/software/foo.rb
 
 The first instance of `foo.rb` that is encountered will be used. Please note that **local** (vendored) softare definitions take precedence!
 
+## Building
+
+Once you've created your package and software definitions you can build with:
+
+```shell
+./bin/omnibus build $MY_PACKAGE_NAME
+```
+
+However there are several caveats to be aware of:
+
+1. You will almost certainly want to uncomment the `base_dir` in `omnibus.rb`,
+or at the very least change `cache_dir` and `build_dir` as otherwise it'll try
+to use `/var/cache/omnibus` and `/opt/$MY_PROJECT_NAME`, requiring root.
+1. The default configuration created for you references a lot of things
+that are in the default config that come from the `omnibus-software` gem.
+So you want to use those you'll need to either uncomment it in the `Gemfile`,
+or fork it, and then reference your own
+1. If this is a ruby project and you want binstubs in `/opt/$project/bin`, you
+will either need to use [appbundler](https://github.com/chef/appbundler), or
+you will need to have a post install step to create those binstubs.
+    - Side note, appbundler requires that you include your Gemfile and gemspec
+      in your gem.
+    - Also, needs to be in your Gemfile for you to use it, as it also must
+      be in the resulting gem.
+1. If you specify an override of the version of the `ruby`, you will also need
+to override `rubygems` and `bundler` to match the versions in that version of
+`ruby` or you'll get failures around bundler version mismatches.
+
+The build command above will of course build on your local host thus being
+specific to the OS and base system you are on. But the skeleten setup by
+`omnibus new` already setup kitchen for you so that it's easy to build for
+a variety of OSes, See the `README.md` in your generated omnibus directory
+for details.
+
 ## Version Manifest
 
 Git-based software definitions may specify branches as their default_version. In this case, the exact git revision to use will be determined at build-time unless a project override (see below) or external version manifest is used. To generate a version manifest use the `omnibus manifest` command:

data/bin/omnibus

@@ -4,7 +4,7 @@
 # https://twitter.com/mitchellh/status/283014103189053442
 Signal.trap("INT") { exit 1 }
 
-$:.push File.expand_path("../../lib", __FILE__)
+$:.push File.expand_path("../lib", __dir__)
 $stdout.sync = true
 
 require "omnibus/cli"

data/lib/omnibus.rb

@@ -17,7 +17,7 @@
 require "omnibus/core_extensions"
 
 require "cleanroom"
-require "pathname"
+require "pathname" unless defined?(Pathname)
 
 require "omnibus/digestable"
 require "omnibus/exceptions"
@@ -208,7 +208,7 @@ module Omnibus
     # @return [Pathname]
     #
     def source_root
-      @source_root ||= Pathname.new(File.expand_path("../..", __FILE__))
+      @source_root ||= Pathname.new(File.expand_path("..", __dir__))
     end
 
     #

data/lib/omnibus/build_version.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "time"
+require "time" unless defined?(Time.zone_offset)
 
 module Omnibus
   # Provides methods for generating Omnibus project build version

data/lib/omnibus/build_version_dsl.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "time"
+require "time" unless defined?(Time.zone_offset)
 
 module Omnibus
   class BuildVersionDSL
@@ -136,12 +136,10 @@ module Omnibus
       return false if build_info.nil?
 
       build_info.split(".").any? do |part|
-        begin
-          Time.strptime(part, Omnibus::BuildVersion::TIMESTAMP_FORMAT)
-          true
-        rescue ArgumentError
-          false
-        end
+        Time.strptime(part, Omnibus::BuildVersion::TIMESTAMP_FORMAT)
+        true
+      rescue ArgumentError
+        false
       end
     end
 

data/lib/omnibus/builder.rb

@@ -14,10 +14,10 @@
 # limitations under the License.
 #
 
-require "fileutils"
-require "mixlib/shellout"
-require "ostruct"
-require "pathname"
+require "fileutils" unless defined?(FileUtils)
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+require "ostruct" unless defined?(OpenStruct)
+require "pathname" unless defined?(Pathname)
 require "omnibus/whitelist"
 
 module Omnibus
@@ -373,11 +373,16 @@ module Omnibus
     # @param (see #command)
     # @return (see #command)
     #
-    def appbundle(software_name, lockdir: nil, gem: nil, without: nil, extra_bin_files: nil , **options)
+    def appbundle(software_name, options = {})
       build_commands << BuildCommand.new("appbundle `#{software_name}'") do
         bin_dir            = "#{install_dir}/bin"
         appbundler_bin     = embedded_bin("appbundler")
 
+        lockdir = options.delete(:lockdir)
+        gem = options.delete(:gem)
+        without = options.delete(:without)
+        extra_bin_files = options.delete(:extra_bin_files)
+
         lockdir ||=
           begin
             app_software = project.softwares.find do |p|
@@ -535,7 +540,7 @@ module Omnibus
     def mkdir(directory, options = {})
       build_commands << BuildCommand.new("mkdir `#{directory}'") do
         Dir.chdir(software.project_dir) do
-          FileUtils.mkdir_p(directory, options)
+          FileUtils.mkdir_p(directory, **options)
         end
       end
     end
@@ -557,7 +562,7 @@ module Omnibus
           parent = File.dirname(file)
           FileUtils.mkdir_p(parent) unless File.directory?(parent)
 
-          FileUtils.touch(file, options)
+          FileUtils.touch(file, **options)
         end
       end
     end
@@ -578,7 +583,7 @@ module Omnibus
       build_commands << BuildCommand.new("delete `#{path}'") do
         Dir.chdir(software.project_dir) do
           FileSyncer.glob(path).each do |file|
-            FileUtils.rm_rf(file, options)
+            FileUtils.rm_rf(file, **options)
           end
         end
       end
@@ -629,7 +634,7 @@ module Omnibus
             log.warn(log_key) { "no matched files for glob #{command}" }
           else
             files.each do |file|
-              FileUtils.cp_r(file, destination, options)
+              FileUtils.cp_r(file, destination, **options)
             end
           end
         end
@@ -658,7 +663,7 @@ module Omnibus
             log.warn(log_key) { "no matched files for glob #{command}" }
           else
             files.each do |file|
-              FileUtils.mv(file, destination, options)
+              FileUtils.mv(file, destination, **options)
             end
           end
         end
@@ -690,7 +695,7 @@ module Omnibus
               log.warn(log_key) { "no matched files for glob #{command}" }
             else
               files.each do |file|
-                FileUtils.ln_s(file, destination, options)
+                FileUtils.ln_s(file, destination, **options)
               end
             end
           end

data/lib/omnibus/cleaner.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "thor"
+require "thor" unless defined?(Thor)
 
 module Omnibus
   class Cleaner < Thor::Group

data/lib/omnibus/cli.rb

@@ -14,9 +14,9 @@
 # limitations under the License.
 #
 
-require "thor"
+require "thor" unless defined?(Thor)
 require "omnibus"
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module Omnibus
   class CLI < Command::Base

data/lib/omnibus/cli/changelog.rb

@@ -18,7 +18,7 @@ require "omnibus/changelog"
 require "omnibus/changelog_printer"
 require "omnibus/manifest_diff"
 require "omnibus/semantic_version"
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module Omnibus
   class Command::ChangeLog < Command::Base

data/lib/omnibus/compressors/base.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 module Omnibus
   class Compressor::Base < Packager::Base

data/lib/omnibus/compressors/dmg.rb

@@ -259,8 +259,11 @@ module Omnibus
           sync
           hdiutil unmount "#{@device}"
           # Give some time to the system so unmount dmg
-          sleep 5
-          hdiutil detach "#{@device}" &&  \
+          ATTEMPTS=1
+          until [ $ATTEMPTS -eq 6 ] || hdiutil detach "#{@device}"; do
+            sleep 10
+            echo Attempt number $(( ATTEMPTS++ ))
+          done
           hdiutil convert \\
             "#{writable_dmg}" \\
             -format UDZO \\

data/lib/omnibus/compressors/tgz.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require "rubygems/package"
-require "zlib"
+require "rubygems/package" unless defined?(Gem::Package)
+require "zlib" unless defined?(Zlib)
 
 module Omnibus
   class Compressor::TGZ < Compressor::Base

data/lib/omnibus/config.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "singleton"
+require "singleton" unless defined?(Singleton)
 
 module Omnibus
   class Config

data/lib/omnibus/core_extensions/open_uri.rb

@@ -1,4 +1,4 @@
-require "open-uri"
+require "open-uri" unless defined?(OpenURI)
 
 module OpenURI
   class << self

data/lib/omnibus/digestable.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require "openssl"
-require "pathname"
+require "openssl" unless defined?(OpenSSL)
+require "pathname" unless defined?(Pathname)
 require "omnibus/logging"
 
 module Omnibus

data/lib/omnibus/download_helpers.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "open-uri"
+require "open-uri" unless defined?(OpenURI)
 require "ruby-progressbar"
 
 module Omnibus
@@ -77,7 +77,11 @@ module Omnibus
           end
         end
 
-        file = open(from_url, options)
+        if RUBY_VERSION.to_f < 2.7
+          file = open(from_url, options)
+        else
+          file = URI.open(from_url, options)
+        end
         # This is a temporary file. Close and flush it before attempting to copy
         # it over.
         file.close

data/lib/omnibus/fetchers/file_fetcher.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 module Omnibus
   class FileFetcher < Fetcher

data/lib/omnibus/fetchers/net_fetcher.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 require "omnibus/download_helpers"
 
 module Omnibus

data/lib/omnibus/fetchers/path_fetcher.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 module Omnibus
   class PathFetcher < Fetcher

data/lib/omnibus/file_syncer.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 module Omnibus
   module FileSyncer

data/lib/omnibus/generator.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "thor"
+require "thor" unless defined?(Thor)
 
 module Omnibus
   class Generator < Thor::Group
@@ -73,7 +73,7 @@ module Omnibus
     class << self
       # Set the source root for Thor
       def source_root
-        File.expand_path("../generator_files", __FILE__)
+        File.expand_path("generator_files", __dir__)
       end
     end
 

data/lib/omnibus/generator_files/README.md.erb

@@ -114,7 +114,8 @@ section:
 ```shell
 $ bin/kitchen login ubuntu-1804
 [vagrant@ubuntu...] $ .  load-omnibus-toolchain.sh
-[vagrant@ubuntu...] $ cd <%= config[:name] %>
+[vagrant@ubuntu...] $ [ -e .bundle ] && sudo chown -R vagrant:vagrant .bundle
+[vagrant@ubuntu...] $ cd <%= config[:name] %>   # or 'cd <%= config[:name] %>/omnibus' if your omnibus project is embedded in your main project
 [vagrant@ubuntu...] $ bundle install
 [vagrant@ubuntu...] $ bin/omnibus build <%= config[:name] %>
 ```