penchant 0.0.2 → 0.0.3

data/README.md

@@ -19,11 +19,6 @@ Installs a bunch of scripts into the `scripts` directory of your project:
 * `hooks/pre-commit`, one of the hooks the prior script installs
 * `initialize-environment`, which bootstraps your local environment so you can get up and running
 
-## 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). This won't run if the `:bootstrap` task is not there.
-
 ## Gemfile.erb?!
 
 Yeah, it's a `Gemfile` with ERB in it:
@@ -43,6 +38,26 @@ It then runs `bundle install`.
 
 You can also run `penchant gemfile ENV`.
 
+## initialize-environment
+
+Get new developers up to speed fast! `script/initialize-environment` does the following when run:
+
+* Check out any remote repos found in `Gemfile.erb` to the same directory where your current project lives.
+  That way, you can have your `Gemfile.erb` set up as above and everything works cleanly.
+* Runs `script/gemfile remote` to set your project to using remote repositories.
+* Runs `rake bootstrap` for the project if it exists.
+
+### After-`gemfile` hooks?
+
+Drop a file called `.penchant` in your project directory. It'll get executed every time you switch environments using
+Penchant. I use it to tell my Hydra clients to sync and update their Gemfiles, too:
+
+``` ruby
+# rake knows if you need "bundle exec" or not.
+
+rake "hydra:sync hydra:remote:bundle"
+```
+
 ### What environment are you currently using in that Gemfile?
 
 `head -n 1` that puppy, or `penchant gemfile-env`.

data/bin/penchant

@@ -3,6 +3,7 @@
 require 'rubygems'
 require 'thor'
 require 'penchant'
+require 'fileutils'
 
 class PenchantCLI < Thor
   include Thor::Actions
@@ -19,21 +20,38 @@ class PenchantCLI < Thor
   method_options :dir => 'script'
   def convert
     install
-    copy_file 'Gemfile', 'Gemfile.erb'
-    remove_file 'Gemfile'
+    FileUtils.mv 'Gemfile', 'Gemfile.erb'
     gemfile(:remote)
   end
 
-  desc "gemfile ENV", "Switch the gemfile environment"
-  def gemfile(env)
-    Penchant::Gemfile.do_full_env_switch!(env)
+  desc "gemfile ENV", "Switch the gemfile environment, or rebuild the current environment if not given"
+  def gemfile(env = get_current_env)
+    if env
+      puts "[penchant] Rebunding for #{env} environment..."
+      Penchant::Gemfile.do_full_env_switch!(env)
+    end
+
+    gemfile = Penchant::Gemfile.new
+    if !gemfile.has_gemfile?
+      puts "No Gemfile or Gemfile.erb, exiting."
+      exit 1
+    end
+    system %{bundle}
   end
 
   desc "gemfile-env", "Get the gemfile environment"
   def gemfile_env
-    gemfile = Penchant::Gemfile.new
-    puts gemfile.environment
+    puts get_current_env
   end
+
+  no_tasks do
+    def get_current_env
+      gemfile = Penchant::Gemfile.new
+      gemfile.environment
+    end
+  end
+
+  default_task :gemfile
 end
 
 PenchantCLI.start

data/lib/penchant/dot_penchant.rb

@@ -0,0 +1,28 @@
+module Penchant
+  class DotPenchant
+    class << self
+      def run(env = nil)
+        dot_penchant = new
+        dot_penchant.run(env)
+        dot_penchant
+      end
+    end
+
+    def run(env = nil)
+      instance_eval(File.read('.penchant'))
+    end
+
+    def rake(*tasks)
+      command = [ "rake", *tasks ]
+      command.unshift("bundle exec") if gemfile?
+      Kernel.system command.join(' ')
+    end
+
+    private
+    def gemfile?
+      File.file?('Gemfile')
+    end
+
+  end
+end
+

data/lib/penchant/gemfile.rb

@@ -7,13 +7,13 @@ module Penchant
     class << self
       def do_full_env_switch!(env)
         gemfile = Penchant::Gemfile.new
+        gemfile.run_dot_penchant!(env)
+
         if !gemfile.has_gemfile_erb?
-          puts "Not using Gemfile.erb, exiting."
           return false
         end
 
         gemfile.switch_to!(env)
-        system %{bundle}
       end
     end
 
