Commit ad514e4dbbed1a6a0e989000ba49ebf5e48ca467
2023-02-26T03:15:27
rbpkg_ci_mux
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123
diff --git a/bin/rbpkg_ci_mux b/bin/rbpkg_ci_mux
index 8675d38..a33f9b3 100755
--- a/bin/rbpkg_ci_mux
+++ b/bin/rbpkg_ci_mux
@@ -31,43 +31,27 @@ def usage()
exit 1
end
+def pop_arg
+ case $ARGS[0]
+ when "--clean"
+ rbpkg_ci_mux_clean
+ when "-h"
+ usage
+ when "--help"
+ usage
+ when "--install"
+ rbpkg_ci_mux_install
+ when "--no-remote"
+ Rbpkg.ci_mux
+ Rbpkg::Log.ok_all
+ exit 0
+ when "--upgrade"
+ rbpkg_ci_mux_upgrade
+ end
+end
+
def rbpkg_ci_mux
- clean = false
- upgrade = false
- pop_arg = proc {
- case $ARGS[0]
- when "--clean"
- shift
- cmd = "rm -rf #{sh_quote(Rbpkg.ci_dir)}"
- verbose(1, cmd)
- raise "command failed: #{cmd.inspect}" unless system(cmd)
- Rbpkg.ci_init
- hosts = $ARGS
- hosts.each do |host|
- cmd! "ssh #{sh_quote(host)} rbpkg/bin/rbpkg_ci --clean"
- end
- Rbpkg::Log.ok_all
- exit 0
- when "-h"
- usage
- when "--help"
- usage
- when "--no-remote"
- Rbpkg.ci_mux
- Rbpkg::Log.ok_all
- exit 0
- when "--upgrade"
- Rbpkg.upgrade_self
- shift
- hosts = $ARGS
- hosts.each do |host|
- cmd! "ssh #{sh_quote(host)} rbpkg/bin/rbpkg upgrade"
- end
- Rbpkg::Log.ok_all
- exit 0
- end
- }
- while pop_arg.()
+ while pop_arg
true
end
repo = shift
@@ -87,6 +71,41 @@ def rbpkg_ci_mux
Rbpkg.ci_mux
end
+def rbpkg_ci_mux_clean
+ shift
+ cmd = "rm -rf #{sh_quote(Rbpkg.ci_dir)}"
+ verbose(1, cmd)
+ raise "command failed: #{cmd.inspect}" unless system(cmd)
+ Rbpkg.ci_init
+ hosts = $ARGS
+ hosts.each do |host|
+ cmd! "ssh #{sh_quote(host)} rbpkg/bin/rbpkg_ci --clean"
+ end
+ Rbpkg::Log.ok_all
+ exit 0
+end
+
+def rbpkg_ci_mux_install
+ shift
+ hosts = $ARGS
+ hosts.each do |host|
+ cmd! "ssh #{sh_quote(host)} git clone https://git.kmx.io/kmx.io/rbpkg.git"
+ end
+ Rbpkg::Log.ok_all
+ exit 0
+end
+
+def rbpkg_ci_mux_upgrade
+ Rbpkg.upgrade_self
+ shift
+ hosts = $ARGS
+ hosts.each do |host|
+ cmd! "ssh #{sh_quote(host)} rbpkg/bin/rbpkg upgrade"
+ end
+ Rbpkg::Log.ok_all
+ exit 0
+end
+
begin
rbpkg_ci_mux
Rbpkg::Log.ok_all
diff --git a/lib/rbpkg/log.rb b/lib/rbpkg/log.rb
index 4037cd4..e60b604 100644
--- a/lib/rbpkg/log.rb
+++ b/lib/rbpkg/log.rb
@@ -181,7 +181,7 @@ class String
"<" => "<",
">" => ">"
}
- s = clone
+ s = "#{self}"
substitution.each do |k, v|
s.gsub!(k, v)
end