zsh_dots 0.5.1 → 0.5.3

data/spec/integration/command_spec.rb

@@ -8,7 +8,7 @@ describe Dots::Command do
   end
 
   describe "persist PATH" do
-    let(:subject) { %x(./bin/dots persist ~/.dot_file) }
+    subject { %x(./bin/dots persist ~/.dot_file) }
 
     it "copies the file to the dots repo" do
       subject.should_not be_blank
@@ -16,7 +16,7 @@ describe Dots::Command do
   end
 
   describe "forget PATH" do
-    let(:subject) { %x(./bin/dots forget ~/.dot_file) }
+    subject { %x(./bin/dots forget ~/.dot_file) }
 
     it "restores the file to its original location" do
       subject.should_not be_blank
@@ -24,7 +24,7 @@ describe Dots::Command do
   end
 
   describe "bare invocation" do
-    let(:subject) { %x(./bin/dots) }
+    subject { %x(./bin/dots) }
 
     it "shows usage information" do
       subject.should_not be_blank

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zsh_dots
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2012-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70358833531220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70358833531220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70358833530800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70358833530800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70358833530380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358833530380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: DOTS is an advanced ZSH framework.
 email:
 - tubbo@psychedeli.ca
@@ -53,7 +68,9 @@ executables:
 - gbrt
 - git_cwd_info
 - lein
+- loggly
 - reattach-to-user-namespace
+- repl.sh
 - ssh-copy-id
 - stock
 extensions: []
@@ -61,7 +78,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .gitmodules
-- .rvmrc
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -71,20 +87,24 @@ files:
 - bin/gbrt
 - bin/git_cwd_info
 - bin/lein
+- bin/loggly
 - bin/reattach-to-user-namespace
+- bin/repl.sh
 - bin/ssh-copy-id
 - bin/stock
-- config/.dot_file
-- config/aws
+- config/Gemfile
+- config/bundle/config
 - config/example.aws.zsh
 - config/gemrc
 - config/gitconfig
+- config/gitignore
+- config/muttrc.example
+- config/osx.zsh
 - config/railsrc
 - config/rspec
-- config/rvmrc
 - config/screenrc
 - config/tmux.conf
-- config/zlogin
+- config/vimrc
 - config/zshenv
 - config/zshrc
 - etc/mandlebrot.c
@@ -94,15 +114,17 @@ files:
 - etc/rails/recipes/html5.rb
 - etc/rails/recipes/readme_markdown.rb
 - etc/rails/template.rb
+- etc/rails/template/.env
+- etc/rails/template/.travis.yml
 - lib/dots.sh
 - lib/dots/aliases.zsh
 - lib/dots/directories.zsh
 - lib/dots/functions.zsh
 - lib/dots/plugins.zsh
-- lib/plugins/aws/aws.plugin.zsh
 - lib/plugins/bundler/_bundler
 - lib/plugins/bundler/bundler.plugin.zsh
 - lib/plugins/git-flow/git-flow.plugin.zsh
+- lib/plugins/git-process/git-process.plugin.zsh
 - lib/plugins/git/git.plugin.zsh
 - lib/plugins/knife/_knife
 - lib/plugins/knife/knife.plugin.zsh
@@ -113,15 +135,17 @@ files:
 - lib/plugins/rake/rake.plugin.zsh
 - lib/plugins/ruby/ruby.plugin.zsh
 - lib/ruby/dots.rb
+- lib/ruby/dots/bootstrap.rb
 - lib/ruby/dots/command.rb
 - lib/ruby/dots/dot_file.rb
+- lib/ruby/dots/installation.rb
+- lib/ruby/dots/installer.rb
+- lib/ruby/dots/persistence.rb
 - lib/ruby/dots/version.rb
-- lib/tasks/db.rake
-- lib/tasks/dots.rake
+- lib/tasks/.gitkeep
 - spec/integration/command_spec.rb
 - spec/models/dot_file_spec.rb
 - spec/spec_helper.rb
-- vendor/antigen.zsh
 - vendor/oh-my-zsh/check_for_upgrade.sh
 - vendor/oh-my-zsh/install.sh
 - vendor/oh-my-zsh/require_tool.sh
@@ -148,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: DOTS is an advanced ZSH framework. It abstracts a lot of hard-to-remember

data/.rvmrc

@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-#
-# WARNING
-#
-# THIS IS NOT YOUR ~/.rvmrc FILE!!!
-#
-# That file is located in ~/.dots/config/rvmrc. Please go there to edit your global RVM changes.
-
-
-
-
-
-
-
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p125@global"
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.12.5 (stable)" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
-    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id" || {
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  }
-fi

data/config/.dot_file

@@ -1 +0,0 @@
-This is my config

data/config/rvmrc

@@ -1 +0,0 @@
-rvm_trust_rvmrcs_flag=1

data/config/zlogin

@@ -1 +0,0 @@
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*

data/lib/plugins/aws/aws.plugin.zsh

@@ -1,20 +0,0 @@
-#
-# Amazon AWS Dev Tools
-#
-
-# Used by all CLI tools produced by Amazon
-export JAVA_HOME="$(/usr/libexec/java_home)"
-export EC2_PRIVATE_KEY="$(/bin/ls "$HOME"/.ec2/pk-*.pem | /usr/bin/head -1)"
-export EC2_CERT="$(/bin/ls "$HOME"/.ec2/cert-*.pem | /usr/bin/head -1)"
-
-# ec2-dev-tools
-export EC2_HOME="/usr/local/Library/LinkedKegs/ec2-api-tools/jars"
-
-# ec2-ami-tools
-export EC2_AMITOOL_HOME="/usr/local/Library/LinkedKegs/ec2-ami-tools/jars"
-
-# aws-sns-cli
-export AWS_SNS_HOME="/usr/local/Library/LinkedKegs/aws-sns-cli/jars"
-
-# Further AWS configuration that must be hidden from Git.
-source "$ZSH/config/aws.zsh"

data/lib/tasks/db.rake

@@ -1,55 +0,0 @@
-require 'logger'
-require 'fileutils'
-
-namespace :db do
-  HOME    = ENV['HOME']
-  EMAIL   = ENV['EMAIL']   || "tubbo@psychedeli.ca"
-  DRY_RUN = ENV['DRY_RUN'] || false
-  RAILS_ENV = ENV['RAILS_ENV'] || "stage"
-
-  desc "Import the eLocal stage database and send an email when it's done."
-  task :import do
-    puts "Writing logs to #{HOME}/log/tasklog"
-    sh "cat /dev/null > #{HOME}/log/tasklog"
-    logger = Logger.new("#{HOME}/log/tasklog")
-    logger.formatter = proc do |severity, datetime, progname, msg|
-      puts msg
-      "#{severity}: #{msg}\n"
-    end
-
-    logger.info "Entering eLocal app directory"
-    cd "#{HOME}/Code/elocal"
-
-    logger.info "Importing #{RAILS_ENV} database content"
-    sh "bundle exec thor db:import:#{RAILS_ENV} > /dev/null" unless DRY_RUN
-    logger.info "..done"
-
-    logger.info "Migrating database structure"
-    sh "bundle exec rake db:migrate > log/tasklog" unless DRY_RUN
-    logger.info "..done"
-
-    logger.info "Database import complete."
-
-    logger.info "Indexing accounts"
-    sh "bundle exec thor solr:index_accounts > /dev/null" unless DRY_RUN
-    logger.info "..done"
-
-    logger.info "Indexing categories"
-    sh "bundle exec thor solr:index_categories > /dev/null" unless DRY_RUN
-    logger.info "..done"
-
-    logger.info "Indexing profiles"
-    sh "bundle exec thor solr:index_profiles > /dev/null" unless DRY_RUN
-    logger.info "..done"
-
-    logger.info "Solr index complete."
-
-    puts "Building email notification to '#{EMAIL}'"
-    raw_log = IO.read("#{HOME}/log/tasklog")
-    logs = "<code><pre>#{raw_log}</pre></code>"
-    subject = "#{RAILS_ENV.capitalize} database import succeeded."
-    body = "<p>Successfully imported the eLocal #{RAILS_ENV} database to playa.</p><p>#{logs}</p>"
-    sh %x(echo 'To: tubbo@psychedeli.ca\nSubject: #{subject}\nContent-Type: text/html;charset="us-ascii"\n\n<html><body>#{body}</body></html>' | sendmail -t)
-    puts "Delivered email notification to '#{EMAIL}'"
-  end
-end

data/lib/tasks/dots.rake

@@ -1,32 +0,0 @@
-task :config do
-  Dir["config/*"].each do |config_file|
-    unless File.directory? config_file
-      config_file.gsub! /config\/|.example/, ""
-      config_file_path = File.expand_path "~/.dots/config/#{config_file}"
-      dot_file_path = File.expand_path "~/.#{config_file}"
-      global_rake_path = File.expand_path "~/.rake"
-
-      if File.exists? dot_file_path
-        puts "Did not symlink #{config_file} since one already exists"
-      else
-        File.symlink config_file_path, dot_file_path
-        puts "Symlinked ~/.#{config_file}"
-      end
-
-      unless File.exists? global_rake_path
-        File.symlink global_rake_path, File.expand_path("~/.dots/lib/tasks")
-      end
-    end
-  end
-  puts "Please reload your DOTS."
-end
-
-desc "Update all installed plugins"
-task :update do
-  sh "cd ~/.dots && git pull origin master"
-
-  antigen_repos = Dir[File.join(File.expand_path("../.antigen/repos"), "*")]
-  antigen_repos.each do |repo|
-    sh "cd #{repo} && git pull origin master"
-  end
-end

data/vendor/antigen.zsh

@@ -1,251 +0,0 @@
-#!/bin/zsh
-#
-# Antigen is a bundled plugin loader.
-
-# Each line in this string has the following entries separated by a space
-# character.
-# <repo-url>, <plugin-location>, <bundle-type>
-# FIXME: Is not kept local by zsh!
-local _ANTIGEN_BUNDLE_RECORD=""
-
-# Syntaxes
-#   antigen-bundle <url> [<loc>=/]
-antigen-bundle () {
-
-    # Bundle spec arguments' default values.
-    local url="$ANTIGEN_DEFAULT_REPO_URL"
-    local loc=/
-    local btype=plugin
-
-    # Set spec values based on the positional arguments.
-    local position_args='url loc'
-    local i=1
-    while ! [[ -z $1 || $1 == --*=* ]]; do
-        local arg_name="$(echo "$position_args" | cut -d\  -f$i)"
-        local arg_value="$1"
-        eval "local $arg_name='$arg_value'"
-        shift
-        i=$(($i + 1))
-    done
-
-    # Check if url is just the plugin name. Super short syntax.
-    if [[ "$url" != */* ]]; then
-        loc="plugins/$url"
-        url="$ANTIGEN_DEFAULT_REPO_URL"
-    fi
-
-    # Set spec values from keyword arguments, if any. The remaining arguments
-    # are all assumed to be keyword arguments.
-    while [[ $1 == --*=* ]]; do
-        local arg_name="$(echo "$1" | cut -d= -f1 | sed 's/^--//')"
-        local arg_value="$(echo "$1" | cut -d= -f2)"
-        eval "local $arg_name='$arg_value'"
-        shift
-    done
-
-    # Resolve the url.
-    if [[ $url != git://* && $url != https://* && $url != /* ]]; then
-        url="${url%.git}"
-        url="https://github.com/$url.git"
-    fi
-
-    # Add it to the record.
-    _ANTIGEN_BUNDLE_RECORD="$_ANTIGEN_BUNDLE_RECORD\n$url $loc $btype"
-
-    -antigen-ensure-repo "$url"
-
-    -antigen-load "$url" "$loc" "$btype"
-
-}
-
-antigen-bundles () {
-    # Bulk add many bundles at one go. Empty lines and lines starting with a `#`
-    # are ignored. Everything else is given to `antigen-bundle` as is, no
-    # quoting rules applied.
-
-    local line
-
-    grep -v '^\s*$\|^#' | while read line; do
-        # Using `eval` so that we can use the shell-style quoting in each line
-        # piped to `antigen-bundles`.
-        eval "antigen-bundle $line"
-    done
-}
-
-antigen-update () {
-    # Update your bundles, i.e., `git pull` in all the plugin repos.
-    -antigen-echo-record | awk '{print $1}' | sort -u | while read url; do
-        -antigen-ensure-repo --update "$url"
-    done
-}
-
--antigen-get-clone-dir () {
-    # Takes a repo url and gives out the path that this url needs to be cloned
-    # to. Doesn't actually clone anything.
-    # TODO: Memoize?
-    echo -n $ADOTDIR/repos/
-    echo "$1" | sed \
-        -e 's/\.git$//' \
-        -e 's./.-SLASH-.g' \
-        -e 's.:.-COLON-.g'
-}
-
--antigen-get-clone-url () {
-    # Takes a repo's clone dir and gives out the repo's original url that was
-    # used to create the given directory path.
-    # TODO: Memoize?
-    echo "$1" | sed \
-        -e "s:^$ADOTDIR/repos/::" \
-        -e 's/$/.git/' \
-        -e 's.-SLASH-./.g' \
-        -e 's.-COLON-.:.g'
-}
-
--antigen-ensure-repo () {
-
-    local update=false
-    if [[ $1 == --update ]]; then
-        update=true
-        shift
-    fi
-
-    local url="$1"
-    local clone_dir="$(-antigen-get-clone-dir $url)"
-
-    if [[ ! -d $clone_dir ]]; then
-        git clone "$url" "$clone_dir"
-    elif $update; then
-        git --git-dir "$clone_dir/.git" --work-tree "$clone_dir" pull
-    fi
-
-}
-
--antigen-load () {
-
-    local url="$1"
-    local location="$(-antigen-get-clone-dir "$url")/$2"
-    local btype="$3"
-
-    if [[ $btype == theme ]]; then
-
-        # Of course, if its a theme, the location would point to the script
-        # file.
-        source "$location"
-
-    else
-
-        # Source the plugin script
-        # FIXME: I don't know. Looks very very ugly. Needs a better
-        # implementation once tests are ready.
-        local script_loc="$(ls "$location" | grep -m1 '.plugin.zsh$')"
-        if [[ -f $script_loc ]]; then
-            # If we have a `*.plugin.zsh`, source it.
-            source "$script_loc"
-        elif [[ ! -z "$(ls "$location" | grep -m1 '.zsh$')" ]]; then
-            # If there is no `*.plugin.zsh` file, source *all* the `*.zsh`
-            # files.
-            for script ($location/*.zsh) source "$script"
-        elif [[ ! -z "$(ls "$location" | grep -m1 '.sh$')" ]]; then
-            # If there are no `*.zsh` files either, we look for and source any
-            # `*.sh` files instead.
-            for script ($location/*.sh) source "$script"
-        fi
-
-        # Add to $fpath, for completion(s)
-        fpath=($location $fpath)
-
-    fi
-
-}
-
-antigen-cleanup () {
-
-    if [[ ! -d "$ADOTDIR/repos" || -z "$(ls "$ADOTDIR/repos/")" ]]; then
-        echo "You don't have any bundles."
-        return 0
-    fi
-
-    # Find directores in ADOTDIR/repos, that are not in the bundles record.
-    local unused_clones="$(comm -13 \
-        <(-antigen-echo-record | awk '{print $1}' | sort -u) \
-        <(ls "$ADOTDIR/repos" | while read line; do
-                -antigen-get-clone-url "$line"
-            done))"
-
-    if [[ -z $unused_clones ]]; then
-        echo "You don't have any unidentified bundles."
-        return 0
-    fi
-
-    echo 'You have clones for the following repos, but are not used.'
-    echo "$unused_clones" | sed 's/^/  /'
-
-    echo -n '\nDelete them all? [y/N] '
-    if read -q; then
-        echo
-        echo
-        echo "$unused_clones" | while read url; do
-            echo -n "Deleting clone for $url..."
-            rm -rf "$(-antigen-get-clone-dir $url)"
-            echo ' done.'
-        done
-    else
-        echo
-        echo Nothing deleted.
-    fi
-}
-
-antigen-lib () {
-    antigen-bundle --loc=lib
-}
-
-antigen-theme () {
-    local name="${1:-robbyrussell}"
-    antigen-bundle --loc=themes/$name.zsh-theme --btype=theme
-}
-
-antigen-apply () {
-    # Initialize completion.
-    # TODO: Only load completions if there are any changes to the bundle
-    # repositories.
-    compinit -i
-}
-
-antigen-list () {
-    # List all currently installed bundles
-    if [[ -z "$_ANTIGEN_BUNDLE_RECORD" ]]; then
-        echo "You don't have any bundles." >&2
-        return 1
-    else
-        -antigen-echo-record
-    fi
-}
-
-# Echo the bundle specs as in the record. The first line is not echoed since it
-# is a blank line.
--antigen-echo-record () {
-    echo "$_ANTIGEN_BUNDLE_RECORD" | sed -n '1!p'
-}
-
--antigen-env-setup () {
-    # Pre-startup initializations
-    -set-default ANTIGEN_DEFAULT_REPO_URL \
-        https://github.com/robbyrussell/oh-my-zsh.git
-    -set-default ADOTDIR $HOME/.antigen
-
-    # Load the compinit module
-    autoload -U compinit
-
-    # Without the following, `compdef` function is not defined.
-    compinit -i
-}
-
-# Same as `export $1=$2`, but will only happen if the name specified by `$1` is
-# not already set.
--set-default () {
-    local arg_name="$1"
-    local arg_value="$2"
-    eval "test -z \"\$$arg_name\" && export $arg_name='$arg_value'"
-}
-
--antigen-env-setup