space-architect 1.3.0 → 2.0.0.rc1

data/lib/space_core/cli/new.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Space::Core::CLI
+class New < BaseCommand
+  desc "Create a new project space"
+  argument :title, required: true, desc: "Space title"
+  option :repo, type: :array, aliases: ["-r"], desc: "Repo ref to clone (repeatable: pass -r once per repo)"
+  option :git, type: :boolean, default: true, desc: "Initialize the space as a Git repository (use --no-git to skip)"
+  example "\"My Space\" -r org/repo -r example-tools/alpha   # clone two repos into the space"
+
+  def call(title:, repo: [], git: true, **opts)
+    setup_terminal(**opts.slice(:color, :colors))
+    result = store.create(title, git: git).bind do |space|
+      terminal.success "Created #{space.id}"
+
+      repo_specs = Array(repo).compact
+      repo_specs.each { |spec| terminal.say "Queued #{spec}" }
+
+      next Success(space) if repo_specs.empty?
+
+      progress = RepoProgress.new(repo_specs.length)
+      terminal.with_spinner(-> { progress.message }) do
+        store.add_repos_to(space, repo_specs, reporter: progress)
+      end.fmap do |results|
+        results.each do |r|
+          terminal.success "Added #{r.fetch(:repo).fetch('full_name')}"
+          terminal.say terminal.path(r.fetch(:path))
+        end
+        space
+      end
+    end
+    render(result) do |space|
+      terminal.say terminal.path(space.path)
+      CLI.record_outcome(Outcome.new(exit_code: 0))
+    end
+  end
+end
+end

data/lib/space_core/cli/path.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Space::Core::CLI
+class Path < BaseCommand
+  desc "Print the path for a space or the current space"
+  argument :identifier, required: false, desc: "Space ID or title slug"
+
+  def call(identifier: nil, **opts)
+    setup_terminal(**opts.slice(:color, :colors))
+    render(store.path_for(identifier)) do |path|
+      terminal.say terminal.path(path)
+      CLI.record_outcome(Outcome.new(exit_code: 0))
+    end
+  end
+end
+end

data/lib/space_core/cli/repeatable_options.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require "dry/cli"
+
+# dry-cli (1.4.x) treats `type: :array` options as comma-separated and OVERWRITES
+# on each occurrence, so `-r a -r b` yields ["b"]. We want repeated flags to
+# accumulate (`-r a -r b -r c` => ["a", "b", "c"]) the way git/docker-style CLIs
+# do, while still accepting the comma form. dry-cli exposes no hook for this, so
+# we reopen two private seams, each mirroring dry-cli 1.4.1 with a single change:
+#
+#   * Parser.call                  — concat instead of assign for array options.
+#   * Banner.extended_command_options — drop the "=VALUE1,VALUE2,.." hint that
+#     advertised the comma form as the only way; show the plain repeatable flag,
+#     matching how you actually type it (-r VALUE).
+#
+# These mirror the released 1.4.1 source EXACTLY (not the dry-rb main branch,
+# which already differs). Pinned via `~> 1.4`; if a future dry-cli reworks these
+# methods, repeatable_options_test goes red and we re-sync. Rationale:
+# notes/ruby-cli-gems-report.md.
+module Dry
+  class CLI
+    module Parser
+      def self.call(command, arguments, prog_name)
+        original_arguments = arguments.dup
+        parsed_options = {}
+
+        OptionParser.new do |opts|
+          command.options.each do |option|
+            opts.on(*option.parser_options) do |value|
+              if option.array?
+                (parsed_options[option.name.to_sym] ||= []).concat(value)
+              else
+                parsed_options[option.name.to_sym] = value
+              end
+            end
+          end
+
+          opts.on_tail("-h", "--help") do
+            return Result.help
+          end
+        end.parse!(arguments)
+
+        parsed_options = command.default_params.merge(parsed_options)
+        parse_required_params(command, arguments, prog_name, parsed_options)
+      rescue ::OptionParser::ParseError, ValueError
+        Result.failure("ERROR: \"#{prog_name}\" was called with arguments \"#{original_arguments.join(" ")}\"")
+      end
+    end
+
+    module Banner
+      def self.extended_command_options(command)
+        result = command.options.map do |option|
+          name = Inflector.dasherize(option.name)
+          name = if option.boolean?
+                   "[no-]#{name}"
+                 elsif option.flag?
+                   name
+                 else
+                   # array options included: repeated flags accumulate, so show
+                   # the single repeatable form rather than "=VALUE1,VALUE2,..".
+                   "#{name}=VALUE"
+                 end
+          name = "#{name}, #{option.alias_names.join(", ")}" if option.aliases.any?
+          name = "  --#{name.ljust(30)}"
+          name = "#{name}  # #{option.desc}"
+          name = "#{name}, default: #{option.default.inspect}" unless option.default.nil?
+          name
+        end
+
+        result << "  --#{"help, -h".ljust(30)}  # Print this help"
+        result.join("\n")
+      end
+    end
+  end
+end

