crew: Remove activesupport gem, implement .blank? logic in lib/convenience_functions (#12081)

* crew: Remove `activesupport` gem

Signed-off-by: SupeChicken666 <me@supechicken666.dev>

* Remove activesupport require lines

Signed-off-by: SupeChicken666 <me@supechicken666.dev>

* Make rubocop happy

Signed-off-by: SupeChicken666 <me@supechicken666.dev>

* Add a comment for `.blank?` methods

Signed-off-by: SupeChicken666 <me@supechicken666.dev>

---------

Signed-off-by: SupeChicken666 <me@supechicken666.dev>
This commit is contained in:
SupeChicken666
2025-06-20 15:15:07 +08:00
committed by GitHub
parent 338bd8e594
commit c31f30f240
9 changed files with 8 additions and 9 deletions

View File

@@ -4,7 +4,6 @@ require_relative '../lib/color'
# Disallow sudo.
abort 'Chromebrew should not be run as root.'.lightred if Process.uid.zero?
require_relative '../lib/require_gem'
require_gem('activesupport', 'active_support/core_ext/object/blank')
require_gem('highline')
# The json gem can break when upgrading from a much older version of ruby.
require_gem('json')

View File

@@ -5,8 +5,6 @@ require_relative '../package_utils'
require_relative '../report_buildsystem_methods'
require_relative '../require_gem'
require_gem('activesupport', 'active_support/core_ext/object/blank')
def check_gem_binary_build_needed(ruby_gem_name = nil, ruby_gem_version = nil)
puts "Checking to see if gem compile for #{ruby_gem_name} is needed..."
@extract_dir = "#{ruby_gem_name}.#{Time.now.utc.strftime('%Y%m%d%H%M%S')}.dir"

View File

@@ -6,6 +6,14 @@ require_relative 'const'
require_relative 'crewlog'
require_relative 'downloader'
# Reimplementation of .blank? method from ActiveSupport
class NilClass; def blank? = true; end
class Numeric; def blank? = false; end
class Array; def blank? = empty?; end
class Hash; def blank? = empty?; end
class Symbol; def blank? = empty?; end
class String; def blank? = strip.empty?; end
class ConvenienceFunctions
def self.determine_conflicts(pkg_name, filelist = File.join(CREW_META_PATH, "#{pkg_name}.filelist"), exclude_suffix = nil, verbose: false)
conflicts = {}

View File

@@ -6,7 +6,6 @@ require_relative 'color'
require_relative 'progress_bar'
require_relative 'require_gem'
require_gem('activesupport', 'active_support/core_ext/object/blank')
require_gem('ptools')
begin

View File

@@ -7,7 +7,6 @@ require_relative 'color'
require_relative 'package'
require_relative 'require_gem'
require_gem('activesupport', 'active_support/core_ext/object/blank')
require_gem('highline')
# All needed constants & variables should be defined here in case they

View File

@@ -89,7 +89,6 @@ class Core < Package
depends_on 'readline'
depends_on 'rtmpdump'
depends_on 'ruby'
depends_on 'ruby_activesupport'
depends_on 'ruby_concurrent_ruby'
# Allows for building binary gems if necessary.
depends_on 'ruby_gem_compiler'

View File

@@ -145,7 +145,6 @@ readline
rtmpdump
ruby
ruby_abbrev
ruby_activesupport
ruby_base64
ruby_benchmark
ruby_bigdecimal

View File

@@ -8,7 +8,6 @@ require_relative '../lib/package'
require_relative '../lib/package_utils'
require_relative '../lib/require_gem'
require_gem('activesupport', 'active_support/core_ext/object/blank')
require_gem('ptools')
output = []

View File

@@ -10,7 +10,6 @@ require_relative '../lib/color'
require_relative '../lib/const'
require_relative '../lib/gem_compact_index_client'
require_relative '../lib/require_gem'
require_gem('activesupport', 'active_support/core_ext/object/blank')
require_gem 'concurrent-ruby'
def check_for_updated_ruby_packages