Bump version to 0.5.1

This means that "init" session layouts can now be used to start and/or
re-attach to your main session.

Personally I have a "main" session layout with a couple of default
windows. I can now either start that session, or re-attach to it from
outside of Tmux by just running `tmuxifier s main`, instead of manually
creating a session named "main" and then loading my windows into it.

README.md

@@ -33,9 +33,10 @@ looks like:
 ```bash
 window_root "~/Desktop"
 new_window "Example Window"
-tmux split-window -t "$session:$window.0" -v -p 20 "watch -t date"
+split_v 20
-tmux split-window -t "$session:$window.1" -h -p 60
+run_cmd "watch -t date"
-tmux select-pane -t "$session:$window.0"
+split_h 60
+select_pane 0
 ```
 
 You can then load that window layout into a new window in the
@@ -51,21 +52,36 @@ Which will yield a Tmux window looking like this:
 
 ## Installation
 
+Clone the repo to your machine:
+
 ```bash
 git clone https://github.com/jimeh/tmuxifier.git ~/.tmuxifier
 ```
 
-And add the following to your `~/.profile`, `~/.bash_profile` or equivalent:
+### 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"
 ```
 
+### tcsh
+
+Add the following to your `~/.cshrc`, `~/.tcshrc` or equivalent:
+
+```tcsh
+if ( -s "$HOME/.tmuxifier/init.sh" ) then
+  source "$HOME/.tmuxifier/init.sh"
+endif
+```
+
 ## Usage
 
 *__Note:__ This section needs expanding upon.*
 
-For a quick reference on available commands, please run:
+For a quick reference on available commands and their aliases, please run:
 
     tmuxifier help
 
@@ -74,6 +90,41 @@ window and session layout files. New layout files are populated with examples
 and comments explaining what things do. Also, having a look at the
 [examples][] directory will also give you a good idea.
 
+### Window Layouts
+
+First off you'll want to define a window layout:
+
+    tmuxifier new-window my-awesome-window
+
+This will create a new layout file called `my-awesome-window.window.sh` in
+your `$TMUXIFIER_LAYOUT_PATH`, and open it with the editor defined in
+`$EDITOR`. Customize it as you wish, and save.
+
+You can now load *my-awesome-window* with the following command:
+
+    tmuxifier load-window my-awesome-window
+
+You should now have a new Tmux window open created from your custom and
+awesome window layout.
+
+### Session Layouts
+
+To create your first session layout, run:
+
+    tmuxifier new-session my-awesome-session
+
+Same deal as with creating a new window, except the filename ends with
+`.session.sh` instead of `.window.sh`, and the file's pre-populated content
+looks different. To have your awesome window loaded, add `load_window
+"my-awesome-window"` to the session layout next to existing examples.
+
+To load the session layout simply run:
+
+    tmuxifier load-session my-awesome-session
+
+You'll now have a new Tmux session with your previously defined awesome window
+in it.
+
 [examples]: https://github.com/jimeh/tmuxifier/tree/master/examples
 
 ## Configure & Customize
@@ -81,8 +132,8 @@ and comments explaining what things do. Also, having a look at the
 ### 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` from
+path and set `$TMUXIFIER` to that path, additionally loading `init.sh` or
-that same path.
+`init.tcsh` from that same path.
 
 ```bash
 export TMUXIFIER="$HOME/.dotfiles/tmuxifier"
@@ -100,7 +151,7 @@ export TMUXIFIER_LAYOUT_PATH="$HOME/.tmux-layouts"
 
 ### Disable Shell-Completion
 
-Tmuxifier comes with shell-completion for bash and zsh. If for any
+Tmuxifier comes with shell-completion for bash, zsh and tcsh. If for any
 reason you need to disable it, just set `$TMUXIFIER_NO_COMPLETE`.
 
 ```bash
@@ -116,7 +167,7 @@ export TMUXIFIER_NO_COMPLETE=1
 ## Tmuxifier vs. Tmuxinator
 
 Though Tmuxifier is largely inspired by the excellent [Tmuxinator][] project,
-but does set itself apart in a number of ways:
+it does set itself apart in a number of ways:
 
 - Uses shell scripts to define Tmux sessions and windows instead of YAML
   files. The benefit is total control over Tmux, but the definition files are
@@ -149,7 +200,7 @@ But if that doesn't put you off, please enjoy Tmuxifier :)
 
 (The MIT license)
 
-Copyright (c) 2012 Jim Myhrberg.
+Copyright (c) 2013 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
@@ -168,4 +219,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

bin/tmuxifier

@@ -9,7 +9,7 @@ else
 fi
 
 # Load tmuxifier environment variables.
-source "$TMUXIFIER/env.sh"
+source "$TMUXIFIER/lib/env.sh"
 
 export PATH="$TMUXIFIER/libexec:$PATH"
 
@@ -24,15 +24,7 @@ case "$command" in
     ;;
 
   * )
-    command_path="$(command -v "tmuxifier-$command" || true)"
+    ! command_path="$(tmuxifier-resolve-command-path "$command")"
-
-    # Attempt to resolve aliases
-    if [ -z "$command_path" ]; then
-      resolved="$(tmuxifier-alias "$command")"
-      if [ ! -z "$resolved" ]; then
-        command_path="$(command -v "tmuxifier-$resolved" || true)"
-      fi
-    fi
 
     if [ -z "$command_path" ]; then
       echo "tmuxifier: no such command '$command'" >&2

completion/tmuxifier.tcsh

@@ -0,0 +1,2 @@
+complete tmuxifier 'p@1@`tmuxifier commands`@' \
+                   'p@2@`tmuxifier completions $:-1`@'

examples/example.window.sh

@@ -7,8 +7,9 @@ window_root "~/Desktop"
 new_window "Example Window"
 
 # Split window into panes.
-tmux split-window -t "$session:$window.0" -v -p 20 "watch -t date"
+split_v 20
-tmux split-window -t "$session:$window.1" -h -p 60
+run_cmd "watch -t date"
+split_h 60
 
 # Set active pane.
-tmux select-pane -t "$session:$window.0"
+select_pane 0

init.sh

@@ -10,7 +10,7 @@ export PATH="$TMUXIFIER/bin:$PATH"
 
 # If `tmuxifier` is available, and `$TMUXIFIER_NO_COMPLETE` is not set, then
 # load tmuxifier shell completion.
-if [ ! -z $(command -v "tmuxifier") ] && [ -z "$TMUXIFIER_NO_COMPLETE" ]; then
+if [ -n "$(command -v "tmuxifier")" ] && [ -z "$TMUXIFIER_NO_COMPLETE" ]; then
   if [ -n "$BASH_VERSION" ]; then
     source "$TMUXIFIER/completion/tmuxifier.bash"
   elif [ -n "$ZSH_VERSION" ]; then

init.tcsh

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

lib/layout-helpers.sh

@@ -13,16 +13,36 @@
 #   - $2: (optional) Shell command to execute when window is created.
 #
 new_window() {
-  if [ ! -z "$1" ]; then
+  if [ -n "$1" ]; then window="$1"; fi
-    window="$1"
+  if [ -n "$2" ]; then local command=("$2"); fi
-  fi
+  if [ -n "$window" ]; then local winarg=(-n "$window"); fi
-  if [ ! -z "$2" ]; then
+
-    local command="\"$2\""
+  tmux new-window -t "$session:" "${winarg[@]}" "${command[@]}"
-  fi
+  __go_to_window_or_session_path
-  if [ ! -z "$window" ]; then
+}
-    local winarg="-n \"$window\""
+
-  fi
+# Split current window/pane vertically.
-  eval "tmux new-window -t \"$session:\" $winarg $command"
+#
+# Arguments:
+#   - $1: (optional) Percentage of frame the new pane will use.
+#   - $2: (optional) Target pane ID to split in current window.
+#
+split_v() {
+  if [ -n "$1" ]; then local percentage=(-p "$1"); fi
+  tmux split-window -t "$session:$window.$2" -v "${percentage[@]}"
+  __go_to_window_or_session_path
+}
+
+# Split current window/pane horizontally.
+#
+# Arguments:
+#   - $1: (optional) Percentage of frame the new pane will use.
+#   - $2: (optional) Target pane ID to split in current window.
+#
+split_h() {
+  if [ -n "$1" ]; then local percentage=(-p "$1"); fi
+  tmux split-window -t "$session:$window.$2" -h "${percentage[@]}"
+  __go_to_window_or_session_path
 }
 
 # Select a specific window.
