chore: cleanup subcommand.rb

.github/workflows/test.yml

@@ -9,6 +9,8 @@ jobs:
     strategy:
       matrix:
         ruby-version:
+          - "3.2"
+          - "3.1"
           - "3.0"
           - "2.7"
           - "2.5"

.gitignore

@@ -5,4 +5,5 @@ vendor/
 .bundle
 coverage/
 
-.yardoc/
+.yardoc/
+Gemfile.lock

lib/autobuild.rb

@@ -11,7 +11,6 @@ module Autobuild
     extend Logger::Root('Autobuild', Logger::INFO)
 end
 
-require 'net/smtp'
 require 'socket'
 require 'etc'
 require 'find'
@@ -21,8 +20,27 @@ module Autobuild
 require 'fileutils'
 require 'optparse'
 require 'singleton'
+require 'open3'
+require 'English'
 require 'pastel'
+require 'fcntl'
+require 'rexml'
 require 'tty-prompt'
+require 'time'
+require 'set'
+require 'rbconfig'
+require 'digest/sha1'
+require 'open-uri'
+require 'net/http'
+require 'net/https'
+require 'net/smtp'
+require 'rubygems/version'
+
+require "concurrent/atomic/atomic_boolean"
+require "concurrent/array"
+
+require 'utilrb/hash/map_value'
+require 'utilrb/kernel/options'
 require 'autobuild/tools'
 
 require 'autobuild/version'
@@ -31,7 +49,7 @@ module Autobuild
 require 'autobuild/pkgconfig'
 require 'autobuild/reporting'
 require 'autobuild/mail_reporter'
-require 'autobuild/subcommand'
+require 'autobuild/subprocess'
 require 'autobuild/timestamps'
 require 'autobuild/parallel'
 require 'autobuild/utility'
@@ -50,6 +68,7 @@ module Autobuild
 require 'autobuild/package'
 require 'autobuild/configurable'
 require 'autobuild/packages/autotools'
+require 'autobuild/packages/gnumake'
 require 'autobuild/packages/cmake'
 require 'autobuild/packages/genom'
 require 'autobuild/packages/import'

lib/autobuild/build_logfile.rb

@@ -1,5 +1,3 @@
-require 'time'
-
 module Autobuild
     # Parse and manipulate the information stored in a build log file (usually
     # in prefix/log/stats.log)

lib/autobuild/environment.rb

@@ -1,7 +1,3 @@
-require 'set'
-require 'rbconfig'
-require 'utilrb/hash/map_value'
-
 module Autobuild
     @windows = RbConfig::CONFIG["host_os"] =~ /(msdos|mswin|djgpp|mingw|[Ww]indows)/
     def self.windows?

lib/autobuild/import/archive.rb

@@ -1,10 +1,3 @@
-require 'autobuild/importer'
-require 'digest/sha1'
-require 'open-uri'
-require 'fileutils'
-require 'net/http'
-require 'net/https'
-
 module Autobuild
     class ArchiveImporter < Importer
         # rubocop:disable Naming/ConstantName

lib/autobuild/import/darcs.rb

@@ -1,7 +1,3 @@
-require 'autobuild/config'
-require 'autobuild/subcommand'
-require 'autobuild/importer'
-
 module Autobuild
     class DarcsImporter < Importer
         # Creates a new importer which gets the source from the Darcs

lib/autobuild/import/git.rb

@@ -1,10 +1,3 @@
-require 'fileutils'
-require 'autobuild/subcommand'
-require 'autobuild/importer'
-require 'utilrb/kernel/options'
-require 'open3'
-require 'English'
-
 module Autobuild
     class Git < Importer
         # Exception raised when a network access is needed while only_local is true

lib/autobuild/import/hg.rb

@@ -1,8 +1,3 @@
-require 'fileutils'
-require 'autobuild/subcommand'
-require 'autobuild/importer'
-require 'utilrb/kernel/options'
-
 module Autobuild
     class Hg < Importer
         # Creates an importer which tracks the given repository

lib/autobuild/import/svn.rb

@@ -1,7 +1,3 @@
-require 'autobuild/subcommand'
-require 'autobuild/importer'
-require 'rexml/document'
-
 module Autobuild
     class SVN < Importer
         # Creates an importer which gets the source for the Subversion URL +source+.

lib/autobuild/importer.rb

@@ -1,6 +1,3 @@
-require 'autobuild/config'
-require 'autobuild/exceptions'
-
 # This class is the base class for objects that are used to get the source from
 # various RCS into the package source directory. A list of patches to apply
 # after the import can be given in the +:patches+ option.

lib/autobuild/packages/autotools.rb

@@ -1,11 +1,3 @@
-require 'pathname'
-require 'autobuild/timestamps'
-require 'autobuild/environment'
-require 'autobuild/package'
-require 'autobuild/subcommand'
-require 'shellwords'
-require 'fileutils'
-
 module Autobuild
     def self.autotools(opts, &proc)
         Autotools.new(opts, &proc)

lib/autobuild/packages/cmake.rb

@@ -1,6 +1,3 @@
-require 'autobuild/configurable'
-require 'autobuild/packages/gnumake'
-
 module Autobuild
     def self.cmake(options, &block)
         CMake.new(options, &block)

lib/autobuild/packages/genom.rb

@@ -1,7 +1,3 @@
-require 'autobuild/packages/autotools'
-require 'open3'
-require 'autobuild/pkgconfig'
-
 module Autobuild
     def self.genom(opts, &proc)
         GenomModule.new(opts, &proc)

lib/autobuild/packages/gnumake.rb

@@ -1,5 +1,3 @@
-require 'rubygems/version'
-
 module Autobuild
     def self.reset_gnumake_detection
         @make_is_gnumake = Hash.new

lib/autobuild/packages/import.rb

@@ -1,6 +1,3 @@
-require 'autobuild/timestamps'
-require 'autobuild/package'
-
 module Autobuild
     def self.import(spec, &proc)
         ImporterPackage.new(spec, &proc)

lib/autobuild/packages/pkgconfig.rb

@@ -1,5 +1,3 @@
-require 'autobuild/pkgconfig'
-
 module Autobuild
     class InstalledPkgConfig < Package
         attr_reader :pkgconfig, :prefix

lib/autobuild/packages/python.rb

@@ -1,6 +1,3 @@
-require 'autobuild/configurable'
-require 'open3'
-
 # Main Autobuild module
 module Autobuild
     def self.python(opts, &proc)

lib/autobuild/progress_display.rb

@@ -1,6 +1,3 @@
-require "concurrent/atomic/atomic_boolean"
-require "concurrent/array"
-
 module Autobuild
     # Management of the progress display
     class ProgressDisplay

lib/autobuild/reporting.rb

@@ -1,5 +1,6 @@
-require 'autobuild/exceptions'
-require 'pastel'
+require "pastel"
+require "concurrent/atomic/atomic_boolean"
+require "concurrent/array"
 
 module Autobuild
     @colorizer = Pastel.new