Bump version to 0.11.3

Source missing utility functions in tmuxifier-tmux

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Jim Myhrberg.
+Copyright (c) 2014 Jim Myhrberg.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,11 +1,11 @@
 # Tmuxifier
 
-Tmuxify your Tmux. Create, edit, mangage and load complex Tmux session, window
+Tmuxify your Tmux. Create, edit, manage and load complex Tmux session, window
 and pane configurations with ease.
 
 In short, Tmuxifier allows you to easily create, edit, and load "layout"
 files, which are simple shell scripts where you use the `tmux` command and
-helper commands provided by tmuxifier to manage Tmux sessions and windows
+helper commands provided by `tmuxifier` to manage Tmux sessions and windows
 
 ### Window Layouts
 
@@ -42,9 +42,7 @@ select_pane 0
 You can then load that window layout into a new window in the
 current tmux session using:
 
-```bash
-tmuxifier load-window example
-```
+    tmuxifier load-window example
 
 Which will yield a Tmux window looking like this:
 
@@ -54,27 +52,84 @@ Which will yield a Tmux window looking like this:
 
 Clone the repo to your machine:
 
+    git clone https://github.com/jimeh/tmuxifier.git ~/.tmuxifier
+
+Then add `$HOME/.tmuxifier/bin` to your PATH to make the `tmuxifier` executable
+available to you:
+
+__In bash & zsh:__
+
 ```bash
-git clone https://github.com/jimeh/tmuxifier.git ~/.tmuxifier
+export PATH="$HOME/.tmuxifier/bin:$PATH"
 ```
 
-### bash & zsh
+__In tcsh:__
+
+```tcsh
+set path = ( "~/.tmuxifier/bin" $path )
+```
+
+__In fish:__
+
+```bash
+set -gx PATH "~/.tmuxifier/bin" $PATH
+```
+
+### Custom Installation Path
+
+To install Tmuxifier somewhere else than the suggested `~/.tmuxifier`, simply
+clone the repository to your custom location, and ensure the `bin` folder is
+added to your PATH making the `tmuxifier` executable available to you.
+
+## Setup
+
+__In bash & zsh:__
 
 And add the following to your `~/.profile`, `~/.bash_profile`, `~/.zshrc` or
 equivalent:
 
 ```bash
-[[ -s "$HOME/.tmuxifier/init.sh" ]] && source "$HOME/.tmuxifier/init.sh"
+eval "$(tmuxifier init -)"
 ```
 
-### tcsh
+__In tcsh:__
 
 Add the following to your `~/.cshrc`, `~/.tcshrc` or equivalent:
 
 ```tcsh
-if ( -s "$HOME/.tmuxifier/init.sh" ) then
-  source "$HOME/.tmuxifier/init.sh"
-endif
+eval `tmuxifier init -`
+```
+
+__In fish:__
+
+And add the following to your `~/.config/fish/config.fish` or equivalent:
+
+```bash
+eval (tmuxifier init -)
+```
+
+### Custom Tmux Arguments
+
+If you need to pass custom arguments to `tmux` itself, you can do so by
+setting the `TMUXIFIER_TMUX_OPTS` environment variable. For example to set
+custom arguments globally:
+
+```bash
+export TMUXIFIER_TMUX_OPTS="-L my-awesome-socket-name"
+eval "$(tmuxifier init -)"
+```
+
+And/or specify dynamically when calling `tmuxifier`:
+
+```bash
+TMUXIFIER_TMUX_OPTS="-L other-socket" tmuxifier load-session welcome
+```
+
+## Updating
+
+```bash
+cd ~/.tmuxifier # or where you've cloned tmuxifier to
+git pull
 ```
 
 ## Usage
@@ -129,17 +184,6 @@ in it.
 
 ## Configure & Customize
 
-### Custom Installaton Path
-
-To install Tmuxifier to a custom path, clone the repository to your desired
-path and set `$TMUXIFIER` to that path, additionally loading `init.sh` or
-`init.tcsh` from that same path.
-
-```bash
-export TMUXIFIER="$HOME/.dotfiles/tmuxifier"
-[[ -s "$TMUXIFIER/init.sh" ]] && source "$TMUXIFIER/init.sh"
-```
-
 ### Custom Layouts Path
 
 You can customize the layouts directory used by Tmuxifier by setting
@@ -151,8 +195,8 @@ export TMUXIFIER_LAYOUT_PATH="$HOME/.tmux-layouts"
 
 ### Disable Shell-Completion
 
