tmuxinator 3.3.3 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5ef87c54d6e438767477e9e41cbe4d0b0d802c6aa980d07d1921819a7dc2b81
-  data.tar.gz: dc974393d493a3ebfd556c87615472acc34f4dc328bb2a31b277ad40a865c8d1
+  metadata.gz: e954effc3cf016798540aa6c25ddf5465797a6653fb9400616d288892bde9c9c
+  data.tar.gz: b501066e62a1cb5b46d286e86bfc866ebeefbbadf157e588a4934dbdd41eb7d4
 SHA512:
-  metadata.gz: dec7830c2331a3fb50a36afd880168ab3ec616900b41ba87c33e610235ee5cb935f794c1738ab5054bc78e3303b3fc078a1a380aed45fd7c9a08870b6a360ca0
-  data.tar.gz: 182bc06919fe54d090fc455c5f69c5a653115887d495acba204cc2112ffd7379e759d3ed8d40067b8c00be1b20d95468f15a72562728400bfbb806f4a7020ede
+  metadata.gz: e29c29f221505b683afb040e11b9e771a3a6b4526e5f716c8c52fe06c27dc642577c6e1f02ff2ead907bcac72ce81b778e65c9763b1adfc0b5d3d4c621b5caad
+  data.tar.gz: 4429eb7736ef16c2d78acb2a70c27df6843bd7dcb1d6abef1940e7852735436e6d8d709e5ac8b6de5041968232cd062b727a03dd3f92af9eb31ba7944677c33d

data/completion/tmuxinator.fish

@@ -1,22 +1,17 @@
 function __fish_tmuxinator_using_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
-set __fish_tmuxinator_program_cmd (commandline -o)[1]
-
-function __fish_tmuxinator_program
-  eval "$__fish_tmuxinator_program_cmd $argv"
-end
-
-complete -f -c $__fish_tmuxinator_program_cmd                                                -a '(__fish_tmuxinator_program completions start)'
-complete -f -c $__fish_tmuxinator_program_cmd -n '__fish_use_subcommand'                  -x -a "(__fish_tmuxinator_program commands)"
-complete -f -c $__fish_tmuxinator_program_cmd -n '__fish_tmuxinator_using_command start'     -a "(__fish_tmuxinator_program completions start)"
-complete -f -c $__fish_tmuxinator_program_cmd -n '__fish_tmuxinator_using_command open'      -a "(__fish_tmuxinator_program completions open)"
-complete -f -c $__fish_tmuxinator_program_cmd -n '__fish_tmuxinator_using_command copy'      -a "(__fish_tmuxinator_program completions copy)"
-complete -f -c $__fish_tmuxinator_program_cmd -n '__fish_tmuxinator_using_command delete'    -a "(__fish_tmuxinator_program completions delete)"
+complete --no-files --command tmuxinator --condition __fish_use_subcommand --exclusive --argument "(tmuxinator commands)"
+complete --no-files --command tmuxinator --condition '__fish_tmuxinator_using_command start' --argument "(tmuxinator completions start)"
+complete --no-files --command tmuxinator --condition '__fish_tmuxinator_using_command open' --argument "(tmuxinator completions open)"
+complete --no-files --command tmuxinator --condition '__fish_tmuxinator_using_command edit' --argument "(tmuxinator completions open)"
+complete --no-files --command tmuxinator --condition '__fish_tmuxinator_using_command copy' --argument "(tmuxinator completions copy)"
+complete --no-files --command tmuxinator --condition '__fish_tmuxinator_using_command delete' --argument "(tmuxinator completions delete)"
+complete --no-files --command tmuxinator --condition '__fish_tmuxinator_using_command debug' --argument "(tmuxinator completions start)"

data/lib/tmuxinator/assets/template.erb

@@ -1,17 +1,19 @@
 #!<%= ENV["SHELL"] || "/bin/bash" %>
 
-# Clear rbenv variables before starting tmux
-unset RBENV_VERSION
-unset RBENV_DIR
+<%- if !append? -%>
+  # Clear rbenv variables before starting tmux
+  unset RBENV_VERSION
+  unset RBENV_DIR
 
-<%= tmux %> start-server;
+  <%= tmux %> start-server;
+<%- end -%>
 
 cd <%= root || "." %>
 
 # Run on_project_start command.
 <%= hook_on_project_start %>
 
-<%- if !tmux_has_session? name -%>
+<%- if append? || !tmux_has_session?(name) -%>
 
   # Run pre command.
   <%= pre %>
@@ -98,7 +100,7 @@ cd <%= root || "." %>
   <%= hook_on_project_restart %>
 <%- end -%>
 
-<%- if attach? -%>
+<%- if attach? && !append? -%>
   if [ -z "$TMUX" ]; then
     <%= tmux %> -u attach-session -t <%= name %>
   else

data/lib/tmuxinator/cli.rb

@@ -15,25 +15,26 @@ module Tmuxinator
     COMMANDS = {
       commands: "Lists commands available in tmuxinator",
       completions: "Used for shell completion",
-      new: "Create a new project file and open it in your editor",
+      copy: %w{
+        Copy an existing project to a new project and
+        open it in your editor
+      }.join(" "),
+      debug: "Output the shell commands that are generated by tmuxinator",
+      delete: "Deletes given project",
+      doctor: "Look for problems in your configuration",
       edit: "Alias of new",
+      implode: "Deletes all tmuxinator projects",
+      local: "Start a tmux session using ./.tmuxinator.y[a]ml",
+      list: "Lists all tmuxinator projects",
+      new: "Create a new project file and open it in your editor",
       open: "Alias of new",
       start: %w{
         Start a tmux session using a project's name (with an optional [ALIAS]
         for project reuse) or a path to a project config file (via the -p flag)
       }.join(" "),
       stop: "Stop a tmux session using a project's tmuxinator config",
-      local: "Start a tmux session using ./.tmuxinator.y[a]ml",
-      debug: "Output the shell commands that are generated by tmuxinator",
-      copy: %w{
-        Copy an existing project to a new project and
-        open it in your editor
-      }.join(" "),
-      delete: "Deletes given project",
-      implode: "Deletes all tmuxinator projects",
+      stop_all: "Stop all tmux sessions which are using tmuxinator projects",
       version: "Display installed tmuxinator version",
-      doctor: "Look for problems in your configuration",
-      list: "Lists all tmuxinator projects"
     }.freeze
 
     # For future reference: due to how tmuxinator currently consumes
@@ -93,7 +94,7 @@ module Tmuxinator
 
     no_commands do
       def new_project(name)
-        project_file = find_project_file(name, options[:local])
+        project_file = find_project_file(name, local: options[:local])
         Kernel.system("$EDITOR #{project_file}") || doctor
       end
 
@@ -145,14 +146,14 @@ module Tmuxinator
           end
         }
 
-        path = config_path(name, options[:local])
+        path = config_path(name, local: options[:local])
         File.open(path, "w") do |f|
           f.write(YAML.dump(yaml))
         end
       end
 
-      def find_project_file(name, local = false)
-        path = config_path(name, local)
+      def find_project_file(name, local: false)
+        path = config_path(name, local: local)
         if File.exist?(path)
           path
         else
@@ -160,7 +161,7 @@ module Tmuxinator
         end
       end
 
-      def config_path(name, local = false)
+      def config_path(name, local: false)
         if local
           Tmuxinator::Config::LOCAL_DEFAULTS[0]
         else
@@ -176,28 +177,22 @@ module Tmuxinator
       end
 
       def create_project(project_options = {})
