Adding the ability to specify tmux session name.

Change-Id: Iee7f34de4448e9ab5d383e6e2eb871639271fdb5

modules/directory/README.md

@@ -22,11 +22,7 @@ Aliases
 -------
 
   - `d` prints the contents of the directory stack.
-
+  - `1 ... 9` changes the directory to the **n** previous one.
-Functions
----------
-
-  - `command_not_found_handler` changes the directory to the **n** previous one.
 
 Authors
 -------

modules/directory/functions/command_not_found_handler

@@ -1,13 +0,0 @@
-#
-# Changes the directory to the n previous one.
-#
-# Authors:
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-
-if [[ "$1" == [[:digit:]]## ]]; then
-  builtin cd "+$1"
-else
-  return 127
-fi
-

modules/directory/init.zsh

@@ -27,4 +27,5 @@ unsetopt CLOBBER            # Do not overwrite existing files with > and >>.
 #
 
 alias d='dirs -v'
+for index ({1..9}) alias "$index"="cd +${index}"; unset index
 

modules/git/functions/git-info

@@ -348,13 +348,13 @@ function git-info {
     # Format added.
     if (( added > 0 )); then
       zstyle -s ':prezto:module:git:info:added' format 'added_format'
-      zformat -f added_formatted "$added_format" "a:$added_format"
+      zformat -f added_formatted "$added_format" "a:$added"
     fi
 
     # Format deleted.
     if (( deleted > 0 )); then
       zstyle -s ':prezto:module:git:info:deleted' format 'deleted_format'
-      zformat -f deleted_formatted "$deleted_format" "d:$deleted_format"
+      zformat -f deleted_formatted "$deleted_format" "d:$deleted"
     fi
 
     # Format modified.

modules/osx/README.md

@@ -9,17 +9,20 @@ Aliases
   - `cdf` changes the current working director to the current _Finder_
     directory.
   - `pushdf` pushes the current working directory onto the directory queue and
-  - `ql` quick looks at files.
+    changes the current working director to the current _Finder_ directory.
-  - `rm-osx-cruft` deletes .DS\_Store, \_\_MACOSX cruft.
 
 Functions
 ---------
 
-  - `manb` opens _man_ pages in [_Bwana.app_][2].
+  - `mand` opens _man_ pages in [_Dash.app_][2].
   - `manp` opens _man_ pages in _Preview.app_.
   - `pfd` prints the current _Finder_ directory.
   - `pfs` prints the current _Finder_ selection.
   - `tab` creates a new tab (works in both _Terminal_ and [_iTerm_][3]).
+  - `ql` previews files in Quick Look.
+  - `osx-rm-dir-metadata` deletes .DS\_Store, \_\_MACOSX cruft.
+  - `osx-ls-download-history` displays the Mac OS X download history.
+  - `osx-rm-download-history` deletes the Mac OS X download history.
 
 Authors
 -------
@@ -29,7 +32,6 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: http://www.apple.com/macosx/
-[2]: http://bruji.com/bwana/
+[2]: http://kapeli.com/dash
 [3]: http://www.iterm2.com/
 [4]: https://github.com/sorin-ionescu/prezto/issues
-

modules/osx/functions/_manb_mand_manp

@@ -1,8 +1,8 @@
-#compdef manb manp
+#compdef mand manp
 #autoload
 
 #
-# Completes manb and manp.
+# Completes mand and manp.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>

modules/osx/functions/manb

@@ -1,24 +0,0 @@
-#
-# Opens man pages in Bwana.app.
-#
-# Authors:
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-
-function manb {
-  local page
-  if (( $# > 0 )); then
-    for page in "$@"; do
-      open "man:$page" 2>/dev/null
-      if (( $? != 0 )); then
-        print "$0: Bwana is not installed" >&2
-        break
-      fi
-    done
-  else
-    print 'What manual page do you want?' >&2
-  fi
-}
-
-manb "$@"
-

modules/osx/functions/mand

@@ -0,0 +1,21 @@
+#
+# Opens man pages in Dash.app.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+function mand {
+  if (( $# > 0 )); then
+    open "dash://manpages:$1" 2>/dev/null
+    if (( $? != 0 )); then
+      print "$0: Dash is not installed" >&2
+      break
+    fi
+  else
+    print 'What manual page do you want?' >&2
+  fi
+}
+
+mand "$@"
+

modules/osx/functions/osx-ls-download-history

@@ -0,0 +1,13 @@
+#
+# Displays the Mac OS X download history.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+local db
+for db in ~/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV*; do
+  if grep -q 'LSQuarantineEvent' < <(sqlite3 "$db" .tables); then
+    sqlite3 "$db" 'SELECT LSQuarantineDataURLString FROM LSQuarantineEvent'
+  fi
+done

modules/osx/functions/osx-rm-dir-metadata

@@ -0,0 +1,11 @@
+#
+# Deletes .DS_Store and __MACOSX directories.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+find "${@:-$PWD}" \( \
+  -type f -name '.DS_Store' -o \
+  -type d -name '__MACOSX' \
+\) -print0 | xargs -0 rm -rf

modules/osx/functions/osx-rm-download-history

@@ -0,0 +1,13 @@
+#
+# Deletes the Mac OS X download history.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+local db
+for db in ~/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV*; do
+  if grep -q 'LSQuarantineEvent' < <(sqlite3 "$db" .tables); then
+    sqlite3 "$db" 'DELETE FROM LSQuarantineEvent; VACUUM'
+  fi
+done

modules/osx/functions/pfd

@@ -7,7 +7,6 @@
 
 osascript 2>/dev/null <<EOF
   tell application "Finder"
-    return POSIX path of (target of window 1 as alias)
+    return POSIX path of (target of first window as text)
   end tell
 EOF
-

modules/osx/functions/pfs

@@ -5,14 +5,11 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-osascript 2>/dev/null <<EOF
+osascript 2>&1 <<EOF
-  set output to ""
   tell application "Finder" to set the_selection to selection
-  set item_count to count the_selection
+  if the_selection is not {}
-  repeat with item_index from 1 to count the_selection
+    repeat with an_item in the_selection
-    if item_index is less than item_count then set the_delimiter to "\n"
+      log POSIX path of (an_item as text)
-    if item_index is item_count then set the_delimiter to ""
+    end repeat
-    set output to output & ((item item_index of the_selection as alias)'s POSIX path) & the_delimiter
+  end if
-  end repeat
 EOF
-

modules/osx/functions/ql

@@ -0,0 +1,10 @@
+#
+# Previews files in Quick Look.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+if (( $# > 0 )); then
+  qlmanage -p "$@" &> /dev/null
+fi

modules/osx/init.zsh

@@ -14,26 +14,8 @@ fi
 # Aliases
 #
 
-# Change directory to the current Finder directory.
+# Changes directory to the current Finder directory.
 alias cdf='cd "$(pfd)"'
 
-# Push directory to the current Finder directory.
+# Pushes directory to the current Finder directory.
 alias pushdf='pushd "$(pfd)"'
-
-#
-# Functions
-#
-
-# Open files in Quick Look.
-function ql {
-  (( $# > 0 )) && qlmanage -p "$@" &> /dev/null
-}
-
-# Delete .DS_Store and __MACOSX directories.
-function rm-osx-cruft {
-  find "${@:-$PWD}" \( \
-    -type f -name '.DS_Store' -o \
-    -type d -name '__MACOSX' \
-  \) -print0 | xargs -0 rm -rf
-}
-

modules/pacman/init.zsh

@@ -28,6 +28,7 @@ if (( $+commands[$_pacman_frontend] )); then
     source "${0:h}/${_pacman_frontend}.zsh"
   fi
 else
+  _pacman_frontend='pacman'
   _pacman_sudo='sudo '
 fi
 
@@ -36,7 +37,7 @@ fi
 #
 
 # Pacman.
-alias pac= "${_pacman_frontend}"
+alias pac="${_pacman_frontend}"
 
 # Installs packages from repositories.
 alias paci="${_pacman_sudo}${_pacman_frontend} --sync"

modules/python/init.zsh

@@ -16,9 +16,12 @@ elif (( $+commands[pyenv] )); then
   eval "$(pyenv init -)"
 
 # Prepend PEP 370 per user site packages directory, which defaults to
-# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH.
+# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH. The
+# path can be overridden using PYTHONUSERBASE.
 else
-  if [[ "$OSTYPE" == darwin* ]]; then
+  if [[ -n "$PYTHONUSERBASE" ]]; then
+    path=($PYTHONUSERBASE/bin $path)
+  elif [[ "$OSTYPE" == darwin* ]]; then
     path=($HOME/Library/Python/*/bin(N) $path)
   else
     # This is subject to change.

modules/ruby/README.md

@@ -8,7 +8,7 @@ Local Gem Installation
 ----------------------
 
 When a Ruby version manager is not detected, local gems are installed in
-*~/Library/Ruby/Gems/1.8* on Mac OS X.
+*~/.gems*; otherwise, they are installed according to the manager.
 
 RVM
 ---
@@ -20,15 +20,33 @@ home directory.
 Since RVM is loaded into the shell and is known to override shell commands, it
 may conflict with shell scripts.
 
+Load this module as late as possible when using RVM since RVM will complain if
+it is not first in `$PATH`.
+
 rbenv
 -----
 
-An alternative RVM is to use [rbenv][3], which allows for switching between multiple,
+An alternative RVM is to use [rbenv][3], which allows for switching between
-isolated Ruby installations in the home directory.
+multiple, isolated Ruby installations in the home directory.
 
 While it is not as feature rich as RVM, it is not loaded into the shell and is
 not known to cause conflicts with shell scripts.
 
+chruby
+------
+
+Yet another alternative is [chruby][6], which is simpler than both RVM and
+rbenv.
+
+### Settings
+
+#### Auto-Switch
+
+To enable auto switching the Ruby version on directory change based on the
+.ruby-version file, add the following line to *zpreztorc*:
+
+    zstyle ':prezto:module:ruby:chruby' auto-switch 'yes'
+
 Bundler
 -------
 
@@ -87,4 +105,4 @@ Authors
 [3]: https://github.com/sstephenson/rbenv
 [4]: http://gembundler.com
 [5]: https://github.com/sorin-ionescu/prezto/issues
-
+[6]: https://github.com/postmodern/chruby

modules/ruby/functions/ruby-info

@@ -18,6 +18,8 @@ if (( $+commands[rvm-prompt] )); then
   version="$(rvm-prompt)"
 elif (( $+commands[rbenv] )); then
   version="$(rbenv version-name)"
+elif (( $+commands[ruby] )); then
+  version="${${$(ruby --version)[(w)1,(w)2]}/ /-}"
 fi
 
 # Format version.

modules/ruby/init.zsh

@@ -23,6 +23,13 @@ elif [[ -s "$HOME/.rbenv/bin/rbenv" ]]; then
 elif (( $+commands[rbenv] )); then
   eval "$(rbenv init - --no-rehash zsh)"
 
+# Load package manager installed chruby into the shell session.
+elif (( $+commands[chruby-exec] )); then
+  source "${commands[chruby-exec]:h:h}/share/chruby/chruby.sh"
+  if zstyle -t ':prezto:module:ruby:chruby' auto-switch; then
+    source "${commands[chruby-exec]:h:h}/share/chruby/auto.sh"
+  fi
+
 # Prepend local gems bin directories to PATH.
 else
   path=($HOME/.gem/ruby/*/bin(N) $path)

modules/screen/init.zsh

@@ -15,7 +15,7 @@ fi
 # Auto Start
 #
 
-if [[ -z "$STY" ]] && ( \
+if [[ -z "$STY" && -z "$EMACS" && -z "$VIM" ]] && ( \
   ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' remote ) ||
   ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' local ) \
 ); then

modules/tmux/README.md

@@ -20,12 +20,19 @@ following line to *zpreztorc*:
 
     zstyle ':prezto:module:tmux:auto-start' remote 'yes'
 
-In both cases, it will create a background session named _#Prezto_ and attach
+In both cases, it will create a background session named _prezto_ if the tmux
-every new shell to it.
+server is not started.
 
-To avoid keeping open sessions, this module sets `destroy-unattached off` on
+You can change the default session name with:
-the background session and `destroy-unattached on` on every other session
+
-(global setting).
+    zstyle ':prezto:module:tmux' session 'YOUR DEFAULT SESSION NAME'
+
+With `auto-start` enabled, you may want to control how multiple sessions are
+managed. The `destroy-unattached` option of tmux controls if the unattached
+sessions must be kept alive, making sessions available for later use, configured
+in *tmux.conf*:
+
+    set-option -g destroy-unattached [on | off]
 
 Aliases
 -------
@@ -41,7 +48,7 @@ connected** to be displayed, which can be fixed by installing
 [reattach-to-user-namespace][3], available in [Homebrew][4], and adding the
 following to *tmux.conf*:
 
-   set-option -g default-command "reattach-to-user-namespace -l $SHELL -l"
+    set-option -g default-command "reattach-to-user-namespace -l $SHELL -l"
 
 Furthermore, tmux is known to cause **kernel panics** on Mac OS X. A discussion
 about this and Prezto has already been [opened][2].
@@ -54,6 +61,7 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
   - [Colin Hebert](https://github.com/ColinHebert)
   - [Georges Discry](https://github.com/gdiscry)
+  - [Xavier Cambar](https://github.com/xcambar)
 
 [1]: http://tmux.sourceforge.net
 [2]: https://github.com/sorin-ionescu/prezto/issues/62

modules/tmux/init.zsh

@@ -5,6 +5,7 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #   Colin Hebert <hebert.colin@gmail.com>
 #   Georges Discry <georges@discry.be>
+#   Xavier Cambar <xcambar@gmail.com>
 #
 
 # Return if requirements are not found.
@@ -16,31 +17,22 @@ fi
 # Auto Start
 #
 
-if [[ -z "$TMUX" ]] && ( \
+if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" ]] && ( \
   ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
   ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
 ); then
-  tmux_session='#Prezto'
+  tmux start-server
 
-  if ! tmux has-session -t "$tmux_session" 2> /dev/null; then
+  # Create a 'prezto' session if no session has been defined in tmux.conf.
-    # Ensure that tmux server is started.
+  if ! tmux has-session 2> /dev/null; then
-    tmux start-server
+    zstyle -s ':prezto:module:tmux' session 'session' || session='prezto'
-
+    tmux \
-    # Disable the destruction of unattached sessions globally.
+      new-session -d -s "$session" \; \
-    tmux set-option -g destroy-unattached off &> /dev/null
+      set-option -t "$session" destroy-unattached off &> /dev/null
-
-    # Create a new session.
-    tmux new-session -d -s "$tmux_session"
-
-    # Disable the destruction of the new, unattached session.
-    tmux set-option -t "$tmux_session" destroy-unattached off &> /dev/null
-
-    # Enable the destruction of unattached sessions globally to prevent
-    # an abundance of open, detached sessions.
-    tmux set-option -g destroy-unattached on &> /dev/null
   fi
 
-  exec tmux new-session -t "$tmux_session"
+  # Attach to the 'prezto' session or to the last session used.
+  exec tmux attach-session
 fi
 
 #

modules/utility/README.md

@@ -50,6 +50,7 @@ Aliases
 
 ### Disabled File Globbing
 
+  - `bower`
   - `fc`
   - `find`
   - `ftp`

modules/utility/init.zsh

@@ -34,6 +34,7 @@ alias mysql='nocorrect mysql'
 alias rm='nocorrect rm'
 
 # Disable globbing.
+alias bower='noglob bower'
 alias fc='noglob fc'
 alias find='noglob find'
 alias ftp='noglob ftp'

runcoms/zpreztorc

@@ -87,6 +87,13 @@ zstyle ':prezto:module:editor' key-bindings 'emacs'
 # Auto set to 'off' on dumb terminals.
 zstyle ':prezto:module:prompt' theme 'sorin'
 
+#
+# Ruby
+#
+
+# Auto switch the Ruby version on directory change.
+# zstyle ':prezto:module:ruby:chruby' auto-switch 'yes'
+
 #
 # Screen
 #
@@ -145,4 +152,3 @@ zstyle ':prezto:module:prompt' theme 'sorin'
 
 # Auto start a session when Zsh is launched in a SSH connection.
 # zstyle ':prezto:module:tmux:auto-start' remote 'yes'
-