add ruby dependency

5 files changed, 12 insertions, 294 deletions

diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 0000000..b637e28
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+ruby  2.7.2
diff --git a/Berksfile b/Berksfile
deleted file mode 100644
index acac58e..0000000
--- a/Berksfile
+++ /dev/null
@@ -1,12 +0,0 @@
-source 'https://supermarket.chef.io'
-
-cookbook 'omnibus'
-
-# Uncomment to use the latest version of the Omnibus cookbook from GitHub
-# cookbook 'omnibus', github: 'chef-cookbooks/omnibus'
-
-group :integration do
-  cookbook 'apt',      '~> 2.8'
-  cookbook 'freebsd',  '~> 0.3'
-  cookbook 'yum-epel', '~> 0.6'
-end
diff --git a/Gemfile b/Gemfile
index e98e3bb..a81af78 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,21 +1,4 @@
 source 'https://rubygems.org'
 
-# Install omnibus
 gem 'omnibus', '~> 8.0'
-
-# Use Chef's software definitions. It is recommended that you write your own
-# software definitions, but you can clone/fork Chef's to get you started.
-# gem 'omnibus-software', github: 'chef/omnibus-software'
-
-# This development group is installed by default when you run `bundle install`,
-# but if you are using Omnibus in a CI-based infrastructure, you do not need
-# the Test Kitchen-based build lab. You can skip these unnecessary dependencies
-# by running `bundle install --without development` to speed up build times.
-group :development do
-  # Use Berkshelf for resolving cookbook dependencies
-  gem 'berkshelf'
-
-  # Use Test Kitchen with Vagrant for converging the build environment
-  gem 'test-kitchen'
-  gem 'kitchen-vagrant'
-end
+gem 'omnibus-software', github: 'chef/omnibus-software'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2bf92f8..83a0349 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/chef/omnibus-software.git
+  revision: a7ed951108689cad13b1ad29293bfe1a0b9e5271
+  specs:
+    omnibus-software (4.0.0)
+      omnibus (>= 8.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -20,58 +27,6 @@ GEM
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.3)
       aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt_pbkdf (1.1.0.rc2)
-    berkshelf (7.2.0)
-      chef (>= 15.7.32)
-      chef-config
-      cleanroom (~> 1.0)
-      concurrent-ruby (~> 1.0)
-      minitar (>= 0.6)
-      mixlib-archive (>= 1.1.4, < 2.0)
-      mixlib-config (>= 2.2.5)
-      mixlib-shellout (>= 2.0, < 4.0)
-      octokit (~> 4.0)
-      retryable (>= 2.0, < 4.0)
-      solve (~> 4.0)
-      thor (>= 0.20)
-    builder (3.2.4)
-    chef (16.10.17)
-      addressable
-      bcrypt_pbkdf (= 1.1.0.rc2)
-      bundler (>= 1.10)
-      chef-config (= 16.10.17)
-      chef-utils (= 16.10.17)
-      chef-vault
-      chef-zero (>= 14.0.11)
-      diff-lcs (>= 1.2.4, < 1.4.0)
-      ed25519 (~> 1.2)
-      erubis (~> 2.7)
-      ffi (>= 1.9.25)
-      ffi-libarchive (~> 1.0, >= 1.0.3)
-      ffi-yajl (~> 2.2)
-      highline (>= 1.6.9, < 3)
-      iniparse (~> 1.4)
-      inspec-core (~> 4.23)
-      license-acceptance (>= 1.0.5, < 3)
-      mixlib-archive (>= 0.4, < 2.0)
-      mixlib-authentication (>= 2.1, < 4)
-      mixlib-cli (>= 2.1.1, < 3.0)
-      mixlib-log (>= 2.0.3, < 4.0)
-      mixlib-shellout (>= 3.1.1, < 4.0)
-      net-sftp (>= 2.1.2, < 4.0)
-      net-ssh (>= 5.1, < 7)
-      net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 16.0)
-      pastel
-      plist (~> 3.2)
-      proxifier (~> 1.0)
-      syslog-logger (~> 1.6)
-      train-core (~> 3.2, >= 3.2.28)
-      train-winrm (>= 0.2.5)
-      tty-prompt (~> 0.21)
-      tty-screen (~> 0.6)
-      tty-table (~> 0.11)
-      uuidtools (>= 2.1.5, < 3.0)
     chef-cleanroom (1.0.2)
     chef-config (16.10.17)
       addressable