@@ -34,6 +54,60 @@ select_window() {
   tmux select-window -t "$session:$1"
 }
 
+# Select a specific pane in the current window.
+#
+# Arguments:
+#   - $1: Pane ID to select.
+#
+select_pane() {
+  tmux select-pane -t "$session:$window.$1"
+}
+
+# Send/paste keys to the currently active pane/window.
+#
+# Arguments:
+#   - $1: String to paste.
+#   - $2: (optional) Target pane ID to send input to.
+#
+send_keys() {
+  tmux send-keys -t "$session:$window.$2" "$1"
+}
+
+# Runs a shell command in the currently active pane/window.
+#
+# Arguments:
+#   - $1: Shell command to run.
+#   - $2: (optional) Target pane ID to run command in.
+#
+run_cmd() {
+  send_keys "$1" "$2"
+  send_keys "C-m" "$2"
+}
+
+# Cusomize session root path. Default is `$HOME`.
+#
+# Arguments:
+#   - $1: Directory path to use for session root.
+#
+session_root() {
+  local dir="$(__expand_path $@)"
+  if [ -d "$dir" ]; then
+    session_root="$dir"
+  fi
+}
+
+# Customize window root path. Default is `$session_root`.
+#
+# Arguments:
+#   - $1: Directory path to use for window root.
+#
+window_root() {
+  local dir="$(__expand_path $@)"
+  if [ -d "$dir" ]; then
+    window_root="$dir"
+  fi
+}
+
 # Load specified window layout.
 #
 # Arguments:
@@ -44,7 +118,7 @@ load_window() {
   if [ -f "$file" ]; then
     window="$1"
     source "$file"
-    window=""
+    window=
 
     # Reset `$window_root`.
     if [[ "$window_root" != "$session_root" ]]; then
@@ -76,30 +150,6 @@ load_session() {
   fi
 }
 
-# Cusomize session root path. Default is `$HOME`.
-#
-# Arguments:
-#   - $1: Directory path to use for session root.
-#
-session_root() {
-  local dir="$(__expand_path $@)"
-  if [ -d "$dir" ]; then
-    session_root="$dir"
-  fi
-}
-
-# Customize window root path. Default is `$session_root`.
-#
-# Arguments:
-#   - $1: Directory path to use for window root.
-#
-window_root() {
-  local dir="$(__expand_path $@)"
-  if [ -d "$dir" ]; then
-    cd "$dir"
-  fi
-}
-
 # Create a new session, returning 0 on success, 1 on failure.
 #
 # Arguments:
@@ -113,7 +163,7 @@ window_root() {
 #   fi
 #
 initialize_session() {
-  if [ ! -z "$1" ]; then
+  if [ -n "$1" ]; then
     session="$1"
   fi
 
@@ -121,23 +171,21 @@ initialize_session() {
   tmux start-server
 
   # Check if the named session already exists.
-  if ! tmux has-session -t "$session" 2>/dev/null; then
+  if ! tmux has-session -t "$session:" 2>/dev/null; then
     # Create the new session.
-    env TMUX= tmux new-session -d -s "$session"
+    env TMUX="" tmux new-session -d -s "$session"
 
     # Set default-path for session
-    if [ ! -z "$session_root" ] && [ -d "$session_root" ]; then
+    if [ -n "$session_root" ] && [ -d "$session_root" ]; then
       cd "$session_root"
-      tmux set-option -t "$session" default-path "$session_root" 1>/dev/null
+      tmux set-option -t "$session:" default-path "$session_root" 1>/dev/null
     fi
 
     # In order to ensure only specified windows are created, we move the
-    # default window to position 99, and later remove it with the
+    # default window to position 999, and later remove it with the
-    # `finalize_session` function.
+    # `finalize_and_go_to_session` function.
-    tmux move-window -s "$session:0" -t "$session:99"
+    local first_window_index=$(__get_first_window_index)
-
+    tmux move-window -s "$session:$first_window_index" -t "$session:999"
-    # Ensure correct pane splitting.
-    __go_to_session
 
     # Session created, return ok exit status.
     return 0
@@ -155,9 +203,52 @@ initialize_session() {
 # 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:99" 2>/dev/null || true
+  ! tmux kill-window -t "$session:999" 2>/dev/null
   if [[ "$(tmuxifier-current-session)" != "$session" ]]; then
     __go_to_session
   fi
 }
+
+
+#
+# Internal functions
+#
+
+# Expands given path.
+#
+# Example:
+#
+#   $ __expand_path "~/Projects"
+#   /Users/jimeh/Projects
+#
+__expand_path() {
+  echo $(eval echo "$@")
+}
+
+__get_first_window_index() {
+  local index
+  index=$(tmux list-windows -t "$session:" -F "#{window_index}" 2>/dev/null)
+  if [ -n "$index" ]; then
+    echo "$index" | head -1
+  else
+    echo "0"
+  fi
+}
+
+__go_to_session() {
+  if [ -z "$TMUX" ]; then
+    tmux -u attach-session -t "$session:"
+  else
+    tmux -u switch-client -t "$session:"
+  fi
+}
+
+__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"
+  fi
+}

lib/runtime.sh

@@ -0,0 +1,12 @@
+#
+# Load up runtime environment for session and window layout files.
+#
+
+# Load tmuxifier environment.
+source "$TMUXIFIER/lib/env.sh"
+
+# Setup default variables.
+session_root="$HOME"
+
+# Load layout helper functions.
+source "$TMUXIFIER/lib/layout-helpers.sh"

libexec/tmuxifier-alias

@@ -2,6 +2,14 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier alias <alias>
+
+Resolve a command alias to it's full name."
+  exit
+fi
+
 case "$1" in
   "session" | "ses" | "s" )
     echo "load-session"
@@ -30,4 +38,6 @@ case "$1" in
   "list-win" | "lsw" )
     echo "list-windows"
     ;;
+  * )
+    exit 1
 esac

libexec/tmuxifier-commands

