penchant 0.2.12 → 0.2.13

data/bin/penchant

@@ -45,6 +45,8 @@ class PenchantCLI < Thor
   method_options :switch_back => false
   desc "gemfile ENV", "Switch the gemfile environment, or rebuild the current environment if not given"
   def gemfile(env = get_current_env)
+    check_git_hooks!
+
     if env
       if options[:switch_back]
         puts "[penchant] Switching back, fallback: #{env}..."
@@ -93,9 +95,17 @@ class PenchantCLI < Thor
       out << "deployment" if gemfile.deployment?
       out.join(' ')
     end
+
+    def check_git_hooks!
+      if !Penchant::Hooks.installed?
+        puts "[penchant] git hooks not installed. Run script/install-git-hooks."
+        puts
+      end
+    end
   end
 
   default_task :gemfile
 end
 
 PenchantCLI.start
+

data/features/cli.feature

@@ -27,4 +27,30 @@ Feature: CLI
       source :rubygems
       """
       And the output should include "No git"
-    
+
+  @wip
+  Scenario: Run in a project where the git hooks are not set up
+    Given I have the file "tmp/Gemfile.penchant" with the content:
+      """
+      gem 'rake'
+      """
+    Given I have the file "tmp/script/hooks/pre-commit" with the content:
+      """
+      a penchant hook
+      """
+    When I run "bin/penchant gemfile remote" in the "tmp" directory
+    Then the output should include "git hooks not installed"
+
+  @wip
+  Scenario: Run in a project where git hooks are set up
+    Given I have the file "tmp/Gemfile.penchant" with the content:
+      """
+      gem 'rake'
+      """
+    Given I have the file "tmp/script/hooks/pre-commit" with the content:
+      """
+      a penchant hook
+      """
+    Given I have the symlink "tmp/.git/hooks/pre-commit" which points to "tmp/script/hooks/pre-commit"
+    When I run "bin/penchant gemfile remote" in the "tmp" directory
+    Then the output should not include "git hooks not installed"

data/features/step_definitions/given/i_have_the_symlink_git_hooks_pre_commit_which_points_to_script_hooks_pre_commit.rb

@@ -0,0 +1,4 @@
+Given /^I have the symlink "(.*?)" which points to "(.*?)"$/ do |source, target|
+  FileUtils.mkdir_p(File.dirname(source))
+  File.symlink(target, source)
+end

data/features/step_definitions/then/the_output_should_not_include_git_hooks_not_installed.rb

@@ -0,0 +1,3 @@
+Then /^the output should not include "(.*?)"$/ do |text|
+  @output.should_not include(text)
+end

data/lib/penchant/hooks.rb

@@ -0,0 +1,21 @@
+require 'pathname'
+
+module Penchant
+  class Hooks
+    HOOKS_DIR = 'script/hooks'
+    GIT_HOOKS_DIR = '.git/hooks'
+
+    def self.installed?
+      if File.directory?(HOOKS_DIR)
+        Dir[File.join(HOOKS_DIR, '*')].each do |file|
+          target = File.join(GIT_HOOKS_DIR, File.basename(file))
+          return false if !File.symlink?(target)
+          return false if !File.expand_path(File.readlink(target)) == File.expand_path(file)
+        end
+
+        true
+      end
+    end
+  end
+end
+

data/lib/penchant/version.rb

@@ -1,3 +1,3 @@
 module Penchant
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 end

data/lib/penchant.rb

@@ -2,4 +2,5 @@ module Penchant
   autoload :Gemfile, 'penchant/gemfile'
   autoload :Repo, 'penchant/repo'
   autoload :DotPenchant, 'penchant/dot_penchant'
+  autoload :Hooks, 'penchant/hooks'
 end

data/script/hooks/commit-msg

@@ -2,14 +2,25 @@
 
 msg=$(cat $1)
 
-OLD_GIT_DIR=$GIT_DIR
+# wtf mac os x lion
+if [ ! -z "$MY_RUBY_HOME" ]; then
+  PATH="$MY_RUBY_HOME/bin:$PATH"
+fi
 
-if [[ "${msg}" != *"[ci skip]"* ]]; then
-  if [ "$(penchant gemfile-env)" != "remote" ]; then
-    penchant gemfile remote
-  fi
+if [ ! -z "$GEM_PATH" ]; then
+  oifs="$IFS"
+  while IFS=":" read -ra GEM_PATHS; do
+    FIXED_GEM_PATH=""
+    for i in "${GEM_PATHS[@]}"; do
+      FIXED_GEM_PATH="$FIXED_GEM_PATH:${i}/bin"
+    done
+  done <<< "$GEM_PATH"
+  IFS="$oifs"
+  PATH="$FIXED_GEM_PATH:$PATH"
+fi
 
-  bundle exec rake
+if [[ "${msg}" != *"[ci skip]"* ]]; then
+  bundle exec rake --trace
   R=$?
   if [ $R -ne 0 ]; then exit $R; fi
 fi

data/script/hooks/post-commit

@@ -1,4 +1,2 @@
 #!/bin/bash
 
-penchant gemfile remote --switch-back
-

data/script/hooks/pre-commit

@@ -1,4 +1,2 @@
 #!/bin/bash
 
-# this has been moved to commit-msg
-

data/template/script/hooks/commit-msg

@@ -4,6 +4,24 @@ msg=$(cat $1)
 
 OLD_GIT_DIR=$GIT_DIR
 
+# lion appears to insert git paths before everything else. ensure rvm can
+# bust through, at the very least.
+if [ ! -z "$MY_RUBY_HOME" ]; then
+  PATH="$MY_RUBY_HOME/bin:$PATH"
+fi
+
+if [ ! -z "$GEM_PATH" ]; then
+  oifs="$IFS"
+  while IFS=":" read -ra GEM_PATHS; do
+    FIXED_GEM_PATH=""
+    for i in "${GEM_PATHS[@]}"; do
+      FIXED_GEM_PATH="$FIXED_GEM_PATH:${i}/bin"
+    done
+  done <<< "$GEM_PATH"
+  IFS="$oifs"
+  PATH="$FIXED_GEM_PATH:$PATH"
+fi
+
 if [[ "${msg}" != *"[ci skip]"* ]]; then
   if [ "$(penchant gemfile-env)" != "remote" ]; then
     unset GIT_DIR

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penchant
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,11 +144,13 @@ files:
 - features/ruby_gemfile.feature
 - features/step_definitions/given/i_am_on_the_linux_platform.rb
 - features/step_definitions/given/i_have_the_file_with_content.rb
+- features/step_definitions/given/i_have_the_symlink_git_hooks_pre_commit_which_points_to_script_hooks_pre_commit.rb
 - features/step_definitions/then/i_should_get_the_following_environments.rb
 - features/step_definitions/then/i_should_get_the_following_repositories.rb
 - features/step_definitions/then/the_file_gemfile_should_have_the_following_stripped_content.rb
 - features/step_definitions/then/the_file_should_have_content.rb
 - features/step_definitions/then/the_output_should_include.rb
+- features/step_definitions/then/the_output_should_not_include_git_hooks_not_installed.rb
 - features/step_definitions/when/i_rebuild_the_gemfile_for_local_mode.rb
 - features/step_definitions/when/i_rebuild_the_gemfile_switching_back.rb
 - features/step_definitions/when/i_rebuild_the_gemfile_with_deployment.rb
@@ -160,6 +162,7 @@ files:
 - lib/penchant.rb
 - lib/penchant/dot_penchant.rb
 - lib/penchant/gemfile.rb
+- lib/penchant/hooks.rb
 - lib/penchant/repo.rb
 - lib/penchant/version.rb
 - penchant.gemspec
@@ -193,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1854452012171480691
+      hash: 3150302730892137404
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,10 +205,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1854452012171480691
+      hash: 3150302730892137404
 requirements: []
 rubyforge_project: penchant
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Things I do for my Rails projects to get up to speed in new environments
@@ -216,11 +219,13 @@ test_files:
 - features/ruby_gemfile.feature
 - features/step_definitions/given/i_am_on_the_linux_platform.rb
 - features/step_definitions/given/i_have_the_file_with_content.rb
+- features/step_definitions/given/i_have_the_symlink_git_hooks_pre_commit_which_points_to_script_hooks_pre_commit.rb
 - features/step_definitions/then/i_should_get_the_following_environments.rb
 - features/step_definitions/then/i_should_get_the_following_repositories.rb
 - features/step_definitions/then/the_file_gemfile_should_have_the_following_stripped_content.rb
 - features/step_definitions/then/the_file_should_have_content.rb
 - features/step_definitions/then/the_output_should_include.rb
+- features/step_definitions/then/the_output_should_not_include_git_hooks_not_installed.rb
 - features/step_definitions/when/i_rebuild_the_gemfile_for_local_mode.rb
 - features/step_definitions/when/i_rebuild_the_gemfile_switching_back.rb
 - features/step_definitions/when/i_rebuild_the_gemfile_with_deployment.rb