penchant 0.1.1 → 0.1.2

data/lib/penchant/version.rb

@@ -1,3 +1,3 @@
 module Penchant
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/script/gemfile

@@ -4,7 +4,6 @@ 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/script/hooks/commit-msg

@@ -21,3 +21,4 @@ if [ "$(penchant gemfile-env)" != "remote deployment" ]; then
   git add Gemfile*
 fi
 
+exit 0

data/script/hooks/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-# this is now handled in commit-msg, to allow for skipping of test running based on the commit message
+# this has been moved to commit-msg
 

data/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}}

data/template/script/hooks/commit-msg

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+msg=$(cat $1)
+
+OLD_GIT_DIR=$GIT_DIR
+
+if [[ "${msg}" != *"[ci skip]"* ]]; then
+  if [ "$(penchant gemfile-env)" != "remote" ]; then
+    penchant gemfile remote
+  fi
+
+  bundle exec rake
+  R=$?
+  if [ $R -ne 0 ]; then exit $R; fi
+fi
+
+if [ "$(penchant gemfile-env)" != "remote deployment" ]; then
+  unset GIT_DIR
+  penchant gemfile remote --deployment
+  GIT_DIR=$OLD_GIT_DIR
+  git add Gemfile*
+fi
+
+exit 0

data/template/script/hooks/post-commit

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

data/template/script/hooks/pre-commit

@@ -1,19 +1,4 @@
 #!/bin/bash
 
-OLD_GIT_DIR=$GIT_DIR
-
-if [ "$(penchant gemfile-env)" != "remote" ]; then
-  penchant gemfile remote
-fi
-
-bundle exec rake
-R=$?
-if [ $R -ne 0 ]; then exit $R; fi
-
-if [ "$(penchant gemfile-env)" != "remote deployment" ]; then
-  unset GIT_DIR
-  penchant gemfile remote --deployment
-  GIT_DIR=$OLD_GIT_DIR
-  git add Gemfile*
-fi
+# this has been moved to commit-msg
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penchant
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -51,6 +51,7 @@ files:
 - spec/lib/penchant_spec.rb
 - spec/spec_helper.rb
 - template/script/gemfile
+- template/script/hooks/commit-msg
 - template/script/hooks/post-commit
 - template/script/hooks/pre-commit
 - template/script/initialize-environment
@@ -69,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2805133852426367993
+      hash: 826851711402513730
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -78,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2805133852426367993
+      hash: 826851711402513730
 requirements: []
 rubyforge_project: penchant
 rubygems_version: 1.8.17