tmuxinator 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b230df62265cc9e7487c362882d6724503c430
-  data.tar.gz: 2e4aa507c3a1e5d0918244b0147c54d0b8dcca3e
+  metadata.gz: 60c188fb2f653399d19450cb82fddc9649e62983
+  data.tar.gz: efdf85185c8c00cee928a4b3e0114111d2efc406
 SHA512:
-  metadata.gz: e397db0f981a7524b9106c4b47f2616aa5aff1486079c023ae8feacb936e8ee37b5617c60af5bebdfb03f354fd13063ccf6ca4cda9fd033dacacb01d5184f46f
-  data.tar.gz: 0540b6d4bf2a5c1ab271368ad4d64393a469e380bdab750fefe8957fd3a14764c8cad5fa71be59ad61a9c7a15576453cffa1762a3a221729353fe7d32bda4585
+  metadata.gz: a9014d3cbacead8062969fc79059631e72683bd746b4139f4d67d23f9a5886fbe4626ef5de8d5b92fa2c2420fb67782e47ce6db31100881594a02c64c2f76412
+  data.tar.gz: c49b1ab81d626ed96711ab0df8e7eb142e1bc81683ab6dc4d371236956e16477504d8211273bf242b4bc2b32c83a5b0d1e63aa576350dd1b19b9697811cc4de0

data/lib/tmuxinator.rb

@@ -2,6 +2,7 @@ require "yaml"
 require "erubis"
 require "shellwords"
 require "thor"
+require "thor/version"
 
 require "tmuxinator/util"
 require "tmuxinator/deprecations"
@@ -15,3 +16,9 @@ require "tmuxinator/version"
 
 module Tmuxinator
 end
+
+class Object
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end
+end

data/lib/tmuxinator/assets/template.erb

@@ -1,4 +1,9 @@
 #!<%= ENV["SHELL"] || "/bin/bash" %>
+
+# Clear rbenv variables before starting tmux
+unset RBENV_VERSION
+unset RBENV_DIR
+
 <%= tmux %> start-server\; has-session -t <%= name %> 2>/dev/null
 
 if [ "$?" -eq 1 ]; then
@@ -12,7 +17,9 @@ if [ "$?" -eq 1 ]; then
 
   <%- 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
+  <%- if root? -%>
+  <%= tmux %> set-option -t <%= name %> <%= Tmuxinator::Config.default_path_option %> <%= root -%> 1>/dev/null
+  <%- end -%>
   <%- end -%>
 
   # Create other windows.

data/lib/tmuxinator/assets/wemux_template.erb

@@ -11,7 +11,9 @@ if [ "$?" -eq 127 ]; then
   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 root? -%>
+  <%= tmux %> set-option -t <%= name %> <%= Tmuxinator::Config.default_path_option %> <%= root -%> 1>/dev/null
+  <%- end -%>
 
   # Create other windows.
   <%- windows.drop(1).each do |window| -%>

data/lib/tmuxinator/cli.rb

@@ -9,7 +9,7 @@ module Tmuxinator
       @command_list = %w(commands copy debug delete doctor help implode list start version)
     end
 
-    package_name "tmuxinator"
+    package_name "tmuxinator" unless Gem::Version.create(Thor::VERSION) < Gem::Version.create("0.18")
 
     desc "commands", "Lists commands available in tmuxinator"
 
@@ -76,14 +76,11 @@ module Tmuxinator
 
       exit!("Project #{existing} doesn't exist!") unless Tmuxinator::Config.exists?(existing)
 
-      if Tmuxinator::Config.exists?(new)
-        if yes?("#{new} already exists, would you like to overwrite it?", :red)
-          FileUtils.rm(new_config_path)
-          say "Overwriting #{new}"
-        end
+      if !Tmuxinator::Config.exists?(new) or yes?("#{new} already exists, would you like to overwrite it?", :red)
+        say "Overwriting #{new}" if Tmuxinator::Config.exists?(new)
+        FileUtils.copy_file(existing_config_path, new_config_path)
       end
 
-      FileUtils.copy_file(existing_config_path, new_config_path)
       Kernel.system("$EDITOR #{new_config_path}")
     end
 

data/lib/tmuxinator/config.rb

@@ -19,7 +19,7 @@ module Tmuxinator
       end
 
       def installed?
-        Kernel.system("which tmux > /dev/null")
+        Kernel.system("type tmux > /dev/null")
       end
 
       def version
@@ -84,13 +84,9 @@ module Tmuxinator
           exit!
         end
 
-        unless project.root?
-          puts "Your project file didn't specify a 'project_root'"
-          exit!
-        end
-
         unless project.name?
           puts "Your project file didn't specify a 'project_name'"
+          exit!
         end
 
         project

data/lib/tmuxinator/project.rb

@@ -25,11 +25,13 @@ module Tmuxinator
     end
 
     def root
-      yaml["project_root"] || File.expand_path(yaml["root"])
+      root = yaml["project_root"] || yaml["root"]
+      root.blank? ? nil : File.expand_path(root).shellescape
     end
 
     def name
-      yaml["project_name"] && yaml["project_name"].shellescape || yaml["name"].shellescape
+      name = yaml["project_name"] || yaml["name"]
+      name.shellescape
     end
 
     def pre

data/lib/tmuxinator/version.rb

@@ -1,3 +1,3 @@
 module Tmuxinator
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

data/lib/tmuxinator/window.rb

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

data/spec/lib/tmuxinator/cli_spec.rb

@@ -4,10 +4,10 @@ describe Tmuxinator::Cli do
 
   before do
     ARGV.clear
-    Kernel.stub(:system)
-    FileUtils.stub(:copy_file)
-    FileUtils.stub(:rm)
-    FileUtils.stub(:remove_dir)
+    allow(Kernel).to receive(:system)
+    allow(FileUtils).to receive(:copy_file)
+    allow(FileUtils).to receive(:rm)
+    allow(FileUtils).to receive(:remove_dir)
   end
 
   context "no arguments" do
@@ -20,7 +20,7 @@ describe Tmuxinator::Cli do
   describe "#completions" do
     before do
       ARGV.replace(["completions", "start"])
-      Tmuxinator::Config.stub(:configs => ["test.yml"])
+      allow(Tmuxinator::Config).to receive_messages(:configs => ["test.yml"])
     end
 
     it "gets completions" do
@@ -43,9 +43,9 @@ describe Tmuxinator::Cli do
   describe "#start" do
     before do
       ARGV.replace(["start", "foo"])
-      Tmuxinator::Config.stub(:validate => project)
-      Tmuxinator::Config.stub(:version => 1.9)
-      Kernel.stub(:exec)
+      allow(Tmuxinator::Config).to receive_messages(:validate => project)
+      allow(Tmuxinator::Config).to receive_messages(:version => 1.9)
+      allow(Kernel).to receive(:exec)
     end
 
     context "no deprecations" do
@@ -59,7 +59,7 @@ describe Tmuxinator::Cli do
 
     context "deprecations" do
       before do
-        $stdin.stub(:getc => "y")
+        allow($stdin).to receive_messages(:getc => "y")
       end
 
       let(:project) { FactoryGirl.build(:project_with_deprecations) }
@@ -76,12 +76,12 @@ describe Tmuxinator::Cli do
 
     before do
       ARGV.replace(["new", "test"])
-      File.stub(:open) { |&block| block.yield file }
+      allow(File).to receive(:open) { |&block| block.yield file }
     end
 
     context "existing project doesn't exist" do
       before do
-        Tmuxinator::Config.stub(:exists? => false)
+        allow(Tmuxinator::Config).to receive_messages(:exists? => false)
       end
 
       it "creates a new tmuxinator project file" do
@@ -92,7 +92,7 @@ describe Tmuxinator::Cli do
 
     context "files exists" do
       before do
-        File.stub(:exists? => true)
+        allow(File).to receive_messages(:exists? => true)
       end
 
       it "just opens the file" do
@@ -105,20 +105,15 @@ describe Tmuxinator::Cli do
   describe "#copy" do
     before do
       ARGV.replace(["copy", "foo", "bar"])