@@ -80,123 +35,32 @@ GEM
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-telemetry (1.0.29)
-      chef-config
-      concurrent-ruby (~> 1.0)
     chef-utils (16.10.17)
-    chef-vault (4.1.0)
-    chef-zero (15.0.4)
-      ffi-yajl (~> 2.2)
-      hashie (>= 2.0, < 5.0)
-      mixlib-log (>= 2.0, < 4.0)
-      rack (~> 2.0, >= 2.0.6)
-      uuidtools (~> 2.1)
-      webrick
     citrus (3.0.2)
-    cleanroom (1.0.0)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.3)
-    ed25519 (1.2.4)
-    erubi (1.10.0)
-    erubis (2.7.0)
-    faraday (1.3.0)
-      faraday-net_http (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday-net_http (1.0.1)
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
     ffi (1.15.0)
-    ffi-libarchive (1.0.17)
-      ffi (~> 1.0)
     ffi-yajl (2.3.4)
       libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
-    gssapi (1.3.1)
-      ffi (>= 1.0.1)
-    gyoku (1.3.1)
-      builder (>= 2.1.2)
-    hashie (4.1.0)
-    highline (2.0.3)
-    httpclient (2.8.3)
-    iniparse (1.5.0)
-    inspec-core (4.26.13)
-      addressable (~> 2.4)
-      chef-telemetry (~> 1.0)
-      faraday (>= 0.9.0, < 1.4)
-      faraday_middleware (~> 1.0)
-      hashie (>= 3.4, < 5.0)
-      license-acceptance (>= 0.2.13, < 3.0)
-      method_source (>= 0.8, < 2.0)
-      mixlib-log (~> 3.0)
-      multipart-post (~> 2.0)
-      parallel (~> 1.9)
-      parslet (>= 1.5, < 2.0)
-      pry (~> 0.13)
-      rspec (>= 3.9, < 3.11)
-      rspec-its (~> 1.2)
-      rubyzip (>= 1.2.2, < 3.0)
-      semverse (~> 3.0)
-      sslshake (~> 1.2)
-      thor (>= 0.20, < 2.0)
-      tomlrb (>= 1.2, < 2.1)
-      train-core (~> 3.0)
-      tty-prompt (~> 0.17)
-      tty-table (~> 0.10)
     iostruct (0.0.4)
     ipaddress (0.8.3)
     jmespath (1.4.0)
     json (2.5.1)
-    kitchen-vagrant (1.8.0)
-      test-kitchen (>= 1.4, < 3)
     libyajl2 (1.2.0)
-    license-acceptance (2.1.13)
-      pastel (~> 0.7)
-      tomlrb (>= 1.2, < 3.0)
-      tty-box (~> 0.6)
-      tty-prompt (~> 0.20)
     license_scout (1.2.9)
       ffi-yajl (~> 2.2)
       mixlib-shellout (>= 2.2, < 4.0)
       toml-rb (>= 1, < 3)
-    little-plugger (1.1.4)
-    logging (2.3.0)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.14)
-    method_source (1.0.0)
-    minitar (0.9)
-    mixlib-archive (1.1.7)
-      mixlib-log
-    mixlib-authentication (3.0.7)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.9)
       tomlrb
-    mixlib-install (3.12.7)
-      mixlib-shellout
-      mixlib-versioning
-      thor
     mixlib-log (3.0.9)
     mixlib-shellout (3.2.5)
       chef-utils
     mixlib-versioning (1.2.12)
-    molinillo (0.7.0)
-    multi_json (1.15.0)
     multipart-post (2.1.1)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
-    net-sftp (3.0.0)
-      net-ssh (>= 5.0.0, < 7.0.0)
     net-ssh (6.1.0)
-    net-ssh-gateway (2.0.0)
-      net-ssh (>= 4.0.0)
-    net-ssh-multi (1.2.1)
-      net-ssh (>= 2.6.5)
-      net-ssh-gateway (>= 1.2.0)
-    nori (2.6.0)
-    octokit (4.20.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
     ohai (16.10.6)
       chef-config (>= 12.8, < 17)
       chef-utils (>= 16.0, < 17)
@@ -222,10 +86,6 @@ GEM
       pedump
       ruby-progressbar (~> 1.7)
       thor (>= 0.18, < 2.0)
-    parallel (1.20.1)
-    parslet (1.8.2)
-    pastel (0.8.0)
-      tty-color (~> 0.5)
     pedump (0.6.2)
       awesome_print
       iostruct (>= 0.0.4)
@@ -233,62 +93,9 @@ GEM
       rainbow
       zhexdump (>= 0.0.2)
     plist (3.6.0)
-    proxifier (1.0.3)
-    pry (0.14.0)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
     public_suffix (4.0.6)
-    rack (2.2.3)
     rainbow (3.0.0)
-    retryable (3.0.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
-    rubyntlm (0.6.3)
-    rubyzip (2.3.0)
-    sawyer (0.8.2)
-      addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    semverse (3.0.0)
-    solve (4.0.4)
-      molinillo (~> 0.6)
-      semverse (>= 1.1, < 4.0)
-    sslshake (1.3.1)
-    strings (0.2.0)
-      strings-ansi (~> 0.2)
-      unicode-display_width (~> 1.5)
-      unicode_utils (~> 1.4)
-    strings-ansi (0.2.0)
-    syslog-logger (1.6.8)
-    test-kitchen (2.11.1)
-      bcrypt_pbkdf (~> 1.0)
-      chef-utils (>= 16.4.35)
-      ed25519 (~> 1.2)
-      license-acceptance (>= 1.0.11, < 3.0)
-      mixlib-install (~> 3.6)
-      mixlib-shellout (>= 1.2, < 4.0)
-      net-scp (>= 1.1, < 4.0)
-      net-ssh (>= 2.9, < 7.0)
-      net-ssh-gateway (>= 1.2, < 3.0)
-      thor (>= 0.19, < 2.0)
-      winrm (~> 2.0)
-      winrm-elevated (~> 1.0)
-      winrm-fs (~> 1.1)
     thor (1.1.0)
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
@@ -300,51 +107,6 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 4.0)
       net-ssh (>= 2.9, < 7.0)
-    train-winrm (0.2.12)
-      winrm (>= 2.3.6, < 3.0)
-      winrm-elevated (~> 1.2.2)
-      winrm-fs (~> 1.0)
-    tty-box (0.7.0)
-      pastel (~> 0.8)
-      strings (~> 0.2.0)
-      tty-cursor (~> 0.7)
-    tty-color (0.6.0)
-    tty-cursor (0.7.1)
-    tty-prompt (0.23.0)
-      pastel (~> 0.8)
-      tty-reader (~> 0.8)
-    tty-reader (0.9.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.8)
-      wisper (~> 2.0)
-    tty-screen (0.8.1)
-    tty-table (0.12.0)
-      pastel (~> 0.8)
-      strings (~> 0.2.0)
-      tty-screen (~> 0.8)
-    unicode-display_width (1.7.0)
-    unicode_utils (1.4.0)
-    uuidtools (2.2.0)
-    webrick (1.7.0)
-    winrm (2.3.6)
-      builder (>= 2.1.2)
-      erubi (~> 1.8)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.3)
-    winrm-elevated (1.2.3)
-      erubi (~> 1.8)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-    winrm-fs (1.3.5)
-      erubi (~> 1.8)
-      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 2.0)
-      winrm (~> 2.0)
-    wisper (2.0.1)
     wmi-lite (1.0.5)
     zhexdump (0.0.2)
 
@@ -352,10 +114,8 @@ PLATFORMS
   x86_64-darwin-19
 
 DEPENDENCIES
-  berkshelf
-  kitchen-vagrant
   omnibus (~> 8.0)
-  test-kitchen
+  omnibus-software!
 
 BUNDLED WITH
    2.2.11
diff --git a/config/software/preparation.rb b/config/software/preparation.rb
index 3b4c4b4..1f068bb 100644
--- a/config/software/preparation.rb
+++ b/config/software/preparation.rb
@@ -1,19 +1,3 @@
-#
-# Copyright 2021 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 prepare the build"
 default_version "1.0.0"
@@ -21,6 +5,8 @@ default_version "1.0.0"
 license :project_license
 skip_transitive_dependency_licensing true
 
+dependency "ruby"
+
 build do
   block do
     touch "#{install_dir}/embedded/lib/.gitkeep"