-        # Strings provided to --attach are coerced into booleans by Thor.
-        # "f" and "false" will result in `:attach` being `false` and any other
-        # string or the empty flag will result in `:attach` being `true`.
-        # If the flag is not present, `:attach` will be `nil`.
-        attach = detach = false
-        attach = true if project_options[:attach] == true
-        detach = true if project_options[:attach] == false
-
-        options = {
+        Tmuxinator::Config.validate(project_create_options(project_options))
+      rescue StandardError => e
+        exit! e.message
+      end
+
+      def project_create_options(project_options)
+        {
           args: project_options[:args],
           custom_name: project_options[:custom_name],
-          force_attach: attach,
-          force_detach: detach,
+          force_attach: project_options[:attach] == true,
+          force_detach: project_options[:attach] == false,
           name: project_options[:name],
-          project_config: project_options[:project_config]
+          project_config: project_options[:project_config],
+          append: project_options[:append],
+          no_pre_window: project_options[:no_pre_window],
         }
-
-        begin
-          Tmuxinator::Config.validate(options)
-        rescue StandardError => e
-          exit! e.message
-        end
       end
 
       def render_project(project)
@@ -221,12 +216,31 @@ module Tmuxinator
       def show_continuation_prompt
         say
         print "Press ENTER to continue."
-        STDIN.getc
+        $stdin.getc
       end
 
       def kill_project(project)
         Kernel.exec(project.kill)
       end
+
+      def start_params(name = nil, *args)
+        # project-config takes precedence over a named project in the case that
+        # both are provided.
+        if options["project-config"]
+          args.unshift name if name
+          name = nil
+        end
+
+        {
+          args: args,
+          attach: options[:attach],
+          custom_name: options[:name],
+          name: name,
+          project_config: options["project-config"],
+          append: options["append"],
+          no_pre_window: options["no-pre-window"],
+        }
+      end
     end
 
     desc "start [PROJECT] [ARGS]", COMMANDS[:start]
@@ -240,22 +254,13 @@ module Tmuxinator
                                     desc: "Path to project config file"
     method_option "suppress-tmux-version-warning",
                   desc: "Don't show a warning for unsupported tmux versions"
-
+    method_option :append, type: :boolean,
+                           desc: "Appends the project windows and panes in " \
+                                 "the current session"
+    method_option "no-pre-window", type: :boolean, default: false,
+                                   desc: "Skip pre_window commands"
     def start(name = nil, *args)
-      # project-config takes precedence over a named project in the case that
-      # both are provided.
-      if options["project-config"]
-        args.unshift name if name
-        name = nil
-      end
-
-      params = {
-        args: args,
-        attach: options[:attach],
-        custom_name: options[:name],
-        name: name,
-        project_config: options["project-config"]
-      }
+      params = start_params(name, *args)
 
       show_version_warning if version_warning?(
         options["suppress-tmux-version-warning"]
@@ -291,6 +296,26 @@ module Tmuxinator
       kill_project(project)
     end
 
+    desc "stop-all", COMMANDS[:stop_all]
+    method_option :noconfirm, type: :boolean,
+                              default: false,
+                              aliases: "-y",
+                              desc: "Skip confirmation"
+    def stop_all
+      # We only need to stop active projects
+      configs = Tmuxinator::Config.configs(active: true)
+
+      unless options[:noconfirm]
+        say "Stop all active projects:\n\n", :yellow
+        say configs.join("\n")
+        say "\n"
+
+        return unless yes?("Are you sure? (n/y)")
+      end
+
+      Project.stop_all
+    end
+
     desc "local", COMMANDS[:local]
     map "." => :local
     method_option "suppress-tmux-version-warning",
@@ -312,24 +337,16 @@ module Tmuxinator
                          desc: "Give the session a different name"
     method_option "project-config", aliases: "-p",
                                     desc: "Path to project config file"
-
+    method_option :append, type: :boolean,
+                           desc: "Appends the project windows and panes in " \
+                                 "the current session"
+    method_option "no-pre-window", type: :boolean, default: false,
+                                   desc: "Skip pre_window commands"
     def debug(name = nil, *args)
-      # project-config takes precedence over a named project in the case that
-      # both are provided.
-      if options["project-config"]
-        args.unshift name if name
-        name = nil
-      end
-
-      params = {
-        args: args,
-        attach: options[:attach],
-        custom_name: options[:name],
-        name: name,
-        project_config: options["project-config"]
-      }
+      params = start_params(name, *args)
 
       project = create_project(params)
+
       say project.render
     end
 
@@ -439,7 +456,7 @@ module Tmuxinator
         Tmuxinator::Cli.new.local
       elsif name && !Tmuxinator::Cli::RESERVED_COMMANDS.include?(name) &&
             Tmuxinator::Config.exist?(name: name)
-        Tmuxinator::Cli.new.start(name, *args.drop(1))
+        Tmuxinator::Cli.start([:start, *args])
       else
         Tmuxinator::Cli.start(args)
       end

data/lib/tmuxinator/config.rb

@@ -20,7 +20,7 @@ module Tmuxinator
       end
 
       def home
-        ENV["HOME"] + "/.tmuxinator"
+        "#{ENV['HOME']}/.tmuxinator"
       end
 
       def home?
@@ -31,7 +31,9 @@ module Tmuxinator
       # a custom value. (e.g. if $XDG_CONFIG_HOME is set to ~/my-config, the
       # return value will be ~/my-config/tmuxinator)
       def xdg
-        XDG["CONFIG"].to_s + "/tmuxinator"
+        xdg_config_directory = ENV.fetch("XDG_CONFIG_HOME", "~/.config")
+        config_home = File.expand_path(xdg_config_directory)
+        File.join(config_home, "tmuxinator")
       end
 
       def xdg?
@@ -131,7 +133,7 @@ module Tmuxinator
         `tmux list-sessions -F "#S"`.split("\n")
       end
 
-      # Sorted list of all project .yml file basenames, including duplicates
+      # Sorted list of all project file basenames, including duplicates.
       #
       # @param active filter configs by active project sessions
       # @return [Array<String>] list of project names
@@ -147,6 +149,16 @@ module Tmuxinator
         configs
       end
 
+      # List the names of all config files relative to the config directory.
+      #
+      # If sub-folders are used, those are part of the name too.
+      #
+      # Example:
+      #   $CONFIG_DIR/project.yml -> project
+      #   $CONFIG_DIR/sub/project.yml -> sub/project
+      #   $HOME_CONFIG_DIR/project.yml -> project
+      #
+      # @return [Array<String] a list of config file names
       def config_file_basenames
         directories.flat_map do |directory|
           Dir["#{directory}/**/*.yml"].map do |path|
@@ -193,7 +205,7 @@ module Tmuxinator
         name = options[:name]
         options[:force_attach] ||= false
         options[:force_detach] ||= false
-        project_config = options.fetch(:project_config) { false }
+        project_config = options.fetch(:project_config, false)
         project_file = if valid_project_config?(project_config)
                          project_config
                        elsif valid_local_project?(name)

data/lib/tmuxinator/project.rb

@@ -36,36 +36,49 @@ module Tmuxinator
     `on_project_exit`) and will be removed in a future release.
     M
 
-    attr_reader :yaml
-    attr_reader :force_attach
-    attr_reader :force_detach
-    attr_reader :custom_name
-
-    def self.load(path, options = {})
-      yaml = begin
-        args = options[:args] || []
-        @settings = parse_settings(args)
-        @args = args
-
-        content = render_template(path, binding)
-        YAML.safe_load(content, aliases: true)
-             rescue SyntaxError, StandardError => error
-               raise "Failed to parse config file: #{error.message}"
+    attr_reader :yaml, :force_attach, :force_detach, :custom_name,
+                :no_pre_window
+
+    class << self
+      include Tmuxinator::Util
+
+      def load(path, options = {})
+        yaml = begin
+          args = options[:args] || []
+          @settings = parse_settings(args)
+          @args = args
+
+          content = render_template(path, binding)
+          YAML.safe_load(content, aliases: true)
+        rescue SyntaxError, StandardError => e
+          raise "Failed to parse config file: #{e.message}"
+        end
+
+        new(yaml, options)
       end
 
-      new(yaml, options)
-    end
+      def parse_settings(args)
+        settings = args.select { |x| x.match(/.*=.*/) }
+        args.reject! { |x| x.match(/.*=.*/) }
+
+        settings.map! do |setting|
+          parts = setting.split("=", 2)
+          [parts[0], parts[1]]
+        end
 
-    def self.parse_settings(args)
-      settings = args.select { |x| x.match(/.*=.*/) }
-      args.reject! { |x| x.match(/.*=.*/) }
+        Hash[settings]
+      end
 
-      settings.map! do |setting|
-        parts = setting.split("=")
-        [parts[0], parts[1]]
+      def active
+        Tmuxinator::Config.configs(active: true).
+          map { |config| Config.validate(name: config) }
       end
 
-      Hash[settings]
+      def stop_all
+        active.
+          sort_by { |project| project.name == current_session_name ? 1 : 0 }.
+          each { |project| Kernel.system(project.kill) }
+      end
     end
 
     def validate!
@@ -83,15 +96,29 @@ module Tmuxinator
 
       @yaml = yaml
 
-      @custom_name = options[:custom_name]
+      set_instance_variables_from_options(options)
 
+      validate_options
+
+      extend Tmuxinator::WemuxSupport if wemux?
+    end
+
+    def set_instance_variables_from_options(options)
+      @custom_name = options[:custom_name]
       @force_attach = options[:force_attach]
       @force_detach = options[:force_detach]
+      @append = options[:append]
+      @no_pre_window = options[:no_pre_window]
+    end
 
-      raise "Cannot force_attach and force_detach at the same time" \
-        if @force_attach && @force_detach
+    def validate_options
+      if @force_attach && @force_detach
+        raise "Cannot force_attach and force_detach at the same time"
+      end
 
-      extend Tmuxinator::WemuxSupport if wemux?
+      if append? && !tmux_has_session?(name)
+        raise "Cannot append to a session that does not exist"
+      end
     end
 
     def render
@@ -121,26 +148,33 @@ module Tmuxinator
     end
 
     def name
-      name = custom_name || yaml["project_name"] || yaml["name"]
+      name =
+        if append?
+          current_session_name
+        else
+          custom_name || yaml["project_name"] || yaml["name"]
+        end
+
       blank?(name) ? nil : name.to_s.shellescape
     end
 
+    def append?
+      @append
+    end
+
     def pre
       pre_config = yaml["pre"]
       parsed_parameters(pre_config)
     end
 
     def attach?
-      yaml_attach = if yaml["attach"].nil?
-                      true
-                    else
-                      yaml["attach"]
-                    end
-      attach = force_attach || !force_detach && yaml_attach
-      attach
+      yaml_attach = yaml["attach"].nil? || yaml["attach"]
+      force_attach || !force_detach && yaml_attach
     end
 
     def pre_window
+      return if no_pre_window
+
       params = if rbenv?
                  "rbenv shell #{yaml['rbenv']}"
                elsif rvm?
@@ -167,6 +201,8 @@ module Tmuxinator
     end
 
     def tmux_has_session?(name)
+      return false unless name
+
       # Redirect stderr to /dev/null in order to prevent "failed to connect
       # to server: Connection refused" error message and non-zero exit status
       # if no tmux sessions exist.
@@ -208,7 +244,13 @@ module Tmuxinator
       end
     end
 
+    def last_window_index
+      `tmux list-windows -F '#I'`.split.last.to_i
+    end
+
     def base_index
+      return last_window_index + 1 if append?
+
       get_base_index.to_i
     end
 
@@ -241,7 +283,7 @@ module Tmuxinator
     end
 
     def window(index)
-      "#{name}:#{index}"
+      append? ? ":#{index}" : "#{name}:#{index}"
     end
 
     def send_pane_command(cmd, window_index, _pane_index)
@@ -329,6 +371,8 @@ module Tmuxinator
     end
 
     def tmux_new_session_command
+      return if append?
+
       window = windows.first.tmux_window_name_option
       "#{tmux} new-session -d -s #{name} #{window}"
     end
@@ -361,17 +405,16 @@ module Tmuxinator
 
     def pane_title_position_not_valid_warning
       print_warning(
-        "The specified pane title position " +
-        "\"#{yaml['pane_title_position']}\" is not valid. " +
-        "Please choose one of: top, bottom, or off."
+        "The specified pane title position '#{yaml['pane_title_position']}' " \
+        "is not valid. Please choose one of: top, bottom, or off."
       )
     end
 
     def pane_titles_not_supported_warning
       print_warning(
-        "You have enabled pane titles in your configuration, " +
-        "but the feature is not supported by your version of tmux.\n" +
-        "Please consider upgrading to a version that supports it (tmux >=2.6)."
+        "You have enabled pane titles in your configuration, but the " \
+        "feature is not supported by your version of tmux.\nPlease consider " \
+        "upgrading to a version that supports it (tmux >=2.6)."
       )
     end
 

data/lib/tmuxinator/util.rb

@@ -12,5 +12,9 @@ module Tmuxinator
     def yes_no(condition)
       condition ? say("Yes", :green) : say("No", :red)
     end
+
+    def current_session_name
+      `[[ -n "${TMUX+set}" ]] && tmux display-message -p "#S"`.strip
+    end
   end
 end

data/lib/tmuxinator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tmuxinator
-  VERSION = "3.3.3"
+  VERSION = "3.3.5"
 end

data/lib/tmuxinator/window.rb

@@ -29,7 +29,7 @@ module Tmuxinator
     end
 
     def layout
-      yaml["layout"] ? yaml["layout"].shellescape : nil
+      yaml["layout"]&.shellescape
     end
 
     def synchronize
@@ -139,7 +139,7 @@ module Tmuxinator
     end
 
     def synchronize_before?
-      synchronize == true || synchronize == "before"
+      [true, "before"].include?(synchronize)
     end
 
     def synchronize_after?

data/lib/tmuxinator.rb

@@ -5,7 +5,6 @@ require "fileutils"
 require "shellwords"
 require "thor"
 require "thor/version"
-require "xdg"
 require "yaml"
 
 module Tmuxinator

data/spec/factories/projects.rb

@@ -115,4 +115,12 @@ FactoryBot.define do
 
     initialize_with { Tmuxinator::Project.load(file) }
   end
+
+  factory :project_with_append, class: Tmuxinator::Project do
+    transient do
+      file { "spec/fixtures/sample.yml" }
+    end
+
+    initialize_with { Tmuxinator::Project.load(file, append: true) }
+  end
 end

data/spec/lib/tmuxinator/cli_spec.rb

@@ -99,11 +99,18 @@ describe Tmuxinator::Cli do
           end
 
           it "should call #start" do
-            instance = instance_double(cli)
-            expect(cli).to receive(:new).and_return(instance)
-            expect(instance).to receive(:start).with(*args)
+            expect(cli).to receive(:start).with([:start, *args])
             subject
           end
+
+          context "and the append option is passed" do
+            let(:args) { ["sample", "--append"] }
+
+            it "should call #start" do
+              expect(cli).to receive(:start).with([:start, *args])
+              subject
+            end
+          end
         end
 
         context "a thor command" do
@@ -191,21 +198,24 @@ describe Tmuxinator::Cli do
 
     it "lists the commands" do
       out, _err = capture_io { cli.start }
-      expected = %w(commands
-                    completions
-                    new
-                    edit
-                    open
-                    start
-                    stop
-                    local
-                    debug
-                    copy
-                    delete
-                    implode
-                    version
-                    doctor
-                    list)
+      expected = %w(
+        commands
+        completions
+        copy
+        debug
+        delete
+        doctor
+        edit
+        implode
+        local
+        list
+        new
+        open
+        start
+        stop
+        stop_all
+        version
+      )
       expect(out).to eq "#{expected.join("\n")}\n"
     end
   end
@@ -372,6 +382,20 @@ describe Tmuxinator::Cli do
     end
   end
 
+  describe "#stop_all" do
+    before do
+      allow(Tmuxinator::Config).to receive_messages(validate: project)
+      allow(Tmuxinator::Config).to receive_messages(version: 1.9)
+    end
+
+    it "stops all projects" do
+      ARGV.replace(["stop-all", "--noconfirm"])
+      out, err = capture_io { cli.start }
+      expect(err).to eq ""
+      expect(out).to eq ""
+    end
+  end
+
   describe "#local" do
     before do
       allow(Tmuxinator::Config).to receive_messages(validate: project)
@@ -900,7 +924,7 @@ describe Tmuxinator::Cli do
       end
 
       it "should generate a project file" do
-        new_path = described_class.new.find_project_file(name, false)
+        new_path = described_class.new.find_project_file(name, local: false)
         expect(new_path).to eq path
         expect(File).to exist new_path
       end
@@ -922,7 +946,7 @@ describe Tmuxinator::Cli do
       end
 
       it "should _not_ generate a new project file" do
-        new_path = described_class.new.find_project_file(name, false)
+        new_path = described_class.new.find_project_file(name, local: false)
         expect(new_path).to eq path
         expect(File).to exist new_path
         expect(File.read(new_path)).to match %r{#{extra}}

data/spec/lib/tmuxinator/config_spec.rb

@@ -55,7 +55,8 @@ describe Tmuxinator::Config do
 
         Dir.mktmpdir do |dir|
           config_parent = "#{dir}/non_existent_parent/s"
-          allow(XDG).to receive(:[]).with("CONFIG").and_return config_parent
+          allow(ENV).to receive(:fetch).with("XDG_CONFIG_HOME", "~/.config").
+            and_return config_parent
           expect(described_class.directory).
             to eq "#{config_parent}/tmuxinator"
           expect(File.directory?("#{config_parent}/tmuxinator")).to be true
@@ -69,7 +70,6 @@ describe Tmuxinator::Config do
       it "is $TMUXINATOR_CONFIG" do
         allow(ENV).to receive(:[]).with("TMUXINATOR_CONFIG").
           and_return "expected"
-        # allow(XDG).to receive(:[]).with("CONFIG").and_return "expected"
         allow(File).to receive(:directory?).and_return true
         expect(described_class.environment).to eq "expected"
       end
@@ -87,7 +87,6 @@ describe Tmuxinator::Config do
 
     context "environment variable $TMUXINATOR_CONFIG is set and empty" do
       it "is an empty string" do
-        allow(XDG).to receive(:[]).with("CONFIG").and_return ""
         allow(ENV).to receive(:[]).with("TMUXINATOR_CONFIG").and_return ""
         expect(described_class.environment).to eq ""
       end
@@ -136,7 +135,7 @@ describe Tmuxinator::Config do
 
   describe "#xdg" do
     it "is $XDG_CONFIG_HOME/tmuxinator" do
-      expect(described_class.xdg).to eq "#{XDG['CONFIG_HOME']}/tmuxinator"
+      expect(described_class.xdg).to eq File.expand_path("~/.config/tmuxinator")
     end
   end
 
@@ -181,7 +180,8 @@ describe Tmuxinator::Config do
 
     before do
       expect(Tmuxinator::Doctor).to receive(:installed?).and_return(true)
-      allow_any_instance_of(Kernel).to receive(:`).with(/tmux\s\-V/).
+      allow_any_instance_of(Kernel).to receive(:`).
+        with(/tmux\s-V/).
         and_return("tmux #{version}")
     end
 

data/spec/lib/tmuxinator/project_spec.rb

@@ -37,6 +37,10 @@ describe Tmuxinator::Project do
     FactoryBot.build(:project_with_alias)
   end
 
+  let(:project_with_append) do
+    FactoryBot.build(:project_with_append)
+  end
+
   it "should include Hooks" do
     expect(project).to be_kind_of(Tmuxinator::Hooks::Project)
   end
@@ -46,6 +50,21 @@ describe Tmuxinator::Project do
       it "creates an instance" do
         expect(project).to be_a(Tmuxinator::Project)
       end
+
+      it "validates append outside a current session" do
+        Tmuxinator::Project.any_instance.stub(tmux_has_session?: false)
+        expect { project_with_append }.to(
+          raise_error(
+            RuntimeError,
+            "Cannot append to a session that does not exist"
+          )
+        )
+      end
+
+      it "validates append within a current session" do
+        Tmuxinator::Project.any_instance.stub(tmux_has_session?: true)
+        expect { project_with_append }.to_not raise_error
+      end
     end
   end
 
@@ -262,6 +281,16 @@ describe Tmuxinator::Project do
         end
       end
     end
+
+    context "no_pre_window option is true" do
+      before do
+        allow(project).to receive_messages(no_pre_window: true)
+      end
+
+      it "returns nil" do
+        expect(pre_window).to be_nil
+      end
+    end
   end
 
   describe "#socket" do
@@ -368,6 +397,17 @@ describe Tmuxinator::Project do
         expect(project.base_index).to eq 0
       end
     end
+
+    context "with append set" do
+      before do
+        Tmuxinator::Project.any_instance.stub(tmux_has_session?: true)
+        project_with_append.stub(last_window_index: 3)
+      end
+
+      it "defaults to the next window index" do
+        expect(project_with_append.base_index).to eq 4
+      end
+    end
   end
 
   describe "#startup_window" do
@@ -410,6 +450,13 @@ describe Tmuxinator::Project do
     it "gets the window and index for tmux" do
       expect(project.window(1)).to eq "sample:1"
     end
+
+    context "with append set" do
+      it "excludes the session name" do
+        Tmuxinator::Project.any_instance.stub(tmux_has_session?: true)
+        expect(project_with_append.window(1)).to eq ":1"
+      end
+    end
   end
 
   describe "#name?" do
@@ -576,6 +623,13 @@ describe Tmuxinator::Project do
         expect(project.tmux_new_session_command).to eq command
       end
     end
+
+    context "with append set" do
+      it "returns nothing" do
+        Tmuxinator::Project.any_instance.stub(tmux_has_session?: true)
+        expect(project_with_append.tmux_new_session_command).to be_nil
+      end
+    end
   end
 
   describe "tmux_kill_session_command" do
@@ -611,7 +665,7 @@ describe Tmuxinator::Project do
   end
 
   describe "::parse_settings" do
-    let(:args) { ["one", "two=three"] }
+    let(:args) { ["one", "two=three", "four=five=six"] }
 
     it "returns settings in a hash" do
       expect(described_class.parse_settings(args)["two"]).to eq("three")
@@ -621,6 +675,10 @@ describe Tmuxinator::Project do
       described_class.parse_settings(args)
       expect(args).to eq(["one"])
     end
+
+    it "handles equals signs in values" do
+      expect(described_class.parse_settings(args)["four"]).to eq("five=six")
+    end
   end
 
   describe "#validate!" do

data/spec/lib/tmuxinator/wemux_support_spec.rb

@@ -12,7 +12,7 @@ describe Tmuxinator::WemuxSupport do
     it "renders the template" do
       expect(File).to receive(:read).at_least(:once) { "wemux ls 2>/dev/null" }
 
-      expect(instance.render).to match %r{wemux.ls.2>\/dev\/null}
+      expect(instance.render).to match %r{wemux.ls.2>/dev/null}
     end
   end
 

data/spec/spec_helper.rb

@@ -1,16 +1,20 @@
 # frozen_string_literal: true
 
-require "coveralls"
 require "pry"
 require "simplecov"
-require "xdg"
 
-formatters = [
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(formatters)
 SimpleCov.start do
+  if ENV["CI"]
+    formatter SimpleCov::Formatter::SimpleFormatter
+  else
+    formatter SimpleCov::Formatter::MultiFormatter.new(
+      [
+        SimpleCov::Formatter::HTMLFormatter,
+        SimpleCov::Formatter::SimpleFormatter,
+      ]
+    )
+  end
+
   add_filter "vendor/cache"
 end
 
@@ -54,11 +58,11 @@ def tmux_config(options = {})
     "bell-on-alert off",
   ]
 
-  if base_index = options.fetch(:base_index) { 1 }
+  if base_index = options.fetch(:base_index, 1)
     standard_options << "base-index #{base_index}"
   end
 
-  if pane_base_index = options.fetch(:pane_base_index) { 1 }
+  if pane_base_index = options.fetch(:pane_base_index, 1)
     standard_options << "pane-base-index #{pane_base_index}"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tmuxinator
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.5
 platform: ruby
 authors:
 - Allen Bargi
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-19 00:00:00.000000000 Z
+date: 2025-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -17,62 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: xdg
+  name: amazing_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.5
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,118 +67,90 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '6.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '6.5'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: '1.79'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: '1.79'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
-- !ruby/object:Gem::Dependency
-  name: unicode-display_width
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.22'
 description: Create and manage complex tmux sessions easily.
 email:
 - allen.bargi@gmail.com
@@ -281,14 +233,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.7
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.23
+      version: '2.7'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Create and manage complex tmux sessions easily.