opswalrus 1.0.97 → 1.0.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccf8e333c2a08306ce5afc14a557c69fe01d8681ffeb5e3957b80b09b68bcafa
-  data.tar.gz: b8d586b564c368d7e055746c515c7ea5883765b4a5ca3a9d389f89cd04e06e2c
+  metadata.gz: b22cc033fad90a7f21523cd1ff33ffcb8f5903605a826ac0abc0b14b17e5425b
+  data.tar.gz: 73861ce2fb52cebc7d39931076e29bf1a388d23d5724c0f896d18efbf8d34e3f
 SHA512:
-  metadata.gz: 2d7a74e6e3872014452eaa8a19203e1da2b81c9af00c9a6e5f0499caff2a3309f18af2122e00097e7276d80bcd89fb937ab3de7e3b01373187611387e0e23b38
-  data.tar.gz: 5b24d54d03bbb5f9bdd03f2d5ddd1644f94819e54803b6d51f5812f5a8758c31f24a58b273c1d42600f00788c0b4e5777e8e3204a8c3a061e10e532c5a150ac9
+  metadata.gz: c557b19ce11df00720f9513e23b3bd49116641a3b2f2c7afc671258229bb7d4208d23ee40c15e614b2d17c214c0144300c5dafa4a93507cb77c7131aeea565b1
+  data.tar.gz: 0c4ea42f15bba85132c5dbc3f0a44c346ceb0c366b3db539c8949e9d527a67c06fb4303a413bcf882b1164b505e1f6cbdc5ad4db5bb508ff90319fc349937735

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.97)
+    opswalrus (1.0.98)
       activesupport (~> 7.0)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)
@@ -15,11 +15,13 @@ PATH
       semantic_logger (~> 4.13)
       sshkit (~> 1.21)
       tty-editor (~> 0.7)
+      tty-exit (~> 0.1)
+      tty-option (~> 0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.2)
+    activesupport (7.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -29,33 +31,33 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     backport (1.2.0)
     base64 (0.2.0)
     bcrypt_pbkdf (1.1.0)
     benchmark (0.3.0)
-    bigdecimal (3.1.4)
+    bigdecimal (3.1.6)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     citrus (3.0.2)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    debug_inspector (1.1.0)
+    debug_inspector (1.2.0)
     diff-lcs (1.5.0)
     drb (2.2.0)
       ruby2_keywords
     e2mmap (0.1.0)
     ed25519 (1.3.0)
-    git (1.18.0)
+    git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     gli (2.21.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.6)
-    json (2.6.3)
+    json (2.7.1)
     kleene (0.10.0)
       activesupport (~> 7.1)
       regexp_parser (~> 2.8)
@@ -64,26 +66,28 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    minitest (5.20.0)
+    minitest (5.21.2)
     mutex_m (0.2.0)
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
-    net-ssh (7.2.0)
-    nokogiri (1.15.4-x86_64-linux)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
+    net-ssh (7.2.1)
+    nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.24.0)
+    parser (3.3.0.4)
       ast (~> 2.4.1)
       racc
     pastel (0.8.0)
       tty-color (~> 0.5)
-    public_suffix (5.0.3)
+    public_suffix (5.0.4)
     racc (1.7.3)
     rainbow (3.1.1)
     rake (13.1.0)
     rbs (2.8.4)
     rchardet (1.8.0)
-    regexp_parser (2.8.2)
+    regexp_parser (2.9.0)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.6)
@@ -100,15 +104,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (1.57.2)
+    rubocop (1.60.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
@@ -118,7 +122,7 @@ GEM
     rubyzip (2.3.2)
     semantic_logger (4.15.0)
       concurrent-ruby (~> 1.0)
-    solargraph (0.49.0)
+    solargraph (0.50.0)
       backport (~> 1.2)
       benchmark
       bundler (~> 2.0)
@@ -134,8 +138,10 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    sshkit (1.21.5)
+    sshkit (1.22.0)
+      mutex_m
       net-scp (>= 1.1.2)
+      net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
     thor (1.3.0)
     tilt (2.3.0)
@@ -143,6 +149,8 @@ GEM
     tty-cursor (0.7.1)
     tty-editor (0.7.0)
       tty-prompt (~> 0.22)
+    tty-exit (0.1.0)
+    tty-option (0.3.0)
     tty-prompt (0.23.1)
       pastel (~> 0.8)
       tty-reader (~> 0.8)
@@ -150,7 +158,7 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)

data/exe/ops2

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'opswalrus'
+
+OpsWalrus::Cli2.run(ARGV)

data/lib/opswalrus/_reboot.ops

@@ -11,55 +11,6 @@ timeout = params.timeout.integer!(default: 300)
 delay = 1 if delay < 1
 
 host_to_value_map = ssh_noprep in: :sequence do
-# ssh_noprep do
-
-  # survey of command options:
-  # sudo reboot
-  # sudo systemctl reboot
-
-  # desc "Rebooting #{to_s} (alias=#{self.alias})"
-  # reboot_success = sh? 'sudo /bin/sh -c "(sleep {{ delay }} && reboot) &"'.mustache
-  # puts reboot_success
-
-  # reconnect_time = nil
-  # reconnect_success = if sync
-  #   desc "Waiting for #{to_s} (alias=#{self.alias}) to finish rebooting"
-  #   initial_reconnect_delay = delay + 10
-  #   sleep initial_reconnect_delay
-
-  #   reconnected = false
-  #   give_up = false
-  #   t1 = Time.now
-  #   until reconnected || give_up
-  #     begin
-  #       reconnected = sh?('true')
-  #       # while trying to reconnect, we expect the following exceptions:
-  #       # 1. Net::SSH::Disconnect < Net::SSH::Exception with message: "connection closed by remote host"
-  #       # 2. Errno::ECONNRESET < SystemCallError with message: "Connection reset by peer"
-  #     rescue Net::SSH::Disconnect, Errno::ECONNRESET => e
-  #       # noop; we expect these while we're trying to reconnect
-  #     rescue => e
-  #       puts "#{e.class} < #{e.class.superclass}"
-  #       puts e.message
-  #       puts e.backtrace.take(5).join("\n")
-  #     end
-
-  #     wait_time_elapsed_in_seconds = Time.now - t1
-  #     give_up = wait_time_elapsed_in_seconds > timeout
-  #     sleep 5
-  #   end
-  #   reconnect_time = initial_reconnect_delay + (Time.now - t1)
-  #   reconnected
-  # else
-  #   false
-  # end
-
-  # {
-  #   success: reboot_success && (sync == reconnect_success),
-  #   rebooted: reboot_success,
-  #   reconnected: reconnect_success,
-  #   reboot_duration: reconnect_time
-  # }
   reboot(delay: delay, sync: sync, timeout: timeout)
 end
 

data/lib/opswalrus/bootstrap.sh

@@ -1,21 +1,19 @@
 #!/usr/bin/env bash
 
-export PATH="$HOME/.local/share/rtx/bin:$PATH"    # this is key for activating rtx without running `eval "$($RTX activate bash)"`
-# eval "$(rtx activate bash)"
-RTX="$HOME/.local/share/rtx/bin/rtx"
-rtx_init() { eval "$($RTX activate bash)"; }
-# RTX_RUBY="$HOME/.local/share/rtx/bin/rtx x ruby -- ruby"
-# RTX_GEM="$HOME/.local/share/rtx/bin/rtx x ruby -- gem"
-RTX_RUBY="$HOME/.local/share/rtx/shims/ruby"
-RTX_GEM="$HOME/.local/share/rtx/shims/gem"
-RUBY_CMD=$RTX_RUBY
-GEM_CMD=$RTX_GEM
+export PATH="$HOME/.local/bin:$PATH"    # this is key for activating mise without running `eval "$($MISE activate bash)"`
+MISE="$HOME/.local/bin/mise"
+# mise_init() { eval "$($MISE activate bash)"; }
+# MISE_RUBY="$HOME/.local/bin/mise x ruby -- ruby"
+# MISE_GEM="$HOME/.local/bin/mise x ruby -- gem"
+MISE_RUBY="$HOME/.local/share/mise/shims/ruby"
+MISE_GEM="$HOME/.local/share/mise/shims/gem"
+RUBY_CMD=$MISE_RUBY
+GEM_CMD=$MISE_GEM
 # RUBY_CMD="ruby"
 # GEM_CMD="gem"
 
-if [ -x $RTX ]; then
-  # rtx_init;
-  # eval "$(rtx activate bash)"
+if [ -x $MISE ]; then
+  # mise_init;
   # if brew is already installed, initialize this shell environment with brew
   # if [ -x "$(command -v /home/linuxbrew/.linuxbrew/bin/brew)" ]; then
   if $RUBY_CMD -e "major, minor, patch = RUBY_VERSION.split('.'); exit 1 unless major.to_i >= 3"; then
@@ -29,7 +27,7 @@ if [ -x $RTX ]; then
       # todo: figure out how to install this differently, so that test versions will work
       # gem install opswalrus
       $GEM_CMD install opswalrus
-      $RTX reshim
+      $MISE reshim
 
       exit 0
     # fi
@@ -81,24 +79,8 @@ fi
 # brew install age    # https://github.com/FiloSottile/age
 
 
-### install ruby
+### install ruby via mise
 
-# 1. via homebrew
-# brew install ruby
-# this doesn't install some gems nicely
-
-# 2. via ruby-install
-# brew install bash grep wget curl md5sha1sum sha2 gnu-tar bzip2 xz patchutils gcc
-# brew install ruby-install
-# ruby-install --update
-# ruby-install ruby 3.2.2
-
-# 3. rvm
-# gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
-# \curl -sSL https://get.rvm.io | bash -s stable --autolibs=homebrew
-# rvm install 3.2.2
-
-# 4. rtx (asdf clone)
 if echo $OS | grep -q 'ubuntu'; then
   # update package list
   sudo apt update -qy
@@ -129,13 +111,12 @@ else
   echo "unsupported OS"
   exit 1
 fi
-curl https://rtx.pub/install.sh | sh
-# eval "$($HOME/.local/share/rtx/bin/rtx activate bash)"
-$RTX use -g ruby@3.2
-$RTX reshim
+curl https://mise.jdx.dev/install.sh | sh
+$MISE use -g ruby@latest
+$MISE reshim
 
 
-# 5. age
+# 5. age encryption
 if echo $OS | grep -q 'ubuntu'; then
   # update package list
   sudo apt update -qy
@@ -161,4 +142,4 @@ fi
 
 # install opswalrus gem
 $GEM_CMD install opswalrus
-$RTX reshim
+$MISE reshim

data/lib/opswalrus/cli2.rb

@@ -0,0 +1,115 @@
+require 'tty-exit'
+require 'tty-option'
+
+require_relative "app"
+
+module OpsWalrus
+  def self.env_specified_age_ids()
+    # ENV['AGE_ID'] || (ENV['OPSWALRUS_AGE_IDS'] && Dir.glob(ENV['OPSWALRUS_AGE_IDS']))
+    ENV['OPSWALRUS_AGE_IDS'] && Dir.glob(ENV['OPSWALRUS_AGE_IDS'])
+  end
+
+
+  class Cli2
+    def self.run(argv = ARGV)
+      app = App.instance(Dir.pwd)
+      app.set_local_hostname(ENV["OPSWALRUS_LOCAL_HOSTNAME"]) if ENV["OPSWALRUS_LOCAL_HOSTNAME"]
+
+      command = CliCommand.new()
+      command.parse(argv)
+      exit_status = command.run(app)
+
+      TTY::Exit.exit_with(exit_status)
+    end
+
+    def initialize(app)
+      @app = app
+    end
+  end
+
+  class OpsCmd
+    include TTY::Option
+
+    usage do
+      program "ops"
+
+      command "run"
+
+      desc "Run a command in a new container"
+
+      example "Set working directory (-w)",
+              "  $ dock run -w /path/to/dir/ ubuntu pwd"
+
+      example <<~EOS
+      Mount volume
+        $ dock run -v `pwd`:`pwd` -w `pwd` ubuntu pwd
+      EOS
+    end
+
+    # argument :image do
+    #   required
+    #   desc "The name of the image to use"
+    # end
+
+    # argument :command do
+    #   optional
+    #   desc "The command to run inside the image"
+    # end
+
+    # keyword :restart do
+    #   default "no"
+    #   permit %w[no on-failure always unless-stopped]
+    #   desc "Restart policy to apply when a container exits"
+    # end
+
+    option :verbose do
+      arity "*"
+      short "-v"
+      desc "Verbose mode"
+    end
+
+    # flag :detach do
+    #   short "-d"
+    #   long "--detach"
+    #   desc "Run container in background and print container ID"
+    # end
+
+    # flag :help do
+    #   short "-h"
+    #   long "--help"
+    #   desc "Print usage"
+    # end
+
+    # option :name do
+    #   required
+    #   long "--name string"
+    #   desc "Assign a name to the container"
+    # end
+
+    # option :port do
+    #   arity one_or_more
+    #   short "-p"
+    #   long "--publish list"
+    #   convert :list
+    #   desc "Publish a container's port(s) to the host"
+    # end
+
+    def run(app)
+      if params[:help]
+        print help
+      elsif params.errors.any?
+        puts params.errors.summary
+      else
+        pp params.to_h
+      end
+      11
+    rescue => e
+      app.fatal "catchall exception handler:"
+      app.fatal exception.class
+      app.fatal exception.message
+      app.fatal exception.backtrace.join("\n")
+      1
+    end
+  end
+
+end