data/lib/space_core/cli/repo.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Space::Core::CLI
+module Repo
+  class Add < BaseCommand
+    desc "Clone repos into the current space"
+    argument :repos, type: :array, required: false, desc: "REPO [REPO...]"
+
+    def call(repos: [], **opts)
+      setup_terminal(**opts.slice(:color, :colors))
+      handle_errors do
+        specs = Array(repos).compact
+        if specs.empty?
+          terminal.error("Usage: space repo add REPO [REPO...]")
+          CLI.record_outcome(Outcome.new(exit_code: 1))
+          next
+        end
+
+        progress = RepoProgress.new(specs.length)
+        add_result = terminal.with_spinner(-> { progress.message }) do
+          store.add_repos(specs, reporter: progress)
+        end
+        render(add_result) do |results|
+          results.each do |result|
+            terminal.success "Added #{result.fetch(:repo).fetch('full_name')}"
+            terminal.say terminal.path(result.fetch(:path))
+          end
+          CLI.record_outcome(Outcome.new(exit_code: 0))
+        end
+      end
+    end
+  end
+
+  class RepoList < BaseCommand
+    desc "List repos in the current space"
+
+    def call(**opts)
+      setup_terminal(**opts.slice(:color, :colors))
+      handle_errors do
+        render(store.repos) do |repos|
+          if repos.empty?
+            id = store.find.fmap(&:id).value_or("(unknown space)")
+            terminal.say "No repos found in #{id}"
+            next
+          end
+
+          rows = repos.map { |repo| [repo.fetch("full_name", repo["name"]), repo.fetch("path", "")] }
+          terminal.say terminal.table(["Repo", "Path"], rows)
+          CLI.record_outcome(Outcome.new(exit_code: 0))
+        end
+      end
+    end
+  end
+
+  class Resolve < BaseCommand
+    desc "Resolve repo refs without cloning"
+    argument :repos, type: :array, required: false, desc: "REPO [REPO...]"
+
+    def call(repos: [], **opts)
+      setup_terminal(**opts.slice(:color, :colors))
+      handle_errors do
+        specs = Array(repos).compact
+        if specs.empty?
+          terminal.error("Usage: space repo resolve REPO [REPO...]")
+          CLI.record_outcome(Outcome.new(exit_code: 1))
+          next
+        end
+
+        references = specs.map { |spec| Space::Core::RepoResolver.new(project_config).resolve(spec) }
+        terminal.say terminal.table(["Repo", "Clone URL"], references.map { |ref| [ref.full_name, ref.clone_url] })
+        CLI.record_outcome(Outcome.new(exit_code: 0))
+      end
+    end
+  end
+end
+end

