Merge 0435b76 into dd52cd1

.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - "2.0.0"
 env:
   - TMUX_VERSION=master
+  - TMUX_VERSION=1.9
   - TMUX_VERSION=1.8
   - TMUX_VERSION=1.7
   - TMUX_VERSION=1.6

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.6.7
+- Remove use of grep for base-index #171
+- Fix bugs in `Tmuxinator::Config.default?` #169
+- Fix path for Rails log in directory sample #177
+- Add completions for fish shell #179
+- Fix grammar in readme #184
+- Make commands take precedence over project names #182
+- Improve error messages when $EDITOR isn't set #186, #194
+- Add confirmation to deletion prompt #197
+- Fix broken badge references after organisation move
+- Remove dependancy on ActiveSupport #199
+- Fix compatability with tmux 1.9
+
 ## 0.6.6
 - Fix a bug caused by not escaping the root path #145
 - Fix bash completion with a single argument #148

lib/tmuxinator/assets/template.erb

@@ -10,8 +10,10 @@ if [ "$?" -eq 1 ]; then
   # Create the session and the first window.
   TMUX= <%= tmux %> new-session -d -s <%= name %> -n <%= windows.first.name %>
 
-  # Set the default path.
-  <%= tmux %> set-option -t <%= name %> default-path <%= root.shellescape -%> 1>/dev/null
+  <%- if Tmuxinator::Config.version < 1.7 -%>
+  # Set the default path for versions prior to 1.7
+  <%= tmux %> set-option -t <%= name %> <%= Tmuxinator::Config.default_path_option %> <%= root.shellescape -%> 1>/dev/null
+  <%- end -%>
 
   # Create other windows.
   <%- windows.drop(1).each do |window| -%>

lib/tmuxinator/config.rb

@@ -22,6 +22,14 @@ def installed?
         Kernel.system("which tmux > /dev/null")
       end
 
+      def version
+        `tmux -V`.split(" ")[1].to_f if installed?
+      end
+
+      def default_path_option
+        version && version < 1.7 ? "default-path" : "-c"
+      end
+
       def editor?
         !ENV["EDITOR"].nil? && !ENV["EDITOR"].empty?
       end

lib/tmuxinator/project.rb

@@ -23,7 +23,7 @@ def windows
     end
 
     def root
-      yaml["project_root"] || yaml["root"]
+      yaml["project_root"] || File.expand_path(yaml["root"])
     end
 
     def name

lib/tmuxinator/version.rb

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

lib/tmuxinator/window.rb

@@ -75,7 +75,7 @@ def tmux_window_command_prefix
     end
 
     def tmux_new_window_command
-      "#{project.tmux} new-window -c #{project.root.shellescape} -t #{tmux_window_target} -n #{name}"
+      "#{project.tmux} new-window #{Tmuxinator::Config.default_path_option} #{File.expand_path(project.root).shellescape} -t #{tmux_window_target} -n #{name}"
     end
 
     def tmux_layout_command

spec/lib/tmuxinator/cli_spec.rb

@@ -44,6 +44,7 @@
     before do
       ARGV.replace(["start", "foo"])
       Tmuxinator::Config.stub(:validate => project)
+      Tmuxinator::Config.stub(:version => 1.9)
       Kernel.stub(:exec)
     end
 

spec/lib/tmuxinator/project_spec.rb

@@ -35,13 +35,13 @@
   describe "#root" do
     context "without deprecations" do
       it "gets the root" do
-        expect(project.root).to eq "~/test"
+        expect(project.root).to include("test")
       end
     end
 
     context "with deprecations" do
       it "still gets the root" do
-        expect(project_with_deprecations.root).to eq "~/test"
+        expect(project_with_deprecations.root).to include("test")
       end
     end
   end

spec/lib/tmuxinator/window_spec.rb

@@ -140,8 +140,14 @@
       )
     end
 
-    it "specifies root path by passing -c to tmux" do
-      expect(window.tmux_new_window_command).to include("-c /project/tmuxinator")
+    context "tmux 1.6 and below" do
+      before do
+        Tmuxinator::Config.stub(:version => 1.6)
+      end
+
+      it "specifies root path by passing default-path to tmux" do
+        expect(window.tmux_new_window_command).to include("default-path /project/tmuxinator")
+      end
     end
   end
 end