penchant 0.2.13 → 0.2.14

data/README.md

@@ -29,6 +29,9 @@ Yeah, it's a `Gemfile` with some extras:
 # Gemfile.penchant
 source :rubygems
 
+# ensure git hooks are installed when a gemfile is processed, see below
+ensure_git_hooks!
+
 gem 'rails', '3.2.3'
 # expands to:
 #
@@ -173,6 +176,13 @@ It runs `penchant gemfile remote` then runs `bundle exec rake`. Make sure your d
 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.
 
+### Ensuring git hooks get installed
+
+I find that when I pull down new projects I never remember to install the git hooks, which involves an awkward running
+of `bundle exec rake` *after* I've already committed code. Since we have computers now, and they can be told to do things,
+you can add `ensure_git_hooks!` anywhere in your `Gemfile.penchant` to make sure the git hooks are symlinked to the ones
+in the `script/hooks` directory with every processing of `Gemfile.penchant`.
+
 ### Skipping all that Rake falderal?
 
 Do it Travis CI style: stick `[ci skip]` in your commit message. That's why the meat of the git hooks resides in

data/bin/penchant

@@ -19,9 +19,7 @@ class PenchantCLI < Thor
     Dir[File.join(options[:dir], '**/*')].each { |file| File.chmod(0755, file) }
 
     if File.directory?('.git')
-      Dir['script/hooks/*'].each do |hook|
-        FileUtils.ln_sf File.join(Dir.pwd, hook), ".git/hooks/#{File.split(hook).last}"
-      end
+      Penchant::Hooks.install!
     else
       puts "No git repository detected here. Skipping git hook installation..."
     end

data/features/cli.feature

@@ -28,7 +28,6 @@ Feature: CLI
       """
       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:
       """
@@ -41,7 +40,6 @@ Feature: CLI
     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:
       """

data/features/ruby_gemfile.feature

@@ -278,3 +278,19 @@ Feature: Gemfiles
       gem "one", {:git=>"git://github.com/john/one.git"}
       """
 
+  @mocha
+  Scenario: Force installing of git hooks if the gemfile asks for it
+    Given I expect git hooks to be installed
+    Given I have the file "Gemfile.penchant" with the content:
+      """
+      ensure_git_hooks!
+
+      gem 'one'
+      """
+    When I rebuild the Gemfile for "local" mode
+    Then the file "Gemfile" should have the following content:
+      """
+      # generated by penchant, environment: local
+      gem "one"
+      """
+

data/features/step_definitions/given/i_expect_git_hooks_to_be_installed.rb

@@ -0,0 +1,3 @@
+Given /^I expect git hooks to be installed$/ do
+  Penchant::Hooks.expects(:install!)
+end

data/lib/penchant/gemfile.rb

@@ -163,6 +163,10 @@ module Penchant
         yield if !is_deployment
       end
 
+      def ensure_git_hooks!
+        Penchant::Hooks.install!
+      end
+
       def os(*args)
         yield if args.include?(current_os)
       end

data/lib/penchant/hooks.rb

@@ -16,6 +16,14 @@ module Penchant
         true
       end
     end
+
+    def self.install!
+      puts "[penchant] installing git hooks"
+
+      Dir['script/hooks/*'].each do |hook|
+        FileUtils.ln_sf File.join(Dir.pwd, hook), ".git/hooks/#{File.split(hook).last}"
+      end
+    end
   end
 end
 

data/lib/penchant/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penchant
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,7 @@ files:
 - features/gemfile.feature
 - features/ruby_gemfile.feature
 - features/step_definitions/given/i_am_on_the_linux_platform.rb
+- features/step_definitions/given/i_expect_git_hooks_to_be_installed.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
@@ -196,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3150302730892137404
+      hash: -4027868368802670317
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -205,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3150302730892137404
+      hash: -4027868368802670317
 requirements: []
 rubyforge_project: penchant
 rubygems_version: 1.8.23
@@ -218,6 +219,7 @@ test_files:
 - features/gemfile.feature
 - features/ruby_gemfile.feature
 - features/step_definitions/given/i_am_on_the_linux_platform.rb
+- features/step_definitions/given/i_expect_git_hooks_to_be_installed.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