From 892ad17e4ef9f9dd1d89b40a0e7db3f35cb15144 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Thu, 18 Aug 2011 17:37:54 -0400
Subject: [PATCH] make things betterer

---
 README.md                        | 25 +++++++++++++++++++------
 bin/penchant                     |  9 +++++++++
 template/script/hooks/pre-commit |  2 +-
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ede3340..64be4d8 100644
--- a/README.md
+++ b/README.md
@@ -22,16 +22,18 @@ Installs a bunch of scripts into the `scripts` directory of your project:
 ## initialize-environment
 
 It will also try to run `rake bootstrap`, so add a `:bootstrap` task for things that should happen when you start going
-(make databases, other stuff, etc, whatever).
+(make databases, other stuff, etc, whatever). This won't run if the `:bootstrap` task is not there.
 
 ## Gemfile.erb?!
 
 Yeah, it's a `Gemfile` with ERB in it:
 
 ``` erb
-<% if env == "local" %>
+<% env :local do %>
   gem 'guard', :path => '../guard'
-<% else %>
+<% end %>
+
+<% env :remote do %>
   gem 'guard', :git => 'git://github.com/johnbintz/guard.git'
 <% end %>
 ```
@@ -39,14 +41,25 @@ Yeah, it's a `Gemfile` with ERB in it:
 Use `script/gemfile local` to get at the local ones, and `script/gemfile remote` (or anything, really) to get at the remote ones.
 It then runs `bundle install`.
 
+You can also run `penchant gemfile ENV`.
+
+### What environment are you currently using in that Gemfile?
+
+`head -n 1` that puppy, or `penchant gemfile-env`.
+
 ## git hook?!
 
-It runs `script/gemfile remote` then runs `bundle exec rake`. Make sure your default Rake task for the project runs your
-tests and performs any other magic necessary before each commit.
+It runs `penchant gemfile remote` then runs `bundle exec rake`. Make sure your default Rake task for the project runs your
+tests and performs any other magic necessary before each commit. Your re-environmented Gemfile and Gemfile.lock will be added
+to your commit if they've changed.
 
 ## How?!
 
 * `gem install penchant`
 * `cd` to your project directory
-* `penchant install` (can do `--dir=WHEREVER`, too)
+
+And then one of the following:
+
+* `penchant install` for a new project (`--dir=WHEREVER` will install the scripts to a directory other than `$PWD/scripts`)
+* `penchant convert` for an existing project (`--dir=WHEVEVER` works here, too)
 
diff --git a/bin/penchant b/bin/penchant
index 442c2b5..c360f64 100755
--- a/bin/penchant
+++ b/bin/penchant
@@ -15,6 +15,15 @@ class PenchantCLI < Thor
     Dir[File.join(options[:dir], '**/*')].each { |file| File.chmod(0755, file) }
   end
 
+  desc "convert", "Make an existing project Penchant-isized"
+  method_options :dir => 'script'
+  def convert
+    install
+    copy_file 'Gemfile', 'Gemfile.erb'
+    remove_file 'Gemfile'
+    gemfile(:remote)
+  end
+
   desc "gemfile ENV", "Switch the gemfile environment"
   def gemfile(env)
     Penchant::Gemfile.do_full_env_switch!(env)
diff --git a/template/script/hooks/pre-commit b/template/script/hooks/pre-commit
index 261b2ae..1e30cb0 100755
--- a/template/script/hooks/pre-commit
+++ b/template/script/hooks/pre-commit
@@ -6,7 +6,7 @@ if [ $(penchant gemfile-env) != "remote" ]; then
   unset GIT_DIR
   penchant gemfile remote
   GIT_DIR=$OLD_GIT_DIR
-  git add Gemfile
+  git add Gemfile*
 fi
 
 bundle exec rake