flombe 0.1.0.5 → 0.1.0.6

data/bin/flombe

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$:.unshift File.expand_path('../../lib', __FILE__)
 require "rubygems"
 require "optparse"
 require "flombe"

data/bootstrap.sh

@@ -23,6 +23,13 @@ else
   sudo gem update                             >> ~/.flombe/bootstrap.log 2>&1
 fi
 
+test -e /usr/local
+if [ $? -ne 0 ]; then
+  echo "=> We need to create the /usr/local directory for homebrew stuff."
+  sudo mkdir -p /usr/local
+  sudo chown -R `whoami` /usr/local
+fi
+
 echo "Flombe gem installed. Going to run a base install with homebrew and rvm."
 
 if [ -f ~/.flombe/Flombefile ]; then
@@ -30,19 +37,18 @@ if [ -f ~/.flombe/Flombefile ]; then
 fi
 
 echo 'recipe "homebrew"'        >> ~/.flombe/Flombefile
-echo 'recipe "rvm"'             >> ~/.flombe/Flombefile
 echo 'recipe "utils"'           >> ~/.flombe/Flombefile
 echo 'recipe "utils::dotfiles"' >> ~/.flombe/Flombefile
 echo 'recipe "utils::colors"'   >> ~/.flombe/Flombefile
 echo 'recipe "utils::keyfixer"' >> ~/.flombe/Flombefile
+echo 'recipe "rvm", :global_gems => ["flombe","rake","bundler"]' >> ~/.flombe/Flombefile
 
 cd ~/.flombe && flombe | tee -a ~/.flombe/bootstrap.log
 
-echo "Flombe successful at `date`" >> ~/.flombe/bootstrap.log 2>&1
-
-if [ "$?" -eq "0" ]; then
+if [ $? -eq 0 ]; then
   echo -e "\033[1;32mFlombe run was successful! :)\033[0m"
   echo -e "\033[0;32mPlease open a new terminal window to have maximum goodness.\033[0m"
+  echo "Flombe successful at `date`" >> ~/.flombe/bootstrap.log 2>&1
 fi
 
 if [ -f ~/.flombe.profile ]; then

data/cookbooks/utils/attributes/git.rb

@@ -1 +1,6 @@
-default['utils::dotfiles']['git']['ignore'] = ['.DS_Store']
+default['utils::dotfiles']['git']['ignore'] = ['.DS_Store']
+default['utils::colors']['git'] = {
+  "branch"  => {"current" => "yellow reverse", "local" => "yellow", "remote" => "green"},
+  "diff"    => {"meta" => "yellow bold", "frag" => "magenta bold", "old" => "red bold"},
+  "status"  => {"added" => "yellow", "changed" => "green", "untracked" => "cyan"}
+}

data/cookbooks/utils/recipes/colors.rb

@@ -9,4 +9,23 @@ end
 
 execute "install IR_Black theme" do
   command "open #{ENV['HOME']}/.flombe/IR_Black.terminal"
-end
+end
+
+execute "enabling git colors" do
+  command <<-EOS
+    git config --global color.ui auto
+    git config --global color.branch auto
+    git config --global color.diff auto
+    git config --global color.status auto
+  EOS
+  not_if "git config --global --get color.ui"
+end
+
+node['utils::colors']['git'].each do |set, colors|
+  colors.each do |key, color|
+    execute "setting git color: color.#{set}.#{key}" do
+      command "git config --global color.#{set}.#{key} \"#{color}\""
+      not_if "git config --global --get color.#{set}.#{key}"
+    end
+  end
+end

data/lib/flombe.rb

@@ -5,7 +5,7 @@ require "tmpdir"
 require "json"
 
 module Flombe
-  VERSION = "0.1.0.5"
+  VERSION = "0.1.0.6"
   
   autoload :Dsl, 'flombe/dsl'
   

metadata

@@ -2,7 +2,7 @@
 name: flombe
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0.5
+  version: 0.1.0.6
 platform: ruby
 authors: 
 - Stephen Craton
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 +08:00
+date: 2011-05-21 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency