diff --git a/lib/const.rb b/lib/const.rb index 397a0cf63..012e051c1 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -4,7 +4,7 @@ require 'etc' require 'open3' OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0' -CREW_VERSION ||= '1.62.0' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION +CREW_VERSION ||= '1.62.1' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION # Kernel architecture. KERN_ARCH ||= Etc.uname[:machine] diff --git a/lib/convenience_functions.rb b/lib/convenience_functions.rb index c4ecac6f9..eb5877924 100644 --- a/lib/convenience_functions.rb +++ b/lib/convenience_functions.rb @@ -9,6 +9,7 @@ require_relative 'downloader' # Reimplementation of .blank? method from ActiveSupport class NilClass; def blank? = true; end class Numeric; def blank? = false; end +class Proc; def blank? = false; end class Array; def blank? = empty?; end class Hash; def blank? = empty?; end class Symbol; def blank? = empty?; end diff --git a/lib/downloader.rb b/lib/downloader.rb index a5b935593..bf6424892 100644 --- a/lib/downloader.rb +++ b/lib/downloader.rb @@ -3,6 +3,7 @@ require 'io/console' require 'uri' require_relative 'const' require_relative 'color' +require_relative 'convenience_functions' require_relative 'progress_bar' require_relative 'require_gem' diff --git a/lib/fixup.rb b/lib/fixup.rb index 3eb2bd3f3..f31204708 100644 --- a/lib/fixup.rb +++ b/lib/fixup.rb @@ -4,6 +4,7 @@ require 'etc' require 'json' require 'open3' require_relative 'color' +require_relative 'convenience_functions' require_relative 'package' require_relative 'require_gem' diff --git a/lib/package.rb b/lib/package.rb index ee49d7b9f..11c3d690a 100644 --- a/lib/package.rb +++ b/lib/package.rb @@ -2,6 +2,7 @@ require 'English' require 'json' require_relative 'const' require_relative 'color' +require_relative 'convenience_functions' require_relative 'package_helpers' require_relative 'require_gem' require_relative 'selector' @@ -360,7 +361,7 @@ class Package rescue RuntimeError => e # Print failed line number and error message. puts "#{e.backtrace[1]}: #{e.message}".orange - raise InstallError, "`#{env.map { |k, v| "#{k}=\"#{v}\"" }.join(' ')} #{cmd_args.join(' ')}` exited with #{$CHILD_STATUS.exitstatus}".lightred + raise InstallError, "`#{env.map { |k, v| "#{k}=\"#{v}\"" }.join(' ')} #{args.join(' ')}` exited with #{$CHILD_STATUS.exitstatus}".lightred end end end diff --git a/lib/report_buildsystem_methods.rb b/lib/report_buildsystem_methods.rb index 2e3ae68f3..8febb2ba3 100644 --- a/lib/report_buildsystem_methods.rb +++ b/lib/report_buildsystem_methods.rb @@ -1,7 +1,7 @@ module ReportBuildsystemMethods def print_buildsystem_methods boolean_list = available_boolean_properties - method_list = methods.reject(&->(m) { boolean_list.include?(m.to_s.delete_suffix('?').to_sym) }).grep(/#{superclass.to_s.downcase}_/).delete_if { |i| send(i).blank? } + method_list = methods.reject(&->(m) { boolean_list.include?(m.to_s.delete_suffix('?').to_sym) }).grep(/#{superclass.to_s.downcase}_/).select(&->(i) { send(i) }) unless method_list.empty? require_gem 'method_source'