whisk_deploy 0.6.26

data/lib/whiskey_disk/config/filters/project_scope_filter.rb

@@ -0,0 +1,34 @@
+require 'whiskey_disk/config/abstract_filter'
+require 'whiskey_disk/config/filters/modules/scope_helper'
+
+class WhiskeyDisk
+  class Config
+    class ProjectScopeFilter < AbstractFilter
+      include ScopeHelper
+
+      def repository_depth(data, depth = 0)
+        raise 'no repository found' unless data.respond_to?(:has_key?)
+        return depth if data.has_key?('repository')
+        repository_depth(data.values.first, depth + 1)
+      end
+  
+      # is this data hash an environment data hash without a project name?
+      def needs_project_scoping?(data)
+        repository_depth(data) == 1
+      end
+
+      # TODO: why do we continue to need override_project_name! ?
+      # TODO: this is invasive into Config's implementation
+      def override_project_name!(data)
+        return if ENV['to'] && ENV['to'] =~ /:/
+        ENV['to'] = data[environment_name]['project'] + ':' + ENV['to'] if data[environment_name]['project']
+      end
+
+      def filter(data)
+        return data unless needs_project_scoping?(data)
+        override_project_name!(data)
+        { project_name => data }
+      end
+    end
+  end
+end

data/lib/whiskey_disk/config/filters/select_project_and_environment_filter.rb

@@ -0,0 +1,12 @@
+require 'whiskey_disk/config/abstract_filter'
+
+class WhiskeyDisk
+  class Config
+    class SelectProjectAndEnvironmentFilter < AbstractFilter
+      def filter(data)
+        raise "No configuration file defined data for project `#{project_name}`, environment `#{environment_name}`" unless data and data[project_name] and data[project_name][environment_name]
+        data[project_name][environment_name]
+      end
+    end
+  end
+end

data/lib/whiskey_disk/config/filters/stringify_hash_keys_filter.rb

@@ -0,0 +1,25 @@
+require 'whiskey_disk/config/abstract_filter'
+
+class WhiskeyDisk
+  class Config
+    class StringifyHashKeysFilter < AbstractFilter
+      def stringify_hash(data)
+        result = {}
+        data.each_pair do |key, value|
+          result[key.to_s] = stringify(value)
+        end
+        result
+      end
+
+      def stringify(structure)
+        return structure.clone unless structure.respond_to? :keys
+        stringify_hash(structure)
+      end
+      
+      def filter(data)
+        stringify(data)
+      end
+    end
+  end
+end
+

data/lib/whiskey_disk/helpers.rb

@@ -0,0 +1,50 @@
+
+# is the current deployment domain in the specified role?
+def role?(role)
+  return false unless ENV['WD_ROLES'] and ENV['WD_ROLES'] != ''
+  ENV['WD_ROLES'].split(':').include?(role.to_s)
+end
+
+# have files of interest changed on this deployment?
+def changed?(path)
+  return true unless gc = git_changes
+  cleaned = Regexp.escape(path.sub(%r{/+$}, ''))
+  [ gc, rsync_changes ].flatten.compact.any? { |p| p =~ %r<^#{cleaned}(?:$|/)> }
+end
+
+# list of changed paths, according to git
+def git_changes
+  changes = read_git_changes_file.split("\n").uniq
+rescue Exception
+  nil
+end
+
+def rsync_changes
+  changes = read_rsync_changes_file.split("\n")
+  changes.map {|c| c.sub(/^[^ ]* [^ ]* [^ ]* /, '') }.
+          grep(/^[^ ]{9,} /).map {|c| c.sub(/^[^ ]{9,} /, '') }.
+          map {|s| s.sub(%r{/$}, '') } - ['.']
+rescue Exception
+  nil
+end
+
+def read_git_changes_file
+  File.read(git_changes_path)
+end
+
+def read_rsync_changes_file
+  File.read(rsync_changes_path)
+end
+
+def changes_file_root
+  path = IO.popen("git rev-parse --show-toplevel").read
+  path == '' ? Dir.pwd : path.chomp
+end
+
+def git_changes_path
+  File.join(changes_file_root, '.whiskey_disk_git_changes')
+end
+
+def rsync_changes_path
+  File.join(changes_file_root, '.whiskey_disk_rsync_changes')
+end

data/lib/whiskey_disk/rake.rb

@@ -0,0 +1,47 @@
+require 'rake'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'whiskey_disk'))
+
+namespace :deploy do
+  desc "Perform initial setup for deployment"
+  task :setup do
+    @whiskey_disk = WhiskeyDisk.new
+    @whiskey_disk.ensure_main_parent_path_is_present
+    @whiskey_disk.ensure_config_parent_path_is_present      if @whiskey_disk.has_config_repo?
+    @whiskey_disk.checkout_main_repository
+    @whiskey_disk.checkout_configuration_repository         if @whiskey_disk.has_config_repo?
+    @whiskey_disk.update_main_repository_checkout
+    @whiskey_disk.update_configuration_repository_checkout  if @whiskey_disk.has_config_repo?
+    @whiskey_disk.refresh_configuration                     if @whiskey_disk.has_config_repo?
+    @whiskey_disk.initialize_all_changes
+    @whiskey_disk.run_post_setup_hooks
+    @whiskey_disk.flush
+    @whiskey_disk.summarize
+
+    exit(1) unless @whiskey_disk.success?
+  end
+  
+  desc "Deploy now."
+  task :now do
+    @whiskey_disk = WhiskeyDisk.new(:staleness_checks => true)
+    @whiskey_disk.update_main_repository_checkout
+    @whiskey_disk.update_configuration_repository_checkout  if @whiskey_disk.has_config_repo?
+    @whiskey_disk.refresh_configuration                     if @whiskey_disk.has_config_repo?
+    @whiskey_disk.run_post_deploy_hooks
+    @whiskey_disk.flush
+    @whiskey_disk.summarize
+
+    exit(1) unless @whiskey_disk.success?
+  end
+  
+  task :post_setup do
+    @whiskey_disk = WhiskeyDisk.new
+    env = @whiskey_disk.setting(:environment)
+    Rake::Task["deploy:#{env}:post_setup"].invoke if Rake::Task.task_defined? "deploy:#{env}:post_setup"      
+  end
+
+  task :post_deploy do
+    @whiskey_disk = WhiskeyDisk.new
+    env = @whiskey_disk.setting(:environment)
+    Rake::Task["deploy:#{env}:post_deploy"].invoke if Rake::Task.task_defined? "deploy:#{env}:post_deploy"      
+  end
+end

data/scenarios/git_repositories/config.git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

data/scenarios/git_repositories/config.git/config

@@ -0,0 +1,5 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
+	ignorecase = true

data/scenarios/git_repositories/config.git/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

data/scenarios/git_repositories/config.git/hooks/applypatch-msg.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

data/scenarios/git_repositories/config.git/hooks/commit-msg.sample

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by git-commit with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

data/scenarios/git_repositories/config.git/hooks/post-commit.sample

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script that is called after a successful
+# commit is made.
+#
+# To enable this hook, rename this file to "post-commit".
+
+: Nothing

data/scenarios/git_repositories/config.git/hooks/post-receive.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script for the "post-receive" event.
+#
+# The "post-receive" script is run after receive-pack has accepted a pack
+# and the repository has been updated.  It is passed arguments in through
+# stdin in the form
+#  <oldrev> <newrev> <refname>
+# For example:
+#  aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
+#
+# see contrib/hooks/ for a sample, or uncomment the next line and
+# rename the file to "post-receive".
+
+#. /usr/share/doc/git-core/contrib/hooks/post-receive-email

data/scenarios/git_repositories/config.git/hooks/post-update.sample

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git-update-server-info

data/scenarios/git_repositories/config.git/hooks/pre-applypatch.sample

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:

data/scenarios/git_repositories/config.git/hooks/pre-commit.sample

@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by git-commit with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git-rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ascii filenames set this variable to true.
+allownonascii=$(git config hooks.allownonascii)
+
+# Cross platform projects tend to avoid non-ascii filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test "$(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0')"
+then
+	echo "Error: Attempt to add a non-ascii file name."
+	echo
+	echo "This can cause problems if you want to work"
+	echo "with people on other platforms."
+	echo
+	echo "To be portable it is advisable to rename the file ..."
+	echo
+	echo "If you know what you are doing you can disable this"
+	echo "check using:"
+	echo
+	echo "  git config hooks.allownonascii true"
+	echo
+	exit 1
+fi
+
+exec git diff-index --check --cached $against --

data/scenarios/git_repositories/config.git/hooks/pre-rebase.sample

@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git-rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git-rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git-rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git-rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git-rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git-rev-list --pretty=oneline ^${publish} "$topic"`
+	perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git-rev-list ^master ^topic next
+	git-rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git-rev-list master..topic
+
+	if this is empty, it is fully merged to "master".