omnibus 6.0.25 → 6.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e008e08071c850bbd9e8021ce0eb22eb8415aaba92060de5380b399de8841fe
-  data.tar.gz: 0260e33da4bf4a91ad49e96d8e3c0f08f9f233b8e4eb58b40208c9e8e126b34b
+  metadata.gz: ed65ad83fa1ddd7ebc9be5254d38054d3de93cc8ba6f681538a2d3bd25356b46
+  data.tar.gz: c848e02cedec959d16e647abb94fe08fb708550c1325d49a0ad3af6557181e1e
 SHA512:
-  metadata.gz: d8b30760147a6adf9919e3fce9e34c21d7b5045f6a646f02b4c3ad7f0e35f71ee8589697618088d938e701ead1336c4f93c02a96649ad8133d5d489b098d9ca9
-  data.tar.gz: 1a72c335607d61739ca95d8954f5b745fa990329e1cc3459460c479273d1345c8ca1c70197f1fd8ae4b5c361163108ebf1dabef69317a050d5f7b6ebe7a67664
+  metadata.gz: d967c3cd4a784d1839cae80a2aa00efd06fe8f6a757ad372f4d0839f332c4c3e65d43d199dc8136fc5827791e543a82dfc2bb2ad7dade918647286b0ee153853
+  data.tar.gz: d5a38d81451a488fde804af1d19f8dc8515b4d3b087d12b7eb305b528e8943d88e5e6e5255940c771a78b795d028b1a406d1cef0b68a006665228b6bfdb0383a

data/Gemfile

@@ -14,5 +14,6 @@ group :debug do
   gem "pry-stack_explorer"
 end
 
-# this brings in several fixes to rspec-json_expectations that are causing test failures
-gem "rspec-json_expectations", git: "https://github.com/tas50/rspec-json_expectations.git"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5")
+  gem "ohai", "<15"
+end

data/README.md

@@ -1,7 +1,7 @@
 # ![Omnibus Icon](lib/omnibus/assets/README-logo.png) Omnibus
 
 [![Gem Version](http://img.shields.io/gem/v/omnibus.svg)][gem]
-[![Travis Build Status](http://img.shields.io/travis/chef/omnibus.svg?label=Travis%20CI)][travis]
+[![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]
 
 Easily create full-stack installers for your project across a variety of platforms.

data/lib/omnibus/builder.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2018, Chef Software Inc.
+# Copyright 2012-2019, Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -372,7 +372,7 @@ module Omnibus
     # @param (see #command)
     # @return (see #command)
     #
-    def appbundle(software_name, lockdir: nil, gem: nil, without: nil, **options)
+    def appbundle(software_name, lockdir: nil, gem: nil, without: nil, extra_bin_files: nil , **options)
       build_commands << BuildCommand.new("appbundle `#{software_name}'") do
         bin_dir            = "#{install_dir}/bin"
         appbundler_bin     = embedded_bin("appbundler")
@@ -400,6 +400,8 @@ module Omnibus
         # get `--without` support, you will likely wind up going down a sad path).
         command << [ "--without", without.join(",") ] unless without.nil?
 
+        command << [ "--extra-bin-files", extra_bin_files.join(",") ] unless extra_bin_files.nil? || extra_bin_files.empty?
+
         # Ensure the main bin dir exists
         FileUtils.mkdir_p(bin_dir)
 

data/lib/omnibus/generator.rb

@@ -90,6 +90,7 @@ module Omnibus
 
     def create_example_software_definitions
       template("config/software/zlib.rb.erb", "#{target}/config/software/#{name}-zlib.rb", template_options)
+      template("config/software/preparation.rb.erb", "#{target}/config/software/preparation.rb", template_options)
     end
 
     def create_kitchen_files

data/lib/omnibus/generator_files/Gemfile.erb

@@ -16,6 +16,6 @@ group :development do
   gem 'berkshelf'
 
   # Use Test Kitchen with Vagrant for converging the build environment
-  gem 'test-kitchen',
-  gem 'kitchen-vagrant',
+  gem 'test-kitchen'
+  gem 'kitchen-vagrant'
 end

data/lib/omnibus/generator_files/config/projects/project.rb.erb

@@ -21,8 +21,5 @@ dependency "preparation"
 # <%= config[:name] %> dependencies/components
 # dependency "somedep"
 
-# Version manifest file
-dependency "version-manifest"
-
 exclude "**/.git"
 exclude "**/bundler/git"

data/lib/omnibus/generator_files/config/software/preparation.rb.erb

@@ -0,0 +1,30 @@
+#
+# Copyright <%= Time.now.year %> YOUR NAME
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name "preparation"
+description "the steps required to preprare the build"
+default_version "1.0.0"
+
+license :project_license
+skip_transitive_dependency_licensing true
+
+build do
+  block do
+    touch "#{install_dir}/embedded/lib/.gitkeep"
+    touch "#{install_dir}/embedded/bin/.gitkeep"
+    touch "#{install_dir}/bin/.gitkeep"
+  end
+end

data/lib/omnibus/packagers/rpm.rb

@@ -630,6 +630,8 @@ module Omnibus
       case Ohai["kernel"]["machine"]
       when "i686"
         "i386"
+      when "armv7l" # raspberry pi 3 CentOS
+        "armv7hl"
       when "armv6l"
         if Ohai["platform"] == "pidora"
           "armv6hl"

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "6.0.25".freeze
+  VERSION = "6.0.30".freeze
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+Encoding.default_external = Encoding::UTF_8
+
 require "rspec"
 require "rspec/its"
 require "rspec/json_expectations"
@@ -16,6 +18,10 @@ def mac?
 end
 
 RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.max_formatted_output_length = 1000
+  end
+
   # Custom matchers and shared examples
   require_relative "support/examples"
   require_relative "support/matchers"

data/spec/unit/generator_spec.rb

@@ -36,6 +36,7 @@ module Omnibus
           omnibus-name/config/projects/name.rb
           omnibus-name/config/software
           omnibus-name/config/software/name-zlib.rb
+          omnibus-name/config/software/preparation.rb
           omnibus-name/omnibus.rb
           omnibus-name/package-scripts
           omnibus-name/package-scripts/name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 6.0.25
+  version: 6.0.30
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -368,6 +368,7 @@ files:
 - lib/omnibus/generator_files/Gemfile.erb
 - lib/omnibus/generator_files/README.md.erb
 - lib/omnibus/generator_files/config/projects/project.rb.erb
+- lib/omnibus/generator_files/config/software/preparation.rb.erb
 - lib/omnibus/generator_files/config/software/zlib.rb.erb
 - lib/omnibus/generator_files/gitignore.erb
 - lib/omnibus/generator_files/omnibus.rb.erb