tmuxinator 0.6.5 → 0.6.6.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d9d7fb728f65009f6058f0810d48d28bbea8d78
-  data.tar.gz: 428a7e368197fdad498e10ba1af3fd63d4bdabd3
+  metadata.gz: 55331f23c1165f7baf76833639f87d594c1b3d44
+  data.tar.gz: 3f8a57eae115f45286223641a72b3147309d10cd
 SHA512:
-  metadata.gz: f8ac28cc11f7a1ec80ec1a832d67d7a786e98d13396dbef493b6e5ea003a48822c4a55a23dac74d7a204875232013ec10d279a6872079673ae9170da76e1f328
-  data.tar.gz: 7889d60c7f2071f6c267bec80c7d13e6bc734bc991e154c530c3b230a742452b1674110ad1cee6e455ec02ac1ca98565fbcef1dad9f70e42be370a7ab9a0f507
+  metadata.gz: 3ff12ea856474fee5fe315123c635f317161573f2762a7e22ff5100c7e1563db232c7ed563bad8aa198e7e24dfc708327932db2f736285f1dfe8ee656975b6d8
+  data.tar.gz: b0136800e96359dcd2566ca3e57117655b5303d2facca41c378460fa811f8747463223bac0a353c51e3c0066320eb4129cd71289911b1573c9127cacf0a8489a

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.6.6
+- Fix a bug caused by not escaping the root path #145
+- Fix bash completion with a single argument #148
+- Fix regression where an array of commands for a window wasn't working #149
+- Add an option to call tmux wrappers or derivatives #154
+- Make multiple commands use tmux's `send-keys` rather than just using `&&` #100
+
 ## 0.6.5
 - Change deprecation continue message from any key to just the enter key
 - Dramatically clean up the readme to be clearer for new users

data/README.md

@@ -94,6 +94,9 @@ root: ~/
 # Pass command line options to tmux. Useful for specifying a different tmux.conf.
 # tmux_options: -f ~/.tmux.mac.conf
 
+# Change the command to call tmux.  This can be used by derivatives/wrappers like byobu.
+# tmux_command: byobu
+
 windows:
   - editor:
       layout: main-vertical

data/completion/tmuxinator.bash

