tmuxinator 0.6.6.pre → 0.6.6.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55331f23c1165f7baf76833639f87d594c1b3d44
-  data.tar.gz: 3f8a57eae115f45286223641a72b3147309d10cd
+  metadata.gz: 8bcc4780395d82023d5e13e4bf7a9b71233a7f2c
+  data.tar.gz: 0a2cfa85b61822b272935a58306340f022567d8a
 SHA512:
-  metadata.gz: 3ff12ea856474fee5fe315123c635f317161573f2762a7e22ff5100c7e1563db232c7ed563bad8aa198e7e24dfc708327932db2f736285f1dfe8ee656975b6d8
-  data.tar.gz: b0136800e96359dcd2566ca3e57117655b5303d2facca41c378460fa811f8747463223bac0a353c51e3c0066320eb4129cd71289911b1573c9127cacf0a8489a
+  metadata.gz: 62293ddba08471509037579f4ed99f2d042bc985990bf0de5d41ebb52889f540b8f2fd08f4453d1b72c438abd8ba250fe707d5421220d0127d831c9ef6f8526e
+  data.tar.gz: 3ef6e0f06d6717b052d7bad8ed5cf3ca0f3b3a0ea0f85efc7901b90506f1453f54b8e166420a1c51343cdd51230f092a5ce200e45ef46a1e94a29473ee9f781c

data/.travis.yml

@@ -2,4 +2,23 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
+env:
+  - TMUX_VERSION=master
+  - TMUX_VERSION=1.8
+  - TMUX_VERSION=1.7
+  - TMUX_VERSION=1.6
+  - TMUX_VERSION=1.5
+matrix:
+  allow_failures:
+    - env: TMUX_VERSION=1.7
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq libevent-dev libncurses-dev
+  - git clone git://git.code.sf.net/p/tmux/tmux-code tmux
+  - cd tmux
+  - git checkout $TMUX_VERSION
+  - sh autogen.sh
+  - ./configure && make && sudo make install
+  - cd ..
+  - tmux -V
 script: bundle exec rspec spec

data/README.md

@@ -144,6 +144,30 @@ pre_window: rbenv shell 2.0.0-p247
 
 These command(s) will run before any subsequent commands in all panes and windows.
 
+## Passing directly to send-keys
+
+tmuxinator passes commands directly to send keys. This differs from simply chaining commands together using `&&` or `;`, in that
+tmux will directly send the commands to shell as if you typed them in. This allows commands to be executed on a remote server over
+SSH for example.
+
+To support this both the window and pane options can take an array as an argument:
+
+```
+name: sample
+root: ~/
+
+windows:
+  - stats:
+    - ssh stats@example.com
+    - tail -f /var/log/stats.log
+  - logs:
+    layout: main-vertical
+    panes:
+      - logs:
+        - ssh logs@example.com
+        - cd /var/logs
+        - tail -f development.log
+```
 
 ## Starting a session
 

data/lib/tmuxinator/assets/template.erb

@@ -23,14 +23,20 @@ if [ "$?" -eq 1 ]; then
   # Window "<%= window.name %>"
     <%- unless window.panes? -%>
   <%= window.tmux_pre_window_command %>
-    <%- window.commands.each do |command| -%>
+      <%- window.commands.each do |command| -%>
   <%= command %>
-    <%- end -%>
+      <%- end -%>
     <%- else -%>
       <%- window.panes.each do |pane| -%>
   <%= pane.tmux_pre_window_command %>
   <%= pane.tmux_pre_command %>
-  <%= pane.tmux_main_command %>
+        <%- if pane.multiple_commands? %>
+          <%- pane.commands.each do |command| -%>
+  <%= pane.tmux_main_command(command) %>
+          <%- end -%>
+        <%- else -%>
+  <%= pane.tmux_main_command(commands.first) %>
+        <%- end -%>
 
       <%- unless pane.last? -%>
   <%= pane.tmux_split_command %>

data/lib/tmuxinator/pane.rb

@@ -1,9 +1,9 @@
 module Tmuxinator
   class Pane
-    attr_reader :command, :project, :index, :project, :tab
+    attr_reader :commands, :project, :index, :project, :tab
 
-    def initialize(command, index, project, tab)
-      @command = command
+    def initialize(index, project, tab, *commands)
+      @commands = commands
       @index = index
       @project = project
       @tab = tab
@@ -21,7 +21,7 @@ module Tmuxinator
       project.pre_window.present? ? "#{project.tmux} send-keys -t #{tmux_window_and_pane_target} #{project.pre_window.shellescape} C-m" : ""
     end
 
-    def tmux_main_command
+    def tmux_main_command(command)
       command.present? ? "#{project.tmux} send-keys -t #{project.name}:#{tab.index + project.base_index}.#{index + tab.project.base_index} #{command.shellescape} C-m" : ""
     end
 
@@ -32,5 +32,9 @@ module Tmuxinator
     def last?
       index == tab.panes.length - 1
     end
+
+    def multiple_commands?
+      commands.present? && commands.length > 0
+    end
   end
 end

data/lib/tmuxinator/project.rb

@@ -15,12 +15,7 @@ module Tmuxinator
     end
 
     def windows