-Tmuxifier comes with shell-completion for bash, zsh and tcsh. If for any
-reason you need to disable it, just set `$TMUXIFIER_NO_COMPLETE`.
+Tmuxifier comes with shell-completion for bash, zsh, tcsh, and fish. If for
+any reason you need to disable it, just set `$TMUXIFIER_NO_COMPLETE`.
 
 ```bash
 export TMUXIFIER_NO_COMPLETE=1
@@ -182,25 +226,16 @@ it does set itself apart in a number of ways:
 [tmuxinator]: https://github.com/aziz/tmuxinator
 [rbenv]: https://github.com/sstephenson/rbenv
 
-## Heed My Warning
-
-Tmuxifier is pretty much an alpha product hacked together over a weekend at
-this point. Documentation is sketchy at best, and things might drastically
-change and/or break.
-
-But if that doesn't put you off, please enjoy Tmuxifier :)
-
 ## Todos
 
 * Improve Readme, specially Usage section.
-* Expand `help` command with details for most commands, rather than just the
-  essential ones.
+* Write up a detailed reference for all available layout helper functions.
 
 ## License
 
 (The MIT license)
 
-Copyright (c) 2013 Jim Myhrberg.
+Copyright (c) 2014 Jim Myhrberg.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

bin/tmuxifier

@@ -2,17 +2,47 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+resolve_link() {
+  $(type -p greadlink readlink | head -1) $1
+}
+
+abs_dirname() {
+  local cwd="$(pwd)"
+  local path="$1"
+
+  while [ -n "$path" ]; do
+    cd "${path%/*}"
+    local name="${path##*/}"
+    path="$(resolve_link "$name" || true)"
+  done
+
+  pwd
+  cd "$cwd"
+}
+
 if [ -z "${TMUXIFIER}" ]; then
-  export TMUXIFIER="${HOME}/.tmuxifier"
+  # Set TMUXIFIER relative to the "tmuxifier" executable.
+  export TMUXIFIER="$(dirname "$(abs_dirname "$0")")"
 else
+  # Strip any trailing slash (/) characters from TMUXIFIER variable.
   export TMUXIFIER="${TMUXIFIER%/}"
 fi
 
 # Load tmuxifier environment variables.
 source "$TMUXIFIER/lib/env.sh"
 
+# Add tmuxifier's internal commands to PATH.
 export PATH="$TMUXIFIER/libexec:$PATH"
 
+# Check Tmux version.
+export TMUXIFIER_MIN_TMUX_VERSION="1.6"
+if [ "$(tmuxifier-tmux-version "$TMUXIFIER_MIN_TMUX_VERSION")" == "<" ]; then
+  echo -e "ERROR: Tmuxifier requires Tmux v${TMUXIFIER_MIN_TMUX_VERSION}" \
+       "or newer. You have v$(tmuxifier-tmux-version)." >&2
+  exit 1
+fi
+
+# Parse given command
 command="$1"
 case "$command" in
   "" | "-h" | "--help" )

completion/tmuxifier.fish

@@ -0,0 +1,36 @@
+
+set -l cmd_load_session  'load-session s'
+set -l cmd_load_window   'load-window w'
+set -l cmd_list          'list l'
+set -l cmd_list_sessions 'list-sessions ls'
+set -l cmd_list_windows  'list-windows lw'
+set -l cmd_new_session   'new-session ns'
+set -l cmd_new_window    'new-window nw'
+set -l cmd_edit_session  'edit-session es'
+set -l cmd_edit_window   'edit-window ew'
+set -l cmd_commands      'commands'
+set -l cmd_version       'version'
+set -l cmd_help          'help'
+
+complete -c tmuxifier -x
+
+# Commands
+complete -c tmuxifier -n '__fish_use_subcommand' -a $cmd_load_session  -d 'Load the specified session layout.'
+complete -c tmuxifier -n '__fish_use_subcommand' -a $cmd_load_window   -d 'Load the specified window layout into current session.'
+complete -c tmuxifier -n '__fish_use_subcommand' -a $cmd_list          -d 'List all session and window layouts.'
+complete -c tmuxifier -n '__fish_use_subcommand' -a $cmd_list_sessions -d 'List session layouts.'
+complete -c tmuxifier -n '__fish_use_subcommand' -a $cmd_list_windows  -d 'List window layouts.'
+complete -c tmuxifier -n '__fish_use_subcommand' -a $cmd_new_session   -d 'Create new session layout and open it with $EDITOR.'
+complete -c tmuxifier -n '__fish_use_subcommand' -a $cmd_new_window    -d 'Create new window layout and open it with $EDITOR.'
+complete -c tmuxifier -n '__fish_use_subcommand' -a $cmd_edit_session  -d 'Edit specified session layout with $EDITOR.'
+complete -c tmuxifier -n '__fish_use_subcommand' -a $cmd_edit_window   -d 'Edit specified window layout with $EDITOR.'
+complete -c tmuxifier -n '__fish_use_subcommand' -a $cmd_commands      -d 'List all tmuxifier commands.'
+complete -c tmuxifier -n '__fish_use_subcommand' -a $cmd_version       -d 'Print Tmuxifier version.'
+complete -c tmuxifier -n '__fish_use_subcommand' -a $cmd_help          -d 'Show this message.'
+
+# Complete subcommands
+complete -c tmuxifier -x -n "__fish_seen_subcommand_from $cmd_load_session" -a '(tmuxifier list-sessions)' -d 'session-template'
+complete -c tmuxifier -x -n "__fish_seen_subcommand_from $cmd_load_window"  -a '(tmuxifier list-windows)'  -d 'window-template'
+complete -c tmuxifier -x -n "__fish_seen_subcommand_from $cmd_edit_session" -a '(tmuxifier list-sessions)' -d 'session-template'
+complete -c tmuxifier -x -n "__fish_seen_subcommand_from $cmd_edit_window"  -a '(tmuxifier list-windows)'  -d 'window-template'
+

init.fish

@@ -0,0 +1,17 @@
+# Set/fix Tmuxifier root path if needed.
+if test -z $TMUXIFIER
+  set -gx TMUXIFIER "$HOME/.tmuxifier"
+end
+
+# Add `bin` directroy to `$PATH`.
+if not contains "$TMUXIFIER/bin" $PATH
+  set -gx PATH "$TMUXIFIER/bin" $PATH
+end
+
+# If `tmuxifier` is available, and `$TMUXIFIER_NO_COMPLETE` is not set, then
+# load Tmuxifier shell completion.
+if test -n (which tmuxifier); and test -z $TMUXIFIER_NO_COMPLETE
+  source "$TMUXIFIER/completion/tmuxifier.fish"
+end
+
+

init.sh

@@ -1,4 +1,4 @@
-# Set tmuxifier root path.
+# Set/fix Tmuxifier root path if needed.
 if [ -z "${TMUXIFIER}" ]; then
   export TMUXIFIER="${HOME}/.tmuxifier"
 else
@@ -6,10 +6,12 @@ else
 fi
 
 # Add `bin` directroy to `$PATH`.
-export PATH="$TMUXIFIER/bin:$PATH"
+if [[ ":$PATH:" != *":$TMUXIFIER/bin:"* ]]; then
+  export PATH="$TMUXIFIER/bin:$PATH"
+fi
 
 # If `tmuxifier` is available, and `$TMUXIFIER_NO_COMPLETE` is not set, then
-# load tmuxifier shell completion.
+# load Tmuxifier shell completion.
 if [ -n "$(command -v "tmuxifier")" ] && [ -z "$TMUXIFIER_NO_COMPLETE" ]; then
   if [ -n "$BASH_VERSION" ]; then
     source "$TMUXIFIER/completion/tmuxifier.bash"

init.tcsh

@@ -1,13 +1,15 @@
-# Set tmuxifier root path.
+# Set Tmuxifier root path if needed.
 if ( ! $?TMUXIFIER ) then
   setenv TMUXIFIER "${HOME}/.tmuxifier"
 endif
 
-# Add `bin` directroy to `$PATH`.
-set path = ( $TMUXIFIER/bin $path )
+# Add `bin` directroy to `$path` if needed.
+if ( ! (" $path " =~ "* $TMUXIFIER/bin *" ) ) then
+  set path = ( $TMUXIFIER/bin $path )
+endif
 
 # If `tmuxifier` is available, and `$TMUXIFIER_NO_COMPLETE` is not set, then
-# load tmuxifier shell completion.
+# load Tmuxifier shell completion.
 if ( ! $?TMUXIFIER_NO_COMPLETE ) then
   which tmuxifier > /dev/null && source "$TMUXIFIER/completion/tmuxifier.tcsh"
 endif

lib/layout-helpers.sh

@@ -6,6 +6,11 @@
 # otherwise more complex means.
 #
 
+# Alias tmux to tmuxifier-tmux wrapper.
+tmux() {
+  tmuxifier-tmux "$@"
+}
+
 # Create a new window.
 #
 # Arguments:
@@ -17,7 +22,7 @@ new_window() {
   if [ -n "$2" ]; then local command=("$2"); fi
   if [ -n "$window" ]; then local winarg=(-n "$window"); fi
 
-  tmux new-window -t "$session:" "${winarg[@]}" "${command[@]}"
+  tmuxifier-tmux new-window -t "$session:" "${winarg[@]}" "${command[@]}"
   __go_to_window_or_session_path
 }
 
@@ -29,7 +34,7 @@ new_window() {
 #
 split_v() {
   if [ -n "$1" ]; then local percentage=(-p "$1"); fi
-  tmux split-window -t "$session:$window.$2" -v "${percentage[@]}"
+  tmuxifier-tmux split-window -t "$session:$window.$2" -v "${percentage[@]}"
   __go_to_window_or_session_path
 }
 
@@ -41,17 +46,49 @@ split_v() {
 #
 split_h() {
   if [ -n "$1" ]; then local percentage=(-p "$1"); fi
-  tmux split-window -t "$session:$window.$2" -h "${percentage[@]}"
+  tmuxifier-tmux split-window -t "$session:$window.$2" -h "${percentage[@]}"
   __go_to_window_or_session_path
 }
 
+# Split current window/pane vertically by line count.
+#
+# Arguments:
+#   - $1: (optional) Number of lines the new pane will use.
+#   - $2: (optional) Target pane ID to split in current window.
+#
+split_vl() {
+  if [ -n "$1" ]; then local count=(-l "$1"); fi
+  tmuxifier-tmux split-window -t "$session:$window.$2" -v "${count[@]}"
+  __go_to_window_or_session_path
+}
+
+# Split current window/pane horizontally by column count.
+#
+# Arguments:
+#   - $1: (optional) Number of columns the new pane will use.
+#   - $2: (optional) Target pane ID to split in current window.
+#
+split_hl() {
+  if [ -n "$1" ]; then local count=(-l "$1"); fi
+  tmuxifier-tmux split-window -t "$session:$window.$2" -h "${count[@]}"
+  __go_to_window_or_session_path
+}
+
+# Run clock mode.
+#
+# Arguments:
+#   - $1: (optional) Target pane ID in which to run
+clock() {
+  tmuxifier-tmux clock-mode -t "$session:$window.$1"
+}
+
 # Select a specific window.
 #
 # Arguments:
 #   - $1: Window ID or name to select.
 #
 select_window() {
-  tmux select-window -t "$session:$1"
+  tmuxifier-tmux select-window -t "$session:$1"
 }
 
 # Select a specific pane in the current window.
@@ -60,7 +97,7 @@ select_window() {
 #   - $1: Pane ID to select.
 #
 select_pane() {
-  tmux select-pane -t "$session:$window.$1"
+  tmuxifier-tmux select-pane -t "$session:$window.$1"
 }
 
 # Send/paste keys to the currently active pane/window.
@@ -70,7 +107,7 @@ select_pane() {
 #   - $2: (optional) Target pane ID to send input to.
 #
 send_keys() {
-  tmux send-keys -t "$session:$window.$2" "$1"
+  tmuxifier-tmux send-keys -t "$session:$window.$2" "$1"
 }
 
 # Runs a shell command in the currently active pane/window.
@@ -84,7 +121,7 @@ run_cmd() {
   send_keys "C-m" "$2"
 }
 
-# Cusomize session root path. Default is `$HOME`.
+# Customize session root path. Default is `$HOME`.
 #
 # Arguments:
 #   - $1: Directory path to use for session root.
@@ -111,12 +148,22 @@ window_root() {
 # Load specified window layout.
 #
 # Arguments:
-#   - $1: Name of window layout to load.
+#   - $1: Name of or file path to window layout to load.
+#   - $2: (optional) Override default window name.
 #
 load_window() {
-  local file="$TMUXIFIER_LAYOUT_PATH/$1.window.sh"
+  local file="$1"
+  if [ ! -f "$file" ]; then
+    file="$TMUXIFIER_LAYOUT_PATH/$1.window.sh"
+  fi
+
   if [ -f "$file" ]; then
-    window="$1"
+    if [ $# -gt 1 ]; then
+      window="$2"
+    else
+      window="${1/%.window.sh}"
+      window="${window/%.sh}"
+    fi
     source "$file"
     window=
 
@@ -125,19 +172,32 @@ load_window() {
       window_root "$session_root"
     fi
   else
-    echo "No such window layout found '$1' in '$TMUXIFIER_LAYOUT_PATH'."
+    echo "\"$1\" window layout not found." >&2
+    return 1
   fi
 }
 
 # Load specified session layout.
 #
 # Arguments:
-#   - $1: Name of session layout to load.
+#   - $1: Name of or file path to session layout to load.
+#   - $2: (optional) Override default window name.
 #
 load_session() {
-  local file="$TMUXIFIER_LAYOUT_PATH/$1.session.sh"
+  local file="$1"
+  if [ ! -f "$file" ]; then
+    file="$TMUXIFIER_LAYOUT_PATH/$1.session.sh"
+  fi
+
   if [ -f "$file" ]; then
-    session="$1"
+    if [ $# -gt 1 ]; then
+      session="$2"
+    else
+      session="${1/%.session.sh}"
+      session="${session/%.sh}"
+    fi
+
+    set_default_path=true
     source "$file"
     session=
 
@@ -146,7 +206,8 @@ load_session() {
       session_root="$HOME"
     fi
   else
-    echo "No such session layout found '$1' in '$TMUXIFIER_LAYOUT_PATH'."
+    echo "\"$1\" session layout not found." >&2
+    return 1
   fi
 }
 
@@ -168,24 +229,37 @@ initialize_session() {
   fi
 
   # Ensure tmux server is running for has-session check.
-  tmux start-server
+  tmuxifier-tmux start-server
 
   # Check if the named session already exists.
-  if ! tmux has-session -t "$session:" 2>/dev/null; then
-    # Create the new session.
-    env TMUX="" tmux new-session -d -s "$session"
+  if ! tmuxifier-tmux has-session -t "$session:" 2>/dev/null; then
+    if [ "$(tmuxifier-tmux-version "1.9")" == "<" ]; then
+      # Tmux 1.8 and earlier.
 
-    # Set default-path for session
-    if [ -n "$session_root" ] && [ -d "$session_root" ]; then
-      cd "$session_root"
-      tmux set-option -t "$session:" default-path "$session_root" 1>/dev/null
+      # Create the new session.
+      env TMUX="" tmuxifier-tmux new-session -d -s "$session"
+
+      # Set default-path for session
+      if [ -n "$session_root" ] && [ -d "$session_root" ]; then
+        cd "$session_root"
+
+        $set_default_path && tmuxifier-tmux \
+          set-option -t "$session:" \
+          default-path "$session_root" 1>/dev/null
+      fi
+    else
+      # Tmux 1.9 and later.
+      if $set_default_path; then local session_args=(-c "$session_root"); fi
+      env TMUX="" tmuxifier-tmux new-session \
+        -d -s "$session" "${session_args[@]}"
     fi
 
     # In order to ensure only specified windows are created, we move the
     # default window to position 999, and later remove it with the
     # `finalize_and_go_to_session` function.
     local first_window_index=$(__get_first_window_index)
-    tmux move-window -s "$session:$first_window_index" -t "$session:999"
+    tmuxifier-tmux move-window \
+      -s "$session:$first_window_index" -t "$session:999"
 
     # Session created, return ok exit status.
     return 0
@@ -196,16 +270,16 @@ initialize_session() {
 
 # Finalize session creation and then switch to it if needed.
 #
-# When the session is created, it leaves a unused window in position #99, this
-# is the default window which was created with the session, but it's also a
-# window that was not explicitly created. Hence we kill it.
+# When the session is created, it leaves a unused window in position #999,
+# this is the default window which was created with the session, but it's also
+# a window that was not explicitly created. Hence we kill it.
 #
 # If the session was created, we've already been switched to it. If it was not
 # created, the session already exists, and we'll need to specifically switch
 # to it here.
 #
 finalize_and_go_to_session() {
-  ! tmux kill-window -t "$session:999" 2>/dev/null
+  ! tmuxifier-tmux kill-window -t "$session:999" 2>/dev/null
   if [[ "$(tmuxifier-current-session)" != "$session" ]]; then
     __go_to_session
   fi
@@ -228,8 +302,9 @@ __expand_path() {
 }
 
 __get_first_window_index() {
-  local index
-  index=$(tmux list-windows -t "$session:" -F "#{window_index}" 2>/dev/null)
+  local index=$(tmuxifier-tmux list-windows -t "$session:" \
+    -F "#{window_index}" 2>/dev/null)
+
   if [ -n "$index" ]; then
     echo "$index" | head -1
   else
@@ -239,9 +314,9 @@ __get_first_window_index() {
 
 __go_to_session() {
   if [ -z "$TMUX" ]; then
-    tmux -u attach-session -t "$session:"
+    tmuxifier-tmux -u attach-session -t "$session:"
   else
-    tmux -u switch-client -t "$session:"
+    tmuxifier-tmux -u switch-client -t "$session:"
   fi
 }
 
@@ -249,6 +324,6 @@ __go_to_window_or_session_path() {
   local window_or_session_root=${window_root-$session_root}
   if [ -n "$window_or_session_root" ]; then
     run_cmd "cd \"$window_or_session_root\""
-    send_keys "C-l"
+    run_cmd "clear"
   fi
 }

lib/util.sh

@@ -0,0 +1,11 @@
+calling-help() {
+  if [[ " $@ " != *" --help "* ]] && [[ " $@ " != *" -h "* ]]; then
+    return 1
+  fi
+}
+
+calling-complete() {
+  if [[ " $@ " != *" --complete "* ]]; then
+    return 1
+  fi
+}

libexec/tmuxifier-alias

@@ -2,8 +2,11 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   echo "usage: tmuxifier alias <alias>
 
 Resolve a command alias to it's full name."
@@ -17,25 +20,25 @@ case "$1" in
   "window" | "win" | "w" )
     echo "load-window"
     ;;
-  "new-ses" | "ns" )
+  "new-ses" | "nses" | "ns" )
     echo "new-session"
     ;;
-  "new-win" | "nw" )
+  "new-win" | "nwin" | "nw" )
     echo "new-window"
     ;;
-  "edit-ses" | "es" )
+  "edit-ses" | "eses" | "es" )
     echo "edit-session"
     ;;
-  "edit-win" | "ew" )
+  "edit-win" | "ewin" | "ew" )
     echo "edit-window"
     ;;
-  "ls" )
+  "l" )
     echo "list"
     ;;
-  "list-ses" | "lss" )
+  "list-ses" | "lses" | "ls" )
     echo "list-sessions"
     ;;
-  "list-win" | "lsw" )
+  "list-win" | "lwin" | "lw" )
     echo "list-windows"
     ;;
   * )

libexec/tmuxifier-commands

@@ -2,8 +2,11 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   echo "usage: tmuxifier commands
 
 List all available commands, includes internal commands not intended for

libexec/tmuxifier-completions

@@ -2,8 +2,11 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   echo "usage: tmuxifier completion <command>
 
 Print a list of available completions for specified command."
@@ -11,7 +14,7 @@ Print a list of available completions for specified command."
 fi
 
 # Provide tmuxifier completions
-if [ "$1" == "--complete" ]; then
+if calling-complete "$@"; then
   tmuxifier-commands
   exit
 fi
@@ -20,13 +23,12 @@ has-completions() {
   grep -i "^# Provide tmuxifier completions" "$1" >/dev/null
 }
 
-command="$1"
-if [ -z "$command" ]; then
-  echo "$(tmuxifier-help completions)" >&2
+if [ -z "$1" ]; then
+  echo "$(tmuxifier-help completions $@)" >&2
   exit 1
 fi
 
-! command_path="$(tmuxifier-resolve-command-path "$command")"
+! command_path="$(tmuxifier-resolve-command-path "$1")"
 
 if [ -n "$command_path" ] && has-completions "$command_path"; then
   shift

libexec/tmuxifier-current-session

@@ -2,8 +2,11 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   echo "usage: tmuxifier current-session
 
 Outputs the name of the current Tmux session."
@@ -11,7 +14,7 @@ Outputs the name of the current Tmux session."
 fi
 
 if [ -n "$TMUX" ]; then
-  for item in $(tmux list-pane -F "#{session_name}");do
+  for item in $(tmuxifier-tmux list-pane -F "#{session_name}");do
     echo $item
     exit 0
   done

libexec/tmuxifier-edit-session

@@ -2,26 +2,27 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   echo "usage: tmuxifier edit-session <layout_name>
 
-Aliases: edit-ses, es
+Aliases: edit-ses, eses, es
 
 Open specified session layout for editing in \$EDITOR."
   exit
 fi
 
 # Provide tmuxifier completions
-if [ "$1" == "--complete" ]; then
-  for item in $(tmuxifier-list-sessions); do
-    echo "$item"
-  done
+if calling-complete "$@"; then
+  tmuxifier-list-sessions
   exit
 fi
 
 if [ -z "$1" ]; then
-  echo "$(tmuxifier-help edit-session)" >&2
+  echo "$(tmuxifier-help edit-session $@)" >&2
   exit 1
 fi
 
@@ -36,4 +37,10 @@ if [ ! -f "$layout_file" ]; then
   exit 1
 fi
 
-exec "$EDITOR" "$layout_file"
+if [ -n "$EDITOR" ]; then
+  exec "$EDITOR" "$layout_file"
+else
+  echo "'\$EDITOR' is not set. Please manually open the layout for editing:"
+  echo "$layout_file"
+  echo
+fi

libexec/tmuxifier-edit-window

@@ -2,26 +2,27 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   echo "usage: tmuxifier edit-window <layout_name>
 
-Aliases: edit-win, ew
+Aliases: edit-win, ewin, ew
 
 Open specified window layout for editing in \$EDITOR."
   exit
 fi
 
 # Provide tmuxifier completions
-if [ "$1" == "--complete" ]; then
-  for item in $(tmuxifier-list-windows); do
-    echo "$item"
-  done
+if calling-complete "$@"; then
+  tmuxifier-list-windows
   exit
 fi
 
 if [ -z "$1" ]; then
-  echo "$(tmuxifier-help edit-window)" >&2
+  echo "$(tmuxifier-help edit-window $@)" >&2
   exit 1
 fi
 
@@ -36,4 +37,10 @@ if [ ! -f "$layout_file" ]; then
   exit 1
 fi
 
-exec "$EDITOR" "$layout_file"
+if [ -n "$EDITOR" ]; then
+  exec "$EDITOR" "$layout_file"
+else
+  echo "'\$EDITOR' is not set. Please manually open the layout for editing:"
+  echo "$layout_file"
+  echo
+fi

libexec/tmuxifier-help

@@ -2,14 +2,17 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   tmuxifier-help
   exit
 fi
 
 # Provide tmuxifier completions
-if [ "$1" == "--complete" ]; then
+if calling-complete "$@"; then
   tmuxifier-commands
   exit
 fi
@@ -18,22 +21,21 @@ has-help() {
   grep -i "^# Provide tmuxifier help" "$1" >/dev/null
 }
 
-command="$1"
-if [ -z "$command" ]; then
+if [ -z "$1" ]; then
   echo "usage: tmuxifier <command> [<args>]
 
 Some useful tmuxifier commands are:
    <command>      <alias>
    load-session   s        Load the specified session layout.
    load-window    w        Load the specified window layout into current session.
-   list           ls       List all session and window layouts.
-   list-sessions  lss      List session layouts.
-   list-windows   lsw      List window layouts.
+   list           l        List all session and window layouts.
+   list-sessions  ls       List session layouts.
+   list-windows   lw       List window layouts.
    new-session    ns       Create new session layout and open it with \$EDITOR.
    new-window     nw       Create new window layout and open it with \$EDITOR.
    edit-session   es       Edit specified session layout with \$EDITOR.
    edit-window    ew       Edit specified window layout with \$EDITOR.
-   commands                List all tmuxifier commands.
+   commands                List all tmuxifier commands (including internal).
    version                 Print Tmuxifier version.
    help                    Show this message.
 
@@ -41,17 +43,19 @@ See 'tmuxifier help <command>' for information on a specific command."
   exit
 fi
 
-! command_path="$(tmuxifier-resolve-command-path "$command")"
+! command_path="$(tmuxifier-resolve-command-path "$1")"
 
 if [ -z "$command_path" ]; then
-  echo "tmuxifier: no such command '$command'" >&2
+  echo "tmuxifier: no such command '$1'" >&2
   exit 1
 fi
 
 if has-help "$command_path"; then
   shift
-  exec "$command_path" --help "$@"
+  exec "$command_path" "$@" --help
 else
+  command="$(basename "$command_path")"
+  command="${command/tmuxifier\-/}"
   echo "Sorry, the '$command' command isn't documented yet."
   echo ""
   echo "You can view the command's source here:"

libexec/tmuxifier-init

@@ -0,0 +1,85 @@
+#! /usr/bin/env bash
+set -e
+[ -n "$TMUXIFIER_DEBUG" ] && set -x
+
+# Set shell to first argument that is not "-", "-h" or "--help".
+for arg in "$@"; do
+  if [ "$arg" != "-" ] && [ "$arg" != "-h" ] && [ "$arg" != "--help" ]; then
+    shell="$arg"
+  fi
+done
+
+if [ -z "$shell" ]; then
+  shell="$(basename "$SHELL")"
+fi
+
+case "$shell" in
+  bash )
+    profile='~/.bash_profile'
+    ;;
+  zsh )
+    profile='~/.zshrc'
+    ;;
+  ksh )
+    profile='~/.profile'
+    ;;
+  csh )
+    profile='~/.cshrc'
+    ;;
+  tcsh )
+    profile='~/.tcshrc'
+    ;;
+  fish )
+    profile='~/.config/fish/config.fish'
+    ;;
+  * )
+    profile='shell init file'
+    ;;
+esac
+
+# Provide tmuxifier help
+if [[ " $@ " == *" --help "* ]]; then
+  echo "usage: tmuxifier init -
+
+Load Tmuxifier by adding the following to your ${profile}:
+"
+
+  case "$shell" in
+    csh | tcsh )
+      echo "    eval \`tmuxifier init -\`
+"
+      ;;
+    fish )
+      echo "    eval (tmuxifier init -)
+"
+      ;;
+    * )
+      echo "    eval \"\$(tmuxifier init -)\"
+"
+      ;;
+  esac
+
+  echo "You might also need to add Tmuxifier's bin directory to your PATH."
+  exit
+fi
+
+# Print help if "-" argument is not given
+if [[ " $@ " != *" - "* ]]; then
+  echo "$(tmuxifier-help init $@)" >&2
+  exit 1
+fi
+
+case "$shell" in
+  csh | tcsh )
+    echo "setenv TMUXIFIER \"$TMUXIFIER\";"
+    echo "source \"\$TMUXIFIER/init.tcsh\";"
+    ;;
+  fish )
+    echo "set -gx TMUXIFIER \"$TMUXIFIER\";"
+    echo "source \"\$TMUXIFIER/init.fish\";"
+    ;;
+  * )
+    echo "export TMUXIFIER=\"$TMUXIFIER\";"
+    echo "source \"\$TMUXIFIER/init.sh\";"
+    ;;
+esac

libexec/tmuxifier-list

@@ -2,11 +2,14 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   echo "usage: tmuxifier list
 
-Aliases: ls
+Aliases: l
 
 List all available session and window layouts."
   exit

libexec/tmuxifier-list-sessions

@@ -2,11 +2,14 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   echo "usage: tmuxifier list-sessions
 
-Aliases: list-ses, lss
+Aliases: list-ses, lses, ls
 
 List all session layouts."
   exit

libexec/tmuxifier-list-windows

@@ -2,11 +2,14 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   echo "usage: tmuxifier list-windows
 
-Aliases: list-win, lsw
+Aliases: list-win, lwin, lw
 
 List all window layouts."
   exit

libexec/tmuxifier-load-session

@@ -2,9 +2,12 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
-  echo "usage: tmuxifier load-session <layout_name>
+if calling-help "$@"; then
+  echo "usage: tmuxifier load-session <layout_name | file_path>
 
 Aliases: session, ses, s
 
@@ -14,15 +17,13 @@ in which case, we simply attach/switch to the existing one."
 fi
 
 # Provide tmuxifier completions
-if [ "$1" == "--complete" ]; then
-  for item in $(tmuxifier-list-sessions); do
-    echo "$item"
-  done
+if calling-complete "$@"; then
+  tmuxifier-list-sessions
   exit
 fi
 
 if [ -z "$1" ]; then
-  echo "$(tmuxifier-help load-session)" >&2
+  echo "$(tmuxifier-help load-session $@)" >&2
   exit 1
 fi
 

libexec/tmuxifier-load-window

@@ -2,9 +2,12 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
-  echo "usage: tmuxifier load-window <layout_name>
+if calling-help "$@"; then
+  echo "usage: tmuxifier load-window <layout_name | file_path>
 
 Aliases: window, win, w
 
@@ -13,15 +16,13 @@ Create a new window using the specified window layout in the current session."
 fi
 
 # Provide tmuxifier completions
-if [ "$1" == "--complete" ]; then
-  for item in $(tmuxifier-list-windows); do
-    echo "$item"
-  done
+if calling-complete "$@"; then
+  tmuxifier-list-windows
   exit
 fi
 
 if [ -z "$1" ]; then
-  echo "$(tmuxifier-help load-window)" >&2
+  echo "$(tmuxifier-help load-window $@)" >&2
   exit 1
 fi
 

libexec/tmuxifier-new-session

@@ -2,26 +2,27 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   echo "usage: tmuxifier new-session <layout_name>
 
-Aliases: new-ses, ns
+Aliases: new-ses, nses, ns
 
 Create a new session layout and open it for editing in \$EDITOR."
   exit
 fi
 
 # Provide tmuxifier completions
-if [ "$1" == "--complete" ]; then
-  for item in $(tmuxifier-list-sessions); do
-    echo "$item"
-  done
+if calling-complete "$@"; then
+  tmuxifier-list-sessions
   exit
 fi
 
 if [ -z "$1" ]; then
-  echo "$(tmuxifier-help new-session)" >&2
+  echo "$(tmuxifier-help new-session $@)" >&2
   exit 1
 fi
 
@@ -45,7 +46,7 @@ fi
 content="$(cat "$template")"
 echo "${content//\{\{SESSION_NAME\}\}/$layout_name}" > "$layout_file"
 
-if [ ! -z "$EDITOR" ]; then
+if [ -n "$EDITOR" ]; then
   exec "$EDITOR" "$layout_file"
 else
   echo "Layout file has been created, but '\$EDITOR' is not set. Please "

libexec/tmuxifier-new-window

@@ -2,26 +2,27 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   echo "usage: tmuxifier new-window <layout_name>
 
-Aliases: new-win, ws
+Aliases: new-win, nwin, nw
 
 Create a new window layout and open it for editing in \$EDITOR."
   exit
 fi
 
 # Provide tmuxifier completions
-if [ "$1" == "--complete" ]; then
-  for item in $(tmuxifier-list-windows); do
-    echo "$item"
-  done
+if calling-complete "$@"; then
+  tmuxifier-list-windows
   exit
 fi
 
 if [ -z "$1" ]; then
-  echo "$(tmuxifier-help new-window)" >&2
+  echo "$(tmuxifier-help new-window $@)" >&2
   exit 1
 fi
 
@@ -45,7 +46,7 @@ fi
 content="$(cat "$template")"
 echo "${content//\{\{WINDOW_NAME\}\}/$layout_name}" > "$layout_file"
 
-if [ ! -z "$EDITOR" ]; then
+if [ -n "$EDITOR" ]; then
   exec "$EDITOR" "$layout_file"
 else
   echo "Layout file has been created, but '\$EDITOR' is not set. Please "

libexec/tmuxifier-resolve-command-path

@@ -2,8 +2,11 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   echo "usage: tmuxifier resolve-command-path <command_or_alias>
 
 Outputs the absolute path to the given command or command alias."

libexec/tmuxifier-tmux

@@ -0,0 +1,17 @@
+#! /usr/bin/env bash
+set -e
+[ -n "$TMUXIFIER_DEBUG" ] && set -x
+
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
+# Provide tmuxifier help
+if [[ " $@ " == *" --help "* ]]; then
+  echo "usage: tmuxifier tmux [...]
+
+Wrapper command for Tmux executable allowing Tmuxifier to pass in any custom
+arguments specified in the TMUXIFIER_TMUX_OPTS environment variable."
+  exit
+fi
+
+tmux $TMUXIFIER_TMUX_OPTS "$@"

libexec/tmuxifier-tmux-version

@@ -0,0 +1,60 @@
+#! /usr/bin/env bash
+shopt -s extglob
+[ -n "$TMUXIFIER_DEBUG" ] && set -x
+
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
+# Provide tmuxifier help
+if calling-help "$@"; then
+  echo "usage: tmuxifier tmux-version [target-version]
+
+Outputs current Tmux version. If given optional target-version it outputs one
+of three possible characters indicating if the current Tmux version number is
+equal to, less than, or greater than the [target-version].
+
+The three possible outputs are \"=\", \"<\", and \">\"."
+  exit
+fi
+
+# The vercomp() function is shamelessly ripped/borrowed from the following
+# StackOverflow answer: http://stackoverflow.com/a/4025065/42146
+vercomp () {
+  if [[ $1 == $2 ]]; then return 0; fi
+
+  local IFS=.
+  local i ver1=($1) ver2=($2)
+
+  # fill empty fields in ver1 with zeros
+  for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do ver1[i]=0; done
+
+  for ((i=0; i<${#ver1[@]}; i++)); do
+    # fill empty fields in ver2 with zeros
+    if [[ -z ${ver2[i]} ]]; then ver2[i]=0; fi
+
+    if ((10#${ver1[i]} > 10#${ver2[i]})); then
+      return 1
+    elif ((10#${ver1[i]} < 10#${ver2[i]})); then
+      return 2
+    fi
+  done
+  return 0
+}
+
+version=$(tmux -V)
+version=${version/tmux /}
+
+if [ -n "$1" ]; then
+  # Fix for "1.9a" version comparison, as vercomp() can only deal with
+  # purely numeric version numbers.
+  version=${version//+([a-zA-Z])/}
+
+  vercomp "$version" "$1"
+  case $? in
+    0) echo '=';;
+    1) echo '>';;
+    2) echo '<';;
+  esac
+else
+  echo "$version"
+fi

libexec/tmuxifier-version

@@ -2,12 +2,15 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
 # Provide tmuxifier help
-if [ "$1" == "--help" ]; then
+if calling-help "$@"; then
   echo "usage: tmuxifier version
 
 Outputs Tmuxifier version."
   exit
 fi
 
-echo "0.5.1"
+echo "0.11.3"

templates/window.sh

@@ -16,7 +16,7 @@ new_window "{{WINDOW_NAME}}"
 
 # Paste text
 #send_keys "top"    # paste into active pane
-#send_keys "date" 1 # paste into active pane
+#send_keys "date" 1 # paste into pane 1
 
 # Set active pane.
 #select_pane 0