@@ -29,6 +29,10 @@ module Penchant
       File.file?('Gemfile')
     end
 
+    def has_dot_penchant?
+      File.file?('.penchant')
+    end
+
     def gemfile_erb_path
       file_in_path('Gemfile.erb')
     end
@@ -52,6 +56,10 @@ module Penchant
       end
     end
 
+    def run_dot_penchant!(env)
+      DotPenchant.run(env || environment) if has_dot_penchant?
+    end
+
     private
     def file_in_path(file)
       File.join(@path, file)

data/lib/penchant/version.rb

@@ -1,3 +1,3 @@
 module Penchant
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/penchant.rb

@@ -1,3 +1,4 @@
 module Penchant
   autoload :Gemfile, 'penchant/gemfile'
+  autoload :DotPenchant, 'penchant/dot_penchant'
 end

data/script/gemfile

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'penchant'
 
 if Penchant::Gemfile.do_full_env_switch!(ARGV[0])
+  system %{bundle}
   puts "Gemfile switched to #{ARGV[0]}"
 else
   exit 0

data/spec/lib/penchant/dot_penchant_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Penchant::DotPenchant do
+  include FakeFS::SpecHelpers
+
+  describe '.run' do
+    before do
+      File.open('.penchant', 'wb') { |fh|
+        fh.puts "@did_run = env"
+      }
+    end
+
+    it 'should run the file in the environment' do
+      dot_file = Penchant::DotPenchant.run(:this)
+
+      dot_file.instance_variable_get(:@did_run).should == :this
+    end
+  end
+
+  let(:dot_file) { described_class.new }
+
+  describe '#rake' do
+    context 'without Gemfile' do
+      before do
+        Kernel.expects(:system).with('rake task1 task2')
+      end
+
+      it 'should run the rake task via system' do
+        dot_file.rake("task1", "task2")
+      end
+    end
+
+    context 'with Gemfile' do
+      before do
+        File.open('Gemfile', 'wb')
+        Kernel.expects(:system).with('bundle exec rake task1 task2')
+      end
+
+      it 'should run the rake task via system' do
+        dot_file.rake("task1", "task2")
+      end
+    end
+  end
+end
+

data/spec/lib/penchant/gemfile_spec.rb

@@ -103,6 +103,20 @@ ERB
         File.read('Gemfile').should_not include('not')
         File.read('Gemfile').should include('all')
       end
+
+      it { should_not have_dot_penchant }
+
+      context 'with .penchant' do
+        before do
+          File.open('.penchant', 'wb')
+        end
+
+        it { should have_dot_penchant }
+
+        it 'should process the file' do
+          subject.switch_to!(:not)
+        end
+      end
     end
   end
 end

data/template/script/initialize-environment

@@ -5,7 +5,7 @@ if File.file?('Gemfile.erb')
 
   Dir.chdir '..' do
     File.readlines(File.join(pwd, 'Gemfile.erb')).find_all { |line| line[':git'] }.each do |line|
-      repo = line[%r{:git => (['"])(.*)\1}, 2]
+      repo = line[%r{:git => (['"])([^'"]+)\1}, 2]
 
       puts "Installing #{repo}"
       system %{git clone #{repo}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penchant
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-18 00:00:00.000000000Z
+date: 2011-09-14 00:00:00.000000000Z
 dependencies: []
 description: Things I do for my Rails projects to get up to speed in new environments
   fast
@@ -27,6 +27,7 @@ files:
 - Rakefile
 - bin/penchant
 - lib/penchant.rb
+- lib/penchant/dot_penchant.rb
 - lib/penchant/gemfile.rb
 - lib/penchant/version.rb
 - penchant.gemspec
@@ -34,6 +35,7 @@ files:
 - script/hooks/pre-commit
 - script/initialize-environment
 - script/install-git-hooks
+- spec/lib/penchant/dot_penchant_spec.rb
 - spec/lib/penchant/gemfile_spec.rb
 - spec/lib/penchant_spec.rb
 - spec/spec_helper.rb
@@ -61,9 +63,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: penchant
-rubygems_version: 1.8.6
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Things I do for my Rails projects to get up to speed in new environments
   fast
-test_files: []
+test_files:
+- spec/lib/penchant/dot_penchant_spec.rb
+- spec/lib/penchant/gemfile_spec.rb
+- spec/lib/penchant_spec.rb
+- spec/spec_helper.rb