tmuxinator 0.6.6 → 0.6.7.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ddb873e6fc9447c5e8f89cc46d7c9bac0cb5c74
-  data.tar.gz: 0099271382f87b75ca699f3ea5037e7d41e85def
+  metadata.gz: 6a0870f5819d50ffe7fdb05a0ef0ff333595f3f1
+  data.tar.gz: 49da270a9f8d2e2273d807fb145a044a357c87fc
 SHA512:
-  metadata.gz: 4783c0e42837502b3b1118f097ddab3df038c12fec4cc78934c54014c3a9cd091692d3ce924494274f9f1c0a0145a115c58b8116530842f465f13c30573346c6
-  data.tar.gz: abf778e9236024b50eb08d2073567275b7f9e945a21d80a2935e1a66cafe2ab5b8b39422968fcee94565053302a4382cf29467727bcf6cc6284cf77655598b99
+  metadata.gz: 4350985c58776967b0e7ea93f09bba9e4919a15329a83204fd4904c03867759d8ea123aabb93f7911515917efbb49beb38f01001df32e1f31d209b111ad75a4a
+  data.tar.gz: e718531175f294d6fac9a91b8c8d3b2ba6896841fa9f40cc49c99c6337a25e7fe923cd841a74b8f489548f1c14458e17d0cf8d516bc44aa6d0c3368ab7f3010a

data/.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

data/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

data/README.md

@@ -1,6 +1,6 @@
 # Tmuxinator
 