@@ -5,7 +5,10 @@ _tmuxinator() {
     local word="${COMP_WORDS[COMP_CWORD]}"
 
     if [ "$COMP_CWORD" -eq 1 ]; then
-        COMPREPLY=( $(compgen -W "$(tmuxinator commands)" -- "$word") )
+        local commands="$(compgen -W "$(tmuxinator commands)" -- "$word")"
+        local projects="$(compgen -W "$(tmuxinator completions start)" -- "$word")"
+
+        COMPREPLY=( $commands $projects )
     else
         local words=("${COMP_WORDS[@]}")
         unset words[0]

data/lib/tmuxinator/assets/sample.yml

@@ -15,6 +15,9 @@ root: ~/
 # Pass command line options to tmux. Useful for specifying a different tmux.conf.
 # tmux_options: -f ~/.tmux.mac.conf
 
+# Change the command to call tmux.  This can be used by derivatives/wrappers like byobu.
+# tmux_command: byobu
+
 windows:
   - editor:
       layout: main-vertical

data/lib/tmuxinator/assets/template.erb

@@ -11,7 +11,7 @@ if [ "$?" -eq 1 ]; then
   TMUX= <%= tmux %> new-session -d -s <%= name %> -n <%= windows.first.name %>
 
   # Set the default path.
-  <%= tmux %> set-option -t <%= name %> default-path <%= root -%> 1>/dev/null
+  <%= tmux %> set-option -t <%= name %> default-path <%= root.shellescape -%> 1>/dev/null
 
   # Create other windows.
   <%- windows.drop(1).each do |window| -%>
@@ -23,7 +23,9 @@ if [ "$?" -eq 1 ]; then
   # Window "<%= window.name %>"
     <%- unless window.panes? -%>
   <%= window.tmux_pre_window_command %>
-  <%= window.tmux_main_command %>
+    <%- window.commands.each do |command| -%>
+  <%= command %>
+    <%- end -%>
     <%- else -%>
       <%- window.panes.each do |pane| -%>
   <%= pane.tmux_pre_window_command %>
@@ -36,7 +38,6 @@ if [ "$?" -eq 1 ]; then
   <%= window.tmux_layout_command %>
     <%- end -%>
 
-
   <%= window.tmux_select_first_pane %>
     <%- end -%>
   <%- end -%>

data/lib/tmuxinator/project.rb

@@ -65,7 +65,15 @@ module Tmuxinator
     end
 
     def tmux
-      "tmux#{tmux_options}#{socket}"
+      "#{tmux_command}#{tmux_options}#{socket}"
+    end
+
+    def tmux_command
+      if yaml["tmux_command"].present?
+        yaml["tmux_command"]
+      else
+        "tmux"
+      end
     end
 
     def socket

data/lib/tmuxinator/version.rb

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

data/lib/tmuxinator/window.rb

@@ -1,13 +1,14 @@
 module Tmuxinator
   class Window
-    attr_reader :name, :panes, :layout, :command, :index, :project
+    include Tmuxinator::Util
+
+    attr_reader :name, :panes, :layout, :commands, :index, :project
 
     def initialize(window_yaml, index, project)
       @name = window_yaml.keys.first.present? ? window_yaml.keys.first.shellescape : nil
       @panes = []
       @layout = nil
       @pre = nil
-      @command = nil
       @project = project
       @index = index
 
@@ -19,7 +20,7 @@ module Tmuxinator
 
         @panes = build_panes(value["panes"])
       else
-        @command = value
+        @commands = build_commands(tmux_window_command_prefix, value)
       end
     end
 
@@ -33,6 +34,18 @@ module Tmuxinator
       end
     end
 
+    def build_commands(prefix, command_yml)
+      if command_yml.is_a?(Array)
+        command_yml.map do |command|
+          "#{tmux_window_command_prefix} #{command.shellescape} C-m" if command.present?
+        end.compact
+      elsif command_yml.present?
+        ["#{tmux_window_command_prefix} #{command_yml.shellescape} C-m"]
+      else
+        []
+      end
+    end
+
     def pre
       if @pre.present?
         if @pre.is_a?(Array)
@@ -57,8 +70,8 @@ module Tmuxinator
       project.pre_window.present? ? "#{project.tmux} send-keys -t #{tmux_window_target} #{project.pre_window.shellescape} C-m" : ""
     end
 
-    def tmux_main_command
-      command.present? ? "#{project.tmux} send-keys -t #{project.name}:#{index + project.base_index} #{command.shellescape} C-m" : ""
+    def tmux_window_command_prefix
+      "#{project.tmux} send-keys -t #{project.name}:#{index + project.base_index}"
     end
 
     def tmux_new_window_command

data/spec/fixtures/sample.yml

@@ -17,7 +17,9 @@ windows:
         - vim
         - #empty, will just run plain bash
         - top
-  - shell: git pull
+  - shell:
+    - git pull
+    - git merge
   - guard:
       layout: tiled
       pre:

data/spec/lib/tmuxinator/cli_spec.rb

@@ -151,11 +151,11 @@ describe Tmuxinator::Cli do
   describe "#delete" do
     before do
       ARGV.replace(["delete", "foo"])
+      $stdin.stub(:gets => "y")
     end
 
     context "project exists" do
       before do
-        $stdin.stub(:gets => "y")
         Tmuxinator::Config.stub(:exists?) { true }
       end
 
@@ -170,6 +170,10 @@ describe Tmuxinator::Cli do
     end
 
     context "project doesn't exist" do
+      before do
+        $stdin.stub(:gets => "y")
+      end
+
       it "exits with error message" do
         expect { capture_io { cli.start } }.to raise_error SystemExit
       end

data/spec/lib/tmuxinator/project_spec.rb

@@ -113,6 +113,24 @@ describe Tmuxinator::Project do
     end
   end
 
+  describe "#tmux_command" do
+    context "tmux_command specified" do
+      before do
+        project.yaml["tmux_command"] = "byobu"
+      end
+
+      it "gets the custom tmux command" do
+        expect(project.tmux_command).to eq "byobu"
+      end
+    end
+
+    context "tmux_command is not specified" do
+      it "returns the default" do
+        expect(project.tmux_command).to eq "tmux"
+      end
+    end
+  end
+
   describe "#tmux_options" do
     context "no tmux options" do
       before do
@@ -231,6 +249,14 @@ describe Tmuxinator::Project do
     end
   end
 
+  describe "#commands" do
+    let(:window) { project.windows.keep_if { |w| w.name == "shell" }.first }
+
+    it "splits commands into an array" do
+      expect(window.commands).to eq(["tmux -f ~/.tmux.mac.conf -L foo send-keys -t sample:1 git\\ pull C-m", "tmux -f ~/.tmux.mac.conf -L foo send-keys -t sample:1 git\\ merge C-m"])
+    end
+  end
+
   describe "#pre" do
     subject(:pre) { project.pre }
 

data/spec/lib/tmuxinator/util_spec.rb

@@ -1,4 +1,6 @@
 require "spec_helper"
 
 describe Tmuxinator::Util do
+  let(:util) { Object.new.extend(Tmuxinator::Util) }
+
 end

data/spec/lib/tmuxinator/window_spec.rb

@@ -1,6 +1,7 @@
 require "spec_helper"
 
 describe Tmuxinator::Window do
+  let(:project) { double }
   let(:yaml) do
     {
       "editor" => {
@@ -11,7 +12,11 @@ describe Tmuxinator::Window do
     }
   end
 
-  let(:window) { Tmuxinator::Window.new(yaml, 0, nil) }
+  let(:window) { Tmuxinator::Window.new(yaml, 0, project) }
+
+  before do
+    project.stub(:tmux => "tmux", :name => "test", :base_index => 1)
+  end
 
   describe "#initialize" do
     it "creates an instance" do
@@ -48,6 +53,38 @@ describe Tmuxinator::Window do
     end
   end
 
+  describe "#build_commands" do
+    context "command is an array" do
+      before do
+        yaml["editor"] = ["git fetch", "git status"]
+      end
+
+      it "returns the flattened command" do
+        expect(window.commands).to eq ["tmux send-keys -t test:1 git\\ fetch C-m", "tmux send-keys -t test:1 git\\ status C-m"]
+      end
+    end
+
+    context "command is a string" do
+      before do
+        yaml["editor"] = "vim"
+      end
+
+      it "returns the command" do
+        expect(window.commands).to eq ["tmux send-keys -t test:1 vim C-m"]
+      end
+    end
+
+    context "command is empty" do
+      before do
+        yaml["editor"] = ""
+      end
+
+      it "returns an empty array" do
+        expect(window.commands).to be_empty
+      end
+    end
+  end
+
   describe "#build_panes" do
     context "no panes" do
       before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tmuxinator
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6.pre
 platform: ruby
 authors:
 - Allen Bargi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Create and manage complex tmux sessions easily.