data/lib/space_core/cli/shell.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+module Space::Core::CLI
+module Shell
+  class ShellInit < BaseCommand
+    desc "Print shell integration script"
+    argument :shell_name, required: true, desc: "Shell name (e.g. fish)"
+
+    def call(shell_name:, **opts)
+      setup_terminal(**opts.slice(:color, :colors))
+      handle_errors do
+        terminal.say Space::Core::ShellIntegration.for(shell_name)
+        CLI.record_outcome(Outcome.new(exit_code: 0))
+      end
+    end
+  end
+
+  class Fish < BaseCommand
+    desc "Manage fish shell integration: install, uninstall, path"
+    argument :subcommand, required: false, desc: "install, uninstall, or path (default: install)"
+    option :force, type: :boolean, default: false, desc: "Overwrite or remove existing shell files"
+
+    def call(subcommand: "install", force: false, **opts)
+      setup_terminal(**opts.slice(:color, :colors))
+      handle_errors do
+        case subcommand
+        when "install"
+          result = Space::Core::ShellIntegration.install("fish", env: project_config.env, force: force)
+          terminal.success fish_install_message(result.fetch(:action), result.fetch(:path))
+          terminal.success fish_completions_install_message(result.fetch(:completions_action), result.fetch(:completions_path))
+          terminal.say "Restart fish to load the integration in this terminal: exec fish"
+        when "uninstall"
+          result = Space::Core::ShellIntegration.uninstall("fish", env: project_config.env, force: force)
+          terminal.success fish_uninstall_message(result.fetch(:action), result.fetch(:path))
+          terminal.success fish_completions_uninstall_message(result.fetch(:completions_action), result.fetch(:completions_path))
+        when "path"
+          terminal.say "Function:    #{terminal.path(Space::Core::ShellIntegration.path_for('fish', env: project_config.env))}"
+          terminal.say "Completions: #{terminal.path(Space::Core::ShellIntegration.completions_path_for('fish', env: project_config.env))}"
+        else
+          err.puts "Usage: space shell fish [install|uninstall|path]"
+          CLI.record_outcome(Outcome.new(exit_code: 1))
+          next
+        end
+        CLI.record_outcome(Outcome.new(exit_code: 0))
+      end
+    end
+
+    private
+
+    def fish_install_message(action, path)
+      case action
+      when :unchanged then "Fish integration already installed: #{terminal.path(path)}"
+      when :updated   then "Updated fish integration: #{terminal.path(path)}"
+      else                 "Installed fish integration: #{terminal.path(path)}"
+      end
+    end
+
+    def fish_uninstall_message(action, path)
+      case action
+      when :missing then "Fish integration was not installed: #{terminal.path(path)}"
+      else               "Removed fish integration: #{terminal.path(path)}"
+      end
+    end
+
+    def fish_completions_install_message(action, path)
+      case action
+      when :unchanged then "Fish completions already installed: #{terminal.path(path)}"
+      when :updated   then "Updated fish completions: #{terminal.path(path)}"
+      else                 "Installed fish completions: #{terminal.path(path)}"
+      end
+    end
+
+    def fish_completions_uninstall_message(action, path)
+      case action
+      when :missing then "Fish completions were not installed: #{terminal.path(path)}"
+      else               "Removed fish completions: #{terminal.path(path)}"
+      end
+    end
+  end
+
+  class Complete < BaseCommand
+    desc "Print completion candidates"
+    argument :kind, required: true, desc: "Completion kind"
+    argument :extra, type: :array, required: false, desc: "Extra args for completion"
+
+    def call(kind:, extra: [], **opts)
+      setup_terminal(**opts.slice(:color, :colors))
+      handle_errors do
+        completion_candidates(kind, Array(extra)).each { |c| terminal.say c }
+        CLI.record_outcome(Outcome.new(exit_code: 0))
+      end
+    end
+
+    private
+
+    def completion_candidates(kind, args)
+      case kind
+      when "spaces"          then store.list.map { |space| "#{space.id}\t#{space.title}" }
+      when "statuses"        then Space::Core::Space::VALID_STATUSES
+      when "config-keys"     then Space::Core::Config::EDITABLE_KEYS
+      when "config-values"   then completion_values_for_config_key(args.first)
+      when "shells"          then ["fish"]
+      when "color-modes"     then %w[auto always never]
+      when "repo-subcommands"   then %w[add list ls resolve]
+      when "config-subcommands" then %w[show path set]
+      when "fish-subcommands"   then %w[install uninstall path]
+      else
+        raise Space::Core::Error, "Usage: space shell complete #{completion_kinds.join('|')}"
+      end
+    end
+
+    def completion_values_for_config_key(key)
+      case key
+      when "git_clone_protocol" then Space::Core::Config::VALID_GIT_CLONE_PROTOCOLS
+      when "default_provider"   then %w[github.com gitlab.com]
+      else []
+      end
+    end
+
+    def completion_kinds
+      %w[spaces statuses config-keys config-values shells color-modes repo-subcommands config-subcommands fish-subcommands]
+    end
+  end
+end
+end

data/lib/space_core/cli/show.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Space::Core::CLI
+class Show < BaseCommand
+  desc "Show metadata for a space or the current space"
+  argument :identifier, required: false, desc: "Space ID or title slug"
+
+  def call(identifier: nil, **opts)
+    setup_terminal(**opts.slice(:color, :colors))
+    render(store.find(identifier)) do |space|
+      terminal.say "ID:         #{space.id}"
+      terminal.say "Title:      #{space.title}"
+      terminal.say "Status:     #{space.status}"
+      terminal.say "Path:       #{terminal.path(space.path)}"
+      terminal.say "Created:    #{space.data['created_at']}"
+      terminal.say "Updated:    #{space.data['updated_at']}"
+      CLI.record_outcome(Outcome.new(exit_code: 0))
+    end
+  end
+end
+end

data/lib/space_core/cli/status.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Space::Core::CLI
+class Status < BaseCommand
+  desc "Set a space status: active, paused, done, archived"
+  argument :rest, type: :array, required: false, desc: "[SPACE] STATUS"
+
+  def call(rest: [], **opts)
+    setup_terminal(**opts.slice(:color, :colors))
+    handle_errors do
+      identifier, status_value = parse_status_args(Array(rest))
+      render(store.find(identifier)) do |space|
+        space.update_status(status_value)
+        terminal.success "#{space.id} is #{space.status}"
+        CLI.record_outcome(Outcome.new(exit_code: 0))
+      end
+    end
+  end
+
+  private
+
+  def parse_status_args(args)
+    case args.length
+    when 1
+      [nil, args.first]
+    when 2
+      args
+    else
+      raise Space::Core::Error, "Usage: space status [SPACE] STATUS"
+    end
+  end
+end
+end

data/lib/space_core/cli/use.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Space::Core::CLI
+class Use < BaseCommand
+  desc "Remember a space in recent state and print its path"
+  argument :identifier, required: true, desc: "Space ID or title slug"
+
+  def call(identifier:, **opts)
+    setup_terminal(**opts.slice(:color, :colors))
+    render(store.use(identifier)) do |space|
+      terminal.success "Recent space: #{space.id}"
+      terminal.say terminal.path(space.path)
+      CLI.record_outcome(Outcome.new(exit_code: 0))
+    end
+  end
+end
+end

data/lib/space_core/cli.rb

@@ -0,0 +1,171 @@
+# frozen_string_literal: true
+
+require "dry/cli"
+require "pastel"
+require_relative "cli/repeatable_options"
+require_relative "cli/help"
+
+module Space::Core
+  module CLI
+    CLI = self
+
+    Outcome = Data.define(:exit_code, :message) do
+      def initialize(exit_code:, message: nil) = super
+    end
+
+    def self.record_outcome(o) = (Thread.current[:space_core_cli_outcome] = o)
+    def self.last_outcome = Thread.current[:space_core_cli_outcome]
+
+    # Pastel used by the colourful help listing (Help / the Usage reopen). Set
+    # per-invocation in .call from the output stream and --color; defaults to a
+    # disabled instance so non-CLI callers and tests render plain text.
+    def self.help_pastel = @help_pastel ||= Pastel.new(enabled: false)
+
+    def self.help_pastel=(pastel)
+      @help_pastel = pastel
+    end
+
+    # Whether the help listing should be colourised: honour an explicit
+    # --color/--colors (always/never), otherwise auto-detect from the streams the
+    # listing can land on (stdout for top-level help, stderr for bare namespaces).
+    def self.help_colors?(argv, out, err)
+      case color_mode(argv)
+      when "always" then true
+      when "never"  then false
+      else tty?(out) || tty?(err)
+      end
+    end
+
+    def self.tty?(io) = io.respond_to?(:tty?) && io.tty?
+
+    def self.color_mode(argv)
+      argv.each_with_index do |arg, i|
+        return arg.split("=", 2)[1].to_s.downcase if arg.start_with?("--color=", "--colors=")
+        return argv[i + 1].to_s.downcase if %w[--color --colors].include?(arg)
+      end
+      "auto"
+    end
+
+    module Registry
+      extend Dry::CLI::Registry
+    end
+
+    TOP_LEVEL_HELP  = [[], ["--help"], ["-h"], ["help"]].freeze
+    VERSION_REQUEST = [["version"], ["--version"]].freeze
+
+    def self.call(argv, out = $stdout, err = $stderr)
+      Thread.current[:space_core_cli_outcome] = nil
+      self.help_pastel = Pastel.new(enabled: help_colors?(argv, out, err))
+
+      if TOP_LEVEL_HELP.include?(argv)
+        print_usage(out)
+        return 0
+      end
+
+      if VERSION_REQUEST.include?(argv)
+        print_version(out)
+        return 0
+      end
+
+      Dry::CLI.new(Registry).call(arguments: normalize_args(argv), out: out, err: err)
+      last_outcome&.exit_code || 0
+    end
+
+    # Move --color/--colors options to the end of the argument list so dry-cli's
+    # command routing is not confused by options before the subcommand name.
+    #
+    # Two passes:
+    #   1. Leading: extract two-token form (--color VALUE) and =-form from the
+    #      front while args still look like options.
+    #   2. Non-leading: extract =-form (--color=VALUE / --colors=VALUE) from any
+    #      position before the -- separator. The bare two-token form is ambiguous
+    #      with a subcommand name in non-leading position and is left in place.
+    def self.normalize_args(argv)
+      args = argv.dup
+      extracted = []
+
+      # Pass 1: leading two-token and =-form (existing behavior, unchanged)
+      while (arg = args.first) && arg != "--" && arg.start_with?("-")
+        if %w[--color --colors].include?(arg)
+          extracted << args.shift
+          extracted << args.shift if args.first && !args.first.start_with?("-")
+        elsif arg.start_with?("--color=", "--colors=")
+          extracted << args.shift
+        else
+          break
+        end
+      end
+
+      # Pass 2: =-form from any non-leading position, stop at --
+      sep = args.index("--")
+      head = sep ? args[0, sep] : args
+      tail = sep ? args[sep..] : []
+      mid_color, head = head.partition { |a| a.start_with?("--color=", "--colors=") }
+      extracted += mid_color
+      args = head + tail
+
+      extracted.empty? ? args : args + extracted
+    end
+
+    def self.print_usage(out)
+      out.puts Dry::CLI::Usage.call(Registry.get([]))
+    end
+
+    def self.print_version(out)
+      out.puts ::Space::Core::VERSION
+    end
+
+    def self.run(argv, out = $stdout, err = $stderr)
+      Kernel.exit(call(argv, out, err))
+    rescue Interrupt
+      err.puts "interrupted"
+      Kernel.exit(130)
+    end
+  end
+end
+
+require_relative "cli/helpers"
+require_relative "cli/base_command"
+require_relative "cli/init"
+require_relative "cli/new"
+require_relative "cli/list"
+require_relative "cli/show"
+require_relative "cli/path"
+require_relative "cli/use"
+require_relative "cli/current"
+require_relative "cli/status"
+require_relative "cli/config"
+require_relative "cli/repo"
+require_relative "cli/shell"
+
+Space::Core::CLI::Registry.register "init",    Space::Core::CLI::Init
+Space::Core::CLI::Registry.register "new",     Space::Core::CLI::New
+Space::Core::CLI::Registry.register "list",    Space::Core::CLI::List
+Space::Core::CLI::Registry.register "ls",      Space::Core::CLI::List
+Space::Core::CLI::Registry.register "show",    Space::Core::CLI::Show
+Space::Core::CLI::Registry.register "path",    Space::Core::CLI::Path
+Space::Core::CLI::Registry.register "use",     Space::Core::CLI::Use
+Space::Core::CLI::Registry.register "current", Space::Core::CLI::Current
+Space::Core::CLI::Registry.register "status",  Space::Core::CLI::Status
+Space::Core::CLI::Registry.register "config" do |c|
+  c.register "show", Space::Core::CLI::Config::Show
+  c.register "path", Space::Core::CLI::Config::ConfigPath
+  c.register "set",  Space::Core::CLI::Config::Set
+end
+Space::Core::CLI::Registry.register "repo" do |r|
+  r.register "add",     Space::Core::CLI::Repo::Add
+  r.register "list",    Space::Core::CLI::Repo::RepoList
+  r.register "ls",      Space::Core::CLI::Repo::RepoList
+  r.register "resolve", Space::Core::CLI::Repo::Resolve
+end
+Space::Core::CLI::Registry.register "repos" do |r|
+  r.register "add",     Space::Core::CLI::Repo::Add
+  r.register "list",    Space::Core::CLI::Repo::RepoList
+  r.register "ls",      Space::Core::CLI::Repo::RepoList
+  r.register "resolve", Space::Core::CLI::Repo::Resolve
+end
+Space::Core::CLI::Registry.register "shell" do |s|
+  s.register "init",     Space::Core::CLI::Shell::ShellInit
+  s.register "fish",     Space::Core::CLI::Shell::Fish
+  s.register "complete", Space::Core::CLI::Shell::Complete
+end

data/lib/{space_architect → space_core}/config.rb

@@ -3,7 +3,7 @@
 require "yaml"
 require "pathname"
 
-module SpaceArchitect
+module Space::Core
   class Config
     DEFAULT_DATA = {
       "version" => 1,

data/lib/{space_architect → space_core}/errors.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module SpaceArchitect
+module Space::Core
   class Error < StandardError; end
   class NotFoundError < Error; end
   class AmbiguousSpaceError < Error; end

data/lib/{space_architect → space_core}/git_client.rb

@@ -5,7 +5,7 @@ require "async/process"
 require "pathname"
 require "tempfile"
 
-module SpaceArchitect
+module Space::Core
   class GitClient
     def init(path)
       path = Pathname.new(path)

data/lib/{space_architect → space_core}/mise_client.rb

@@ -4,7 +4,7 @@ require "async/process"
 require "pathname"
 require "tempfile"
 
-module SpaceArchitect
+module Space::Core
   class MiseClient
     def trust(path)
       path = Pathname.new(path)

data/lib/{space_architect → space_core}/repo_reference.rb

@@ -2,7 +2,7 @@
 
 require "pathname"
 
-module SpaceArchitect
+module Space::Core
   RepoReference = Data.define(:provider, :owner, :name, :clone_url, :source) do
     def full_name
       "#{provider}/#{owner}/#{name}"

data/lib/{space_architect → space_core}/repo_resolver.rb

@@ -2,7 +2,7 @@
 
 require "uri"
 
-module SpaceArchitect
+module Space::Core
   class RepoResolver
     SCP_LIKE_PATTERN = /\A(?:[^@\/]+@)?(?<provider>[^:\/]+):(?<path>.+)\z/
     URL_PATTERN = %r{\A[A-Za-z][A-Za-z0-9+\-.]*://}

data/lib/{space_architect → space_core}/shell_integration.rb

@@ -2,7 +2,7 @@
 
 require "fileutils"
 
-module SpaceArchitect
+module Space::Core
   module ShellIntegration
     FISH_TEMPLATE = <<~'FISH'
       # Generated by space-architect. Do not edit by hand.

data/lib/{space_architect → space_core}/slugger.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module SpaceArchitect
+module Space::Core
   module Slugger
     module_function
 

data/lib/{space_architect → space_core}/space.rb

@@ -4,7 +4,7 @@ require "yaml"
 require "pathname"
 require "time"
 
-module SpaceArchitect
+module Space::Core
   class Space
     METADATA_FILE = "space.yaml"
     VALID_STATUSES = %w[active paused done archived].freeze