@@ -2,12 +2,21 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier commands
+
+List all available commands, includes internal commands not intended for
+normal use by users."
+  exit
+fi
+
 shopt -s nullglob
 
 { for path in ${PATH//:/$'\n'}; do
     for command in "${path}/tmuxifier-"*; do
       command="${command##*tmuxifier-}"
-      echo ${command##sh-}
+      echo "$command"
     done
   done
 } | sort | uniq

libexec/tmuxifier-completions

@@ -2,6 +2,14 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier completion <command>
+
+Print a list of available completions for specified command."
+  exit
+fi
+
 # Provide tmuxifier completions
 if [ "$1" == "--complete" ]; then
   tmuxifier-commands
@@ -9,7 +17,7 @@ if [ "$1" == "--complete" ]; then
 fi
 
 has-completions() {
-  grep -i "^# provide tmuxifier completions" "$1" >/dev/null
+  grep -i "^# Provide tmuxifier completions" "$1" >/dev/null
 }
 
 command="$1"
@@ -18,17 +26,9 @@ if [ -z "$command" ]; then
   exit 1
 fi
 
-command_path="$(command -v "tmuxifier-$command" || true)"
+! command_path="$(tmuxifier-resolve-command-path "$command")"
 
-# Attempt to resolve aliases
+if [ -n "$command_path" ] && has-completions "$command_path"; then
-if [ -z "$command_path" ]; then
-  resolved="$(tmuxifier-alias "$command")"
-  if [ ! -z "$resolved" ]; then
-    command_path="$(command -v "tmuxifier-$resolved" || true)"
-  fi
-fi
-
-if [ ! -z "$command_path" ] && has-completions "$command_path"; then
   shift
   exec "$command_path" --complete "$@"
 fi

libexec/tmuxifier-current-session

@@ -2,12 +2,18 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
-if [ ! -z $TMUX ]; then
+# Provide tmuxifier help
-  for item in $(tmux list-sessions -F "#{?session_attached,1,0}:#S"); do
+if [ "$1" == "--help" ]; then
-    if [[ "$item" == "1:"* ]]; then
+  echo "usage: tmuxifier current-session
-      echo ${item/1:/}
+
+Outputs the name of the current Tmux session."
+  exit
+fi
+
+if [ -n "$TMUX" ]; then
+  for item in $(tmux list-pane -F "#{session_name}");do
+    echo $item
     exit 0
-    fi
   done
 fi
 

libexec/tmuxifier-edit-session

@@ -2,6 +2,16 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier edit-session <layout_name>
+
+Aliases: edit-ses, 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
@@ -22,7 +32,7 @@ if [ ! -f "$layout_file" ]; then
   echo "tmuxifier: session layout '$layout_name' does not exist." >&2
   echo "" >&2
   echo "You can create it with:" >&2
-  echo "  tmuxifier new-session $layout_name" >&2
+  echo "  tmuxifier new-session '$layout_name'" >&2
   exit 1
 fi
 

libexec/tmuxifier-edit-window

@@ -2,6 +2,16 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier edit-window <layout_name>
+
+Aliases: edit-win, 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
@@ -22,7 +32,7 @@ if [ ! -f "$layout_file" ]; then
   echo "tmuxifier: window layout '$layout_name' does not exist." >&2
   echo "" >&2
   echo "You can create it with:" >&2
-  echo "  tmuxifier new-window $layout_name" >&2
+  echo "  tmuxifier new-window '$layout_name'" >&2
   exit 1
 fi
 

libexec/tmuxifier-help

@@ -2,26 +2,24 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  tmuxifier-help
+  exit
+fi
+
 # Provide tmuxifier completions
 if [ "$1" == "--complete" ]; then
   tmuxifier-commands
   exit
 fi
 
+has-help() {
+  grep -i "^# Provide tmuxifier help" "$1" >/dev/null
+}
+
 command="$1"
-command_path="$(command -v "tmuxifier-$command" || true)"
+if [ -z "$command" ]; then
-
-# Attempt to resolve aliases
-if [ -z "$command_path" ]; then
-  resolved="$(tmuxifier-alias "$command")"
-  if [ ! -z "$resolved" ]; then
-    command="$resolved"
-    command_path="$(command -v "tmuxifier-$command" || true)"
-  fi
-fi
-
-case "$command" in
-  "" )
   echo "usage: tmuxifier <command> [<args>]
 
 Some useful tmuxifier commands are:
@@ -40,85 +38,23 @@ Some useful tmuxifier commands are:
    help                    Show this message.
 
 See 'tmuxifier help <command>' for information on a specific command."
-    ;;
+  exit
-  "load-session" )
+fi
-    echo "usage: tmuxifier load-session <layout_name>
 
-Aliases: session, ses, s
+! command_path="$(tmuxifier-resolve-command-path "$command")"
 
-Create a session using the session layout, unless the session already exists
+if [ -z "$command_path" ]; then
-in which case, we simply switch to the existing one."
+  echo "tmuxifier: no such command '$command'" >&2
-    ;;
+  exit 1
-  "load-window" )
+fi
-    echo "usage: tmuxifier load-window <layout_name>
 
-Aliases: window, win, w
+if has-help "$command_path"; then
-
+  shift
-Create a new window using the specified window layout in the current session."
+  exec "$command_path" --help "$@"
-    ;;
+else
-  "new-session" )
-    echo "usage: tmuxifier new-session <layout_name>
-
-Aliases: new-ses, ns
-
-Create a new session layout and open it for editing in \$EDITOR."
-    ;;
-  "new-window" )
-    echo "usage: tmuxifier new-window <layout_name>
-
-Aliases: new-win, ws
-
-Create a new window layout and open it for editing in \$EDITOR."
-    ;;
-  "edit-session" )
-    echo "usage: tmuxifier edit-session <layout_name>
-
-Aliases: edit-ses, es
-
-Open specified session layout for editing in \$EDITOR."
-    ;;
-  "edit-window" )
-    echo "usage: tmuxifier edit-window <layout_name>
-
-Aliases: edit-win, ew
-
-Open specified window layout for editing in \$EDITOR."
-    ;;
-  "completions" )
-    echo "usage: tmuxifier completion <command>
-
-Print a list of available completions for specified command."
-    ;;
-  "list" )
-    echo "usage: tmuxifier list
-
-Aliases: ls
-
-List all available session and window layouts."
-    ;;
-  "list-sessions" )
-    echo "usage: tmuxifier list-sessions
-
-Aliases: list-ses, lss
-
-List all session layouts."
-    ;;
-  "list-windows" )
-    echo "usage: tmuxifier list-windows
-
-Aliases: list-win, lsw
-
-List all window layouts."
-    ;;
-  * )
-    if [ ! -z "$command_path" ]; then
   echo "Sorry, the '$command' command isn't documented yet."
-      echo
+  echo ""
   echo "You can view the command's source here:"
   echo "$command_path"
-      echo
+  echo ""
-    else
+fi
-      echo "tmuxifier: no such command '$command'"
-    fi
-    ;;
-esac

libexec/tmuxifier-list

@@ -2,10 +2,24 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier list
+
+Aliases: ls
+
+List all available session and window layouts."
+  exit
+fi
+
 echo ""
 echo "Sessions:"
-tmuxifier-list-sessions
+for item in $(tmuxifier-list-sessions); do
+  echo " - $item"
+done
 echo ""
 echo "Windows:"
-tmuxifier-list-windows
+for item in $(tmuxifier-list-windows); do
+  echo " - $item"
+done
 echo ""

libexec/tmuxifier-list-sessions

@@ -2,8 +2,18 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
-list=$(find "$TMUXIFIER_LAYOUT_PATH" -name "*.session.sh")
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier list-sessions
+
+Aliases: list-ses, lss
+
+List all session layouts."
+  exit
+fi
+
+list=$(find -L "$TMUXIFIER_LAYOUT_PATH" -name "*.session.sh")
 for file in $list; do
   file=${file/$TMUXIFIER_LAYOUT_PATH\//}
-  echo "  ${file/.session.sh/}"
+  echo "${file/.session.sh/}"
 done

libexec/tmuxifier-list-windows

@@ -2,8 +2,18 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
-list=$(find "$TMUXIFIER_LAYOUT_PATH" -name "*.window.sh")
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier list-windows
+
+Aliases: list-win, lsw
+
+List all window layouts."
+  exit
+fi
+
+list=$(find -L "$TMUXIFIER_LAYOUT_PATH" -name "*.window.sh")
 for file in $list; do
   file=${file/$TMUXIFIER_LAYOUT_PATH\//}
-  echo "  ${file/.window.sh/}"
+  echo "${file/.window.sh/}"
 done

libexec/tmuxifier-load-session

@@ -2,6 +2,17 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier load-session <layout_name>
+
+Aliases: session, ses, s
+
+Create a session using the session layout, unless the session already exists
+in which case, we simply attach/switch to the existing one."
+  exit
+fi
+
 # Provide tmuxifier completions
 if [ "$1" == "--complete" ]; then
   for item in $(tmuxifier-list-sessions); do
@@ -16,11 +27,7 @@ if [ -z "$1" ]; then
 fi
 
 # Load runtime functions.
-source "$TMUXIFIER/runtime.sh"
+source "$TMUXIFIER/lib/runtime.sh"
 
-if [ ! -z $TMUX ]; then
+# Load session file.
-  load_session "$1"
+load_session "$1"
-else
-  echo "tmuxifier: 'load-session' command can only be used from within Tmux."
-  exit 1
-fi

libexec/tmuxifier-load-window

@@ -2,6 +2,16 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier load-window <layout_name>
+
+Aliases: window, win, w
+
+Create a new window using the specified window layout in the current session."
+  exit
+fi
+
 # Provide tmuxifier completions
 if [ "$1" == "--complete" ]; then
   for item in $(tmuxifier-list-windows); do
@@ -16,7 +26,7 @@ if [ -z "$1" ]; then
 fi
 
 # Load runtime functions.
-source "$TMUXIFIER/runtime.sh"
+source "$TMUXIFIER/lib/runtime.sh"
 
 if [ ! -z $TMUX ]; then
   session="$(tmuxifier-current-session)"

libexec/tmuxifier-new-session

@@ -2,6 +2,24 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier new-session <layout_name>
+
+Aliases: new-ses, 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
+  exit
+fi
+
 if [ -z "$1" ]; then
   echo "$(tmuxifier-help new-session)" >&2
   exit 1

libexec/tmuxifier-new-window

@@ -2,6 +2,24 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier new-window <layout_name>
+
+Aliases: new-win, ws
+
+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
+  exit
+fi
+
 if [ -z "$1" ]; then
   echo "$(tmuxifier-help new-window)" >&2
   exit 1

libexec/tmuxifier-resolve-command-path

@@ -0,0 +1,27 @@
+#! /usr/bin/env bash
+set -e
+[ -n "$TMUXIFIER_DEBUG" ] && set -x
+
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier resolve-command-path <command_or_alias>
+
+Outputs the absolute path to the given command or command alias."
+  exit
+fi
+
+if [ -n "$1" ]; then
+  ! command_path="$(command -v "tmuxifier-$1")"
+  if [ -z "$command_path" ]; then
+    resolved="$(tmuxifier-alias "$1")"
+    if [ -n "$resolved" ]; then
+      ! command_path="$(command -v "tmuxifier-$resolved")"
+    fi
+  fi
+fi
+
+if [ -n "$command_path" ]; then
+  echo "$command_path"
+else
+  exit 1
+fi

libexec/tmuxifier-version

@@ -2,4 +2,12 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
-echo "0.1.0"
+# Provide tmuxifier help
+if [ "$1" == "--help" ]; then
+  echo "usage: tmuxifier version
+
+Outputs Tmuxifier version."
+  exit
+fi
+
+echo "0.5.1"

runtime.sh

@@ -1,36 +0,0 @@
-#
-# Load up runtime environment for session and window layout files.
-#
-
-# Load tmuxifier environment.
-source "$TMUXIFIER/env.sh"
-
-# Setup default variables.
-session_root="$HOME"
-
-# Load layout helper functions.
-source "$TMUXIFIER/lib/layout-helpers.sh"
-
-
-#
-# Internal functions
-#
-
-# Expands given path.
-#
-# Example:
-#
-#   $ __expand_path "~/Projects"
-#   /Users/jimeh/Projects
-#
-__expand_path() {
-  echo $(eval echo "$@")
-}
-
-__go_to_session() {
-  if [ -z $TMUX ]; then
-    tmux -u attach-session -t "$session"
-  else
-    tmux -u switch-client -t "$session"
-  fi
-}

templates/window.sh

@@ -7,7 +7,16 @@
 new_window "{{WINDOW_NAME}}"
 
 # Split window into panes.
-#tmux split-window -t "$session:$window.0" -h -p 20
+#split_v 20
+#split_h 50
+
+# Run commands.
+#run_cmd "top"     # runs in active pane
+#run_cmd "date" 1  # runs in pane 1
+
+# Paste text
+#send_keys "top"    # paste into active pane
+#send_keys "date" 1 # paste into active pane
 
 # Set active pane.
-#tmux select-pane -t "$session:$window.0"
+#select_pane 0