Merge pull request #2 from robbyrussell/master

rebasing with upstream/master

lib/misc.zsh

@@ -22,7 +22,12 @@ alias _='sudo'
 alias please='sudo'
 
 ## more intelligent acking for ubuntu users
-alias afind='ack-grep -il'
+if which ack-grep &> /dev/null;
+then
+  alias afind='ack-grep -il'
+else
+  alias afind='ack -il'
+fi
 
 # only define LC_CTYPE if undefined
 if [[ -z "$LC_CTYPE" && -z "$LC_ALL" ]]; then

plugins/atom/README.md

@@ -1,23 +0,0 @@
-## atom
-
-This plugin makes "at" a useful function for invoking the Atom Editor.
-
-Originally by Github user [aforty](https://github.com/aforty) for OSX, modified to alias 'at' to 'atom' for Linux, since atom already works on the terminal for Linux, and calling 'at' in a non-OSX environment should still work.
-
-### Requirements
-
- * [Atom](https://atom.io/)
-
-### Usage
-
- * If `at` command is called without an argument, launch Atom
-
- * If `at` is passed a directory, open it in Atom
-
- * If `at` is passed a file, open it in Atom
-
-### Examples
-
- * Open the current dir in atom: `at .`
- * Open another dir in atom: `at path/to/folder`
- * Open a file: `at filename.extension`

plugins/atom/atom.plugin.zsh

@@ -1,37 +0,0 @@
-case $OSTYPE in
-darwin*)
-    local _atom_paths > /dev/null 2>&1
-    _atom_paths=(
-        "$HOME/Applications/Atom.app"
-        "/Applications/Atom.app"
-    )
-
-    for _atom_path in $_atom_paths; do
-        if [[ -a $_atom_path ]]; then
-            alias at="open -a '$_atom_path'"
-            break
-        fi
-    done
-    ;;
-cygwin)
-    local _atom_path > /dev/null 2>&1
-
-    _atom_path=${LOCALAPPDATA}/atom/bin/atom
-
-    if [[ -a $_atom_path ]]; then
-        cyg_open_atom()
-        {
-            if [[ -n $1 ]]; then
-                ${_atom_path} `cygpath -w -a $1`
-            else
-                ${_atom_path}
-            fi
-        }
-
-        alias at=cyg_open_atom
-    fi
-    ;;
-linux*)
-    # Alerts the user if 'atom' is not a found command.
-    type atom >/dev/null 2>&1 && alias at="atom" || { echo >&2 "You have enabled the atom oh-my-zsh plugin on Linux, but atom is not a recognized command. Please make sure you have it installed before using this plugin."; }
-esac

plugins/git-extras/README.md

@@ -0,0 +1,11 @@
+# git-extras
+
+This plugin provides completion definitions for some of the commands defined by [git-extras](http://github.com/tj/git-extras).
+
+##  Setup notes
+
+The completions work by augmenting the `_git` completion provided by `zsh`. This only works with the `zsh`-provided `_git`, not the `_git` provided by `git` itself. If you have both `zsh` and `git` installed, you need to make sure that the `zsh`-provided `_git` takes precedence.
+
+### OS X Homebrew Setup
+
+On OS X with Homebrew, you need to install `git` with `brew install git --without-completions`. Otherwise, `git`'s `_git` will take precedence, and you won't see the completions for `git-extras` commands.

plugins/git-extras/git-extras.plugin.zsh

@@ -1,10 +1,13 @@
-#compdef git
 # ------------------------------------------------------------------------------
 # Description
 # -----------
 #
 #  Completion script for git-extras (http://github.com/tj/git-extras).
 #
+#  This depends on and reueses some of the internals of the _git completion
+#  function that ships with zsh itself. It will not work with the _git that ships
+#  with git.
+#
 # ------------------------------------------------------------------------------
 # Authors
 # -------
@@ -22,16 +25,18 @@
 # ------------------------------------------------------------------------------
 
 
-__git_command_successful () {
+# Internal functions
-    if (( ${#pipestatus:#0} > 0 )); then
+# These are a lot like their __git_* equivalents inside _git
-        _message 'not a git repository'
+
-        return 1
+__gitex_command_successful () {
-    fi
+  if (( ${#*:#0} > 0 )); then
-    return 0
+    _message 'not a git repository'
+    return 1
+  fi
+  return 0
 }
 
-
+__gitex_commits() {
-__git_commits() {
     declare -A commits
     git log --oneline -15 | sed 's/\([[:alnum:]]\{7\}\) /\1:/' | while read commit
     do
@@ -42,7 +47,7 @@ __git_commits() {
     _describe -t commits commit commits && ret=0
 }
 
-__git_tag_names() {
+__gitex_tag_names() {
     local expl
     declare -a tag_names
     tag_names=(${${(f)"$(_call_program tags git for-each-ref --format='"%(refname)"' refs/tags 2>/dev/null)"}#refs/tags/})
@@ -51,7 +56,7 @@ __git_tag_names() {
 }
 
 
-__git_branch_names() {
+__gitex_branch_names() {
     local expl
     declare -a branch_names
     branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
@@ -59,7 +64,7 @@ __git_branch_names() {
     _wanted branch-names expl branch-name compadd $* - $branch_names
 }
 
-__git_specific_branch_names() {
+__gitex_specific_branch_names() {
     local expl
     declare -a branch_names
     branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/"$1" 2>/dev/null)"}#refs/heads/$1/})
@@ -67,32 +72,28 @@ __git_specific_branch_names() {
     _wanted branch-names expl branch-name compadd $* - $branch_names
 }
 
-
+__gitex_feature_branch_names() {
-__git_feature_branch_names() {
+    __gitex_specific_branch_names 'feature'
-    __git_specific_branch_names 'feature'
 }
 
-
+__gitex_refactor_branch_names() {
-__git_refactor_branch_names() {
+    __gitex_specific_branch_names 'refactor'
-    __git_specific_branch_names 'refactor'
 }
 
-
+__gitex_bug_branch_names() {
-__git_bug_branch_names() {
+    __gitex_specific_branch_names 'bug'
-    __git_specific_branch_names 'bug'
 }
 
-
+__gitex_submodule_names() {
-__git_submodule_names() {
     local expl
     declare -a submodule_names
-    submodule_names=(${(f)"$(_call_program branchrefs git submodule status | awk '{print $2}')"})
+    submodule_names=(${(f)"$(_call_program branchrefs git submodule status | awk '{print $2}')"})  # '
     __git_command_successful || return
     _wanted submodule-names expl submodule-name compadd $* - $submodule_names
 }
 
 
-__git_author_names() {
+__gitex_author_names() {
     local expl
     declare -a author_names
     author_names=(${(f)"$(_call_program branchrefs git log --format='%aN' | sort -u)"})
@@ -123,7 +124,7 @@ _git-bug() {
             case $line[1] in
                 (finish)
                     _arguments -C \
-                        ':branch-name:__git_bug_branch_names'
+                        ':branch-name:__gitex_bug_branch_names'
                     ;;
             esac
     esac
@@ -139,7 +140,7 @@ _git-changelog() {
 
 _git-contrib() {
     _arguments \
-        ':author:__git_author_names'
+        ':author:__gitex_author_names'
 }
 
 
@@ -151,19 +152,19 @@ _git-count() {
 
 _git-delete-branch() {
     _arguments \
-        ':branch-name:__git_branch_names'
+        ':branch-name:__gitex_branch_names'
 }
 
 
 _git-delete-submodule() {
     _arguments \
-        ':submodule-name:__git_submodule_names'
+        ':submodule-name:__gitex_submodule_names'
 }
 
 
 _git-delete-tag() {
     _arguments \
-        ':tag-name:__git_tag_names'
+        ':tag-name:__gitex_tag_names'
 }
 
 
@@ -172,6 +173,7 @@ _git-effort() {
         '--above[ignore file with less than x commits]'
 }
 
+
 _git-extras() {
     local curcontext=$curcontext state line ret=1
     declare -A opt_args
@@ -216,7 +218,7 @@ _git-feature() {
             case $line[1] in
                 (finish)
                     _arguments -C \
-                        ':branch-name:__git_feature_branch_names'
+                        ':branch-name:__gitex_feature_branch_names'
                     ;;
             esac
     esac
@@ -225,8 +227,8 @@ _git-feature() {
 
 _git-graft() {
     _arguments \
-        ':src-branch-name:__git_branch_names' \
+        ':src-branch-name:__gitex_branch_names' \
-        ':dest-branch-name:__git_branch_names'
+        ':dest-branch-name:__gitex_branch_names'
 }
 
 
@@ -236,12 +238,14 @@ _git-ignore() {
         '(--global -g)'{--global,-g}'[show global gitignore]'
 }
 
+
 _git-missing() {
     _arguments \
-        ':first-branch-name:__git_branch_names' \
+        ':first-branch-name:__gitex_branch_names' \
-        ':second-branch-name:__git_branch_names'
+        ':second-branch-name:__gitex_branch_names'
 }
 
+
 _git-refactor() {
     local curcontext=$curcontext state line ret=1
     declare -A opt_args
@@ -263,7 +267,7 @@ _git-refactor() {
             case $line[1] in
                 (finish)
                     _arguments -C \
-                        ':branch-name:__git_refactor_branch_names'
+                        ':branch-name:__gitex_refactor_branch_names'
                     ;;
             esac
     esac
@@ -272,12 +276,12 @@ _git-refactor() {
 
 _git-squash() {
     _arguments \
-        ':branch-name:__git_branch_names'
+        ':branch-name:__gitex_branch_names'
 }
 
 _git-summary() {
-    _arguments '--line[summarize with lines other than commits]'
+    _arguments '--line[summarize with lines rather than commits]'
-    __git_commits
+    __gitex_commits
 }
 
 

plugins/git-hubflow/git-hubflow.plugin.zsh

@@ -20,6 +20,13 @@
 #     c. Or, use this file as an oh-my-zsh plugin.
 #
 
+alias ghf='git hf'
+alias ghff='git hf feature'
+alias ghfr='git hf release'
+alias ghfh='git hf hotfix'
+alias ghfs='git hf support'
+alias ghfu='git hf update'
+
 _git-hf ()
 {
     local curcontext="$curcontext" state line

plugins/gulp/gulp.plugin.zsh

@@ -19,8 +19,8 @@
 # Grabs all available tasks from the `gulpfile.js`
 # in the current directory.
 #
-function $$gulp_completion() {
+function $$gulp_completion {
-    compls=$(grep -Eo "gulp.task\((['\"](([a-zA-Z0-9]|-)*)['\"],)" gulpfile.js 2>/dev/null | grep -Eo "['\"](([a-zA-Z0-9]|-)*)['\"]" | sed s/"['\"]"//g | sort)"
+    compls="$(grep -Eo "gulp.task\((['\"](([a-zA-Z0-9]|-)*)['\"],)" gulpfile.js 2>/dev/null | grep -Eo "['\"](([a-zA-Z0-9]|-)*)['\"]" | sed s/"['\"]"//g | sort)"
 
     completions=(${=compls})
     compadd -- $completions

plugins/nmap/README.md

@@ -19,14 +19,19 @@ Nmap options are:
 
 ## Aliases explained
 
- * nmap_open_ports - scan for open ports on target
+ * nmap_open_ports - Scan for open ports on target
- * nmap_list_interfaces - list all network interfaces on host where the command runs
+ * nmap_list_interfaces - List all network interfaces on host where the command runs
- * nmap_slow - slow scan that avoids to spam the targets logs
+ * nmap_slow - Slow scan that avoids to spam the targets logs
- * nmap_fin - scan to see if hosts are up with TCP FIN scan
+ * nmap_fin - Scan to see if hosts are up with TCP FIN scan
- * nmap_full - aggressive full scan that scans all ports, tries to determine OS and service versions
+ * nmap_full - Aggressive full scan that scans all ports, tries to determine OS and service versions
  * nmap_check_for_firewall - TCP ACK scan to check for firewall existence
  * nmap_ping_through_firewall - Host discovery with SYN and ACK probes instead of just pings to avoid firewall
    restrictions
  * nmap_fast - Fast scan of the top 300 popular ports
- * nmap_detect_versions - detects versions of services and OS, runs on all ports
+ * nmap_detect_versions - Detects versions of services and OS, runs on all ports
- * nmap_check_for_vulns - uses vulscan script to check target services for vulnerabilities
+ * nmap_check_for_vulns - Uses vulscan script to check target services for vulnerabilities
+ * nmap_full_udp - Same as full but via UDP
+ * nmap_traceroute - Try to traceroute using the most common ports
+ * nmap_full_with_scripts - Same as nmap_full but also runs all the scripts
+ * nmap_web_safe_osscan - Little "safer" scan for OS version  as connecting to only HTTP and HTTPS ports doesn't look so attacking.
+

plugins/nmap/nmap.plugin.zsh

@@ -22,7 +22,11 @@ alias nmap_fin="nmap -sF -v"
 alias nmap_full="nmap -sS -T4 -PE -PP -PS80,443 -PY -g 53 -A -p1-65535 -v"
 alias nmap_check_for_firewall="nmap -sA -p1-65535 -v -T4"
 alias nmap_ping_through_firewall="nmap -PS -PA"
-alias nmap_fast="nmap -F -T5 --top-ports 300"
+alias nmap_fast="nmap -F -T5 --version-light --top-ports 300"
 alias nmap_detect_versions="nmap -sV -p1-65535 -O --osscan-guess -T4 -Pn"
 alias nmap_check_for_vulns="nmap --script=vulscan"
+alias nmap_full_udp="nmap -sS -sU -T4 -A -v -PE -PS22,25,80 -PA21,23,80,443,3389 "
+alias nmap_traceroute="nmap -sP -PE -PS22,25,80 -PA21,23,80,3389 -PU -PO --traceroute "
+alias nmap_full_with_scripts="sudo nmap -sS -sU -T4 -A -v -PE -PP -PS21,22,23,25,80,113,31339 -PA80,113,443,10042 -PO --script all " 
+alias nmap_web_safe_osscan="sudo nmap -p 80,443 -O -v --osscan-guess --fuzzy "
 

plugins/npm/npm.plugin.zsh

@@ -1,8 +1,9 @@
 eval "$(npm completion 2>/dev/null)"
 
+# Install dependencies globally
+alias npmg="npm i -g "
 
 # npm package names are lowercase
-# - https://twitter.com/substack/status/23122603153150361
 # Thus, we've used camelCase for the following aliases:
 
 # Install and save to dependencies in your package.json
@@ -12,6 +13,7 @@ alias npmS="npm i -S "
 # Install and save to dev-dependencies in your package.json
 # npmd is used by https://github.com/dominictarr/npmd
 alias npmD="npm i -D "
+
 # Execute command from node_modules folder based on current directory
 # i.e npmE gulp
 alias npmE='PATH="$(npm bin)":"$PATH"'

plugins/rails/rails.plugin.zsh

@@ -59,7 +59,7 @@ alias rn='rake notes'
 alias rr='rake routes'
 alias rrg='rake routes | grep'
 alias rt='rake test'
-
+alias rmd='rake middleware'
 
 # legacy stuff
 alias sstat='thin --stats "/thin/stats" start'

plugins/textmate/textmate.plugin.zsh

@@ -1,11 +1,3 @@
-alias et='mate .'
-alias ett='mate Gemfile app config features lib db public spec test Rakefile Capfile Todo'
-alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
-alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
-
-# Edit Ruby app in TextMate
-alias mr='mate CHANGELOG app config db lib public script spec test'
-
 # If the tm command is called without an argument, open TextMate in the current directory
 # If tm is passed a directory, cd to it and open it in TextMate
 # If tm is passed a file, open it in TextMate

plugins/xcode/xcode.plugin.zsh

@@ -179,7 +179,10 @@ function simulator {
   if [[ -d "${devfolder}/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app" ]]; then
     open "${devfolder}/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app"
   # Xcode ≥ 6.x
-  else
+  elif [[ -d "${devfolder}/Applications/iOS Simulator.app" ]]; then
     open "${devfolder}/Applications/iOS Simulator.app"
+  # Xcode ≥ 7.x
+  else
+    open "${devfolder}/Applications/Simulator.app"
   fi
 }