-      windows_yml =
-        if yaml["tabs"].present?
-          yaml["tabs"]
-        else
-          yaml["windows"]
-        end
+      windows_yml = yaml["tabs"].presence || yaml["windows"]
 
       @windows ||= windows_yml.map.with_index do |window_yml, index|
         Tmuxinator::Window.new(window_yml, index, self)
@@ -28,19 +23,11 @@ module Tmuxinator
     end
 
     def root
-      if yaml["project_root"].present?
-        yaml["project_root"]
-      else
-        yaml["root"]
-      end
+      yaml["project_root"].presence || yaml["root"]
     end
 
     def name
-      if yaml["project_name"].present?
-        yaml["project_name"].shellescape
-      else
-        yaml["name"].shellescape
-      end
+      yaml["project_name"].presence.try(:shellescape) || yaml["name"].shellescape
     end
 
     def pre
@@ -69,11 +56,7 @@ module Tmuxinator
     end
 
     def tmux_command
-      if yaml["tmux_command"].present?
-        yaml["tmux_command"]
-      else
-        "tmux"
-      end
+      yaml["tmux_command"].presence || "tmux"
     end
 
     def socket

data/lib/tmuxinator/version.rb

@@ -1,3 +1,3 @@
 module Tmuxinator
-  VERSION = "0.6.6.pre"
+  VERSION = "0.6.6.pre.2"
 end

data/lib/tmuxinator/window.rb

@@ -1,3 +1,5 @@
+require "pry"
+
 module Tmuxinator
   class Window
     include Tmuxinator::Util
@@ -24,14 +26,16 @@ module Tmuxinator
       end
     end
 
-    def build_panes(pane_yml)
-      if pane_yml.is_a?(Array)
-        pane_yml.map.with_index do |pane_cmd, index|
-          Tmuxinator::Pane.new(pane_cmd, index, project, self)
+    def build_panes(panes_yml)
+      Array(panes_yml).map.with_index do |pane_yml, index|
+        if pane_yml.is_a?(Hash)
+          pane_yml.map do |name, commands|
+            Tmuxinator::Pane.new(index, project, self, *commands)
+          end
+        else
+          Tmuxinator::Pane.new(index, project, self, pane_yml)
         end
-      else
-        Tmuxinator::Pane.new(pane_yml, index, project, self)
-      end
+      end.flatten
     end
 
     def build_commands(prefix, command_yml)

data/spec/fixtures/sample.yml

@@ -17,6 +17,9 @@ windows:
         - vim
         - #empty, will just run plain bash
         - top
+        - pane_with_multiple_commands:
+            - ssh server
+            - echo "Hello"
   - shell:
     - git pull
     - git merge

data/spec/lib/tmuxinator/window_spec.rb

@@ -2,12 +2,13 @@ require "spec_helper"
 
 describe Tmuxinator::Window do
   let(:project) { double }
+  let(:panes) { ["vim", nil, "top"] }
   let(:yaml) do
     {
       "editor" => {
         "pre" => ["echo 'I get run in each pane.  Before each pane command!'", nil],
         "layout" => "main-vertical",
-        "panes" => ["vim", nil, "top"]
+        "panes" => panes
       }
     }
   end
@@ -24,9 +25,50 @@ describe Tmuxinator::Window do
     end
   end
 
-  describe "#build_panes" do
-    it "creates the list of panes" do
-      expect(window.panes).to_not be_empty
+  describe "#panes" do
+    let(:pane) { double(:pane) }
+
+    before do
+      Tmuxinator::Pane.stub :new => pane
+    end
+
+    context "with a three element Array" do
+      let(:panes) { ["vim", nil, "top"] }
+
+      it "creates three panes" do
+        expect(Tmuxinator::Pane).to receive(:new).exactly(3).times
+        window.panes
+      end
+
+      it "returns three panes" do
+        expect(window.panes).to eql [pane, pane, pane]
+      end
+    end
+
+    context "with a String" do
+      let(:panes) { "vim" }
+
+      it "creates one pane" do
+        expect(Tmuxinator::Pane).to receive(:new).once
+        window.panes
+      end
+
+      it "returns one pane in an Array" do
+        expect(window.panes).to eql [pane]
+      end
+    end
+
+    context "with nil" do
+      let(:panes) { nil }
+
+      it "doesn't create any panes" do
+        expect(Tmuxinator::Pane).to_not receive(:new)
+        window.panes
+      end
+
+      it "returns an empty Array" do
+        expect(window.panes).to be_empty
+      end
     end
   end
 
@@ -85,18 +127,6 @@ describe Tmuxinator::Window do
     end
   end
 
-  describe "#build_panes" do
-    context "no panes" do
-      before do
-        yaml["editor"]["panes"] = "vim"
-      end
-
-      it "creates one pane" do
-        expect(window.panes).to be_a(Tmuxinator::Pane)
-      end
-    end
-  end
-
   describe "#tmux_new_window_command" do
     let(:project) { double(:project) }
     let(:window) { Tmuxinator::Window.new(yaml, 0, project) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tmuxinator
 version: !ruby/object:Gem::Version
-  version: 0.6.6.pre
+  version: 0.6.6.pre.2
 platform: ruby
 authors:
 - Allen Bargi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor