zsh_dots 0.5.0 → 0.5.1

data/README.md

@@ -22,21 +22,16 @@ Features
 Installation
 ------------
 
-### One line install:
+Just run the following commands:
 
-If you really trust me, you can run this simple command in your Terminal to download and install the DOTS framework!
+```bash
+$ gem install zsh_dots
+$ dots install
+```
 
-    curl -L https://github.com/tubbo/dots/raw/master/tools/install.sh | sh
-
-### Manual install:
-
-For the more paranoid users, here's basically what the above script does:
-
-    git clone git://github.com/tubbo/dots.git ~/.dots
-    ln -s ~/.dots/config/zshrc ~/.zshrc
-    chsh -s /bin/zsh
-
-Then start (or restart) ZSH by reloading or opening a new terminal window.
+This will link the gem's installation to `~/.dots`, and symlink all of
+the files in `~/.dots/config` to your home directory as dotfiles (unless
+existing ones are found).
 
 ### Problems?
 
@@ -48,13 +43,13 @@ Usage
 
 There are a number of commands built-in to the DOTS framework:
 
-### persist <dot-file>
+### persist DOT_FILE
 
 You can persist any dot file with DOTS. Simply run this command on the file...it will copy the
 file to your `$DOTS` folder and symlink that new file in its original place, preserving your
 settings in a git repository but making it accessible for the application needing to use it.
 
-### forget <dot-file>
+### forget DOT_FILE
 
 The opposite of `persist`. Deletes the symlink and restores your file. For when you just need to
 fuggeddaboutit...
@@ -64,6 +59,35 @@ fuggeddaboutit...
 For Mac OS X users, this runs a bunch of settings that I found very helpful for browsing and using
 my Mac. It's totally optional, but this alias simply runs the `tools/osx.zsh` script.
 
+### set_title TO_STRING
+
+Sets the title of the iTerm window to the String you pass in.
+
+### o, v and e
+
+These three commands open, view and edit files, respectively. They use
+the Finder (OS X only), whatever you set as your `$PAGER` and whatever
+you set as your `$EDITOR` to do their tasks. Merely aliases, these
+conventions are prime examples of how DOTS is constructed. They all use
+sensible defaults, for example `o` will open the current directory, but
+`o ~/Code` will open up ~/Code in the Finder. `e` follows suit, but `v`
+throws an error as this should almost never be the case. 
+
+### more on e() and macvim
+
+`e` has some special functionality for [alloy's MacVim
+fork](http://github.com/alloy/macvim), referred to here as
+`macvim_drawer`. 
+
+`e`'s functionality is slightly different for users of `macvim_drawer`, 
+as `mvim` automatically opens up to a directory for some users of the
+fork. Because of this, `e` detects the use of `mvim` and will perform a
+quick hack to allow you to type `e ~/Code/project` without leaving the
+current directory. It `cd`s into the directory you give it, then opens a
+file that's usually there, like `README.md`. It then `cd`s back to the
+original directory and exits with a success code. You can disable this
+functionality by setting `DRAWER=false` in your zshenv.
+
 Forking
 -------
 

data/config/zshenv

@@ -15,6 +15,7 @@ MANPATH=/opt/local/share/man:$MANPATH
 # Text editing and paging
 EDITOR='vim'
 PAGER='less -R'
+DRAWER=true # use macvim_drawer
 
 # A more basic version of my promptstring for non-interactive shells.
 PROMPT="♬  "

data/lib/dots/aliases.zsh

@@ -33,7 +33,7 @@ alias v=$PAGER
 
 # Terminal support
 alias c='clear'
-alias ti='set_title'
+aliasias ti='set_title'
 alias o='open .'
 
 # Ripple

data/lib/dots/functions.zsh

@@ -21,12 +21,16 @@ function proc() {
 # functionality of the macvim_drawer plugin. Requires macvim_drawer to be installed, 
 # regular MacVim will break with this function.
 function e() {
-  if [[ -f "./README.md" ]]; then
-    mvim README.md
-  elif [[ -f "./README.rdoc" ]]; then
-    mvim README.rdoc
+  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
   else
-    mvim
+    $EDITOR
   fi
 }
 

data/lib/ruby/dots/command.rb

@@ -26,6 +26,22 @@ The following tasks are meant to help you use the shell more efficiently...
       %x(cd ~/.dots && git pull origin master)
     end
 
+    desc :install, "Installs DOTS to ~/.dots and links all of your dotfiles"
+    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}"
+
+        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
+    end
+
     desc :version, "Show the current version of DOTS"
     def version
       say "DOTS version #{Dots::VERSION} - http://tubbo.github.com/dots"

data/lib/ruby/dots/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zsh_dots
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70310540326480 !ruby/object:Gem::Requirement
+  requirement: &70358833531220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70310540326480
+  version_requirements: *70358833531220
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70310540326060 !ruby/object:Gem::Requirement
+  requirement: &70358833530800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70310540326060
+  version_requirements: *70358833530800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70310540325640 !ruby/object:Gem::Requirement
+  requirement: &70358833530380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310540325640
+  version_requirements: *70358833530380
 description: DOTS is an advanced ZSH framework.
 email:
 - tubbo@psychedeli.ca