Bump version to 0.2.1

Complete names of existing sessions and windows for the `new` commands,
enabling easier creation of similarly named layouts.

bin/tmuxifier

@@ -24,14 +24,7 @@ case "$command" in
     ;;
 
   * )
-    # Lookup command, attempt to resolve as alias if fails
-    ! command_path="$(command -v "tmuxifier-$command")"
-    if [ -z "$command_path" ]; then
-      resolved="$(tmuxifier-alias "$command")"
-      if [ ! -z "$resolved" ]; then
-        ! command_path="$(command -v "tmuxifier-$resolved")"
-      fi
-    fi
+    ! command_path="$(tmuxifier-resolve-command-path "$command")"
 
     if [ -z "$command_path" ]; then
       echo "tmuxifier: no such command '$command'" >&2

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

lib/layout-helpers.sh

@@ -13,19 +13,36 @@
 #   - $2: (optional) Shell command to execute when window is created.
 #
 new_window() {
-  if [ ! -z "$1" ]; then
-    window="$1"
-  fi
-  local command=()
-  if [ ! -z "$2" ]; then
-    command+=("$2")
-  fi
-  if [ ! -z "$window" ]; then
-    local winarg=(-n "$window")
-  fi
+  if [ -n "$1" ]; then window="$1"; fi
+  if [ -n "$2" ]; then local command=("$2"); fi
+  if [ -n "$window" ]; then local winarg=(-n "$window"); fi
+
+  if [ -n "$window_root" ]; then cd "$window_root"; fi
   tmux new-window -t "$session:" "${winarg[@]}" "${command[@]}"
 }
 
+# Split current window/pane vertically.
+#
+# 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[@]}"
+}
+
+# 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[@]}"
+}
+
 # Select a specific window.
 #
 # Arguments:
@@ -35,6 +52,50 @@ 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"
+}
+
+# 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() {
+  tmux send-keys -t "$session:$window.$2" -l "$1"
+  tmux send-keys -t "$session:$window.$2" "C-m"
+}
+
+# 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:
@@ -45,7 +106,7 @@ load_window() {
   if [ -f "$file" ]; then
     window="$1"
     source "$file"
-    window=""
+    window=
 
     # Reset `$window_root`.
     if [[ "$window_root" != "$session_root" ]]; then
@@ -77,30 +138,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:
@@ -114,7 +151,7 @@ window_root() {
 #   fi
 #
 initialize_session() {
-  if [ ! -z "$1" ]; then
+  if [ -n "$1" ]; then
     session="$1"
   fi
 
@@ -122,14 +159,14 @@ 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
@@ -156,9 +193,34 @@ 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
   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 "$@")
+}
+
+__go_to_session() {
+  if [ -z "$TMUX" ]; then
+    tmux -u attach-session -t "$session:"
+  else
+    tmux -u switch-client -t "$session:"
+  fi
+}

libexec/tmuxifier-alias

@@ -31,6 +31,5 @@ case "$1" in
     echo "list-windows"
     ;;
   * )
-    echo "unknown alias \"$1\""
     exit 1
 esac

libexec/tmuxifier-commands

@@ -7,7 +7,7 @@ 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

@@ -18,16 +18,9 @@ if [ -z "$command" ]; then
   exit 1
 fi
 
-# Lookup command, attempt to resolve as alias if fails
-! command_path="$(command -v "tmuxifier-$command")"
-if [ -z "$command_path" ]; then
-  resolved="$(tmuxifier-alias "$command")"
-  if [ ! -z "$resolved" ]; then
-    ! command_path="$(command -v "tmuxifier-$resolved")"
-  fi
-fi
+! command_path="$(tmuxifier-resolve-command-path "$command")"
 
-if [ ! -z "$command_path" ] && has-completions "$command_path"; then
+if [ -n "$command_path" ] && has-completions "$command_path"; then
   shift
   exec "$command_path" --complete "$@"
 fi

libexec/tmuxifier-current-session

@@ -2,7 +2,7 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
-if [ ! -z $TMUX ]; then
+if [ -n "$TMUX" ]; then
   for item in $(tmux list-sessions -F "#{?session_attached,1,0}:#S"); do
     if [[ "$item" == "1:"* ]]; then
       echo ${item/1:/}

libexec/tmuxifier-edit-session

@@ -22,7 +22,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

@@ -22,7 +22,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

@@ -10,13 +10,11 @@ fi
 
 command="$1"
 
-# Lookup command, attempt to resolve as alias if fails
-! command_path="$(command -v "tmuxifier-$command")"
-if [ -z "$command_path" ]; then
-  resolved="$(tmuxifier-alias "$command")"
-  if [ ! -z "$resolved" ]; then
+# Ensure we have the correct command name in case an alias was given.
+if [ -n "$command" ]; then
+  ! resolved="$(tmuxifier-alias "$command")"
+  if [ -n "$resolved" ]; then
     command="$resolved"
-    ! command_path="$(command -v "tmuxifier-$command")"
   fi
 fi
 
@@ -111,14 +109,16 @@ Aliases: list-win, lsw
 List all window layouts."
     ;;
   * )
-    if [ ! -z "$command_path" ]; then
+    ! command_path="$(tmuxifier-resolve-command-path "$command")"
+    if [ -n "$command_path" ]; then
       echo "Sorry, the '$command' command isn't documented yet."
       echo
       echo "You can view the command's source here:"
       echo "$command_path"
       echo
     else
-      echo "tmuxifier: no such command '$command'"
+      echo "tmuxifier: no such command '$command'" >&2
+      exit 1
     fi
     ;;
 esac

libexec/tmuxifier-new-session

@@ -2,6 +2,14 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# 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,14 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# 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,19 @@
+#! /usr/bin/env bash
+set -e
+[ -n "$TMUXIFIER_DEBUG" ] && set -x
+
+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,4 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
-echo "0.1.2"
+echo "0.2.1"

runtime.sh

@@ -10,27 +10,3 @@ 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,12 @@
 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
 
 # Set active pane.
-#tmux select-pane -t "$session:$window.0"
+#select_pane 0