appbundle-updater 1.0.36 → 19.0.4.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0171110448530a18147369da16dce8eb93e307f41612ec64ff6b6bb9afeaacb2'
-  data.tar.gz: 51007a24f2ddc9acf07ada87d8bc1569957793a379a873bd86c8b4b8e5834c18
+  metadata.gz: 610edf01709d93520dbd4e4bc64fd796b23c045f53961fb02a07778729406d23
+  data.tar.gz: 24b6a2a9f05f4b30a5f1f42e5a400e278ca37b8977d3ddf70df22f0f6b9145ae
 SHA512:
-  metadata.gz: c2988440b0f9b6f59749ed7fc26e2064945a23de755496d200bbb091915d846f2281c68e168022deec0a2aea129f1756b84c31af626f5a481e24eee25edd15a0
-  data.tar.gz: 27c221bf29327bbab60560bf79be31eddce5b7717a19d1fdaece80c62741eed1e974fbd8e49d55e94eb0ccb1b00ae82641c2729f81ed7d0b53ff0e97ae6d550c
+  metadata.gz: 727dcd147949ee9e311fed28e69dbaa489c96bace756ab3ac9c4bc36d20cb61fac60959dfc35afbf7f23b0e389b789c65efd793a8d9b301546d4764b134cd090
+  data.tar.gz: ebf89ef3ce334717e770ae559779e93b3cac4d0373e84d1f33396df2587881bdfa784b29c7923ac1e8a0683292aef12769b061ef005545c5f0ffa97ad29192d9

data/CHANGELOG.md

@@ -1,32 +1,50 @@
 # appbundle-updater Change Log
 
-<!-- latest_release 1.0.36 -->
-## [v1.0.36](https://github.com/chef/appbundle-updater/tree/v1.0.36) (2022-02-09)
+<!-- latest_release 19.0.4 -->
+## [v19.0.4](https://github.com/chef/appbundle-updater/tree/v19.0.4) (2025-06-17)
 
 #### Merged Pull Requests
-- Use rake install:local [#100](https://github.com/chef/appbundle-updater/pull/100) ([lamont-granquist](https://github.com/lamont-granquist))
+- Use bundler binary from ruby package instead of from vendor/gems as it&#39;s no longer there [#120](https://github.com/chef/appbundle-updater/pull/120) ([neha-p6](https://github.com/neha-p6))
 <!-- latest_release -->
 
-<!-- release_rollup since=1.0.23 -->
+<!-- release_rollup since=19.0.2.rc.1 -->
 ### Changes not yet released to rubygems.org
 
 #### Merged Pull Requests
-- Use rake install:local [#100](https://github.com/chef/appbundle-updater/pull/100) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 1.0.36 -->
-- Update chefstyle requirement from 2.1.3 to 2.2.0 [#98](https://github.com/chef/appbundle-updater/pull/98) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 1.0.35 -->
-- Need a version bump for release [#97](https://github.com/chef/appbundle-updater/pull/97) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 1.0.34 -->
-- remove bundle exec from rake install [#96](https://github.com/chef/appbundle-updater/pull/96) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 1.0.33 -->
-- Update chefstyle requirement from 2.1.1 to 2.1.3 [#95](https://github.com/chef/appbundle-updater/pull/95) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 1.0.32 -->
-- Update chefstyle requirement from 2.1.0 to 2.1.1 [#93](https://github.com/chef/appbundle-updater/pull/93) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 1.0.31 -->
-- Update chefstyle requirement from 2.0.9 to 2.1.0 [#92](https://github.com/chef/appbundle-updater/pull/92) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 1.0.30 -->
-- Update chefstyle requirement from 2.0.7 to 2.0.9 [#90](https://github.com/chef/appbundle-updater/pull/90) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 1.0.29 -->
-- Update chefstyle requirement from 2.0.5 to 2.0.7 [#87](https://github.com/chef/appbundle-updater/pull/87) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 1.0.28 -->
-- Update chefstyle requirement from 1.7.5 to 2.0.5 [#85](https://github.com/chef/appbundle-updater/pull/85) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 1.0.27 -->
-- Update parallel requirement from &lt; 1.20 to &lt; 1.21 [#81](https://github.com/chef/appbundle-updater/pull/81) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 1.0.26 -->
-- Upgrade to GitHub-native Dependabot [#80](https://github.com/chef/appbundle-updater/pull/80) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 1.0.25 -->
-- Update chefstyle requirement from 1.7.2 to 1.7.5 [#79](https://github.com/chef/appbundle-updater/pull/79) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 1.0.24 -->
+- Use bundler binary from ruby package instead of from vendor/gems as it&#39;s no longer there [#120](https://github.com/chef/appbundle-updater/pull/120) ([neha-p6](https://github.com/neha-p6)) <!-- 19.0.4 -->
+- Skip inspec-core-bin for 19 [#117](https://github.com/chef/appbundle-updater/pull/117) ([tpowell-progress](https://github.com/tpowell-progress)) <!-- 19.0.3 -->
+- Delimit rc and version no as rc.1 in gemspec as using &#39;rc1&#39; has not pushed the gem to artifactory [#116](https://github.com/chef/appbundle-updater/pull/116) ([neha-p6](https://github.com/neha-p6)) <!-- 19.0.2 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v19.0.2.rc.1](https://github.com/chef/appbundle-updater/tree/v19.0.2.rc.1) (2025-02-11)
+
+#### Merged Pull Requests
+- update codeowners to include omnibus team &amp; some cleanup [#103](https://github.com/chef/appbundle-updater/pull/103) ([vkarve-chef](https://github.com/vkarve-chef))
+- update ruby images to 3.0 and 3.1 [#108](https://github.com/chef/appbundle-updater/pull/108) ([rishichawda](https://github.com/rishichawda))
+- add release branches [#110](https://github.com/chef/appbundle-updater/pull/110) ([rishichawda](https://github.com/rishichawda))
+- use habitat build instead of omnibus [#107](https://github.com/chef/appbundle-updater/pull/107) ([rishichawda](https://github.com/rishichawda))
+- Add rc tag to the gem from gemspec instead of from VERSION file [#113](https://github.com/chef/appbundle-updater/pull/113) ([neha-p6](https://github.com/neha-p6))
+- Add rc tag to the gem from gemspec instead of from VERSION file [#115](https://github.com/chef/appbundle-updater/pull/115) ([neha-p6](https://github.com/neha-p6))
+<!-- latest_stable_release -->
+
+## [v1.0.36](https://github.com/chef/appbundle-updater/tree/v1.0.36) (2022-02-09)
+
+#### Merged Pull Requests
+- Update chefstyle requirement from 1.7.2 to 1.7.5 [#79](https://github.com/chef/appbundle-updater/pull/79) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot]))
+- Upgrade to GitHub-native Dependabot [#80](https://github.com/chef/appbundle-updater/pull/80) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot]))
+- Update parallel requirement from &lt; 1.20 to &lt; 1.21 [#81](https://github.com/chef/appbundle-updater/pull/81) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Update chefstyle requirement from 1.7.5 to 2.0.5 [#85](https://github.com/chef/appbundle-updater/pull/85) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Update chefstyle requirement from 2.0.5 to 2.0.7 [#87](https://github.com/chef/appbundle-updater/pull/87) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Update chefstyle requirement from 2.0.7 to 2.0.9 [#90](https://github.com/chef/appbundle-updater/pull/90) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Update chefstyle requirement from 2.0.9 to 2.1.0 [#92](https://github.com/chef/appbundle-updater/pull/92) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Update chefstyle requirement from 2.1.0 to 2.1.1 [#93](https://github.com/chef/appbundle-updater/pull/93) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Update chefstyle requirement from 2.1.1 to 2.1.3 [#95](https://github.com/chef/appbundle-updater/pull/95) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- remove bundle exec from rake install [#96](https://github.com/chef/appbundle-updater/pull/96) ([lamont-granquist](https://github.com/lamont-granquist))
+- Need a version bump for release [#97](https://github.com/chef/appbundle-updater/pull/97) ([lamont-granquist](https://github.com/lamont-granquist))
+- Update chefstyle requirement from 2.1.3 to 2.2.0 [#98](https://github.com/chef/appbundle-updater/pull/98) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Use rake install:local [#100](https://github.com/chef/appbundle-updater/pull/100) ([lamont-granquist](https://github.com/lamont-granquist))
+
 ## [v1.0.23](https://github.com/chef/appbundle-updater/tree/v1.0.23) (2021-03-16)
 
 #### Merged Pull Requests
@@ -45,7 +63,6 @@
 - Update chefstyle requirement from 1.6.2 to 1.7.1 [#74](https://github.com/chef/appbundle-updater/pull/74) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot]))
 - Update chefstyle requirement from 1.7.1 to 1.7.2 [#75](https://github.com/chef/appbundle-updater/pull/75) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot]))
 - Add support for post bundle install hook [#76](https://github.com/chef/appbundle-updater/pull/76) ([lamont-granquist](https://github.com/lamont-granquist))
-<!-- latest_stable_release -->
 
 ## [v1.0.8](https://github.com/chef/appbundle-updater/tree/v1.0.8) (2020-08-12)
 

data/VERSION

@@ -1 +1 @@
-1.0.36
+19.0.4

data/appbundle-updater.gemspec

@@ -4,7 +4,7 @@ require "appbundle_updater/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "appbundle-updater"
-  spec.version       = AppbundleUpdater::VERSION
+  spec.version       = "#{AppbundleUpdater::VERSION}.rc.1"
   spec.authors       = ["lamont-granquist"]
   spec.email         = ["lamont@chef.io"]
   spec.description   = %q{Updates appbundled apps in Chef's omnibus packages}

data/bin/appbundle-updater

@@ -24,22 +24,43 @@ require "rubygems/package"
 require "zlib"
 require "tempfile"
 
-# FIXME: move to helpers mixin
-
 def windows?
   @windows ||= RUBY_PLATFORM =~ /mswin|mingw|windows/
 end
 
-def chefdk
+def habitat
   if windows?
-    Pathname.new(File.join(ENV["SYSTEMDRIVE"], "opscode", ARGV[0]))
+    Pathname.new(File.join(ENV["SYSTEMDRIVE"], "hab", "pkgs"))
   else
-    Pathname.new(File.join("/opt", ARGV[0]))
+    Pathname.new(File.join("/hab", "pkgs"))
   end
 end
 
+# find the path to installed package in habitat package directory
+# example, /hab/pkgs/{ARGV[0]}/{ARGV[1]}/x.x.x/xxxxxxxxxxxxxx
+def pkg_path
+  pkg_path = habitat.join(ARGV[0], ARGV[1])
+  version = Dir.glob("#{pkg_path}/*").max
+  raise "No existing installation found for #{ARGV[0]}/#{ARGV[1]} in #{pkg_path}" if version.nil?
+
+  pkg_path = pkg_path.join(version)
+  build_no = Dir.glob("#{pkg_path}/*").max
+  raise "No existing installation found for #{ARGV[0]}/#{ARGV[1]}/#{version} in #{pkg_path}" if build_no.nil?
+
+  pkg_path.join(build_no)
+end
+
+def vendor_bin_dir
+  pkg_path.join("vendor", "bin")
+end
+
 def bin_dir
-  chefdk.join("embedded/bin")
+  pkg_path.join("bin")
+end
+
+def ruby_pkg
+  # NOTE: this is sort of a 'hacky' way maybe to find which ruby binary to use?
+  File.read("#{pkg_path}/DEPS").split("\n").find { |l| l.start_with?(%r{(core|chef)\/ruby}) }
 end
 
 ENV["PATH"] = ( [ bin_dir ] + ENV["PATH"].split(File::PATH_SEPARATOR) ).join(File::PATH_SEPARATOR)
@@ -50,7 +71,7 @@ ENV_KEYS = %w{
 
 def run(cmd)
   ENV_KEYS.each { |key| ENV["_YOLO_#{key}"] = ENV[key]; ENV.delete(key) }
-  ENV["PATH"] = bin_dir.to_s + File::PATH_SEPARATOR + ENV["_YOLO_PATH"]
+  ENV["PATH"] = habitat.join(ruby_pkg, "bin").to_s + File::PATH_SEPARATOR + ENV["_YOLO_PATH"]
   puts "    running: #{cmd}"
   output = `#{cmd} 2>&1` # FIXME: bash/zsh-ism, will not work on csh
   unless $?.exited? && $?.exitstatus == 0
@@ -66,7 +87,7 @@ TAR_LONGLINK = "././@LongLink".freeze
 
 def install_package_dependencies
   banner("Installing Packages")
-  case `#{bin_dir}/ohai platform_family` # rubocop: disable Lint/LiteralAsCondition
+  case `hab pkg exec #{ARGV[0]}/#{ARGV[1]} ohai platform_family` # rubocop: disable Lint/LiteralAsCondition
   when /debian/
     ENV["DEBIAN_FRONTEND"] = "noninteractive"
     run("apt-get -y update")
@@ -118,7 +139,7 @@ def extract_tgz(file, destination = ".")
   end
 end
 
-App = Struct.new(:name, :repo, :bundle_without, :install_commands, :gems) do
+App = Struct.new(:name, :origin, :bundle_without, :install_commands, :gems) do
   def initialize(*)
     super
     self.gems ||= {}
@@ -129,88 +150,66 @@ App = Struct.new(:name, :repo, :bundle_without, :install_commands, :gems) do
   end
 end
 
-chef_install_command = "#{bin_dir.join("rake")} install:local"
+chef_install_command = "#{vendor_bin_dir.join("rake")} install:local"
 
-CHEFDK_APPS = [
+HABITAT_PACKAGES = [
   App.new(
     "berkshelf",
-    "berkshelf/berkshelf",
+    "chef",
     "docs changelog",
-    "#{bin_dir.join("rake")} install"
+    "#{vendor_bin_dir.join("rake")} install"
   ),
   App.new(
+    "chef-infra-client",
     "chef",
-    "chef/chef",
     "server docgen maintenance pry integration ci chefstyle profile",
     chef_install_command,
     {
       "chef" => %w{docgen chefstyle},
       "chef-bin" => %w{development},
       "ohai" =>  %w{development docs debug profile},
-      "inspec-core-bin" =>  %w{development},
-    }
-  ),
-  App.new(
-    "chef-dk",
-    "chef/chef-dk",
-    "development test",
-    "#{bin_dir.join("bundle")} install",
-    {
-      "chef" => %w{docgen chefstyle omnibus_package},
-      "foodcritic" => %w{development test},
-      "test-kitchen" => %w{changelog debug docs development},
-      "inspec" =>  %w{deploy tools maintenance integration},
-      "chef-run" => %w{changelog docs debug},
-      "chef-cli" =>  %w{changelog docs debug},
-      "berkshelf" => %w{changelog docs debug development},
-      "chef-bin" => %w{changelog},
-      "chef-apply" => %w{changelog},
-      "chef-vault" => %w{changelog},
-      "ohai" => %w{changelog},
-      "opscode-pushy-client" => %w{changelog},
-      "cookstyle" => %w{changelog},
+      # "inspec-core-bin" => %w{development}, # <== temporary? for RC version
     }
   ),
   App.new(
     "chef-vault",
-    "chef/chef-vault",
+    "chef",
     "development",
-    "#{bin_dir.join("rake")} install"
+    "#{vendor_bin_dir.join("rake")} install"
   ),
   App.new(
     "cookstyle",
-    "chef/cookstyle",
+    "chef",
     "development debug docs",
-    "#{bin_dir.join("rake")} install"
-  ),
-  App.new(
-    "foodcritic",
-    "foodcritic/foodcritic",
-    "development",
-    "#{bin_dir.join("rake")} install"
+    "#{vendor_bin_dir.join("rake")} install"
   ),
   App.new(
     "inspec",
-    "chef/inspec",
+    "chef",
     "test integration tools maintenance deploy",
-    "#{bin_dir.join("rake")} install"
+    "#{vendor_bin_dir.join("rake")} install"
   ),
   App.new(
     "ohai",
-    "chef/ohai",
+    "chef",
     "development docs debug",
-    "#{bin_dir.join("rake")} install"
+    "#{vendor_bin_dir.join("rake")} install"
   ),
   App.new(
     "test-kitchen",
-    "test-kitchen/test-kitchen",
+    "chef",
     "changelog integration debug chefstyle docs",
-    "#{bin_dir.join("rake")} install"
+    "#{vendor_bin_dir.join("rake")} install"
   ),
 ].freeze
 
+def bundler_from_ruby_pkg
+  ruby_path = `hab pkg path #{ruby_pkg}`.strip
+  File.join(ruby_path, "bin", "bundle")
+end
+
 class Updater
-  attr_reader :app, :ref, :tarball, :repo, :gems, :install_commands
+  attr_reader :app, :ref, :tarball, :origin, :repo, :gems, :install_commands
 
   def initialize(options)
     @app = options[:app]
@@ -219,6 +218,7 @@ class Updater
     @extra_bin_files = options[:extra_bin_files]
     @binstubs_source = options[:binstubs_source]
     @repo = options[:repo] || @app.repo
+    @origin = options[:origin] || @app.origin
     @gems = @app.gems
     @install_commands = @app.install_commands
   end
@@ -228,101 +228,103 @@ class Updater
       abort "#{$0} needs to be run as root user or with sudo"
     end
 
-    banner("Cleaning #{app} checkout")
-    app_dir.rmtree if app_dir.directory?
-
-    top_dir = chefdk.join("embedded/apps")
-    unless File.exist?(top_dir)
-      banner("Creating #{top_dir} directory")
-      FileUtils.mkdir_p top_dir
-    end
-
     install_package_dependencies
 
-    if  tarball
-      # NOTE: THIS IS DELIBERATELY PURE RUBY USING NO NATIVE GEMS AND ONLY
-      # THE RUBY STDLIB BY DESIGN
-      git_url = "https://github.com/#{repo}/archive/#{ref}.tar.gz"
-      banner("Extracting #{app} from #{git_url}")
-      Dir.chdir(chefdk.join("embedded/apps")) do
-        Tempfile.open("appbundle-updater") do |tempfile|
-          tempfile.binmode
-          URI.open(git_url) do |uri|
-            tempfile.write(uri.read)
+    tmp_dir = Dir.mktmpdir
+    banner("Creating #{tmp_dir}/#{app.name} directory")
+    app_dir = File.join(tmp_dir, app.name.to_s)
+
+    begin
+      if  tarball
+        # NOTE: THIS IS DELIBERATELY PURE RUBY USING NO NATIVE GEMS AND ONLY
+        # THE RUBY STDLIB BY DESIGN
+        git_url = "https://github.com/#{repo}/archive/#{ref}.tar.gz"
+        banner("Extracting #{app} from #{git_url}")
+        Dir.chdir(tmp_dir) do
+          Tempfile.open("appbundle-updater") do |tempfile|
+            tempfile.binmode
+            URI.open(git_url) do |uri|
+              tempfile.write(uri.read)
+            end
+            tempfile.close
+            extract_tgz(tempfile.path)
           end
-          tempfile.close
-          extract_tgz(tempfile.path)
+          base = File.basename repo
+          FileUtils.mv Dir.glob("#{base}-*")[0], app.name.to_s
+        end
+      else
+        git_url = "https://github.com/#{repo}.git"
+        banner("Cloning #{app} from #{git_url}")
+        run("git clone #{git_url} #{app_dir}")
+
+        banner("Checking out #{app} to #{ref}")
+        Dir.chdir(app_dir) do
+          run("git checkout #{ref}")
         end
-        base = File.basename repo
-        FileUtils.mv Dir.glob("#{base}-*")[0], "#{app.name}"
       end
-    else
-      git_url = "https://github.com/#{repo}.git"
-      banner("Cloning #{app} from #{git_url}")
-      run("git clone #{git_url} #{app_dir}")
 
-      banner("Checking out #{app} to #{ref}")
+      banner("Installing dependencies")
       Dir.chdir(app_dir) do
-        run("git checkout #{ref}")
+        # Use the bundler from Ruby package instead of from vendor/bin
+        bundle_executable = bundler_from_ruby_pkg
+        banner("Using bundler from Ruby package: #{bundle_executable}")
+        cmd = "#{bundle_executable} install"
+        cmd += " --without #{app.bundle_without}" if app.bundle_without
+        ruby(cmd)
       end
-    end
 
-    banner("Installing dependencies")
-    Dir.chdir(app_dir) do
-      cmd = "#{bin_dir.join("bundle")} install"
-      cmd += " --without #{app.bundle_without}" if app.bundle_without
-      ruby(cmd)
-    end
-
-    banner("Re-installing git-installed gems")
-    Dir.chdir(app_dir) do
-      ruby("post-bundle-install.rb #{chefdk}") if File.exist?("#{app_dir}/post-bundle-install.rb")
-    end
-
-    banner("Installing gem")
-    Dir.chdir(app_dir) do
-      Array(install_commands).each do |command|
-        ruby(command)
+      banner("Re-installing git-installed gems")
+      Dir.chdir(app_dir) do
+        ruby("post-bundle-install.rb #{bin_dir}") if File.exist?("#{app_dir}/post-bundle-install.rb")
       end
-    end
 
-    banner("Updating appbundler binstubs for #{app}")
-    if gems.empty?
+      banner("Installing gem")
       Dir.chdir(app_dir) do
-        cmd = "#{bin_dir.join("appbundler")} #{app_dir} #{chefdk.join("bin")}"
-        cmd += " --extra-bin-files #{@extra_bin_files}" if @extra_bin_files
-        cmd += " --binstubs-source #{@binstubs_source}" if @binstubs_source
-        ruby(cmd)
+        Array(install_commands).each do |command|
+          ruby(command)
+        end
       end
-    else
-      gems.each do |gem_name, without|
+
+      banner("Updating appbundler binstubs for #{app}")
+      if gems.empty?
         Dir.chdir(app_dir) do
-          cmd = "#{bin_dir.join("appbundler")} #{app_dir} #{chefdk.join("bin")} #{gem_name}"
-          cmd += " --without #{without.join(",")}" if without
+          cmd = "#{vendor_bin_dir.join("appbundler")} #{app_dir} #{bin_dir}"
           cmd += " --extra-bin-files #{@extra_bin_files}" if @extra_bin_files
           cmd += " --binstubs-source #{@binstubs_source}" if @binstubs_source
           ruby(cmd)
         end
+      else
+        gems.each do |gem_name, without|
+          Dir.chdir(app_dir) do
+            cmd = "#{vendor_bin_dir.join("appbundler")} #{app_dir} #{bin_dir} #{gem_name}"
+            cmd += " --without #{without.join(",")}" if without
+            cmd += " --extra-bin-files #{@extra_bin_files}" if @extra_bin_files
+            cmd += " --binstubs-source #{@binstubs_source}" if @binstubs_source
+            ruby(cmd)
+          end
+        end
       end
-    end
 
-    banner("Finished!")
+    rescue => e
+      puts "aborting!!", e
+    else
+      banner("Finished!")
+    ensure
+      banner("Cleaning up #{app_dir}")
+      FileUtils.remove_entry app_dir
+      banner("Done.")
+    end
   end
 
   private
 
-  def app_dir
-    chefdk.join("embedded/apps/#{app}")
-  end
-
   def banner(msg)
     puts "-----> #{msg}"
   end
 
   def ruby(script)
-    ruby = bin_dir.join("ruby").to_s.tap { |p| p.concat(".exe") if windows? }
-
-    run([ruby, script].join(" "))
+    ruby_cmd = "hab pkg exec #{ruby_pkg} ruby"
+    run([ruby_cmd, script].join(" "))
   end
 
 end
@@ -356,7 +358,7 @@ class CLI
       end
       opts.separator("")
       opts.separator("App names:")
-      CHEFDK_APPS.each { |a| opts.separator("    * #{a.name}") }
+      HABITAT_PACKAGES.each { |a| opts.separator("    * #{a.name}") }
     end
     @parser.parse!
     validate!
@@ -364,7 +366,7 @@ class CLI
 
   def validate!
     die("PROJECT APP_NAME GIT_REF options are all required") if ARGV.length < 3
-    options[:app] = CHEFDK_APPS.find { |a| a.name == ARGV[1] }
+    options[:app] = HABITAT_PACKAGES.find { |a| a.name == ARGV[1] }
     die("Invalid APP_NAME: #{ARGV[1]}") if options[:app].nil?
     options[:ref] = ARGV[2]
   end

data/lib/appbundle_updater/version.rb

@@ -1,3 +1,3 @@
 module AppbundleUpdater
-  VERSION = "1.0.36".freeze
+  VERSION = "19.0.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appbundle-updater
 version: !ruby/object:Gem::Version
-  version: 1.0.36
+  version: 19.0.4.rc.1
 platform: ruby
 authors:
 - lamont-granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2025-06-17 00:00:00.000000000 Z
 dependencies: []
 description: Updates appbundled apps in Chef's omnibus packages
 email:
@@ -46,11 +46,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Updates appbundled apps in Chef's omnibus packages