dotman 0.0.3 → 0.0.3.1

data/spec/data/Timbinous_dotfiles/.vim/spell/en.utf-8.add

@@ -0,0 +1,5 @@
+screencasts
+bluetooth
+google
+gmail
+pomodoro

data/spec/data/Timbinous_dotfiles/.vimrc

@@ -0,0 +1,70 @@
+call pathogen#infect()
+"colorscheme grb2
+syntax on
+filetype plugin indent on
+set tabstop=2 softtabstop=2 shiftwidth=2 expandtab
+autocmd FileType ruby compiler ruby
+no ,w <C-w><C-w>
+map ,s <C-w><C-v><C-w><C-w>
+map ,t :w\|:!rspec %<cr>
+map ,r :w\|:!RAILS_ENV=qa rspec %<cr>
+
+imap <Nul> <ESC>
+imap jk <ESC>
+imap kj <ESC>
+imap <C-h> <C-W>
+map <C-n> :tabn<cr>
+map <C-p> :tabp<cr>
+map <C-b> :tabnew<cr>
+"nmap n nzz
+"nmap N Nzz
+no J 8j
+no K 8k
+" set winwidth=104
+set winheight=5
+set winminheight=5
+set winheight=999
+set wildmode=longest,list
+set wildmenu
+set nu
+set viminfo='100,<50,s10,h,:100
+set modeline
+set ls=2
+set switchbuf=usetab
+let g:EclimJavascriptValidate = 0
+
+""""""""""""""""""""""""""""""
+" => Visual mode related
+""""""""""""""""""""""""""""""
+" Really useful!
+"  In visual mode when you press * or # to search for the current selection
+vnoremap <silent> * :call VisualSearch('f')<CR>
+vnoremap <silent> # :call VisualSearch('b')<CR>
+
+" When you press gv you vimgrep after the selected text
+vmap <silent>gg :call VisualSearch('gv')<CR>
+vmap <silent>gd :call VisualSearch('gd')<CR>
+map ,g :Ack 
+map cc <C-_><C-_>
+
+" From an idea by Michael Naumann
+function! VisualSearch(direction) range
+    let l:saved_reg = @"
+    execute "normal! vgvy"
+
+    let l:pattern = escape(@", '\\/.*$^~[]')
+    let l:pattern = substitute(l:pattern, "\n$", "", "")
+
+    if a:direction == 'b'
+        execute "normal ?" . l:pattern . "^M"
+    elseif a:direction == 'gv'
+        execute "Ack " . l:pattern
+    elseif a:direction == 'gd'
+        execute "Ack \"(def|function|class) " . l:pattern . "\""
+    elseif a:direction == 'f'
+        execute "normal /" . l:pattern . "^M"
+    endif
+
+    let @/ = l:pattern
+    let @" = l:saved_reg
+endfunction

data/spec/data/Timbinous_dotfiles/.zshrc

@@ -0,0 +1,62 @@
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
+
+# Set name of the theme to load.
+# Look in ~/.oh-my-zsh/themes/
+# Optionally, if you set this to "random", it'll load a random theme each
+# time that oh-my-zsh is loaded.
+ZSH_THEME="tim"
+
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# Set to this to use case-sensitive completion
+# CASE_SENSITIVE="true"
+
+# Comment this out to disable bi-weekly auto-update checks
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment to change how many often would you like to wait before auto-updates occur? (in days)
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+# COMPLETION_WAITING_DOTS="true"
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git)
+
+source $ZSH/oh-my-zsh.sh
+
+# Customize to your needs...
+export PATH=$PATH:/usr/lib/lightdm/lightdm:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/home/tim/.rvm/bin
+
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function
+
+function byebye {
+pair=`ps -U pair | grep sshd | awk '{ print $1 }'`
+sudo kill $pair
+}
+
+function tstart {
+  tmux -S /tmux/prog new-session -s prog -d
+  `chmod 777 /tmux/prog`
+  `tjoin`
+}
+
+function tjoin {
+  tmux -S /tmux/prog attach
+}
+
+function tlist {
+  ps -o ruser,command -ax | grep '[n]ew-session -s' | ruby -ne '$_ =~ /^(\w+).*-s (\w+)/; puts "#{$1} started #{$2}"'
+}

