omaship 0.4.0 → 0.6.0

data/lib/omaship/color_picker.rb

@@ -2,6 +2,8 @@ require "io/console"
 
 module Omaship
   class ColorPicker
+    include LinearPickerControls
+
     SCHEMES = [
       { key: "flexoki-light",    bg: "#FFFCF0", primary: "#205EA6", accent: "#AD8301", text: "#100F0F" },
       { key: "flexoki-dark",     bg: "#100F0F", primary: "#4385BE", accent: "#D0A215", text: "#FFFCF0" },
@@ -18,6 +20,8 @@ module Omaship
     ].freeze
 
     DEFAULT_INDEX = 9
+    SWATCH_SURFACE = "#FFFFFF"
+    SWATCH_BORDER = "#000000"
 
     def initialize(out: $stdout, input: $stdin)
       @out = out
@@ -28,24 +32,23 @@ module Omaship
     def pick
       render
       loop do
-        key = read_key
+        key = read_linear_navigation_key(@input)
         case key
-        when :left, "h"
+        when :previous
           @index = (@index - 1) % SCHEMES.size
           render
-        when :right, "l"
+        when :next
           @index = (@index + 1) % SCHEMES.size
           render
         when :enter, "q"
-          @out.print "\e[?25h"
-          @out.puts
           return SCHEMES[@index][:key]
         when :ctrl_c
-          @out.print "\e[?25h"
-          @out.puts
-          return SCHEMES[DEFAULT_INDEX][:key]
+          raise Interrupt
         end
       end
+    ensure
+      @out.print "\e[?25h"
+      @out.puts if @rendered_lines
     end
 
     private
@@ -65,26 +68,18 @@ module Omaship
 
     def build_preview(scheme)
       name = scheme[:key]
-      bg_block = color_block(scheme[:bg])
-      primary_block = color_block(scheme[:primary])
-      accent_block = color_block(scheme[:accent])
-      text_block = color_block(scheme[:text])
-
-      nav = SCHEMES.map.with_index do |s, i|
-        if i == @index
-          "\e[1m[#{s[:key]}]\e[0m"
-        else
-          " #{s[:key]} "
-        end
-      end
+      bg_block = color_swatch(scheme[:bg], "bg")
+      primary_block = color_swatch(scheme[:primary], "primary")
+      accent_block = color_swatch(scheme[:accent], "accent")
+      text_block = color_swatch(scheme[:text], "text")
 
       [
         "",
         "  #{left_arrow} #{name} #{right_arrow}",
         "",
-        "  #{bg_block} bg    #{primary_block} primary    #{accent_block} accent    #{text_block} text",
+        "  #{bg_block}    #{primary_block}    #{accent_block}    #{text_block}",
         "",
-        "  Use \e[1m<-\e[0m / \e[1m->\e[0m or \e[1mh\e[0m / \e[1ml\e[0m to browse. \e[1mEnter\e[0m to select.",
+        linear_navigation_hint,
         ""
       ]
     end
@@ -97,33 +92,37 @@ module Omaship
       @index < SCHEMES.size - 1 ? "\e[1m>\e[0m" : " "
     end
 
+    def color_swatch(hex, label)
+      "#{color_block(hex)} #{label}"
+    end
+
     def color_block(hex)
+      [
+        background_escape(SWATCH_SURFACE),
+        foreground_escape(SWATCH_BORDER),
+        "[",
+        background_escape(hex),
+        "    ",
+        background_escape(SWATCH_SURFACE),
+        foreground_escape(SWATCH_BORDER),
+        "]",
+        "\e[0m"
+      ].join
+    end
+
+    def background_escape(hex)
       r, g, b = hex_to_rgb(hex)
-      "\e[48;2;#{r};#{g};#{b}m    \e[0m"
+      "\e[48;2;#{r};#{g};#{b}m"
+    end
+
+    def foreground_escape(hex)
+      r, g, b = hex_to_rgb(hex)
+      "\e[38;2;#{r};#{g};#{b}m"
     end
 
     def hex_to_rgb(hex)
       hex = hex.delete("#")
       [ hex[0..1], hex[2..3], hex[4..5] ].map { |c| c.to_i(16) }
     end
-
-    def read_key
-      char = @input.raw { @input.getc }
-      case char
-      when "\r", "\n"
-        :enter
-      when "\e"
-        seq = @input.raw { @input.read_nonblock(2) rescue "" }
-        case seq
-        when "[D" then :left
-        when "[C" then :right
-        else :unknown
-        end
-      when "\x03"
-        :ctrl_c
-      else
-        char
-      end
-    end
   end
 end

data/lib/omaship/harbor_picker.rb

@@ -0,0 +1,72 @@
+require "io/console"
+
+module Omaship
+  class HarborPicker
+    include LinearPickerControls
+
+    def initialize(harbors:, out: $stdout, input: $stdin)
+      @harbors = Array(harbors)
+      @out = out
+      @input = input
+      @index = 0
+    end
+
+    def pick
+      render
+      loop do
+        key = read_linear_navigation_key(@input)
+
+        case key
+        when :previous
+          @index = (@index - 1) % @harbors.size
+          render
+        when :next
+          @index = (@index + 1) % @harbors.size
+          render
+        when :enter, "q"
+          return @harbors.fetch(@index).fetch("id")
+        when :ctrl_c
+          raise Interrupt
+        end
+      end
+    ensure
+      @out.print "\e[?25h"
+      @out.puts if @rendered_lines
+    end
+
+    private
+      def render
+        @out.print "\e[?25l"
+        @out.print "\r\e[K"
+        lines = build_preview
+        move_up = @rendered_lines || 0
+        @out.print "\e[#{move_up}A" if move_up > 0
+        lines.each do |line|
+          @out.print "\r\e[K#{line}\n"
+        end
+        @rendered_lines = lines.size
+      end
+
+      def build_preview
+        [
+          "",
+          *harbor_rows,
+          "",
+          linear_navigation_hint,
+          ""
+        ]
+      end
+
+      def harbor_rows
+        width = @harbors.map { |harbor| harbor.fetch("name").length }.max || 0
+
+        @harbors.map.with_index do |harbor, index|
+          marker = index == @index ? ">" : " "
+          label = harbor.fetch("name").ljust(width)
+          summary = harbor.fetch("management", "managed").capitalize
+          line = "#{marker} #{label}  #{summary}"
+          "  #{index == @index ? "\e[1m#{line}\e[0m" : line}"
+        end
+      end
+  end
+end

data/lib/omaship/linear_picker_controls.rb

@@ -0,0 +1,34 @@
+module Omaship
+  module LinearPickerControls
+    private
+    def linear_navigation_hint
+      "  Navigate with arrows or h/j/k/l. Enter to select."
+    end
+
+    def read_linear_navigation_key(input)
+      char = input.raw { input.getc }
+      case char
+      when "\r", "\n"
+        :enter
+      when "\e"
+        seq = input.raw { input.read_nonblock(2) rescue "" }
+        case seq
+        when "[A", "[D"
+          :previous
+        when "[B", "[C"
+          :next
+        else
+          :unknown
+        end
+      when "\x03"
+        :ctrl_c
+      when "h", "k"
+        :previous
+      when "j", "l"
+        :next
+      else
+        char
+      end
+    end
+  end
+end

data/lib/omaship/progress_renderer.rb

@@ -1,8 +1,22 @@
 module Omaship
   class ProgressRenderer
+    SPINNER_FRAMES = [
+      "[=   ]",
+      "[ =  ]",
+      "[  = ]",
+      "[   =]",
+      "[  = ]",
+      "[ =  ]"
+    ].freeze
+
     def initialize(out:)
       @out = out
       @seen = {}
+      @activity_mutex = Mutex.new
+      @activity_message = nil
+      @activity_eta = nil
+      @current_frame = SPINNER_FRAMES.first
+      @cursor_hidden = false
     end
 
     def step(message)
@@ -11,5 +25,138 @@ module Omaship
       @seen[message] = true
       @out.puts message
     end
+
+    def start_activity(message, eta: nil)
+      @activity_mutex.synchronize do
+        @activity_message = message
+        @activity_eta = eta
+      end
+
+      if interactive_output?
+        hide_cursor
+        render_activity_frame(@current_frame)
+        start_spinner
+      else
+        step(activity_line(message:, eta:))
+      end
+    end
+
+    def update_activity(message: nil, eta: nil)
+      @activity_mutex.synchronize do
+        @activity_message = message if message
+        @activity_eta = eta if eta
+      end
+
+      if interactive_output?
+        render_activity_frame(@current_frame)
+      else
+        line = nil
+        @activity_mutex.synchronize do
+          line = activity_line(message: @activity_message, eta: @activity_eta)
+        end
+        step(line)
+      end
+    end
+
+    def finish_activity(message = nil)
+      stop_spinner
+      step(message) if message
+    end
+
+    private
+      def interactive_output?
+        @out.respond_to?(:tty?) && @out.tty?
+      end
+
+      def start_spinner
+        return if @spinner_thread&.alive?
+
+        @spinner_stop = false
+        @spinner_thread = Thread.new do
+          index = 1
+
+          until @spinner_stop
+            frame = SPINNER_FRAMES[index % SPINNER_FRAMES.length]
+            render_activity_frame(frame)
+            sleep 0.12
+            index += 1
+          end
+        end
+      end
+
+      def stop_spinner
+        return unless @spinner_thread
+
+        @spinner_stop = true
+        @spinner_thread.join(0.5)
+        @spinner_thread.kill if @spinner_thread.alive?
+        @spinner_thread = nil
+        clear_line
+        show_cursor
+      end
+
+      def activity_line(message:, eta:)
+        normalized_message = message.to_s.strip
+        normalized_eta = eta.to_s.strip
+
+        if normalized_eta.empty?
+          normalized_message
+        else
+          "#{normalized_message} (ETA #{normalized_eta})"
+        end
+      end
+
+      def render_activity_frame(frame)
+        line = nil
+
+        @activity_mutex.synchronize do
+          @current_frame = frame
+          line = "#{frame} #{activity_line(message: @activity_message, eta: @activity_eta)}"
+        end
+
+        clear_line
+        @out.print(truncate_for_terminal(line))
+        @out.flush if @out.respond_to?(:flush)
+      end
+
+      def clear_line
+        @out.print("\r\e[2K")
+      end
+
+      def hide_cursor
+        return if @cursor_hidden
+
+        @out.print("\e[?25l")
+        @out.flush if @out.respond_to?(:flush)
+        @cursor_hidden = true
+      end
+
+      def show_cursor
+        return unless @cursor_hidden
+
+        @out.print("\e[?25h")
+        @out.flush if @out.respond_to?(:flush)
+        @cursor_hidden = false
+      end
+
+      def truncate_for_terminal(line)
+        maximum_width = [ terminal_width - 1, 1 ].max
+        return line if line.length <= maximum_width
+        return line[0, maximum_width] if maximum_width <= 3
+
+        "#{line[0, maximum_width - 3]}..."
+      end
+
+      def terminal_width
+        width = if @out.respond_to?(:winsize)
+          Array(@out.winsize)[1]
+        elsif IO.respond_to?(:console) && IO.console
+          IO.console.winsize[1]
+        end
+
+        width.to_i > 0 ? width.to_i : 80
+      rescue IOError, NoMethodError
+        80
+      end
   end
 end

data/lib/omaship/ship_detector.rb

@@ -3,7 +3,7 @@ require "open3"
 module Omaship
   class ShipDetector
     class DetectionError < StandardError; end
-    SHIP_CONTEXT_ERROR_MESSAGE = "Could not determine which ship to use automatically. Pass --ship <org/repo> (or ship id) to choose a ship.".freeze
+    SHIP_CONTEXT_ERROR_MESSAGE = "Could not determine which ship to use automatically. Pass --ship <ship-domain> (or ship id) to choose a ship.".freeze
 
     def initialize(api_client:)
       @api_client = api_client

data/lib/omaship/ship_type_picker.rb

@@ -0,0 +1,98 @@
+require "io/console"
+
+module Omaship
+  class ShipTypePicker
+    include LinearPickerControls
+
+    OPTIONS = [
+      {
+        key: "landing",
+        label: "Landingpage",
+        summary: "Public landing page with waitlist capture"
+      },
+      {
+        key: "app",
+        label: "Full App",
+        summary: "Authenticated product UI with dashboard"
+      },
+      {
+        key: "api",
+        label: "Agent API",
+        summary: "Agent-first API with CLI scaffolding"
+      }
+    ].freeze
+
+    DEFAULT_INDEX = 1
+
+    def self.label_for(key)
+      option = OPTIONS.find { |entry| entry[:key] == key }
+      option ? option[:label] : key.to_s
+    end
+
+    def initialize(out: $stdout, input: $stdin)
+      @out = out
+      @input = input
+      @index = DEFAULT_INDEX
+    end
+
+    def pick
+      render
+      loop do
+        key = read_linear_navigation_key(@input)
+
+        case key
+        when :previous
+          @index = (@index - 1) % OPTIONS.size
+          render
+        when :next
+          @index = (@index + 1) % OPTIONS.size
+          render
+        when :enter, "q"
+          return OPTIONS[@index][:key]
+        when :ctrl_c
+          raise Interrupt
+        end
+      end
+    ensure
+      @out.print "\e[?25h"
+      @out.puts if @rendered_lines
+    end
+
+    private
+
+    def render
+      option = OPTIONS[@index]
+      @out.print "\e[?25l"
+      @out.print "\r\e[K"
+      lines = build_preview(option)
+      move_up = @rendered_lines || 0
+      @out.print "\e[#{move_up}A" if move_up > 0
+      lines.each do |line|
+        @out.print "\r\e[K#{line}\n"
+      end
+      @rendered_lines = lines.size
+    end
+
+    def build_preview(option)
+      [
+        "",
+        *option_rows(option: option),
+        "",
+        linear_navigation_hint,
+        ""
+      ]
+    end
+
+    def option_rows(option:)
+      OPTIONS.map do |entry|
+        marker = entry == option ? ">" : " "
+        line = "#{marker} #{entry[:label].ljust(label_width)}  #{entry[:summary]}"
+        "  #{entry == option ? "\e[1m#{line}\e[0m" : line}"
+      end
+    end
+
+    def label_width
+      @label_width ||= OPTIONS.map { |entry| entry[:label].length }.max
+    end
+  end
+end

data/lib/omaship/version.rb

@@ -1,3 +1,3 @@
 module Omaship
-  VERSION = "0.4.0".freeze
+  VERSION = "0.6.0".freeze
 end

data/lib/omaship.rb

@@ -6,5 +6,8 @@ require_relative "omaship/api_client"
 require_relative "omaship/credentials"
 require_relative "omaship/progress_renderer"
 require_relative "omaship/ship_detector"
+require_relative "omaship/linear_picker_controls"
 require_relative "omaship/color_picker"
+require_relative "omaship/harbor_picker"
+require_relative "omaship/ship_type_picker"
 require_relative "omaship/cli"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omaship
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Omaship
@@ -51,7 +51,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: CLI for login, ship provisioning, and deploy operations against Omaship.
+description: CLI for login, ship provisioning, and ship management against Omaship.
 email:
 - hello@omaship.com
 executables:
@@ -67,8 +67,11 @@ files:
 - lib/omaship/cli.rb
 - lib/omaship/color_picker.rb
 - lib/omaship/credentials.rb
+- lib/omaship/harbor_picker.rb
+- lib/omaship/linear_picker_controls.rb
 - lib/omaship/progress_renderer.rb
 - lib/omaship/ship_detector.rb
+- lib/omaship/ship_type_picker.rb
 - lib/omaship/version.rb
 homepage: https://omaship.com
 licenses:
@@ -91,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Omaship command-line interface
 test_files: []