tmuxinator 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7cd1f3c563eee9b9981022927df6cf8c703ea9d
-  data.tar.gz: c8ced2615c6a557de62667d63b0c10c4d255ec0d
+  metadata.gz: d39dfeb0a8545d2a350baa90a8e10d955fca6cce
+  data.tar.gz: 6a65bf9c56691ca61b97fdf8a83273b5e77237e5
 SHA512:
-  metadata.gz: 975db144ae961626c1e48eb9d1425a96b8b5ee11207d113c365de80c5f34a574b6014400268c718fe8ad5ba914628c8a125d396c723bb03d86209397d2e65384
-  data.tar.gz: 53e4ec5d574481f124be5befaab0dcb7219fd3484db427f5f989c1e560509c25e49b5e7a7dbbfca54a428bae67a749ea5800ac2610ac2c3db4ddc371e8b73046
+  metadata.gz: da7b46dcb158ab71ac91c40f944b22a657ccb20091a5c8895db1d79a087416f1c81967693e371b883fad2f3fc880885fbc5b561d042422a136b888d0e52f2d2d
+  data.tar.gz: 41ffd48199849fb16c7b777bd451b8e36446379858236bbac9a3b40a9442c029ab6bb6dd1a76c3d686fbc04ff2f7cfa4d804a667a8162d11a779c7d55d6711ac

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.6.3
+- Remove stray pry #128
+- Allow starting a tmuxinator project while inside a tmux session #130
+- Set the tmux layout after pane creation to avoid pane too small errors #131
+- Check for both pane-base-index and base-index #126
+
 ## 0.6.2
 - Also pass command line options to the `base_index` lookup.
 - Fixed bug #116.

data/README.md

@@ -36,7 +36,7 @@ Download the appropriate completion file from the repo.
 
 Add the following to your `~/.bashrc`:
 
-    source `which tmuxinator.zsh`
+    source `which tmuxinator.bash`
 
 ### zsh
 
@@ -112,7 +112,7 @@ or [specify your own](http://stackoverflow.com/a/9976282/183537).
 This will fire up tmux with all the tabs and panes you configured.
 
 ``` bash
-$ tmuinxator start [project]
+$ tmuxinator start [project]
 ```
 
 ## Shorthand
@@ -125,10 +125,10 @@ $ mux [command]
 
 ## Interpreter Managers & Environment Variables
 
-To use tmuxinator with rbenv, RVM, NVM etc, use the `pre_tab` option.
+To use tmuxinator with rbenv, RVM, NVM etc, use the `pre_window` option.
 
 ```
-pre_tab: rbenv shell 2.0.0-p247
+pre_window: rbenv shell 2.0.0-p247
 ```
 
 These commands will run before any pane or window.

data/lib/tmuxinator/assets/template.erb

@@ -8,7 +8,7 @@ if [ "$?" -eq 1 ]; then
   <%= pre %>
 
   # Create the session and the first window.
-  <%= tmux %> new-session -d -s <%= name %> -n <%= windows.first.name %>
+  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
@@ -33,10 +33,10 @@ if [ "$?" -eq 1 ]; then
       <%- unless pane.last? -%>
   <%= pane.tmux_split_command %>
       <%- end -%>
+  <%= window.tmux_layout_command %>
     <%- end -%>
 
 
-  <%= window.tmux_layout_command %>
   <%= window.tmux_select_first_pane %>
     <%- end -%>
   <%- end -%>
@@ -44,4 +44,8 @@ if [ "$?" -eq 1 ]; then
   <%= tmux %> select-window -t <%= base_index %>
 fi
 
-<%= tmux %> -u attach-session -t <%= name %>
+if [ -z "$TMUX" ]; then
+  <%= tmux %> -u attach-session -t <%= name %>
+else
+  <%= tmux %> -u switch-client -t <%= name %>
+fi

data/lib/tmuxinator/project.rb

@@ -83,16 +83,16 @@ module Tmuxinator
 
     def tmux_options
       if cli_args?
-        " #{yaml["cli_args"].strip}"
+        " #{yaml["cli_args"].to_s.strip}"
       elsif tmux_options?
-        " #{yaml["tmux_options"].strip}"
+        " #{yaml["tmux_options"].to_s.strip}"
       else
         ""
       end
     end
 
     def base_index
-      `#{tmux} start-server\\\; show-window-options -g | grep pane-base-index`.split(/\s/).last.to_i
+      get_pane_base_index.present? ? get_pane_base_index.to_i : get_base_index.to_i
     end
 
     def tmux_options?
@@ -138,5 +138,13 @@ module Tmuxinator
       deprecations << "DEPRECATION: The cli_args option has been replaced by the tmux_options option and will not be supported in 0.8.0." if yaml["cli_args"].present?
       deprecations
     end
+
+    def get_pane_base_index
+      `#{tmux} start-server\\; show-option -g | grep pane-base-index`.split(/\s/).last
+    end
+
+    def get_base_index
+      `#{tmux} start-server\\; show-option -g | grep base-index`.split(/\s/).last
+    end
   end
 end

data/lib/tmuxinator/version.rb

@@ -1,3 +1,3 @@
 module Tmuxinator
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/lib/tmuxinator/project_spec.rb

@@ -135,6 +135,30 @@ describe Tmuxinator::Project do
     end
   end
 
+  describe "#base_index" do
+    context "pane base index present" do
+      before do
+        project.stub(:get_pane_base_index => "1")
+        project.stub(:get_base_index => "1")
+      end
+
+      it "gets the pane base index" do
+        expect(project.base_index).to eq 1
+      end
+    end
+
+    context "pane base index no present" do
+      before do
+        project.stub(:get_pane_base_index => nil)
+        project.stub(:get_base_index => "0")
+      end
+
+      it "gets the base index" do
+        expect(project.base_index).to eq 0
+      end
+    end
+  end
+
   describe "#window" do
     it "gets the window and index for tmux" do
       expect(project.window(1)).to eq "sample:1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tmuxinator
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Allen Bargi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor