flombe 0.1.0.5 → 0.1.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/bin/flombe CHANGED
@@ -1,4 +1,5 @@
1
1
  #!/usr/bin/env ruby
2
+ $:.unshift File.expand_path('../../lib', __FILE__)
2
3
  require "rubygems"
3
4
  require "optparse"
4
5
  require "flombe"
data/bootstrap.sh CHANGED
@@ -23,6 +23,13 @@ else
23
23
  sudo gem update >> ~/.flombe/bootstrap.log 2>&1
24
24
  fi
25
25
 
26
+ test -e /usr/local
27
+ if [ $? -ne 0 ]; then
28
+ echo "=> We need to create the /usr/local directory for homebrew stuff."
29
+ sudo mkdir -p /usr/local
30
+ sudo chown -R `whoami` /usr/local
31
+ fi
32
+
26
33
  echo "Flombe gem installed. Going to run a base install with homebrew and rvm."
27
34
 
28
35
  if [ -f ~/.flombe/Flombefile ]; then
@@ -30,19 +37,18 @@ if [ -f ~/.flombe/Flombefile ]; then
30
37
  fi
31
38
 
32
39
  echo 'recipe "homebrew"' >> ~/.flombe/Flombefile
33
- echo 'recipe "rvm"' >> ~/.flombe/Flombefile
34
40
  echo 'recipe "utils"' >> ~/.flombe/Flombefile
35
41
  echo 'recipe "utils::dotfiles"' >> ~/.flombe/Flombefile
36
42
  echo 'recipe "utils::colors"' >> ~/.flombe/Flombefile
37
43
  echo 'recipe "utils::keyfixer"' >> ~/.flombe/Flombefile
44
+ echo 'recipe "rvm", :global_gems => ["flombe","rake","bundler"]' >> ~/.flombe/Flombefile
38
45
 
39
46
  cd ~/.flombe && flombe | tee -a ~/.flombe/bootstrap.log
40
47
 
41
- echo "Flombe successful at `date`" >> ~/.flombe/bootstrap.log 2>&1
42
-
43
- if [ "$?" -eq "0" ]; then
48
+ if [ $? -eq 0 ]; then
44
49
  echo -e "\033[1;32mFlombe run was successful! :)\033[0m"
45
50
  echo -e "\033[0;32mPlease open a new terminal window to have maximum goodness.\033[0m"
51
+ echo "Flombe successful at `date`" >> ~/.flombe/bootstrap.log 2>&1
46
52
  fi
47
53
 
48
54
  if [ -f ~/.flombe.profile ]; then
@@ -1 +1,6 @@
1
- default['utils::dotfiles']['git']['ignore'] = ['.DS_Store']
1
+ default['utils::dotfiles']['git']['ignore'] = ['.DS_Store']
2
+ default['utils::colors']['git'] = {
3
+ "branch" => {"current" => "yellow reverse", "local" => "yellow", "remote" => "green"},
4
+ "diff" => {"meta" => "yellow bold", "frag" => "magenta bold", "old" => "red bold"},
5
+ "status" => {"added" => "yellow", "changed" => "green", "untracked" => "cyan"}
6
+ }
@@ -9,4 +9,23 @@ end
9
9
 
10
10
  execute "install IR_Black theme" do
11
11
  command "open #{ENV['HOME']}/.flombe/IR_Black.terminal"
12
- end
12
+ end
13
+
14
+ execute "enabling git colors" do
15
+ command <<-EOS
16
+ git config --global color.ui auto
17
+ git config --global color.branch auto
18
+ git config --global color.diff auto
19
+ git config --global color.status auto
20
+ EOS
21
+ not_if "git config --global --get color.ui"
22
+ end
23
+
24
+ node['utils::colors']['git'].each do |set, colors|
25
+ colors.each do |key, color|
26
+ execute "setting git color: color.#{set}.#{key}" do
27
+ command "git config --global color.#{set}.#{key} \"#{color}\""
28
+ not_if "git config --global --get color.#{set}.#{key}"
29
+ end
30
+ end
31
+ end
data/lib/flombe.rb CHANGED
@@ -5,7 +5,7 @@ require "tmpdir"
5
5
  require "json"
6
6
 
7
7
  module Flombe
8
- VERSION = "0.1.0.5"
8
+ VERSION = "0.1.0.6"
9
9
 
10
10
  autoload :Dsl, 'flombe/dsl'
11
11
 
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: flombe
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.1.0.5
5
+ version: 0.1.0.6
6
6
  platform: ruby
7
7
  authors:
8
8
  - Stephen Craton
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2011-05-19 00:00:00 +08:00
13
+ date: 2011-05-21 00:00:00 +08:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency