From 7aa2b7fd19e1583eab62668fd8f48207e3fa96c4 Mon Sep 17 00:00:00 2001
From: "Satadru Pramanik, DO, MPH, MEng" <satadru@gmail.com>
Date: Sat, 11 Jan 2025 20:17:29 -0500
Subject: [PATCH] Add byebug gem and fix regression in crew install of
 no_source_build packages (#11126)

* Add Ruby Byebug gem

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Fix regression in crew install of no_source_build package binaries.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* lint

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* bump version

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* cleanup

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

---------

Signed-off-by: Satadru Pramanik <satadru@gmail.com>
---
 bin/crew                    |  6 ++++--
 lib/const.rb                |  2 +-
 packages/ruby_byebug.rb     | 21 +++++++++++++++++++++
 packages/ruby_pry_byebug.rb |  1 +
 tools/packages.yaml         |  5 +++++
 5 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 packages/ruby_byebug.rb

diff --git a/bin/crew b/bin/crew
index d5a31e79e..e37ea51e3 100755
--- a/bin/crew
+++ b/bin/crew
@@ -471,7 +471,7 @@ def download
 
   if !url
     abort "No precompiled binary or source is available for #{@device[:architecture]}.".lightred
-  elsif url.casecmp?('SKIP') || ((@pkg.no_source_build? || @pkg.gem_compile_needed?) && caller.grep(/download_command/).empty?)
+  elsif url.casecmp?('SKIP') || (@pkg.no_source_build? || @pkg.gem_compile_needed?)
     puts 'Skipping source download...'
   elsif @pkg.build_from_source
     puts 'Downloading source...'
@@ -488,7 +488,9 @@ def download
     # We want to skip when no_source_build is true during the build,
     # but when we have built a binary we are in upgrade, and we need
     # download since we need to extract the just generated binary.
-    next if (@pkg.no_source_build? || @pkg.gem_compile_needed?) && !@pkg.in_upgrade && caller.grep(/download_command/).empty?
+    crewlog '(@pkg.no_source_build? || @pkg.gem_compile_needed?) && !@pkg.in_upgrade && !@pkg.in_install && caller.grep(/download_command/).empty?'
+    crewlog "#{@pkg.no_source_build?} || #{@pkg.gem_compile_needed?} && #{!@pkg.in_upgrade} && #{!@pkg.in_install} && #{caller.grep(/download_command/).empty?}"
+    next if (@pkg.no_source_build? || @pkg.gem_compile_needed?) && !@pkg.in_upgrade && !@pkg.in_install && caller.grep(/download_command/).empty?
     case File.basename(filename)
     # Sources that download with our internal downloader.
     # This also covers all precompiled binaries.
diff --git a/lib/const.rb b/lib/const.rb
index 28769a2f6..dc6e02b99 100644
--- a/lib/const.rb
+++ b/lib/const.rb
@@ -3,7 +3,7 @@
 require 'etc'
 
 OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0'
-CREW_VERSION ||= '1.56.7' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
+CREW_VERSION ||= '1.56.8' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
 
 # Kernel architecture.
 KERN_ARCH ||= Etc.uname[:machine]
diff --git a/packages/ruby_byebug.rb b/packages/ruby_byebug.rb
new file mode 100644
index 000000000..7fdb2847e
--- /dev/null
+++ b/packages/ruby_byebug.rb
@@ -0,0 +1,21 @@
+require 'buildsystems/ruby'
+
+class Ruby_byebug < RUBY
+  description 'Byebug is a Ruby debugger.'
+  homepage 'https://github.com/deivid-rodriguez/byebug'
+  version "11.1.3-#{CREW_RUBY_VER}"
+  license 'BSD-2-Clause'
+  compatibility 'all'
+  source_url 'SKIP'
+  binary_compression 'gem'
+
+  binary_sha256({
+    aarch64: 'a66196f0efe8c3d71684307b069a33483e56ec1d2217e4f33101fdbfef1f1f87',
+     armv7l: 'a66196f0efe8c3d71684307b069a33483e56ec1d2217e4f33101fdbfef1f1f87',
+       i686: '59217683304ae983a704955c2082222b5eeefc369b62804fc06cbc01d567cd39',
+     x86_64: 'c668fb6e1798a9ac0091fcaae08d47d09af02762204f839754619c385621b559'
+  })
+
+  conflicts_ok
+  gem_compile_needed
+end
diff --git a/packages/ruby_pry_byebug.rb b/packages/ruby_pry_byebug.rb
index eb07987f7..3d99caa85 100644
--- a/packages/ruby_pry_byebug.rb
+++ b/packages/ruby_pry_byebug.rb
@@ -8,6 +8,7 @@ class Ruby_pry_byebug < RUBY
   compatibility 'all'
   source_url 'SKIP'
 
+  depends_on 'ruby_byebug' # L
   depends_on 'ruby_pry' # L
   conflicts_ok
   no_compile_needed
diff --git a/tools/packages.yaml b/tools/packages.yaml
index b19a627b5..033862c18 100644
--- a/tools/packages.yaml
+++ b/tools/packages.yaml
@@ -7950,6 +7950,11 @@ url: https://github.com/asciidoctor/asciidoctor/releases
 activity: medium
 ---
 kind: url
+name: ruby_byebug
+url: https://github.com/deivid-rodriguez/byebug/releases
+activity: low
+---
+kind: url
 name: ruby_concurrent_ruby
 url: https://github.com/ruby-concurrency/concurrent-ruby/releases
 activity: medium