data/lib/opswalrus/errors.rb

@@ -1,4 +1,6 @@
 module OpsWalrus
+  ExitCodeHostTemporarilyUnavailable = 11
+
   class Error < StandardError
   end
 
@@ -9,6 +11,9 @@ module OpsWalrus
     end
   end
 
+  class RetriableRemoteInvocationError < RemoteInvocationError
+  end
+
   class SymbolResolutionError < Error
   end
 end

data/lib/opswalrus/host.rb

@@ -162,39 +162,8 @@ module OpsWalrus
       reboot_success = sh? 'sudo /bin/sh -c "(sleep {{ delay }} && reboot) &"'.mustache
       puts reboot_success
 
-      reconnect_time = nil
-      reconnect_success = if sync
-        desc "Waiting for #{to_s} (alias=#{self.alias}) to finish rebooting"
-        initial_reconnect_delay = delay + 10
-        sleep initial_reconnect_delay
-
-        reconnected = false
-        give_up = false
-        t1 = Time.now
-        until reconnected || give_up
-          begin
-            reconnected = sh?('true')
-            # while trying to reconnect, we expect the following exceptions:
-            # 1. Net::SSH::Disconnect < Net::SSH::Exception with message: "connection closed by remote host"
-            # 2. Errno::ECONNRESET < SystemCallError with message: "Connection reset by peer"
-            # 3. Errno::ECONNREFUSED < SystemCallError with message: "Connection refused - connect(2) for 192.168.56.10:22"
-          rescue Net::SSH::Disconnect, Net::SSH::ConnectionTimeout, Errno::ECONNRESET, Errno::ECONNREFUSED => e
-            # noop; we expect these while we're trying to reconnect
-          rescue => e
-            puts "#{e.class} < #{e.class.superclass}"
-            puts e.message
-            puts e.backtrace.take(5).join("\n")
-          end
-
-          wait_time_elapsed_in_seconds = Time.now - t1
-          give_up = wait_time_elapsed_in_seconds > timeout
-          sleep 5
-        end
-        reconnect_time = initial_reconnect_delay + (Time.now - t1)
-        reconnected
-      else
-        false
-      end
+      reconnect_time = reconnect(delay, timeout) if sync
+      reconnect_success = !!reconnect_time
 
       {
         success: reboot_success && (sync == reconnect_success),
@@ -204,6 +173,50 @@ module OpsWalrus
       }
     end
 
+    def autoretry(&block)
+      attempts ||= 0
+      attempts += 1
+      block.call
+    rescue RetriableRemoteInvocationError => e
+      retry if attempts <= 3
+    end
+
+    # returns an integer number of seconds if reconnected; nil otherwise
+    def reconnect(delay: 1, timeout: 300)
+      delay = 1 if delay < 1
+
+      desc "Waiting for #{to_s} (alias=#{self.alias}) to become available. Reconnecting."
+      initial_reconnect_delay = delay + 10
+      sleep initial_reconnect_delay
+
+      reconnected = false
+      give_up = false
+      t1 = Time.now
+      until reconnected || give_up
+        begin
+          reconnected = sh?('true')
+          # while trying to reconnect, we expect the following exceptions:
+          # 1. Net::SSH::Disconnect < Net::SSH::Exception with message: "connection closed by remote host"
+          # 2. Errno::ECONNRESET < SystemCallError with message: "Connection reset by peer"
+          # 3. Errno::ECONNREFUSED < SystemCallError with message: "Connection refused - connect(2) for 192.168.56.10:22"
+        rescue Net::SSH::Disconnect, Net::SSH::ConnectionTimeout, Errno::ECONNRESET, Errno::ECONNREFUSED => e
+          # noop; we expect these while we're trying to reconnect
+        rescue => e
+          puts "#{e.class} < #{e.class.superclass}"
+          puts e.message
+          puts e.backtrace.take(5).join("\n")
+        end
+
+        wait_time_elapsed_in_seconds = Time.now - t1
+        give_up = wait_time_elapsed_in_seconds > timeout
+        sleep 5
+      end
+
+      if reconnected
+        initial_reconnect_delay + (Time.now - t1)
+      end
+    end
+
     # runs the given command
     # returns the stdout from the command
     def sh(desc_or_cmd = nil, cmd = nil, input: nil, &block)

