Allow perlbrew environment to be loaded via zstyle

When Emacs and Vim are launched from outside of an interactive shell,
$TMUX and $STY are not set; check for Emacs and Vim environment
variables instead.

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>

modules/directory/README.md

@@ -22,11 +22,7 @@ Aliases
 -------
 
   - `d` prints the contents of the directory stack.
-
-Functions
----------
-
-  - `command_not_found_handler` changes the directory to the **n** previous one.
+  - `1 ... 9` 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/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.
-  - `rm-osx-cruft` deletes .DS\_Store, \_\_MACOSX cruft.
+    changes the current working director to the current _Finder_ directory.
 
 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
-  set output to ""
+osascript 2>&1 <<EOF
   tell application "Finder" to set the_selection to selection
-  set item_count to count the_selection
-  repeat with item_index from 1 to count the_selection
-    if item_index is less than item_count then set the_delimiter to "\n"
-    if item_index is item_count then set the_delimiter to ""
-    set output to output & ((item item_index of the_selection as alias)'s POSIX path) & the_delimiter
-  end repeat
+  if the_selection is not {}
+    repeat with an_item in the_selection
+      log POSIX path of (an_item as text)
+    end repeat
+  end if
 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/perl/README.md

@@ -30,6 +30,10 @@ Perlbrew
 An alternative to the above is to use [Perlbrew][2], which allows for the
 management of multiple, isolated Perl installations in the home directory.
 
+You can specify the perlbrew location so the environment is automatically loaded.
+
+    zstyle ':prezto:module:perl:perlbrew' location '/path/to/perlbrew'
+
 Aliases
 -------
 

modules/perl/init.zsh

@@ -29,6 +29,13 @@ if [[ "$OSTYPE" == darwin* ]]; then
 
   unset perl_path
   unset cache_file
+
+  # Perlbrew
+  zstyle -s ':prezto:module:perl:perlbrew' location '_perlbrew_root' 
+  if [[ -s "${_perlbrew_root}/etc/bashrc" ]]; then
+    export PERLBREW_ROOT="${_perlbrew_root}"
+    source "${_perlbrew_root}/etc/bashrc"
+  fi
 fi
 
 #

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,
-isolated Ruby installations in the home directory.
+An alternative RVM is to use [rbenv][3], which allows for switching between
+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 "$INSIDE_EMACS" || -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/init.zsh

@@ -16,11 +16,11 @@ fi
 # Auto Start
 #
 
-if [[ -z "$TMUX" ]] && ( \
+if [[ -z "$TMUX" && ( -z "$INSIDE_EMACS" || -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_session='prezto'
 
   if ! tmux has-session -t "$tmux_session" 2> /dev/null; then
     # Ensure that tmux server is started.

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
 #