Bump version to 0.12.2

Fixes for load_session with file in current dir

.travis.yml

@@ -4,6 +4,7 @@ env:
   - TMUX_VERSION="1.7"
   - TMUX_VERSION="1.8"
   - TMUX_VERSION="1.9a"
+  - TMUX_VERSION="2.0"
 before_install:
   - sudo apt-get update
   - sudo apt-get install -y bc build-essential libevent-dev libncurses5-dev

README.md

@@ -202,6 +202,22 @@ any reason you need to disable it, just set `$TMUXIFIER_NO_COMPLETE`.
 export TMUXIFIER_NO_COMPLETE=1
 ```
 
+## Tips
+
+### iTerm2 Integration
+
+Tmuxifier supports iTerm2's [Tmux integration][]. It can be used in two ways:
+
+- Passing `-CC` as a second argument to the `load-session` command. For
+example:
+
+        tmuxifier load-session my-awesome-session -CC
+
+- Setting the `TMUXIFIER_TMUX_ITERM_ATTACH` environment variable to `-CC`
+  before calling the `load-session` command.
+
+[tmux integration]: https://gitlab.com/gnachman/iterm2/wikis/TmuxIntegration
+
 ## Inspiration
 
 - Tmuxifier is largely inspired by [Tmuxinator][].

lib/layout-helpers.sh

@@ -22,6 +22,10 @@ new_window() {
   if [ -n "$2" ]; then local command=("$2"); fi
 
   tmuxifier-tmux new-window -t "$session:" "${winarg[@]}" "${command[@]}"
+
+  # Disable renaming if a window name was given.
+  if [ -n "$1" ]; then tmuxifier-tmux set-option -t "$1" allow-rename off; fi
+
   window="$(__get_current_window_index)"
   __go_to_window_or_session_path
 }
@@ -185,31 +189,39 @@ load_window() {
 #   - $2: (optional) Override default window name.
 #
 load_session() {
-  local file="$1"
+  local file
-  if [ ! -f "$file" ]; then
+  if [ "${1#*/}" = "$1" ]; then
-    file="$TMUXIFIER_LAYOUT_PATH/$1.session.sh"
+    # There's no slash in the path.
-  fi
+    if [ -f "$TMUXIFIER_LAYOUT_PATH/$1.session.sh" ] || [ ! -f "$1" ]; then
-
+      file="$TMUXIFIER_LAYOUT_PATH/$1.session.sh"
-  if [ -f "$file" ]; then
-    if [ $# -gt 1 ]; then
-      session="$2"
     else
-      session="${1/%.session.sh}"
+      # bash's 'source' requires an slash in the filename to not use $PATH.
-      session="${session/%.sh}"
+      file="./$1"
-    fi
-
-    set_default_path=true
-    source "$file"
-    session=
-
-    # Reset `$session_root`.
-    if [[ "$session_root" != "$HOME" ]]; then
-      session_root="$HOME"
     fi
   else
+    file="$1"
+  fi
+
+  if ! [ -f "$file" ]; then
     echo "\"$1\" session layout not found." >&2
     return 1
   fi
+
+  if [ $# -gt 1 ]; then
+    session="$2"
+  else
+    session="${1/%.session.sh}"
+    session="${session/%.sh}"
+  fi
+
+  set_default_path=true
+  source "$file"
+  session=
+
+  # Reset `$session_root`.
+  if [[ "$session_root" != "$HOME" ]]; then
+    session_root="$HOME"
+  fi
 }
 
 # Create a new session, returning 0 on success, 1 on failure.
@@ -261,6 +273,11 @@ initialize_session() {
       -d -s "$session" "${session_args[@]}"
   fi
 
+  if $set_default_path && [[ "$session_root" != "$HOME" ]]; then
+    tmuxifier-tmux setenv -t "$session:" \
+      TMUXIFIER_SESSION_ROOT "$session_root"
+  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.
@@ -323,16 +340,27 @@ __get_current_window_index() {
 
 __go_to_session() {
   if [ -z "$TMUX" ]; then
-    tmuxifier-tmux -u attach-session -t "$session:"
+    tmuxifier-tmux $TMUXIFIER_TMUX_ITERM_ATTACH -u \
+      attach-session -t "$session:"
   else
     tmuxifier-tmux -u switch-client -t "$session:"
   fi
 }
 
 __go_to_window_or_session_path() {
-  local window_or_session_root=${window_root-$session_root}
+  local target_path
-  if [ -n "$window_or_session_root" ]; then
+
-    run_cmd "cd \"$window_or_session_root\""
+  if [ -n "$window_root" ]; then
+    target_path="$window_root"
+  elif [ -n "$TMUXIFIER_SESSION_ROOT" ]; then
+    target_path="$TMUXIFIER_SESSION_ROOT"
+  elif [ -n "$session_root" ]; then
+    target_path="$session_root"
+  fi
+
+  # local window_or_session_root=${window_root-$session_root}
+  if [ -n "$target_path" ]; then
+    run_cmd "cd \"$target_path\""
     run_cmd "clear"
   fi
 }

libexec/tmuxifier-load-session

@@ -7,12 +7,19 @@ source "$TMUXIFIER/lib/util.sh"
 
 # Provide tmuxifier help
 if calling-help "$@"; then
-  echo "usage: tmuxifier load-session <layout_name | file_path>
+  echo "usage: tmuxifier load-session <layout_name | file_path> [<iterm mode>]
 
 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."
+in which case, we simply attach/switch to the existing one.
+
+Arguments:
+   <layout_name | file_path>  - Name of a session layout stored in the layouts
+                                directory, or path to a session layout file.
+   <iterm mode>               - When given as \"-CC\" tmux will be called with
+                                the -CC argument enabling iTerm2 integration.
+                                More info: http://bit.ly/1yDbMlm"
   exit
 fi
 
@@ -30,5 +37,9 @@ fi
 # Load runtime functions.
 source "$TMUXIFIER/lib/runtime.sh"
 
+if [ "$2" == "-CC" ]; then
+  export TMUXIFIER_TMUX_ITERM_ATTACH="-CC"
+fi
+
 # Load session file.
 load_session "$1"

libexec/tmuxifier-load-window

@@ -11,7 +11,11 @@ if calling-help "$@"; then
 
 Aliases: window, win, w
 
-Create a new window using the specified window layout in the current session."
+Create a new window using the specified window layout in the current session.
+
+Arguments:
+   <layout_name | file_path>  - Name of a window layout stored in the layouts
+                                directory, or path to a window layout file."
   exit
 fi
 

libexec/tmuxifier-tmux-version

@@ -7,7 +7,7 @@ source "$TMUXIFIER/lib/util.sh"
 
 # Provide tmuxifier help
 if calling-help "$@"; then
-  echo "usage: tmuxifier tmux-version [target-version]
+  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

libexec/tmuxifier-version

@@ -13,4 +13,4 @@ Outputs Tmuxifier version."
   exit
 fi
 
-echo "0.11.6"
+echo "0.12.2"

test/lib/layout-helpers/__go_to_session.test.sh

@@ -16,6 +16,16 @@ assert_raises \
   "stub_called_with tmuxifier-tmux -u attach-session -t \"${session}:\"" 0
 restore tmuxifier-tmux
 
+# When TMUXIFIER_TMUX_ITERM_ATTACH is set, pass it in as first argument(s) to
+# tmuxifier-tmux
+TMUXIFIER_TMUX_ITERM_ATTACH="-CC"
+stub tmuxifier-tmux
+__go_to_session
+assert_raises \
+  "stub_called_with tmuxifier-tmux -CC -u attach-session -t \"${session}:\"" 0
+restore tmuxifier-tmux
+unset TMUXIFIER_TMUX_ITERM_ATTACH
+
 # When TMUX is set, switch to $session.
 TMUX="/tmp/tmux-501/default,1203,0"
 stub tmuxifier-tmux

test/lib/layout-helpers/__go_to_window_or_session_path.test.sh

@@ -23,6 +23,17 @@ unset window_root
 restore run_cmd
 
 
+# When only $TMUXIFIER_SESSION_ROOT is set, runs cd to $TMUXIFIER_SESSION_ROOT
+# path.
+stub run_cmd
+TMUXIFIER_SESSION_ROOT="/opt"
+__go_to_window_or_session_path
+assert 'stub_called_with_times run_cmd cd \"/opt\"' "1"
+assert 'stub_called_with_times run_cmd clear' "1"
+unset TMUXIFIER_SESSION_ROOT
+restore run_cmd
+
+
 # When only $session_root is set, runs cd to $session_root path.
 stub run_cmd
 session_root="/usr"
@@ -45,5 +56,33 @@ unset session_root
 restore run_cmd
 
 
+# When $TMUXIFIER_SESSION_ROOT and $session_root are set, runs cd to
+# $TMUXIFIER_SESSION_ROOT path.
+stub run_cmd
+TMUXIFIER_SESSION_ROOT="/opt"
+session_root="/usr"
+__go_to_window_or_session_path
+assert 'stub_called_with_times run_cmd cd \"/opt\"' "1"
+assert 'stub_called_with_times run_cmd clear' "1"
+unset TMUXIFIER_SESSION_ROOT
+unset session_root
+restore run_cmd
+
+
+# When $window_root, $TMUXIFIER_SESSION_ROOT, and $session_root are set, runs
+# cd to $window_root path.
+stub run_cmd
+window_root="/tmp"
+TMUXIFIER_SESSION_ROOT="/opt"
+session_root="/usr"
+__go_to_window_or_session_path
+assert 'stub_called_with_times run_cmd cd \"/tmp\"' "1"
+assert 'stub_called_with_times run_cmd clear' "1"
+unset window_root
+unset TMUXIFIER_SESSION_ROOT
+unset session_root
+restore run_cmd
+
+
 # End of tests.
 assert_end "__go_to_window_or_session_path()"