From 81f561282af61df0be52536ad41d635882ffcc01 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Mon, 9 Jan 2012 13:20:58 -0500 Subject: [PATCH] make sure window.promot doesn't get called, fixes #106 --- Rakefile | 2 +- script/hooks/post-commit | 4 ++++ script/hooks/pre-commit | 4 ++-- script/initialize-environment | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100755 script/hooks/post-commit diff --git a/Rakefile b/Rakefile index a9c6eb5..def34d7 100644 --- a/Rakefile +++ b/Rakefile @@ -14,7 +14,7 @@ require 'jasmine/headless/task' Jasmine::Headless::Task.new -PLATFORMS = %w{1.8.7 1.9.2 ree 1.9.3-rc1} +PLATFORMS = %w{1.8.7 1.9.2 ree 1.9.3} def rvm_bundle(command = '') Bundler.with_clean_env do diff --git a/script/hooks/post-commit b/script/hooks/post-commit new file mode 100755 index 0000000..490f85d --- /dev/null +++ b/script/hooks/post-commit @@ -0,0 +1,4 @@ +#!/bin/bash + +penchant gemfile remote --switch-back + diff --git a/script/hooks/pre-commit b/script/hooks/pre-commit index e1b1e1c..fc9f07f 100755 --- a/script/hooks/pre-commit +++ b/script/hooks/pre-commit @@ -2,9 +2,9 @@ OLD_GIT_DIR=$GIT_DIR -if [ "$(penchant gemfile-env)" != "remote" ]; then +if [ "$(penchant gemfile-env)" != "remote deployment" ]; then unset GIT_DIR - penchant gemfile remote + penchant gemfile remote --deployment GIT_DIR=$OLD_GIT_DIR git add Gemfile* fi diff --git a/script/initialize-environment b/script/initialize-environment index 222c8f1..dad92b2 100755 --- a/script/initialize-environment +++ b/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}}