-[![Gem Version](https://badge.fury.io/rb/tmuxinator.png)](http://badge.fury.io/rb/tmuxinator) [![Build Status](https://secure.travis-ci.org/aziz/tmuxinator.png)](http://travis-ci.org/aziz/tmuxinator?branch=master) [![Coverage Status](https://coveralls.io/repos/aziz/tmuxinator/badge.png)](https://coveralls.io/r/aziz/tmuxinator) [![Code Climate](https://codeclimate.com/github/aziz/tmuxinator.png)](https://codeclimate.com/github/aziz/tmuxinator) [![Dependency Status](https://gemnasium.com/aziz/tmuxinator.png)](https://gemnasium.com/aziz/tmuxinator)
+[![Gem Version](https://badge.fury.io/rb/tmuxinator.png)](http://badge.fury.io/rb/tmuxinator) [![Build Status](https://secure.travis-ci.org/tmuxinator/tmuxinator.png)](http://travis-ci.org/tmuxinator/tmuxinator?branch=master) [![Coverage Status](https://coveralls.io/repos/tmuxinator/tmuxinator/badge.png)](https://coveralls.io/r/tmuxinator/tmuxinator) [![Code Climate](https://codeclimate.com/github/tmuxinator/tmuxinator.png)](https://codeclimate.com/github/tmuxinator/tmuxinator) [![Dependency Status](https://gemnasium.com/tmuxinator/tmuxinator.png)](https://gemnasium.com/tmuxinator/tmuxinator)
 
 Create and manage tmux sessions easily.
 
@@ -59,6 +59,12 @@ Add the following to your `~/.zshrc`:
 
     source ~/.bin/tmuxinator.zsh
 
+### fish
+
+Move `tmuxinator.fish` to your `completions` folder:
+
+    cp ~/.bin/tmuxinator.fish ~/.config/completions/
+
 ## Usage
 
 A working knowledge of tmux is assumed. You should understand what windows and
@@ -104,7 +110,7 @@ windows:
         - vim
         - guard
   - server: bundle exec rails s
-  - logs: tail -f logs/development.log
+  - logs: tail -f log/development.log
 ```
 
 ## Windows
@@ -150,7 +156,7 @@ These command(s) will run before any subsequent commands in all panes and window
 ## 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
+tmux will directly send the commands to a 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:
@@ -238,7 +244,7 @@ Add `export DISABLE_AUTO_TITLE=true` to your `.zshrc` or `.bashrc`
 
 ## Contributing
 
-To contribute, please read the [contributing guide](https://github.com/aziz/tmuxinator/blob/master/CONTRIBUTING.md).
+To contribute, please read the [contributing guide](https://github.com/tmuxinator/tmuxinator/blob/master/CONTRIBUTING.md).
 
 ## Copyright
 

data/bin/mux

@@ -7,7 +7,9 @@ require "tmuxinator"
 if ARGV.length == 1
   name = ARGV[0]
 
-  if Tmuxinator::Config.exists?(name)
+  if Tmuxinator::Cli.new.command_list.include?(name)
+    Tmuxinator::Cli.start
+  elsif Tmuxinator::Config.exists?(name)
     Tmuxinator::Cli.new.start(name)
   else
     Tmuxinator::Cli.start

data/bin/tmuxinator

@@ -7,7 +7,9 @@ require "tmuxinator"
 if ARGV.length == 1
   name = ARGV[0]
 
-  if Tmuxinator::Config.exists?(name)
+  if Tmuxinator::Cli.new.command_list.include?(name)
+    Tmuxinator::Cli.start
+  elsif Tmuxinator::Config.exists?(name)
     Tmuxinator::Cli.new.start(name)
   else
     Tmuxinator::Cli.start

data/completion/tmuxinator.fish

@@ -0,0 +1,16 @@
+function __fish_tmuxinator_using_command
+  set cmd (commandline -opc)
+  if [ (count $cmd) -gt 1 ]
+    if [ $argv[1] = $cmd[2] ]
+      return 0
+    end
+  end
+  return 1
+end
+
+complete -f -c tmuxinator -a '(tmuxinator completions start)'
+complete -f -c tmuxinator -a '(tmuxinator commands)'
+complete -f -c tmuxinator -n '__fish_tmuxinator_using_command start' -a '(tmuxinator completions start)'
+complete -f -c tmuxinator -n '__fish_tmuxinator_using_command open' -a '(tmuxinator completions open)'
+complete -f -c tmuxinator -n '__fish_tmuxinator_using_command copy' -a '(tmuxinator completions copy)'
+complete -f -c tmuxinator -n '__fish_tmuxinator_using_command delete' -a '(tmuxinator completions delete)'

data/lib/tmuxinator.rb

@@ -2,7 +2,6 @@ require "yaml"
 require "erubis"
 require "shellwords"
 require "thor"
-require "active_support/all"
 
 require "tmuxinator/util"
 require "tmuxinator/deprecations"

data/lib/tmuxinator/assets/sample.yml

@@ -25,4 +25,4 @@ windows:
         - vim
         - guard
   - server: bundle exec rails s
-  - logs: tail -f logs/development.log
+  - logs: tail -f log/development.log

data/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| -%>

data/lib/tmuxinator/cli.rb

@@ -40,7 +40,7 @@ module Tmuxinator
         File.open(config, "w") { |f| f.write(erb) }
       end
 
-      Kernel.system("$EDITOR #{config}")
+      Kernel.system("$EDITOR #{config}") || doctor
     end
 
     desc "start [PROJECT]", "Start a tmux session using a project's tmuxinator config"
@@ -95,7 +95,7 @@ module Tmuxinator
       if Tmuxinator::Config.exists?(project)
         config =  "#{Tmuxinator::Config.root}/#{project}.yml"
 
-        if yes?("Are you sure you want to delete #{project}?", :red)
+        if yes?("Are you sure you want to delete #{project}?(y/n)", :red)
           FileUtils.rm(config)
           say "Deleted #{project}"
         end

data/lib/tmuxinator/config.rb

@@ -15,13 +15,21 @@ module Tmuxinator
       end
 
       def default?
-        exists?(default)
+        exists?("default")
       end
 
       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

data/lib/tmuxinator/deprecations.rb

@@ -1,19 +1,19 @@
 module Tmuxinator
   module Deprecations
     def rvm?
-      yaml["rvm"].present?
+      yaml["rvm"]
     end
 
     def rbenv?
-      yaml["rbenv"].present?
+      yaml["rbenv"]
     end
 
     def pre_tab?
-      yaml["pre_tab"].present?
+      yaml["pre_tab"]
     end
 
     def cli_args?
-      yaml["cli_args"].present?
+      yaml["cli_args"]
     end
   end
 end

data/lib/tmuxinator/pane.rb

@@ -14,15 +14,15 @@ module Tmuxinator
     end
 
     def tmux_pre_command
-      tab.pre.present? ? "#{project.tmux} send-keys -t #{tmux_window_and_pane_target} #{tab.pre.shellescape} C-m" : ""
+      tab.pre ? "#{project.tmux} send-keys -t #{tmux_window_and_pane_target} #{tab.pre.shellescape} C-m" : ""
     end
 
     def tmux_pre_window_command
-      project.pre_window.present? ? "#{project.tmux} send-keys -t #{tmux_window_and_pane_target} #{project.pre_window.shellescape} C-m" : ""
+      project.pre_window ? "#{project.tmux} send-keys -t #{tmux_window_and_pane_target} #{project.pre_window.shellescape} C-m" : ""
     end
 
     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" : ""
+      command ? "#{project.tmux} send-keys -t #{project.name}:#{tab.index + project.base_index}.#{index + tab.project.base_index} #{command.shellescape} C-m" : ""
     end
 
     def tmux_split_command
@@ -34,7 +34,7 @@ module Tmuxinator
     end
 
     def multiple_commands?
-      commands.present? && commands.length > 0
+      commands && commands.length > 0
     end
   end
 end

data/lib/tmuxinator/project.rb

@@ -15,7 +15,7 @@ module Tmuxinator
     end
 
     def windows
-      windows_yml = yaml["tabs"].presence || yaml["windows"]
+      windows_yml = yaml["tabs"] || yaml["windows"]
 
       @windows ||= windows_yml.map.with_index do |window_yml, index|
         Tmuxinator::Window.new(window_yml, index, self)
@@ -23,11 +23,11 @@ module Tmuxinator
     end
 
     def root
-      yaml["project_root"].presence || yaml["root"]
+      yaml["project_root"] || File.expand_path(yaml["root"])
     end
 
     def name
-      yaml["project_name"].presence.try(:shellescape) || yaml["name"].shellescape
+      yaml["project_name"] && yaml["project_name"].shellescape || yaml["name"].shellescape
     end
 
     def pre
@@ -56,13 +56,13 @@ module Tmuxinator
     end
 
     def tmux_command
-      yaml["tmux_command"].presence || "tmux"
+      yaml["tmux_command"] || "tmux"
     end
 
     def socket
-      if socket_path.present?
+      if socket_path
         " -S #{socket_path}"
-      elsif socket_name.present?
+      elsif socket_name
         " -L #{socket_name}"
       else
         nil
@@ -88,11 +88,11 @@ module Tmuxinator
     end
 
     def base_index
-      get_pane_base_index.present? ? get_pane_base_index.to_i : get_base_index.to_i
+      get_pane_base_index ? get_pane_base_index.to_i : get_base_index.to_i
     end
 
     def tmux_options?
-      yaml["tmux_options"].present?
+      yaml["tmux_options"]
     end
 
     def windows?
@@ -100,11 +100,11 @@ module Tmuxinator
     end
 
     def root?
-      root.present?
+      !root.nil?
     end
 
     def name?
-      name.present?
+      !name.nil?
     end
 
     def window(i)
@@ -112,7 +112,7 @@ module Tmuxinator
     end
 
     def send_pane_command(cmd, window_index, pane_index)
-      if cmd.blank?
+      if cmd.empty?
         ""
       else
         "#{tmux} send-keys -t #{window(window_index)} #{cmd.shellescape} C-m"
@@ -120,7 +120,7 @@ module Tmuxinator
     end
 
     def send_keys(cmd, window_index)
-      if cmd.blank?
+      if cmd.empty?
        ""
       else
         "#{tmux} send-keys -t #{window(window_index)} #{cmd.shellescape} C-m"
@@ -130,17 +130,41 @@ module Tmuxinator
     def deprecations
       deprecations = []
       deprecations << "DEPRECATION: rbenv/rvm specific options have been replaced by the pre_tab option and will not be supported in 0.8.0." if yaml["rbenv"] || yaml["rvm"]
-      deprecations << "DEPRECATION: The tabs option has been replaced by the windows option and will not be supported in 0.8.0." if yaml["tabs"].present?
-      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 << "DEPRECATION: The tabs option has been replaced by the windows option and will not be supported in 0.8.0." if yaml["tabs"]
+      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"]
       deprecations
     end
 
     def get_pane_base_index
-      `#{tmux} start-server\\; show-option -g | grep pane-base-index`.split(/\s/).last
+      tmux_config["pane-base-index"]
     end
 
     def get_base_index
-      `#{tmux} start-server\\; show-option -g | grep base-index`.split(/\s/).last
+      tmux_config["base-index"]
+    end
+
+    def show_tmux_options
+      "#{tmux} start-server\\; show-option -g"
+    end
+
+    private
+
+    def tmux_config
+      @tmux_config ||= extract_tmux_config
+    end
+
+    def extract_tmux_config
+      options_hash = {}
+
+      options_string = `#{show_tmux_options}`
+
+      options_string.split("\n").map do |entry|
+        key, value = entry.split("\s")
+        options_hash[key] = value
+        options_hash
+      end
+
+      options_hash
     end
   end
 end

data/lib/tmuxinator/version.rb

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

data/lib/tmuxinator/window.rb

@@ -5,7 +5,7 @@ module Tmuxinator
     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
+      @name = !window_yaml.keys.first.nil? ? window_yaml.keys.first.shellescape : nil
       @panes = []
       @layout = nil
       @pre = nil
@@ -15,8 +15,8 @@ module Tmuxinator
       value = window_yaml.values.first
 
       if value.is_a?(Hash)
-        @layout = value["layout"].present? ? value["layout"].shellescape : nil
-        @pre = value["pre"] if value["pre"].present?
+        @layout = value["layout"] ? value["layout"].shellescape : nil
+        @pre = value["pre"] if value["pre"]
 
         @panes = build_panes(value["panes"])
       else
@@ -39,9 +39,9 @@ module Tmuxinator
     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?
+          "#{tmux_window_command_prefix} #{command.shellescape} C-m" if command
         end.compact
-      elsif command_yml.present?
+      elsif command_yml.is_a?(String) && !command_yml.empty?
         ["#{tmux_window_command_prefix} #{command_yml.shellescape} C-m"]
       else
         []
@@ -49,12 +49,10 @@ module Tmuxinator
     end
 
     def pre
-      if @pre.present?
-        if @pre.is_a?(Array)
-          @pre.join(" && ")
-        elsif @pre.is_a?(String)
-          @pre
-        end
+      if @pre.is_a?(Array)
+        @pre.join(" && ")
+      elsif @pre.is_a?(String)
+        @pre
       else
         ""
       end
@@ -69,7 +67,7 @@ module Tmuxinator
     end
 
     def tmux_pre_window_command
-      project.pre_window.present? ? "#{project.tmux} send-keys -t #{tmux_window_target} #{project.pre_window.shellescape} C-m" : ""
+      project.pre_window ? "#{project.tmux} send-keys -t #{tmux_window_target} #{project.pre_window.shellescape} C-m" : ""
     end
 
     def tmux_window_command_prefix
@@ -77,7 +75,7 @@ module Tmuxinator
     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

data/spec/lib/tmuxinator/cli_spec.rb

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

data/spec/lib/tmuxinator/config_spec.rb

@@ -19,6 +19,30 @@ describe Tmuxinator::Config do
     end
   end
 
+  describe "#default?" do
+    let(:root) { Tmuxinator::Config.root }
+
+    context "when the file exists" do
+      before do
+        File.stub(:exists?).with(Tmuxinator::Config.default) { true }
+      end
+
+      it "returns true" do
+        expect(Tmuxinator::Config.default?).to be_true
+      end
+    end
+
+    context "when the file doesn't exist" do
+      before do
+        File.stub(:exists?).with(Tmuxinator::Config.default) { false }
+      end
+
+      it "returns true" do
+        expect(Tmuxinator::Config.default?).to be_false
+      end
+    end
+  end
+
   describe "#configs" do
     before do
       Dir.stub(:[] => ["test.yml"])

data/spec/lib/tmuxinator/project_spec.rb

@@ -35,13 +35,13 @@ describe Tmuxinator::Project do
   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
@@ -153,6 +153,22 @@ describe Tmuxinator::Project do
     end
   end
 
+  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))
+
+      expect(project.get_pane_base_index).to eq("3")
+    end
+  end
+
+  describe "#get_base_index" do
+    it "extracts the base index from options" do
+      project.stub(show_tmux_options: tmux_config(base_index: 1))
+
+      expect(project.get_base_index).to eq("1")
+    end
+  end
+
   describe "#base_index" do
     context "pane base index present" do
       before do

data/spec/lib/tmuxinator/window_spec.rb

@@ -140,8 +140,14 @@ describe Tmuxinator::Window do
       )
     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

data/spec/spec_helper.rb

@@ -34,3 +34,21 @@ ensure
   $stdout = orig_stdout
   $stderr = orig_stderr
 end
+
+def tmux_config(options = {})
+  standard_options = [
+    "assume-paste-time 1",
+    "bell-action any",
+    "bell-on-alert off",
+  ]
+
+  if base_index  = options.fetch(:base_index) {1}
+    standard_options << "base-index #{base_index}"
+  end
+
+  if pane_base_index  = options.fetch(:pane_base_index) {1}
+    standard_options << "pane-base-index #{pane_base_index}"
+  end
+
+  "echo '#{standard_options.join("\n")}'"
+end

data/tmuxinator.gemspec

@@ -38,7 +38,6 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = ">= 1.8.23"
 
   spec.add_dependency "thor", ">= 0.18.0"
-  spec.add_dependency "activesupport"
   spec.add_dependency "erubis"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tmuxinator
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7.pre
 platform: ruby
 authors:
 - Allen Bargi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.18.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -185,6 +171,7 @@ files:
 - bin/mux
 - bin/tmuxinator
 - completion/tmuxinator.bash
+- completion/tmuxinator.fish
 - completion/tmuxinator.zsh
 - lib/tmuxinator.rb
 - lib/tmuxinator/assets/sample.yml
@@ -233,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Create and manage complex tmux sessions easily.