odysseus-cli 0.3.0 → 0.10.0

data/lib/odysseus/cli/ui.rb

@@ -35,8 +35,8 @@ module Odysseus
         @io.respond_to?(method, include_private)
       end
 
-      def method_missing(method, *args, &block)
-        @io.send(method, *args, &block)
+      def method_missing(method, *, &)
+        @io.send(method, *, &)
       end
     end
 
@@ -68,27 +68,32 @@ module Odysseus
       end
 
       # --- Header ---
+      #
+      # These three take `io` for the same reason error/warn/step below do: the
+      # interactive sessions print a header describing a terminal whose own
+      # output is stdout, so the description has to go somewhere else. The
+      # default keeps every other caller writing exactly where it did.
 
-      def header(title)
+      def header(title, io: $stdout)
         reset_steps!
         if debug?
-          puts "\e[36m#{title}\e[0m"
+          io.puts "\e[36m#{title}\e[0m"
         else
-          puts ""
-          puts "  #{COPPER}#{title}#{RESET}"
+          io.puts ''
+          io.puts "  #{COPPER}#{title}#{RESET}"
         end
       end
 
-      def info(label, value)
+      def info(label, value, io: $stdout)
         if debug?
-          puts "  #{label}: #{value}"
+          io.puts "  #{label}: #{value}"
         else
-          puts "  #{DIM}#{label}:#{RESET} #{value}"
+          io.puts "  #{DIM}#{label}:#{RESET} #{value}"
         end
       end
 
-      def blank
-        puts ""
+      def blank(io: $stdout)
+        io.puts ''
       end
 
       # --- Single spin step ---
@@ -116,19 +121,18 @@ module Odysseus
         $stdout = wr
 
         thread = Thread.new do
-          begin
-            result = yield
-          rescue => e
-            err = e
-          ensure
-            done = true
-            wr.close
-          end
+          result = yield
+        rescue StandardError => e
+          err = e
+        ensure
+          done = true
+          wr.close
         end
 
         frame_idx = 0
         loop do
           break if done
+
           frame = SPINNER_FRAMES[frame_idx % SPINNER_FRAMES.size]
           old_stdout.print "\r  #{DIM}#{num}#{RESET}  #{COPPER}#{frame}#{RESET}  #{message}"
           old_stdout.flush
@@ -190,7 +194,7 @@ module Odysseus
           $stdout = wr
           begin
             result = yield
-          rescue => e
+          rescue StandardError => e
             err = e
           ensure
             done = true
@@ -199,7 +203,7 @@ module Odysseus
         end
 
         frame_idx = 0
-        buf = ""
+        buf = ''
 
         loop do
           # Non-blocking read from pipe
@@ -216,6 +220,7 @@ module Odysseus
           while (nl = buf.index("\n"))
             line = buf.slice!(0..nl).strip
             next if line.empty?
+
             line = clean_line(line)
             next unless line
 
@@ -263,6 +268,7 @@ module Odysseus
         end
 
         raise err if err
+
         result
       end
 
@@ -289,19 +295,24 @@ module Odysseus
         puts "  #{MINT}✓#{RESET} #{message}"
       end
 
-      def error(message)
-        puts "  #{RED}✗#{RESET} #{message}"
+      # `io` is for the commands whose stdout is data rather than chatter:
+      # `odysseus logs web1 > app.log` captures a log stream, and a notice about
+      # which container the logs came from does not belong in it. A default
+      # rather than a second set of methods, so every other caller keeps writing
+      # to stdout exactly as before.
+      def error(message, io: $stdout)
+        io.puts "  #{RED}✗#{RESET} #{message}"
       end
 
-      def warn(message)
-        puts "  \e[33m!#{RESET} #{message}"
+      def warn(message, io: $stdout)
+        io.puts "  \e[33m!#{RESET} #{message}"
       end
 
-      def step(message)
+      def step(message, io: $stdout)
         if debug?
-          puts "  #{redact(message)}"
+          io.puts "  #{redact(message)}"
         else
-          puts "  #{DIM}›#{RESET} #{message}"
+          io.puts "  #{DIM}›#{RESET} #{message}"
         end
       end
 
@@ -318,12 +329,12 @@ module Odysseus
           [h.to_s.length, rows.map { |r| r[i].to_s.length }.max || 0].max
         end
 
-        header_line = headers.map.with_index { |h, i| h.to_s.ljust(widths[i]) }.join("  ")
+        header_line = headers.map.with_index { |h, i| h.to_s.ljust(widths[i]) }.join('  ')
         puts "  #{COPPER}#{header_line}#{RESET}"
         puts "  #{widths.map { |w| '─' * w }.join('  ')}"
 
         rows.each do |row|
-          line = row.map.with_index { |c, i| c.to_s.ljust(widths[i]) }.join("  ")
+          line = row.map.with_index { |c, i| c.to_s.ljust(widths[i]) }.join('  ')
           puts "  #{line}"
         end
       end
@@ -341,15 +352,15 @@ module Odysseus
       # --- Deploy-specific helpers ---
 
       def deploy_header(service:, image:, image_tag:, build: false, distribution: nil)
-        header "Odysseus Deploy"
-        info "Service", service
-        info "Image", "#{image}:#{image_tag}"
-        info "Distribute", distribution if build && distribution
+        header 'Odysseus Deploy'
+        info 'Service', service
+        info 'Image', "#{image}:#{image_tag}"
+        info 'Distribute', distribution if build && distribution
         blank
       end
 
       def deploy_complete(duration: nil)
-        msg = "Deployment successful"
+        msg = 'Deployment successful'
         msg += " in #{duration}s" if duration
         step_ok msg
       end
@@ -421,9 +432,7 @@ module Odysseus
 
         # Map known messages to clean versions
         CLEAN_MESSAGES.each do |pattern, replacement|
-          if line.match?(pattern)
-            return line.sub(pattern, replacement)
-          end
+          return line.sub(pattern, replacement) if line.match?(pattern)
         end
 
         line
@@ -440,8 +449,9 @@ module Odysseus
         /^Pushing to (.+)\.\.\./ => 'Pushing image to \1',
         /^Starting (.+)\.\.\.$/ => 'Starting \1',
         /^Stopping (.+) .*/ => 'Stopping \1',
-        /^Attaching (.+) to proxy.*/ => 'Attaching \1 to proxy',
+        /^Attaching (.+) to proxy.*/ => 'Attaching \1 to proxy'
       }.freeze
+      private_constant :CLEAN_MESSAGES
     end
   end
 end

data/lib/odysseus/cli/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Odysseus
+  module CLI
+    VERSION = '0.10.0'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odysseus-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Thomas
@@ -15,56 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: ratatui_ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
+        version: 0.10.0
 description: Command-line interface for deploying with Odysseus
 email:
 - thomas@imfiny.com
@@ -73,14 +31,25 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE.txt
 - README.md
 - bin/odysseus
 - lib/odysseus/cli/cli.rb
+- lib/odysseus/cli/doctor_commands.rb
+- lib/odysseus/cli/interactive_commands.rb
+- lib/odysseus/cli/rollback_commands.rb
+- lib/odysseus/cli/setup_commands.rb
 - lib/odysseus/cli/ui.rb
+- lib/odysseus/cli/version.rb
 homepage: https://github.com/WA-Systems-EU/odysseus
 licenses:
-- LGPL-3.0-only
-metadata: {}
+- MIT
+metadata:
+  homepage_uri: https://github.com/WA-Systems-EU/odysseus
+  source_code_uri: https://github.com/WA-Systems-EU/odysseus
+  changelog_uri: https://github.com/WA-Systems-EU/odysseus/blob/trunk/odysseus-cli/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -88,14 +57,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.19
 specification_version: 4
 summary: CLI for Odysseus deployment tool
 test_files: []