data/lib/opswalrus/invocation.rb

@@ -215,7 +215,7 @@ module OpsWalrus
       retval = JSON.parse(json_string)
       case retval
       when Hash
-        if retval["type"] == 'Invocation::Error'
+        if retval["type"] == Invocation::Error::Type
           # this structure comes from OpsWalrus::Invocation::Error being serialized in App#print_script_result being called from App#run
           # {
           #   type: "Invocation::Error",
@@ -223,9 +223,15 @@ module OpsWalrus
           #   error_class: value.class.name,
           #   error: value,
           #   backtrace: value.is_a?(Exception) ? value.backtrace.take(10).join("\n") : nil,
+          #   exit_status: exit_status
           # }
           # raise RemoteInvocationError.new("Remote Invocation Error:\n  #{retval["error_class"]}: #{retval["error"]}#{retval["backtrace"] && "\n  Backtrace: #{retval['backtrace']}"}")
-          raise RemoteInvocationError.new("Remote Invocation Error:\n  #{retval["error_class"]}: #{retval["error"]}#{retval["backtrace"] && "\n  Backtrace: #{retval['backtrace']}"}", retval)
+
+          if retval["error_variant"] == Invocation::EarlyExitError.name && retval["exit_status"] == ExitCodeHostTemporarilyUnavailable
+            raise RetriableRemoteInvocationError.new("Retriable Remote Invocation Error (exit_status=#{retval["exit_status"]}):\n  #{retval["error_class"]}: #{retval["error"]}#{retval["backtrace"] && "\n  Backtrace: #{retval['backtrace']}"}", retval)
+          else
+            raise RemoteInvocationError.new("Remote Invocation Error (exit_status=#{retval["exit_status"]}):\n  #{retval["error_class"]}: #{retval["error"]}#{retval["backtrace"] && "\n  Backtrace: #{retval['backtrace']}"}", retval)
+          end
         else
           retval.with_indifferent_access.easynav
         end

data/lib/opswalrus/operation_runner.rb

@@ -70,6 +70,12 @@ module OpsWalrus
 
     # runtime_kv_args is an Array(String) of the form: ["arg1:val1", "arg1:val2", ...]
     # params_json_hash is a Hash representation of a JSON string
+    # returns:
+    #   Invocation::Success on success
+    #   or Invocation::EarlyExitError when the user's script intentionally exits early without running to completion
+    #   or Invocation::SshError when a connection error condition is raised
+    #   or Invocation::RuntimeError when some known error condition is raised
+    #   or Invocation::UnhandledError when some unknown error condition is raised
     def run(runtime_kv_args, params_json_hash: nil)
       params_hash = build_params_hash(runtime_kv_args, params_json_hash: params_json_hash)
 

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -37,16 +37,18 @@ module OpsWalrus
       end
     end
     class Error < Result
+      Type = "Invocation::Error"
       def initialize(value, exit_status = 1)
         super(value, exit_status == 0 ? 1 : exit_status)
       end
       def serialize_error
         {
-          type: "Invocation::Error",
+          type: Type,
           error_variant: self.class.name,
           error_class: value.class.name,
           error: value,
           backtrace: value.is_a?(Exception) ? value.backtrace.take(10).join("\n") : nil,
+          exit_status: exit_status
         }
       end
       def failure?
@@ -54,6 +56,8 @@ module OpsWalrus
       end
     end
     class EarlyExitError < Error
+      # irb(main):062> OpsWalrus::Invocation::EarlyExitError.new(nil, 11).serialize_error
+      # => {:type=>"Invocation::Error", :error_variant=>"OpsWalrus::Invocation::EarlyExitError", :error_class=>"NilClass", :error=>nil, :backtrace=>nil, :exit_status=>11}
     end
     class SshError < Error
     end
@@ -217,6 +221,22 @@ module OpsWalrus
       @runtime_env.app.inventory(tags).hosts
     end
 
+    # delay: integer?     # default: 1 - 1 second delay before reboot
+    def reboot(delay: 1)
+      delay = 1 if delay < 1
+
+      # desc "Rebooting"
+      rebooting = sh? 'sudo /bin/sh -c "(sleep {{ delay }} && reboot) &"'.mustache
+      # puts reboot_success
+
+      rebooting
+    end
+
+    def reboot_and_exit(delay: 1)
+      # exit status 11 means Resource temporarily unavailable
+      exit(ExitCodeHostTemporarilyUnavailable, "Host temporarily unavailable. Rebooting.") if reboot(delay)
+    end
+
     def exit(exit_status, message = nil)
       if message
         puts message.mustache(1)

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.97"
+  VERSION = "1.0.98"
 end

data/lib/opswalrus.rb

@@ -4,6 +4,7 @@ require 'bundler/setup'
 
 require_relative 'opswalrus/app'
 require_relative 'opswalrus/cli'
+require_relative 'opswalrus/cli2'
 require_relative 'opswalrus/version'
 
 module OpsWalrus

data/opswalrus.gemspec

@@ -41,6 +41,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rubyzip", "~> 2.3"
   spec.add_dependency "semantic_logger", "~> 4.13"
   spec.add_dependency "tty-editor", "~> 0.7"
+  spec.add_dependency "tty-exit", "~> 0.1"
+  spec.add_dependency "tty-option", "~> 0.3"
 
   spec.add_dependency "bcrypt_pbkdf", "~> 1.1"
   spec.add_dependency "ed25519", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.97
+  version: 1.0.98
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2024-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: tty-exit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: tty-option
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +226,7 @@ email:
 - david@conquerthelawn.com
 executables:
 - ops
+- ops2
 extensions: []
 extra_rdoc_files: []
 files:
@@ -210,8 +239,8 @@ files:
 - README.md
 - Rakefile
 - build.ops
-- cli2.rb
 - exe/ops
+- exe/ops2
 - lib/opswalrus.rb
 - lib/opswalrus/_bootstrap.ops
 - lib/opswalrus/_reboot.ops
@@ -221,6 +250,7 @@ files:
 - lib/opswalrus/bootstrap.sh
 - lib/opswalrus/bundler.rb
 - lib/opswalrus/cli.rb
+- lib/opswalrus/cli2.rb
 - lib/opswalrus/errors.rb
 - lib/opswalrus/git.rb
 - lib/opswalrus/host.rb
@@ -273,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: opswalrus is a tool that runs scripts against a fleet of hosts

data/cli2.rb

@@ -1,88 +0,0 @@
-require 'tty-option'
-
-class Command
-  include TTY::Option
-
-  usage do
-    program "dock"
-
-    command "run"
-
-    desc "Run a command in a new container"
-
-    example "Set working directory (-w)",
-            "  $ dock run -w /path/to/dir/ ubuntu pwd"
-
-    example <<~EOS
-    Mount volume
-      $ dock run -v `pwd`:`pwd` -w `pwd` ubuntu pwd
-    EOS
-  end
-
-  argument :image do
-    required
-    desc "The name of the image to use"
-  end
-
-  argument :command do
-    optional
-    desc "The command to run inside the image"
-  end
-
-  keyword :restart do
-    default "no"
-    permit %w[no on-failure always unless-stopped]
-    desc "Restart policy to apply when a container exits"
-  end
-
-  option :verbose do
-    arity "+"
-    short "-v"
-    desc "Verbose mode"
-  end
-
-  flag :detach do
-    short "-d"
-    long "--detach"
-    desc "Run container in background and print container ID"
-  end
-
-  flag :help do
-    short "-h"
-    long "--help"
-    desc "Print usage"
-  end
-
-  option :name do
-    required
-    long "--name string"
-    desc "Assign a name to the container"
-  end
-
-  option :port do
-    arity one_or_more
-    short "-p"
-    long "--publish list"
-    convert :list
-    desc "Publish a container's port(s) to the host"
-  end
-
-  def run
-    puts params[:verbose].inspect
-    if params[:help]
-      print help
-    elsif params.errors.any?
-      puts params.errors.summary
-    else
-      pp params.to_h
-    end
-  end
-end
-
-def main
-  cmd = Command.new
-  cmd.parse
-  puts cmd.run
-end
-
-main