-      Tmuxinator::Config.stub(:exists?) { true }
+      allow(Tmuxinator::Config).to receive(:exists?) { true }
     end
 
     context "new project already exists" do
       before do
-        Thor::LineEditor.stub(:readline => "y")
+        allow(Thor::LineEditor).to receive_messages(:readline => "y")
       end
 
       it "prompts user to confirm overwrite" do
-        expect(FileUtils).to receive(:rm)
-        capture_io { cli.start }
-      end
-
-      it "copies the config" do
         expect(FileUtils).to receive(:copy_file)
         capture_io { cli.start }
       end
@@ -126,7 +121,7 @@ describe Tmuxinator::Cli do
 
     context "existing project doens't exist" do
       before do
-        Tmuxinator::Config.stub(:exists?) { false }
+        allow(Tmuxinator::Config).to receive(:exists?) { false }
       end
 
       it "exit with error code" do
@@ -140,7 +135,7 @@ describe Tmuxinator::Cli do
 
     before do
       ARGV.replace(["debug", "foo"])
-      Tmuxinator::Config.stub(:validate => project)
+      allow(Tmuxinator::Config).to receive_messages(:validate => project)
     end
 
     it "renders the project" do
@@ -152,12 +147,12 @@ describe Tmuxinator::Cli do
   describe "#delete" do
     before do
       ARGV.replace(["delete", "foo"])
-      Thor::LineEditor.stub(:readline => "y")
+      allow(Thor::LineEditor).to receive_messages(:readline => "y")
     end
 
     context "project exists" do
       before do
-        Tmuxinator::Config.stub(:exists?) { true }
+        allow(Tmuxinator::Config).to receive(:exists?) { true }
       end
 
       it "deletes the project" do
@@ -168,7 +163,7 @@ describe Tmuxinator::Cli do
 
     context "project doesn't exist" do
       before do
-        Thor::LineEditor.stub(:readline => "y")
+        allow(Thor::LineEditor).to receive_messages(:readline => "y")
       end
 
       it "exits with error message" do
@@ -180,7 +175,7 @@ describe Tmuxinator::Cli do
   describe "#implode" do
     before do
       ARGV.replace(["implode"])
-      Thor::LineEditor.stub(:readline => "y")
+      allow(Thor::LineEditor).to receive_messages(:readline => "y")
     end
 
     it "confirms deletion of all projects" do
@@ -197,7 +192,7 @@ describe Tmuxinator::Cli do
   describe "#list" do
     before do
       ARGV.replace(["list"])
-      Dir.stub(:[] => ["/path/to/project.yml"])
+      allow(Dir).to receive_messages(:[] => ["/path/to/project.yml"])
     end
 
     it "lists all projects" do
@@ -222,9 +217,9 @@ describe Tmuxinator::Cli do
     end
 
     it "checks requirements" do
-      Tmuxinator::Config.should_receive(:installed?)
-      Tmuxinator::Config.should_receive(:editor?)
-      Tmuxinator::Config.should_receive(:shell?)
+      expect(Tmuxinator::Config).to receive(:installed?)
+      expect(Tmuxinator::Config).to receive(:editor?)
+      expect(Tmuxinator::Config).to receive(:shell?)
       capture_io { cli.start }
     end
   end

data/spec/lib/tmuxinator/config_spec.rb

@@ -24,28 +24,28 @@ describe Tmuxinator::Config do
 
     context "when the file exists" do
       before do
-        File.stub(:exists?).with(Tmuxinator::Config.default) { true }
+        allow(File).to receive(:exists?).with(Tmuxinator::Config.default) { true }
       end
 
       it "returns true" do
-        expect(Tmuxinator::Config.default?).to be_true
+        expect(Tmuxinator::Config.default?).to be_truthy
       end
     end
 
     context "when the file doesn't exist" do
       before do
-        File.stub(:exists?).with(Tmuxinator::Config.default) { false }
+        allow(File).to receive(:exists?).with(Tmuxinator::Config.default) { false }
       end
 
       it "returns true" do
-        expect(Tmuxinator::Config.default?).to be_false
+        expect(Tmuxinator::Config.default?).to be_falsey
       end
     end
   end
 
   describe "#configs" do
     before do
-      Dir.stub(:[] => ["test.yml"])
+      allow(Dir).to receive_messages(:[] => ["test.yml"])
     end
 
     it "gets a list of all projects" do
@@ -56,21 +56,21 @@ describe Tmuxinator::Config do
   describe "#installed?" do
     context "tmux is installed" do
       before do
-        Kernel.stub(:system) { true }
+        allow(Kernel).to receive(:system) { true }
       end
 
       it "returns true" do
-        expect(Tmuxinator::Config.installed?).to be_true
+        expect(Tmuxinator::Config.installed?).to be_truthy
       end
     end
 
     context "tmux is not installed" do
       before do
-        Kernel.stub(:system) { false }
+        allow(Kernel).to receive(:system) { false }
       end
 
       it "returns true" do
-        expect(Tmuxinator::Config.installed?).to be_false
+        expect(Tmuxinator::Config.installed?).to be_falsey
       end
     end
   end
@@ -78,21 +78,21 @@ describe Tmuxinator::Config do
   describe "#editor?" do
     context "$EDITOR is set" do
       before do
-        ENV.stub(:[]).with("EDITOR") { "vim" }
+        allow(ENV).to receive(:[]).with("EDITOR") { "vim" }
       end
 
       it "returns true" do
-        expect(Tmuxinator::Config.editor?).to be_true
+        expect(Tmuxinator::Config.editor?).to be_truthy
       end
     end
 
     context "$EDITOR is not set" do
       before do
-        ENV.stub(:[]).with("EDITOR") { nil }
+        allow(ENV).to receive(:[]).with("EDITOR") { nil }
       end
 
       it "returns false" do
-        expect(Tmuxinator::Config.editor?).to be_false
+        expect(Tmuxinator::Config.editor?).to be_falsey
       end
     end
   end
@@ -100,33 +100,33 @@ describe Tmuxinator::Config do
   describe "#shell?" do
     context "$SHELL is set" do
       before do
-        ENV.stub(:[]).with("SHELL") { "vim" }
+        allow(ENV).to receive(:[]).with("SHELL") { "vim" }
       end
 
       it "returns true" do
-        expect(Tmuxinator::Config.shell?).to be_true
+        expect(Tmuxinator::Config.shell?).to be_truthy
       end
     end
 
     context "$SHELL is not set" do
       before do
-        ENV.stub(:[]).with("SHELL") { nil }
+        allow(ENV).to receive(:[]).with("SHELL") { nil }
       end
 
       it "returns false" do
-        expect(Tmuxinator::Config.shell?).to be_false
+        expect(Tmuxinator::Config.shell?).to be_falsey
       end
     end
   end
 
   describe "#exists?" do
     before do
-      File.stub(:exists? => true)
-      Tmuxinator::Config.stub(:project => "")
+      allow(File).to receive_messages(:exists? => true)
+      allow(Tmuxinator::Config).to receive_messages(:project => "")
     end
 
     it "checks if the given project exists" do
-      expect(Tmuxinator::Config.exists?("test")).to be_true
+      expect(Tmuxinator::Config.exists?("test")).to be_truthy
     end
   end
 
@@ -135,7 +135,7 @@ describe Tmuxinator::Config do
 
     before do
       path = File.expand_path("../../../fixtures/", __FILE__)
-      Tmuxinator::Config.stub(:root => path)
+      allow(Tmuxinator::Config).to receive_messages(:root => path)
     end
 
     context "with project yml" do

data/spec/lib/tmuxinator/project_spec.rb

@@ -81,8 +81,8 @@ describe Tmuxinator::Project do
     context "with deprecations" do
       context "rbenv option is present" do
         before do
-          project.stub(:rbenv? => true)
-          project.stub_chain(:yaml, :[]).and_return("2.0.0-p247")
+          allow(project).to receive_messages(:rbenv? => true)
+          allow(project).to receive_message_chain(:yaml, :[]).and_return("2.0.0-p247")
         end
 
         it "still gets the correct pre_window command" do