data/spec/data/Timbinous_dotfiles/symlinkify

@@ -0,0 +1,58 @@
+#!/bin/bash
+############################
+# .make.sh
+# This script creates symlinks from the home directory to any desired dotfiles in ~/dotfiles
+############################
+
+########## Variables
+
+olddir=~/.dotfiles_old             # old dotfiles backup directory
+files=".bashrc .vimrc .vim .zshrc .tmux.conf .oh-my-zsh"    # list of files/folders to symlink in homedir
+bundle=`pwd`/.vim/bundle
+
+##########
+
+# clone my pathogen vim goodies
+if [ ! -e $bundle/Command-T ]; then
+  git clone git@github.com:wincent/Command-T.git $bundle/Command-T/
+fi
+
+if [ ! -e $bundle/ack.vim ]; then
+  git clone git@github.com:mileszs/ack.vim.git $bundle/ack.vim/
+fi
+
+if [ ! -e $bundle/tcomment_vim ]; then
+  git clone git@github.com:tomtom/tcomment_vim.git $bundle/tcomment_vim/
+fi
+
+if [ ! -e $bundle/vim-fugitive ]; then
+  git clone git@github.com:tpope/vim-fugitive.git $bundle/vim-fugitive/
+fi
+
+if [ ! -e $bundle/vim-rails ]; then
+  git clone git@github.com:tpope/vim-rails.git $bundle/vim-rails/
+fi
+
+if [ ! -e $bundle/vim-ruby ]; then
+  git clone git@github.com:vim-ruby/vim-ruby.git $bundle/vim-ruby/
+fi
+
+# if [ ! -e $bundle/vim-ruby-debugger ]; then
+  # git clone git@github.com:astashov/vim-ruby-debugger.git $bundle/vim-ruby-debugger/
+# fi
+
+mkdir -p $olddir
+
+# move any existing dotfiles in homedir to dotfiles_old directory, then create symlinks 
+for file in $files; do
+  if [ -h ~/$file ]
+  then
+    rm ~/$file
+  elif [ -e ~/$file ]
+  then
+    echo "Moving any existing dotfiles from ~ to $olddir"
+    mv ~/$file $olddir/$file
+  fi
+  echo "Creating symlink to $file in home directory."
+  ln -s `pwd`/$file ~/$file
+done

data/spec/data/Timbinous_dotfiles/tim.zsh-theme

@@ -0,0 +1,29 @@
+# Personalized!
+
+# Grab the current date (%D) and time (%T) wrapped in {}: {%D %T}
+DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}"
+# Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
+if [ -e ~/.rvm/bin/rvm-prompt ]; then
+  DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
+else
+  if which rbenv &> /dev/null; then
+    DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg[white]%}]%{$reset_color%}"
+  fi
+fi
+# Grab the current machine name: muscato
+DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}"
+# Grab the current filepath, use shortcuts: ~/Desktop
+# Append the current git branch, if in a git repository: ~aw@master
+DALLAS_CURRENT_LOCA_="%{$fg[cyan]%}%~ \$(git_prompt_info)%{$reset_color%}"
+# Grab the current username: dallas
+DALLAS_CURRENT_USER_="%{$fg[red]%}%n%{$reset_color%}"
+# Use a % for normal users and a # for privelaged (root) users.
+# DALLAS_PROMPT_CHAR_="%{$fg[white]%}%(!.#.%%)%{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[magenta]%}<%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[yellow]%}x%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+# Put it all together!
+PROMPT="$DALLAS_CURRENT_TIME_$DALLAS_CURRENT_RUBY_$DALLAS_CURRENT_LOCA_%{$fg[magenta]%}>%{$reset_color%} "

data/spec/dotman/collect_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe Dotman::Collect do
+
+  let(:collect) { Dotman::Collect.new }
+
+  context '#create_dotman' do
+
+    it 'should check for dotfiles directory and not create if exists' do
+      File.stub(:directory?).and_return(true)
+      FileUtils.should_not_receive(:mkdir)
+      collect.create_dotman
+    end
+    
+    xit 'should check for dotfiles directory and create if does not exist' do
+      File.stub(:directory?).and_return(false)
+      FileUtils.should_receive(:mkdir)
+      collect.create_dotman
+    end
+
+    it 'should call collect_dotfiles to continue execution' do
+      File.stub(:directory?).and_return(true)
+      collect.should_receive(:collect_dotfiles)
+      collect.create_dotman 
+    end
+
+  end
+
+  context '#collect_dotfiles' do
+
+    it 'should call copy_over_dot for each dotfile in pwd' do
+      Dir.stub(:entries).and_return(['test1', 'test2', 'test3'])
+      collect.should_receive(:copy_over_dot).exactly(3).times
+      collect.collect_dotfiles
+    end
+
+    it 'should print collecting for script status' do
+      collect.stub(:copy_over_dot)
+      collect.should_receive(:puts).with('collecting...')
+      collect.collect_dotfiles
+    end
+  end
+
+  context '#copy_over_dot' do
+
+    it 'should copy dot files over if correct file format' do
+      FileUtils.should_receive(:copy).exactly(1).times
+      collect.copy_over_dot(File.join(ENV['HOME'], '.dotman'))
+    end
+
+    it 'should print out file being copied for user' do
+      collect.should_receive(:puts).with("copying #{File.join(ENV['HOME'], '.dotman')} to dotfiles")
+      FileUtils.stub(:copy)
+      collect.copy_over_dot(File.join(ENV['HOME'], '.dotman'))
+    end
+
+  end
+
+end

data/spec/integration/dotfile_collection_integration_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 describe Dotman::DotfileCollection do
-  before :all do
+  before :each do
     Dotman::Git.clone_repository('git@github.com:Timbinous/dotfiles.git', 'tim')
   end
 
@@ -9,13 +9,27 @@ describe Dotman::DotfileCollection do
       let (:alias_name)                 { 'tim' }
       let (:dotfile_collection_name)    { 'Timbinous_dotfiles' }
       let! (:dotfile_configuration)     { Dotman::DotfileCollection.new_configuration(dotfile_collection_name, alias_name) }
+
       it "returns the dotfile collection" do
         Dotman::DotfileCollection.find_by_alias(alias_name).should be_an_instance_of(Dotman::DotfileCollection)
       end
     end
   end
-  after :all do
-    FileUtils.rm_r("#{ENV['HOME']}/.dotman/dotfiles.yml")
-    FileUtils.rm_rf("#{ENV['HOME']}/.dotman/Timbinous_dotfiles")
+
+  describe ".all_aliases" do
+    context "when an alias exists in the collection" do
+      it "lists the alias" do
+        Dotman::DotfileCollection.all_aliases.should include('tim')
+      end
+    end
+  end
+
+  describe ".show_all_aliases" do
+    context "when aliases exist in the collection" do
+      it "shows all the aliases" do
+        STDOUT.should_receive(:puts).with("default\ntim")
+        Dotman::DotfileCollection.show_all_aliases
+      end
+    end
   end
 end

data/spec/integration/git_integration_spec.rb

@@ -5,6 +5,12 @@
 require 'spec_helper'
 describe Dotman::Git do
 
