tmuxinator 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 837a353050a6ac064ea463e3e33113a845a1b555a9069c2514045b59440a634b
-  data.tar.gz: '008ef11a9c0734010632d58c06ea63f9ebc1d46eba0cfb4153c1dc63b1c7b6bc'
+  metadata.gz: 63c172a560956a6811c0d20df3bf2f53e32c8b14a6bad84d78b2b7dfd65e8c84
+  data.tar.gz: 2b9b9c77ed47a1b98645ccd0eb2292d854df97c4e9dbda69da74a64622d16310
 SHA512:
-  metadata.gz: 81c8a46ec5380f78d7db741ee707d69e25ac5d6edb56892e861ebfe06131d1c7d2725f6ce4e8880192564e761ff4e2a4de50087b01addfa0d3a6305df444c4f1
-  data.tar.gz: 39c755d7aa5c61ff52b225ab1a2a3f5f7eef68c58cfefcd421c217f350e304b2b3f920df61af349d004e7cc53eff61d69e84afd9179fd113a4ca86dda185f039
+  metadata.gz: 995b321ee1874e190db8e5bc3c2c0f680edbb3af6148011a7b00e286c3b09b03372896bd60cd89c3a0ae20e3e3143fee5457b3c201e30a0d16bdcceef69a1e50
+  data.tar.gz: 48c82f9f431b7a5229332c99fca42fd13726df7052e900ca05d11d43f62a9070531db6acc44245ef7ea269d1716814005afe459590c7034d8bd64424d1154fbc

data/lib/tmuxinator/assets/template.erb

@@ -19,18 +19,7 @@ cd <%= root || "." %>
   # Run on_project_first_start command.
   <%= hook_on_project_first_start %>
 
-  # Create the session and the first window. Manually switch to root
-  # directory if required to support tmux < 1.9
-  <% if windows.first.root? %>
-    <% if Tmuxinator::Config.version < 1.9 %>
   TMUX= <%= tmux_new_session_command %>
-  <%= windows.first.tmux_window_command_prefix %> <%= "cd #{windows.first.root}".shellescape %> C-m
-    <%- else -%>
-  TMUX= <%= tmux_new_session_command %> -c <%= windows.first.root.shellescape %>
-    <% end %>
-  <%- else -%>
-  TMUX= <%= tmux_new_session_command %>
-  <% end %>
 
   <% if Tmuxinator::Config.version < 1.7 %>
   # Set the default path for versions prior to 1.7
@@ -48,8 +37,8 @@ cd <%= root || "." %>
     <% end %>
   <% end %>
 
-  # Create other windows.
-  <% windows.drop(1).each do |window| %>
+  # Create windows.
+  <% windows.each do |window| %>
   <%= window.tmux_new_window_command %>
   <% end %>
 

data/lib/tmuxinator/version.rb

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

data/lib/tmuxinator/window.rb

@@ -36,12 +36,16 @@ module Tmuxinator
       yaml["synchronize"] || false
     end
 
+    # The expanded, joined window root path
+    # Relative paths are joined to the project root
     def root
-      _yaml_root || _project_root
+      return _project_root unless _yaml_root
+
+      File.expand_path(_yaml_root, _project_root).shellescape
     end
 
     def _yaml_root
-      File.expand_path(yaml["root"]).shellescape if yaml["root"]
+      yaml["root"]
     end
 
     def _project_root
@@ -115,7 +119,7 @@ module Tmuxinator
 
     def tmux_new_window_command
       path = root? ? "#{Tmuxinator::Config.default_path_option} #{root}" : nil
-      "#{project.tmux} new-window #{path} -t #{tmux_window_target} #{tmux_window_name_option}"
+      "#{project.tmux} new-window #{path} -k -t #{tmux_window_target} #{tmux_window_name_option}"
     end
 
     def tmux_tiled_layout_command

data/spec/lib/tmuxinator/window_spec.rb

@@ -7,6 +7,8 @@ describe Tmuxinator::Window do
   let(:panes) { ["vim", nil, "top"] }
   let(:window_name) { "editor" }
   let(:synchronize) { false }
+  let(:root) {}
+  let(:root?) { root }
   let(:yaml) do
     {
       window_name => {
@@ -16,27 +18,14 @@ describe Tmuxinator::Window do
         ],
         "synchronize" => synchronize,
         "layout" => "main-vertical",
-        "panes" => panes
-      }
-    }
-  end
-  let(:yaml_root) do
-    {
-      "editor" => {
-        "root" => "/project/override",
-        "root?" => true,
-        "pre" => [
-          "echo 'I get run in each pane.  Before each pane command!'",
-          nil
-        ],
-        "layout" => "main-vertical",
-        "panes" => panes
+        "panes" => panes,
+        "root" => root,
+        "root?" => root?,
       }
     }
   end
 
   let(:window) { described_class.new(yaml, 0, project) }
-  let(:window_root) { described_class.new(yaml_root, 0, project) }
 
   shared_context "window command context" do
     let(:project) { double(:project) }
@@ -81,9 +70,19 @@ describe Tmuxinator::Window do
       end
     end
 
-    context "with window root" do
+    context "with absolute window root" do
+      let(:root) { "/project/override" }
+
       it "gets the window root" do
-        expect(window_root.root).to include("/project/override")
+        expect(window.root).to include("/project/override")
+      end
+    end
+
+    context "with relative window root" do
+      let(:root) { "relative" }
+
+      it "joins the project root" do
+        expect(window.root).to include("/project/tmuxinator/relative")
       end
     end
   end
@@ -354,7 +353,7 @@ describe Tmuxinator::Window do
 
     let(:window_part) { "new-window" }
     let(:name_part) { window.tmux_window_name_option }
-    let(:target_part) { "-t #{window.tmux_window_target}" }
+    let(:target_part) { "-k -t #{window.tmux_window_target}" }
     let(:path_part) { "#{path_option} #{project.root}" }
 
     let(:path_option) { "-c" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tmuxinator
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Allen Bargi
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -59,20 +59,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.5
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement