zsh_dots 0.5.1 → 0.5.3

data/lib/dots/aliases.zsh

@@ -1,40 +1,65 @@
-# = Aliases
-#
-# General purpose, time-saving aliases for everyday use.
-
-# Access the superuser for a single command.
+# System administration
 alias _='sudo'
-
-# Show command history.
 alias history='fc -l 1'
-
-# Use grep with ack.
 alias afind='ack-grep -il'
 
-# Reload DOTS after a change.
-alias reload="source $HOME/.zshenv; source $HOME/.zshrc"
+# Reload the DOTS framework and clear the screen.
 alias refresh="reload && clear"
-
-# Reload TextMate bundles.
-alias tmbundle="osascript -e 'tell app \"TextMate\" to reload bundles'"
-
-# Find all ._* files in the directory and remove them.
-alias rmbs="find . -type f -name '._*' -exec rm {} + && echo \"Removed all ._ files\""
-
-# Make `ed` easier to use.
+alias rmbs="rhombus"
 alias ed='ed -p "ed> "'
 
 # Dotfiles persistence
 alias persist='dots persist'
+alias pst='persist'
 alias forget='dots forget'
+alias fgt='forget'
 
 # File viewing and editing
 alias v=$PAGER
+alias e='editor'
 
 # Terminal support
 alias c='clear'
-aliasias ti='set_title'
-alias o='open .'
+alias ti='set_title'
+alias o='open_file_or_directory'
+alias p='echo'
+
+# iOS development
+alias ripple='canary'
+
+# Application deployment
+alias dp='bundle exec rain on production'
+alias ds='bundle exec rain on stage'
+
+# Language REPLs
+alias rb='ruby'
+alias py='python'
+alias js='node'
+alias json='jsonlint'
+
+# Running Ruby tests
+alias t='run_single_test'
+alias rts='rtest_rake'
+
+# Kill the first Ruby process.
+alias kill_first_ruby_process="kill -9 `ps -A | grep ruby | awk '{ print $1 }' | head -n 1`"
+alias krp='kill_first_ruby_process'
+
+alias fs='foreman start'
+alias reload='dots update'
+
+alias guard='nocorrect guard --no-bundler-warning'
+alias rspec='nocorrect rspec'
+alias rain='nocorrect rain'
+
+# Kill it with fire
+alias k9='kill -9'
+
+# Sane defaults for the `patch` command, reverts a given diff.
+alias revert='patch -R -p1'
+
+# Set up Autoenv for this directory.
+alias cfg='source .env'
 
-# Ripple
-alias ripple='open /Applications/Google\ Chrome\ Canary.app --args -disable-web-security'
+# Just in case..
+alias dots='nocorrect dots'

data/lib/dots/directories.zsh

@@ -1,7 +1,3 @@
-# = Directories
-#
-# Quick aliases for development endpoints.
-
 # eLocal web application
 elocal=$HOME/Code/elocal
 alias elocal='nocorrect elocal'

data/lib/dots/functions.zsh

@@ -1,8 +1,3 @@
-# = Functions
-#
-# New commands that were a bit complicated for simple aliases, or otherwise didn't
-# work in the alias world. All kinds of functionality here.
-
 # Installs the "OSX For Hackers" shellscript, which plays with some of the OS X defaults to give you
 # a faster and more enjoyable experience, albeit with a little less minimalism going on.
 #
@@ -17,20 +12,42 @@ function proc() {
   ps -A | grep $1
 }
 
-# Load the README.md file into mvim as well as the current directory, as defined by the
-# functionality of the macvim_drawer plugin. Requires macvim_drawer to be installed, 
+# Load the README.md file into mvim as well as the current 
+# directory, as defined by the functionality of the 
+# macvim_drawer plugin. Requires macvim_drawer to be installed, 
 # regular MacVim will break with this function.
-function e() {
-  if [[ $EDITOR == 'mvim']] && [[ $DRAWER == true ]]; then
-    if [[ -f "./README.md" ]]; then
-      mvim README.md
-    elif [[ -f "./README.rdoc" ]]; then
-      mvim README.rdoc
-    else
-      mvim
-    fi
+function editor() {
+  if (($+DRAWER)); then
+    #if [[ -f "./README.md" ]]; then
+      #let readme = "README.md"
+    #elif [[ -f "./README.rdoc" ]]; then
+      #let readme = "README.rdoc"
+    #elif [[ -f "./README.textile" ]]; then
+      #let readme = "README.textile"
+    #elif [[ -f "./README" ]]; then
+      #let readme = "README"
+    #elif [[ -f "./README.txt" ]]; then
+      #let readme = "README.txt"
+    #else
+      #let readme = ""
+    #fi
+  fi
+
+  if (($+VISUAL)); then
+    $VISUAL $1
+  elif (($+EDITOR)); then
+    $EDITOR $1
   else
-    $EDITOR
+    echo "Please set your \$EDITOR or \$VISUAL before using this command."
+  fi
+}
+
+# Open the given file, or a directory if no input is given.
+function open_file_or_directory() {
+  if [[ $1 != "" ]]; then
+    open $1
+  else
+    open .
   fi
 }
 
@@ -43,3 +60,31 @@ function set_title() {
 function exit_code() {
   cat /usr/include/sysexits.h | grep "$1"
 }
+
+# Run a line of AppleScript to reload the bundles in TextMate.
+function tmbundle() {
+  osascript -e 'tell app \"TextMate\" to reload bundles'
+}
+
+function update_dots() {
+  dots update > /dev/null
+}
+
+# Reload DOTS after a change.
+function reload_dots() {
+  source $HOME/.zshenv
+  source $HOME/.zshrc
+  echo 'DOTS reloaded!'
+}
+
+# Open Google Chrome Canary and disable web
+# security. For iOS developers using Ripple.
+function canary() {
+  open /Applications/Google\ Chrome\ Canary.app --args -disable-web-security
+}
+
+# Remove TextMate junk from the directory.
+function rhombus() {
+  find . -type f -name '._*' -exec rm {} +
+  echo "Removed all ._ files"
+}

data/lib/dots/plugins.zsh

@@ -1,18 +1,25 @@
 # Load the plugin architecture
-source "$ZSH/vendor/antigen.zsh"
+source "$ZSH/vendor/antigen/antigen.zsh"
 
 # Set up the plugin architecture
 antigen-lib
 
-# Load plugins
-antigen-bundle tubbo/dots lib/plugins/aws
-antigen-bundle tubbo/dots lib/plugins/bundler
+# Bare Oh My ZSH plugins
 antigen-bundle cap
-antigen-bundle tubbo/dots lib/plugins/git
-antigen-bundle tubbo/dots lib/plugins/git-flow
-antigen-bundle tubbo/dots lib/plugins/knife
-antigen-bundle tubbo/dots lib/plugins/macvim
-antigen-bundle tubbo/dots lib/plugins/osx
-antigen-bundle tubbo/dots lib/plugins/rails3
-antigen-bundle tubbo/dots lib/plugins/ruby
+
+# Local modifications to OMZ plugins
+antigen-bundle $HOME/.dots lib/plugins/bundler
+antigen-bundle $HOME/.dots lib/plugins/git
+antigen-bundle $HOME/.dots lib/plugins/git-process
+antigen-bundle $HOME/.dots lib/plugins/knife
+antigen-bundle $HOME/.dots lib/plugins/osx
+antigen-bundle $HOME/.dots lib/plugins/rails3
+antigen-bundle $HOME/.dots lib/plugins/ruby
+antigen-bundle kennethreitz/autoenv
+
+# From alternative sources
 antigen-bundle zsh-users/zsh-syntax-highlighting
+#antigen-bundle kennethreitz/autoenv
+
+# Apply loaded plugins to the environment
+antigen-apply

data/lib/plugins/git/git.plugin.zsh

@@ -38,13 +38,13 @@ alias glg='git log --graph --max-count=5'
 compdef _git glg=git-log
 alias lol='git lol'
 compdef _git lol=git-log
-alias gss='git status -s'
+alias gsts='git status -s'
 compdef _git gss=git-status
 alias ga='git add'
 compdef _git ga=git-add
 alias gm='git merge'
 compdef _git gm=git-merge
-alias gls="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
+alias gls="git l"
 compdef _git gls=git-log
 alias grv='git remote -v'
 compdef _get grv=git-remote
@@ -62,18 +62,16 @@ alias gts='git reset --soft'
 compdef _get gt=git-reset
 alias gthh='git reset --hard HEAD'
 compdef _get gt=git-reset
-alias gs='git pull --rebase && git push'
-compdef _get gs=git-pull
-compdef _get gs=git-push
-alias gsf='git pull --rebase && git push tubbo'
-compdef _get gs=git-pull
-compdef _get gs=git-push
-alias gy='git synchronize'
-compdef _get gy=git-synchronize
 alias garc='ga . && grc'
 compdef _get garc=git-add
 compdef _get garc=git-rebase
 
+# Stash
+alias gs='git stash save'
+compdef _get gsh=git-stash
+alias gsp='git stash pop'
+compdef _get gsh=git-stash
+
 # Merging and Rebasing
 alias gr='git rebase'
 compdef _get gg=git-rebase
@@ -97,19 +95,17 @@ compdef _get grv=git-status
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 compdef git-svn-dcommit-push=git
+alias gvr='git svn rebase'
+alias gvd='git svn dcommit'
 
-alias gsr='git svn rebase'
-alias gsd='git svn dcommit'
-#
 # Will return the current branch name
 # Usage example: git pull origin $(current_branch)
-#
 function current_branch() {
   ref=$(git symbolic-ref HEAD 2> /dev/null) || return
   echo ${ref#refs/heads/}
 }
 
-# these aliases take advantage of the previous function
+# These aliases take advantage of the previous function
 alias ggpull='git pull origin $(current_branch)'
 compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
@@ -121,6 +117,3 @@ compdef ggpnp=git
 if (( $+commands[hub] )) ; then
   function git() {hub "$@"}
 fi
-
-# SHIP IT
-alias ship='echo ">>> SHIP IT <<<"; git checkout master; git pull --rebase origin master; git merge develop; git push origin master'

data/lib/plugins/git-process/git-process.plugin.zsh

@@ -0,0 +1,20 @@
+#!zsh
+#
+# git-process plugin
+# -------------------
+#
+# Shortcuts and other useful sugar that goes well with git-process.
+
+
+# Create a new feature branch based on the integration branch.
+alias gf='git new-fb'
+
+# Gets the latest changes that have happened on the integration branch, then pushes your changes to a "private" branch on the server.
+alias gy='git sync --rebase'
+alias gym='git sync' # because merging should be harder to do than rebasing
+
+# Creates a Pull Request for the current branch.
+alias gq='git pull-request'
+
+# Rebase against the integration branch, then push to it.
+alias gu='git to-master'

data/lib/plugins/osx/osx.plugin.zsh

@@ -98,4 +98,6 @@ function trash() {
 }
 
 alias ql='quick-look'
-alias osx_for_hackers='source $ZSH/lib/plugins/osx/osx_for_hackers.zsh'
+
+# Configure OSX using a modified version of 'OSX for Hackers'.
+alias osx_bootstrap='source $DOTS/config/osx.sh'

data/lib/plugins/rails3/rails3.plugin.zsh

@@ -61,7 +61,7 @@ alias rsp='bundle exec foreman start' # Rails Server and Processes
 # Rake tasks
 alias rdm='rake db:migrate'
 alias rdr='rake db:rollback'
-alias rdbm='rake db:migrate db:test:clone'
+alias rdbm='rake db:migrate db:test:prepare'
 alias rt='rake test'
 alias rtu='rake test:units'
 alias rtf='rake test:functionals'

data/lib/plugins/ruby/ruby.plugin.zsh

@@ -49,10 +49,13 @@ eval "function rtest_bare () {_rbtest_without_rake \$@}"
 alias rtest='nocorrect rtest_bare'
 alias rtest_rake='nocorrect rtest_rake'
 
-# Shorthand aliases
-alias t='rtest'
-alias rts='rtest_rake'
+# Framework-agnostic testing command.
+run_single_test() {
+  if [ -f "spec/spec_helper.rb" ]; then
+    bundle exec rspec $@;
+  else
+    rtest $@;
+  fi
+}
 
-# Run a ruby script
-alias rb='ruby'
 

data/lib/ruby/dots/bootstrap.rb

@@ -0,0 +1,56 @@
+module Dots
+  module Bootstrap
+    include Thor::Actions
+
+    # These are the programs we are going to download from Homebrew.
+    PROGRAMS = %w(httpie git ruby)
+
+    # Install C binaries, Python programs, and other useful tools
+    # from Homebrew.
+    def install_programs
+      if installed? "brew"
+        programs_to_install = PROGRAMS.reduce([]) { |programs, program|
+          programs << program unless installed? program
+        }.join " "
+
+        system "brew install #{programs_to_install}" \
+          unless programs_to_install.empty?
+      else
+        install_homebrew
+      end
+    end
+
+    # Install the latest version of all gems to the global gemset. These
+    # gems are configured in +~/.Gemfile+.
+    def install_bundle
+      system "cd #{Dots::HOME} && #{bundle_install}"
+    end
+
+  private
+    def installed? command
+      `which #{command}` != ""
+    end
+
+    def bundle_install
+      return install_global_gemset if installed? 'bundle'
+      "#{install_bundler} #{install_global_gemset}"
+    end
+
+    def install_global_gemset
+      "bundle install --gemfile=#{global_gemset}"
+    end
+
+    def install_bundler
+      "gem install bundler"
+    end
+
+    # Install the latest version of the Homebrew package manager.
+    def install_homebrew
+      %x[ruby -e "$(curl -fsSkL raw.github.com/mxcl/homebrew/go)"]
+    end
+
+    def global_gemset
+      "#{Dots.root}/config/Gemfile"
+    end
+  end
+end

data/lib/ruby/dots/command.rb

@@ -1,45 +1,26 @@
+require 'dots/persistence'
+require 'dots/installation'
+require 'dots/bootstrap'
+
 module Dots
   class Command < Thor
-    include FileUtils
-
+    include Thor::Actions, Dots::Persistence, Dots::Installation, Dots::Bootstrap
     default_task :usage
 
     desc :usage, "Show usage information"
     def usage
-      say <<-TEXT
-
-The DOTS Project
-
-DOTS is a ZSH Framework for managing your dotfiles and other shell configuration.
-It also gives you some nice, sensible defaults and time-saver aliases to better
-work with and understand your shell environment.
-
-The following tasks are meant to help you use the shell more efficiently...
-
-      TEXT
-
-      help
+      say Dots::USAGE_INFORMATION and help
     end
 
-    desc :update, "Update DOTS to the latest version"
-    def update
-      %x(cd ~/.dots && git pull origin master)
-    end
-
-    desc :install, "Installs DOTS to ~/.dots and links all of your dotfiles"
+    desc :install, "Copies DOTS to your home directory."
+    alias install install_framework
     def install
-      %x(ln -s #{installation_path} ~/.dots)
-
-      Dir[File.expand_path("~/.dots/config")].each do |config_file|
-        file_name = File.basename config_file
-        dot_file = File.expand_path "~/.#{file_name}"
+      copy_to_home_directory and link_dot_files
+    end
 
-        if File.exists? dot_file
-          say "Skipping #{dot_file} as it already exists. Manually merge and symlink later with `dots persist`."
-        else
-          %x(ln -s #{config_file} #{dot_file})
-        end
-      end
+    desc :update, "Update DOTS, Antigen and all plugins to their latest version."
+    def update
+      update_the_framework
     end
 
     desc :version, "Show the current version of DOTS"
@@ -47,28 +28,26 @@ The following tasks are meant to help you use the shell more efficiently...
       say "DOTS version #{Dots::VERSION} - http://tubbo.github.com/dots"
     end
 
-    desc :persist, "Copy a dotfile to .dots/config and symlink the original location"
-    def persist file_name
-      dot_file = Dots::DotFile.new file_name
+    desc :link, "Symlink your ~/.dots/config into dotfiles"
+    def link
+      link_dot_files
+    end
 
-      if dot_file.save
-        say "#{dot_file} saved to DOTS!"
-      else
-        say "Error: #{dot_file} could not be symlinked:"
-        dot_file.errors.full_messages.each { |msg| say "- #{msg}" }
-      end
+    desc :persist, "Copy a dotfile to .dots/config and symlink the original location"
+    alias persist persist_file
+    def persist_file name
+      persist_dot_file name
     end
 
     desc :forget, "Remove the symlink and restore a dotfile back to its original location"
-    def forget file_name
-      dot_file = Dots::DotFile.find file_name
+    alias forget forget_file
+    def forget_file name
+      forget_dot_file name
+    end
 
-      if dot_file.destroy
-        say "#{dot_file} is no longer being persisted."
-      else
-        say "Error: #{dot_file} could not be forgotten:"
-        dot_file.errors.full_messages.each { |msg| say "- #{msg}" }
-      end
+    desc :bootstrap, "Install the whole shebang: gems, C programs, Python stuff, DOTS."
+    def bootstrap
+      install_programs and install_bundle and install_framework
     end
   end
 end

data/lib/ruby/dots/installation.rb

@@ -0,0 +1,53 @@
+# = Dots::Installation
+#
+# These are various tasks that DOTS uses to install itself onto each
+# machine. While most RubyGems are served from its directory in
+# GEM_HOME, DOTS is primarily run from the user's home directory,
+# since a user typically makes all kinds of shell configuration
+# enhancements after installing.
+module Dots
+  module Installation
+    include Thor::Actions
+
+    # The Git remote we'll be pulling from. Set this in your +~/.zshenv+
+    # to use a different fork of the project.
+    REMOTE = ENV['DOTS_REMOTE']
+
+    # Attempts to update DOTS, but fails if changes are detected
+    # in the repo beforehand.
+    #
+    # The +git ls-files -m+ command will return no results when there
+    # are no modified files in the repo. This method blocks DOTS from
+    # installing itself overtop of your committed changes, as well as
+    # saves the user from an ugly Git error...
+    def update_the_framework
+      if repo_is_clean?
+        pull_from_origin and run 'reload_dots'
+      else
+        say "You have uncommitted changes in ~/.dots. Please resolve them before updating."
+      end
+    end
+
+    def copy_to_home_directory
+      system "mkdir -p #{Dots.home} cp -R #{Dots.root} #{Dots.home}"
+    end
+
+    # Fetches and rebases the same code stored in +Dots.root+ to
+    # +~/.dots+. This essentially replays your own local changes on
+    # top of the official updates to the framework. If you're using
+    # a fork, you can set +DOTS_REMOTE+ to the remote's name in
+    # origin (this will default to your Github username, by the way).
+    def pull_latest_changes
+      system "cd #{Dots.home} && #{git_pull}"
+    end
+
+  private
+    def repo_is_clean?
+      `cd #{Dots.home} && git ls-files -m`.split("\n").empty?
+    end
+
+    def git_pull
+      "git pull --rebase #{REMOTE} #{Dots::VERSION}"
+    end
+  end
+end

data/lib/ruby/dots/installer.rb

@@ -0,0 +1,2 @@
+module Installer
+end

data/lib/ruby/dots/persistence.rb

@@ -0,0 +1,41 @@
+module Dots
+  module Persistence
+    include Thor::Actions
+
+    # Run through every file in +~/.dots/config+ and symlink them to
+    # +~/.+.
+    def link_dot_files
+      Dir[File.expand_path("~/.dots/config/*")].each do |config_file|
+        persist_dot_file config_file
+      end
+    end
+
+    # Moves the given +~/.file+ to the repo, while saving its original
+    # location. It then symlinks the new location to the old location
+    # so applications will continue to run.
+    def persist_dot_file file_name
+      dot_file = Dots::DotFile.new file_name
+
+      if dot_file.save
+        say "#{dot_file} saved to DOTS!"
+      else
+        say "Error: #{dot_file} could not be symlinked:"
+        dot_file.errors.full_messages.each { |msg| say "- #{msg}" }
+      end
+    end
+
+    # Restores the given configuration file that's in the repo back
+    # to an unremembered state. Deletes the symlink and places the
+    # file back to its perceived original location in +~/.file+.
+    def forget_dot_file file_name
+      dot_file = Dots::DotFile.find file_name
+
+      if dot_file.destroy
+        say "#{dot_file} is no longer being persisted."
+      else
+        say "Error: #{dot_file} could not be forgotten:"
+        dot_file.errors.full_messages.each { |msg| say "- #{msg}" }
+      end
+    end
+  end
+end

data/lib/ruby/dots/version.rb

@@ -1,3 +1,3 @@
 module Dots
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

data/lib/ruby/dots.rb

@@ -1,9 +1,39 @@
+require 'rubygems'
+require 'fileutils'
 require 'thor'
 require 'active_model'
-require 'fileutils'
-
 require 'dots/dot_file'
 require 'dots/command'
 require 'dots/version'
+require 'dots/persistence'
+require 'dots/installation'
+
+module Dots
+  # The root path of the DOTS gem.
+  def self.root
+    @root_dir ||= begin
+      spec = Gem::Specification.find_by_name 'zsh_dots'
+      spec.gem_dir
+    end
+  end
+
+  # The home directory of DOTS.
+  def self.home
+    @home_dir ||= File.expand_path "~/.dots"
+  end
+
+  # Usage information for the DOTS command line tool.
+  USAGE_INFORMATION = <<-TEXT
+
+  The DOTS Project
+
+  DOTS is a ZSH Framework for managing your dotfiles and other shell configuration.
+  It also gives you some nice, sensible defaults and time-saver aliases to better
+  work with and understand your shell environment.
+
+  The following tasks are meant to help you use the shell more efficiently...
+
+  TEXT
+
+end
 
-module Dots; end