+  before :each do
+    Dotman::Base.ensure_dotman_folder_exists
+    Dotman::Base.ensure_default_folder_exists
+    Dotman::Base.ensure_current_dotman_file_exists
+  end
+
   context "cloning a new repo" do
 
     let (:git_dotfile_repo_path)    { "git@github.com:Timbinous/dotfiles.git" }
@@ -22,11 +28,6 @@ describe Dotman::Git do
         Dotman::DotfileCollection.find_by_alias(git_folder_name).should_not be_false
       end
 
-      after :all do
-        FileUtils.rm_r("#{ENV['HOME']}/.dotman/dotfiles.yml")
-        FileUtils.rm_rf("#{ENV['HOME']}/.dotman/Timbinous_dotfiles")
-      end
-
     end
 
     context "when alias was passed" do
@@ -41,11 +42,6 @@ describe Dotman::Git do
         Dotman::DotfileCollection.find_by_alias('tim').should_not be_false
       end
 
-      after :all do
-        FileUtils.rm_r("#{ENV['HOME']}/.dotman/dotfiles.yml")
-        FileUtils.rm_rf("#{ENV['HOME']}/.dotman/Timbinous_dotfiles")
-      end
-
     end
   end
   

data/spec/integration/user_integration_spec.rb

@@ -2,12 +2,9 @@ require 'spec_helper'
 describe Dotman::User do
   let (:tim)                 { Dotman::User.new('tim') }
 
-  before :all do
-    Dotman::Git.clone_repository("git@github.com:Timbinous/dotfiles.git", 'tim')
-  end
-
   describe ".current_user_alias" do
     before :all do
+      Dotman::Base.ensure_dotman_folder_exists
       File.open(Dotman::Base.current_dotman, 'w') { |f| f.write 'tim' }
     end
 
@@ -17,6 +14,10 @@ describe Dotman::User do
   end
 
   describe "#set_current_user" do
+    before :each do
+      Dotman::Base.ensure_dotman_folder_exists
+      Dotman::Git.clone_repository("git@github.com:Timbinous/dotfiles.git", 'tim')
+    end
 
     it 'writes to the .current file, the alias of the current user' do
       tim.set_current_user
@@ -26,6 +27,10 @@ describe Dotman::User do
 
 
   describe ".current" do
+    before :each do
+      Dotman::Base.ensure_dotman_folder_exists
+      Dotman::Git.clone_repository("git@github.com:Timbinous/dotfiles.git", 'tim')
+    end
 
     it 'returns the current users information' do
       tim.set_current_user
@@ -35,7 +40,9 @@ describe Dotman::User do
 
   describe "#set" do
 
-    before :all do
+    before :each do
+      Dotman::Base.ensure_dotman_folder_exists
+      Dotman::Git.clone_repository("git@github.com:Timbinous/dotfiles.git", 'tim')
       $default_user.set_current_user
       FileUtils.touch(["#{ENV['HOME']}/.vimrc", "#{ENV['HOME']}/.zshrc", "#{ENV['HOME']}/.bashrc"])
       FileUtils.mkdir("#{ENV['HOME']}/.dotman/default")

data/spec/spec_helper.rb

@@ -4,7 +4,15 @@ require_relative "../lib/dotman"
 
 RSpec.configure do |config|
 
