Added an awesome auto_reload PROMPT command that watches bashrc for c…

…hanges, and reloads automatically

More reorganizing
vims not needed any more
Even more re-organizing
Working on git config setup
control rake task with env variable
Moved ruby dotfiles into symlinked files
made option OVERWRITE_ALL

README.textile

@@ -1,13 +1,12 @@
 h3. Setup scripts and configuration for Ubuntu development machine
 
-* Base packages
+* Package installation
 * Git & SSH setup
-* Well-honed .bashrc
-* RVM & ruby 1.9.2
-* gedit tweaked to perfection for Ruby on Rails
+* .bashrc with a lot of useful aliases / functions
+* RVM
 * Gnome themes, icons & conky
 
-h2. Run the following command to set up a freshly installed machine:
+h2. Run the following command to set up a new machine
 
 bc. sudo apt-get install -ym git-core && git clone https://github.com/ndbroadbent/ubuntu_config.git /tmp/ubuntu_config && cd /tmp/ubuntu_config && ./dev_machine_setup.sh
 

Rakefile

@@ -0,0 +1,64 @@
+require 'rake'
+
+desc "Hook our dotfiles into system-standard positions."
+task :install do 
+  # Install symlinks
+  linkables = Dir.glob('*/**{.symlink}')
+
+  skip_all = false
+  overwrite_all = ENV['OVERWRITE_ALL']
+  backup_all = false
+
+  linkables.each do |linkable|
+    overwrite = false
+    backup = false
+
+    file = linkable.split('/').last.split('.symlink').last
+    target = "#{ENV["HOME"]}/.#{file}"
+
+    if File.exists?(target) || File.symlink?(target)
+      unless skip_all || overwrite_all || backup_all
+        puts "File already exists: #{target}, what do you want to do? [s]kip, [S]kip all, [o]verwrite, [O]verwrite all, [b]ackup, [B]ackup all"
+        case STDIN.gets.chomp
+        when 'o' then overwrite = true
+        when 'b' then backup = true
+        when 'O' then overwrite_all = true
+        when 'B' then backup_all = true
+        when 'S' then skip_all = true
+        when 's' then next
+        end
+      end
+      FileUtils.rm_rf(target) if overwrite || overwrite_all
+      `mv "$HOME/.#{file}" "$HOME/.#{file}.backup"` if backup || backup_all
+    end
+    `ln -s "$PWD/#{linkable}" "#{target}"`
+  end
+
+  # Run other install tasks
+  %w(bashrc git_config).each do |script|
+    puts "== Running setup/#{script}.sh"
+    %x[./setup/#{script}.sh]
+  end
+end
+
+task :uninstall do
+
+  Dir.glob('**/*.symlink').each do |linkable|
+
+    file = linkable.split('/').last.split('.symlink').last
+    target = "#{ENV["HOME"]}/.#{file}"
+
+    # Remove all symlinks created during installation
+    if File.symlink?(target)
+      FileUtils.rm(target)
+    end
+
+    # Replace any backups made during installation
+    if File.exists?("#{ENV["HOME"]}/.#{file}.backup")
+      `mv "$HOME/.#{file}.backup" "$HOME/.#{file}"` 
+    end
+
+  end
+end
+
+task :default => 'install'

assets/bashrc/aliases.sh → bashrc/aliases.sh

@@ -14,7 +14,6 @@ alias ak='ack-grep'
 alias aka='ack-grep -a'
 alias aki='ack-grep -i'
 alias psg='ps ax | grep'
-alias vims='vim -c start' # open vim in 'insert' mode
 alias e="ge geany"
 alias sbrc="source ~/.bashrc"
 

bashrc/auto_reload.sh

@@ -0,0 +1,14 @@
+# Reloads bashrc if anything changes in a monitored directory
+auto_reload_bashrc() {
+  local recent_change="$(bashrc_last_modified)"
+  if [ "$BASHRC_LAST_UPDATED" != "$recent_change" ]; then
+    export BASHRC_LAST_UPDATED="$recent_change"
+    source $HOME/.bashrc
+  fi
+}
+
+bashrc_last_modified() {
+  find "$DOTFILES_PATH/bashrc" -type f -printf '%T@ %p\n' | sort -n | tail -1
+}
+
+PROMPT_COMMAND="auto_reload_bashrc; $PROMPT_COMMAND"

assets/bashrc/crossroads.sh → bashrc/crossroads.sh

@@ -11,4 +11,3 @@ restart_bamboo() {
   ssh [email protected] "/etc/init.d/bamboo restart"
   echo "===== Restarted. Bamboo agents will automatically restart."
 }
-

assets/bashrc/default.sh → bashrc/default.sh

@@ -13,7 +13,7 @@ shopt -s checkwinsize
 if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
     debian_chroot=$(cat /etc/debian_chroot)
 fi
-
+ 
 # set a fancy prompt
 case "$TERM" in
     xterm-color) color_prompt=yes;;

dev_machine_setup.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-. _shared.sh
+. setup/_shared.sh
 # This bash script will set up (or update) your development environment for Ubuntu (v=>9.10)
 
 scripts=""
@@ -17,13 +17,13 @@ echo -e "
 
 # Prerequisites
 # -------------------------------------
-# Requires root permissions
+# Requires root permissions (requests password here)
 sudo true
 
 # '--all' flag installs everything
 if [ "$1" = "--all" ]; then
   echo "== Setting up default environment..."
-  scripts="packages dropbox skype keepass2 netrc rc git_config ruby_dotfiles
+  scripts="packages dropbox skype keepass2 netrc rc git_config
            gimp gedit vim gnome conky startup tomate apt-install rvm "
   prompt_for_git
   prompt_for_netrc
@@ -77,7 +77,7 @@ for script in $scripts; do
     sudo apt-get install -ym $apt_packages | grep -v "is already the newest version"
     sudo apt-get autoremove -ym
   else
-    . $script\_setup.sh
+    . setup/$script.sh
   fi
 done
 

other_setup_scripts/iphone_bashrc_setup.sh → iphone/bashrc_setup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 iPhone="root@nathans-iphone"
 
-cat assets/iphone_bashrc.sh | \
+cat ./iphone_bashrc.sh | \
 ssh $iPhone 'cat > /var/root/.bashrc && \
              if ! (grep "source /var/root/.bashrc" /etc/profile); then \
                   echo "source /var/root/.bashrc" >> /etc/profile; \

assets/Gemfile → ruby/Gemfile

@@ -2,9 +2,6 @@
 # -----------------------------
 source :rubygems
 
-# Colorize output
-gem 'wirble'
-
 # Colorize and format objects
 gem 'awesome_print'
 

ruby/autotest.symlink

@@ -0,0 +1,3 @@
+Autotest.add_hook :initialize do |at|
+  %w{.svn .hg .git vendor}.each {|exception| at.add_exception(exception)}
+end

ruby/caprc.symlink

@@ -0,0 +1 @@
+require 'capistrano_colors'

ruby/gemrc.symlink

@@ -0,0 +1 @@
+gem: --no-ri --no-rdoc

ruby/rdebugrc.symlink

@@ -0,0 +1,3 @@
+set autoeval
+set autolist
+set autoreload

ruby/rvmrc.symlink

@@ -0,0 +1,2 @@
+export rvm_path="$HOME/.rvm"
+rvm_trust_rvmrcs_flag=1

_shared.sh → setup/_shared.sh

@@ -24,6 +24,7 @@ if [ -z "$_shared_functions" ]; then
     read -p "===== [Git config] Please enter your name: " git_name
     read -p "===== [Git config] Please enter your email: " git_email
     read -p "===== [Git config] Please enter your github username: " github_user
+    read -p "===== [Git config] Please enter your github API token: " github_token
   }
 
   function prompt_for_netrc() {

rc_setup.sh → setup/bashrc.sh

@@ -1,11 +1,10 @@
 #!/bin/bash
-echo "== Installing ~/.bashrc & other related dot files..."
+echo "== Installing ~/.bashrc ..."
 this_dir=$(pwd)
 
 IFS=" "
 
-bashrc_parts="default prompt aliases functions ruby_on_rails crossroads"
-rc_files="inputrc ackrc irbrc livereload"
+bashrc_parts="default prompt aliases functions auto_reload ruby_on_rails crossroads"
 
 cat /dev/null > ~/.bashrc
 
@@ -15,33 +14,25 @@ for part in $bashrc_parts; do
     cat assets/bashrc/$part.sh >> ~/.bashrc
   else
     # Source bashrc from parts
-    echo "source '$this_dir/assets/bashrc/$part.sh'" >> ~/.bashrc
+    echo "source '$this_dir/bashrc/$part.sh'" >> ~/.bashrc
   fi
 done
 
 # Add scm_breeze
 echo '[[ -s "$HOME/.scm_breeze/scm_breeze.sh" ]] && . "$HOME/.scm_breeze/scm_breeze.sh"' >> ~/.bashrc
 
-# Export ubuntu_config_path
-echo "export UBUNTU_CONFIG_PATH=\"$this_dir\"" >> ~/.bashrc
-
-# Append dynamic update command
+# Append dynamic footer
 cat >> ~/.bashrc <<EOF
+# Export path of dotfiles repo
+export DOTFILES_PATH="$this_dir"
+
+# Set bashrc autoreload variable at start
+export BASHRC_LAST_UPDATED="\$(bashrc_last_modified)"
+
 # Update this file from GitHub
 alias pull_bashrc='cd $this_dir && git pull origin master && . bashrc_setup.sh && cd -'
 EOF
 
-for rc in $rc_files; do
-  rm -f ~/.$rc
-  if [ "$1" = "copy" ]; then
-    # Copy other *rc files
-    cp -f "$this_dir/assets/$rc" "$HOME/.$rc"
-  else
-    # Symlink other *rc files
-    ln -fs "$this_dir/assets/$rc" "$HOME/.$rc"
-  fi
-done
-
 
 # If run from dev_machine_setup, we cannot update current shell.
 if ! [[ "$0" =~ "dev_machine_setup.sh" ]]; then

conky_setup.sh → setup/conky.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
-. _shared.sh
+if [ "$(basename $(pwd))" = "setup" ]; then . _shared.sh; else . setup/_shared.sh; fi;  
+
 echo "== Setting up conky..."
 
 # Queue or install apt packages
@@ -22,7 +23,7 @@ fi
 
 # Copy conky config files.
 sudo rm -rf ~/.conkycolors
-cp -rf assets/conkycolors ~/.conkycolors
+cp -rf conky/conkycolors ~/.conkycolors
 
 # Set home directory placeholder
 sed "s%@HOME@%$HOME%g" -i ~/.conkycolors/conkyrc

dropbox_setup.sh → setup/dropbox.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-. _shared.sh
+if [ "$(basename $(pwd))" = "setup" ]; then . _shared.sh; else . setup/_shared.sh; fi;
 # Install Dropbox Nautilus Extension
 # -------------------------------------------
 echo "== Installing dropbox nautilus extension..."

dropbox_links_setup.sh → setup/dropbox_links.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-. _shared.sh
+if [ "$(basename $(pwd))" = "setup" ]; then . _shared.sh; else . setup/_shared.sh; fi;
 # Create symlinks for Dropbox synced directories
 # ----------------------------------------------
 echo "== Creating Dropbox symlinks..."

gedit_setup.sh → setup/gedit.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-. _shared.sh
+if [ "$(basename $(pwd))" = "setup" ]; then . _shared.sh; else . setup/_shared.sh; fi;
 # Sets up gedit for RoR development.
 # -------------------------------------------
 echo "== Setting up gedit plugins, settings and assets (RoR colors, etc)..."

gimp_setup.sh → setup/gimp.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-. _shared.sh
+if [ "$(basename $(pwd))" = "setup" ]; then . _shared.sh; else . setup/_shared.sh; fi;
 # Install latest version of Gimp
 # -------------------------------------------
 echo "== Installing latest version of gimp from ppa..."