@@ -92,8 +92,8 @@ describe Tmuxinator::Project do
 
       context "rvm option is present" do
         before do
-          project.stub(:rbenv? => false)
-          project.stub_chain(:yaml, :[]).and_return("ruby-2.0.0-p247")
+          allow(project).to receive_messages(:rbenv? => false)
+          allow(project).to receive_message_chain(:yaml, :[]).and_return("ruby-2.0.0-p247")
         end
 
         it "still gets the correct pre_window command" do
@@ -103,8 +103,8 @@ describe Tmuxinator::Project do
 
       context "pre_tab is present" do
         before do
-          project.stub(:rbenv? => false)
-          project.stub(:pre_tab? => true)
+          allow(project).to receive_messages(:rbenv? => false)
+          allow(project).to receive_messages(:pre_tab? => true)
         end
 
         it "still gets the correct pre_window command" do
@@ -117,7 +117,7 @@ describe Tmuxinator::Project do
   describe "#socket" do
     context "socket path is present" do
       before do
-        project.stub(:socket_path => "/tmp")
+        allow(project).to receive_messages(:socket_path => "/tmp")
       end
 
       it "gets the socket path" do
@@ -147,7 +147,7 @@ describe Tmuxinator::Project do
   describe "#tmux_options" do
     context "no tmux options" do
       before do
-        project.stub(:tmux_options? => false)
+        allow(project).to receive_messages(:tmux_options? => false)
       end
 
       it "returns nothing" do
@@ -157,7 +157,7 @@ describe Tmuxinator::Project do
 
     context "with deprecations" do
       before do
-        project_with_deprecations.stub(:cli_args? => true)
+        allow(project_with_deprecations).to receive_messages(:cli_args? => true)
       end
 
       it "still gets the tmux options" do
@@ -168,7 +168,7 @@ describe Tmuxinator::Project do
 
   describe "#get_pane_base_index" do
     it "extracts the pane_base_index from tmux_options" do
-      project.stub(show_tmux_options: tmux_config(pane_base_index: 3))
+      allow(project).to receive_messages(show_tmux_options: tmux_config(pane_base_index: 3))
 
       expect(project.get_pane_base_index).to eq("3")
     end
@@ -176,7 +176,7 @@ describe Tmuxinator::Project do
 
   describe "#get_base_index" do
     it "extracts the base index from options" do
-      project.stub(show_tmux_options: tmux_config(base_index: 1))
+      allow(project).to receive_messages(show_tmux_options: tmux_config(base_index: 1))
 
       expect(project.get_base_index).to eq("1")
     end
@@ -185,8 +185,8 @@ describe Tmuxinator::Project do
   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")
+        allow(project).to receive_messages(:get_pane_base_index => "1")
+        allow(project).to receive_messages(:get_base_index => "1")
       end
 
       it "gets the pane base index" do
@@ -196,8 +196,8 @@ describe Tmuxinator::Project do
 
     context "pane base index no present" do
       before do
-        project.stub(:get_pane_base_index => nil)
-        project.stub(:get_base_index => "0")
+        allow(project).to receive_messages(:get_pane_base_index => nil)
+        allow(project).to receive_messages(:get_base_index => "0")
       end
 
       it "gets the base index" do
@@ -215,7 +215,7 @@ describe Tmuxinator::Project do
   describe "#name?" do
     context "name is present" do
       it "returns true" do
-        expect(project.name?).to be_true
+        expect(project.name?).to be_truthy
       end
     end
   end
@@ -223,7 +223,7 @@ describe Tmuxinator::Project do
   describe "#windows?" do
     context "windows are present" do
       it "returns true" do
-        expect(project.windows?).to be_true
+        expect(project.windows?).to be_truthy
       end
     end
   end
@@ -231,7 +231,7 @@ describe Tmuxinator::Project do
   describe "#root?" do
     context "root are present" do
       it "returns true" do
-        expect(project.root?).to be_true
+        expect(project.root?).to be_truthy
       end
     end
   end