-  config.after(:all) do
+  config.before(:each) do
+    Dotman::Git.stub(:system) do |arg|
+      if arg == "git clone git@github.com:Timbinous/dotfiles.git /home/tim/source/dotman/spec/data/home/.dotman/Timbinous_dotfiles"
+        FileUtils.cp_r(File.expand_path('../data/Timbinous_dotfiles', __FILE__), File.join(ENV['HOME'], '.dotman'))
+      end
+    end
+  end
+
+  config.after(:each) do
     FileUtils.rm_rf(File.join(ENV['HOME'], '.dotman')) if File.directory? (File.join(ENV['HOME'], '.dotman'))
     FileUtils.rm(File.join(ENV['HOME'], '.bashrc')) if File.symlink? (File.join(ENV['HOME'], '.bashrc'))
     FileUtils.rm(File.join(ENV['HOME'], '.gitignore')) if File.symlink? (File.join(ENV['HOME'], '.gitignore'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotman
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.3.1
 platform: ruby
 authors:
 - Tim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,12 +84,43 @@ files:
 - dotman.gemspec
 - lib/dotman.rb
 - lib/dotman/base.rb
+- lib/dotman/collect.rb
 - lib/dotman/dotfile_collection.rb
 - lib/dotman/git.rb
 - lib/dotman/user.rb
 - lib/dotman/version.rb
+- spec/data/Timbinous_dotfiles/.bashrc
+- spec/data/Timbinous_dotfiles/.gitignore
+- spec/data/Timbinous_dotfiles/.tmux.conf
+- spec/data/Timbinous_dotfiles/.vim/autoload/pathogen.vim
+- spec/data/Timbinous_dotfiles/.vim/bundle/.gitkeep
+- spec/data/Timbinous_dotfiles/.vim/colors/Black.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/Dark.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/autumnleaf.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/c.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/darkzen.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grb.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grb.vim~
+- spec/data/Timbinous_dotfiles/.vim/colors/grb2.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grb256.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grb3.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grb4.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grblight.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grblight.vim~
+- spec/data/Timbinous_dotfiles/.vim/colors/ir_black.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/moria.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/pyte.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/redstring.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/xterm16.vim
+- spec/data/Timbinous_dotfiles/.vim/spell/en.utf-8.add
+- spec/data/Timbinous_dotfiles/.vim/spell/en.utf-8.add.spl
+- spec/data/Timbinous_dotfiles/.vimrc
+- spec/data/Timbinous_dotfiles/.zshrc
+- spec/data/Timbinous_dotfiles/symlinkify
+- spec/data/Timbinous_dotfiles/tim.zsh-theme
 - spec/data/home/.gitkeep
 - spec/dotman/base_spec.rb
+- spec/dotman/collect_spec.rb
 - spec/dotman/dotfile_collection_spec.rb
 - spec/dotman_spec.rb
 - spec/git_spec.rb
@@ -124,8 +155,38 @@ specification_version: 4
 summary: Use this utility to manage your dotfiles and others who may use the same
   login user as yourself
 test_files:
+- spec/data/Timbinous_dotfiles/.bashrc
+- spec/data/Timbinous_dotfiles/.gitignore
+- spec/data/Timbinous_dotfiles/.tmux.conf
+- spec/data/Timbinous_dotfiles/.vim/autoload/pathogen.vim
+- spec/data/Timbinous_dotfiles/.vim/bundle/.gitkeep
+- spec/data/Timbinous_dotfiles/.vim/colors/Black.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/Dark.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/autumnleaf.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/c.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/darkzen.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grb.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grb.vim~
+- spec/data/Timbinous_dotfiles/.vim/colors/grb2.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grb256.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grb3.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grb4.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grblight.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/grblight.vim~
+- spec/data/Timbinous_dotfiles/.vim/colors/ir_black.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/moria.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/pyte.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/redstring.vim
+- spec/data/Timbinous_dotfiles/.vim/colors/xterm16.vim
+- spec/data/Timbinous_dotfiles/.vim/spell/en.utf-8.add
+- spec/data/Timbinous_dotfiles/.vim/spell/en.utf-8.add.spl
+- spec/data/Timbinous_dotfiles/.vimrc
+- spec/data/Timbinous_dotfiles/.zshrc
+- spec/data/Timbinous_dotfiles/symlinkify
+- spec/data/Timbinous_dotfiles/tim.zsh-theme
 - spec/data/home/.gitkeep
 - spec/dotman/base_spec.rb
+- spec/dotman/collect_spec.rb
 - spec/dotman/dotfile_collection_spec.rb
 - spec/dotman_spec.rb
 - spec/git_spec.rb