whiskey_disk 0.6.22 → 0.6.23

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

@@ -0,0 +1,12 @@
+require 'whiskey_disk/config/abstract_filter'
+
+class WhiskeyDisk
+  class Config
+    class DefaultDomainFilter < AbstractFilter
+      def filter(data)
+        data.has_key?('domain') ? data : data.merge('domain' => [ { 'name' => 'local' } ] )
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,32 @@
+require 'whiskey_disk/config/abstract_filter'
+
+class WhiskeyDisk
+  class Config
+    class DropEmptyDomainRolesFilter < AbstractFilter
+      def has_empty_role?(domain)
+        return true unless domain.has_key?('roles')
+        return true if domain['roles'].nil?
+
+        roles = domain['roles'].uniq.compact
+        return true if roles == [ '' ]
+        return true if roles == []
+        
+        false
+      end
+      
+      def drop_empty_roles_for_domain(domain)
+        return domain unless has_empty_role?(domain)
+        domain.reject {|key, value| key == 'roles' }
+      end
+      
+      def drop_empty_domain_roles(domains_list)
+        domains_list.collect { |domain| drop_empty_roles_for_domain(domain) }
+      end
+      
+      def filter(data)
+        data.merge('domain' => drop_empty_domain_roles(data['domain']))
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,20 @@
+require 'whiskey_disk/config/abstract_filter'
+require 'whiskey_disk/config/filters/modules/scope_helper'
+
+class WhiskeyDisk
+  class Config
+    class EnvironmentScopeFilter < AbstractFilter      
+      include ScopeHelper
+
+      # is this data hash a bottom-level data hash without an environment name?
+      def needs_environment_scoping?(data)
+        repository_depth(data) == 0
+      end
+  
+      def filter(data)
+        return data unless needs_environment_scoping?(data)
+        { environment_name => data }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+require 'whiskey_disk/config/abstract_filter'
+
+class WhiskeyDisk
+  class Config
+    class HashifyDomainEntriesFilter < AbstractFilter
+      def needs_hashing?(domain)
+        ! domain.respond_to?(:keys)
+      end
+      
+      def hashify_domain(domain)
+        needs_hashing?(domain) ? { 'name' => domain } : domain
+      end
+      
+      def new_domain
+        { 'name' => '' }
+      end
+      
+      def hashify_domains(domain_list)
+        return new_domain unless domain_list
+        domain_list.collect {|domain| hashify_domain(domain) }
+      end
+
+      def filter(data)
+        data.merge('domain' => hashify_domains(data['domain']))
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,24 @@
+require 'whiskey_disk/config/abstract_filter'
+
+class WhiskeyDisk
+  class Config
+    class LocalizeDomainsFilter < AbstractFilter
+      def is_local?(name)
+        name.nil? or name == ''
+      end
+      
+      def localize(name)
+        is_local?(name) ? 'local' : name
+      end
+      
+      def localize_domains(domain_list)
+        domain_list.collect {|domain| domain.merge('name' => localize(domain['name'])) }
+      end
+
+      def filter(data)
+        data.merge('domain' => localize_domains(data['domain']))
+      end
+    end
+  end
+end
+

data/lib/whiskey_disk/config/filters/modules/scope_helper.rb

@@ -0,0 +1,11 @@
+class WhiskeyDisk
+  class Config
+    module 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
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+require 'whiskey_disk/config/abstract_filter'
+
+class WhiskeyDisk
+  class Config
+    class NormalizeSshOptionsFilter < AbstractFilter
+      def drop_empties(options_list)
+        options_list.select {|option| option and option != '' }
+      end
+      
+      def drop_empty_ssh_options_for_domain(domain)
+        result = drop_empties([ domain['ssh_options'] ].flatten)
+        if result and result != []
+          domain.merge('ssh_options' => result)
+        else
+          domain.reject {|k,v| k == 'ssh_options' }
+        end
+      end
+      
+      def normalize_ssh_options(domains_list)
+        domains_list.collect { |domain| drop_empty_ssh_options_for_domain(domain) }
+      end
+      
+      def filter(data)
+        data.merge('domain' => normalize_ssh_options(data['domain']))
+      end
+    end
+  end
+end
+

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

@@ -22,7 +22,7 @@ end
 def rsync_changes
   changes = read_rsync_changes_file.split("\n")
   changes.map {|c| c.sub(/^[^ ]* [^ ]* [^ ]* /, '') }.
-          grep(/^[^ ]{9} /).map {|c| c.sub(/^[^ ]{9} /, '') }.
+          grep(/^[^ ]{9,} /).map {|c| c.sub(/^[^ ]{9,} /, '') }.
           map {|s| s.sub(%r{/$}, '') } - ['.']
 rescue Exception
   nil

data/lib/whiskey_disk/rake.rb

@@ -4,41 +4,44 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'whiskey_disk')
 namespace :deploy do
   desc "Perform initial setup for deployment"
   task :setup do
-    WhiskeyDisk.ensure_main_parent_path_is_present
-    WhiskeyDisk.ensure_config_parent_path_is_present      if WhiskeyDisk.has_config_repo?
-    WhiskeyDisk.checkout_main_repository
-    WhiskeyDisk.checkout_configuration_repository         if WhiskeyDisk.has_config_repo?
-    WhiskeyDisk.update_main_repository_checkout
-    WhiskeyDisk.update_configuration_repository_checkout  if WhiskeyDisk.has_config_repo?
-    WhiskeyDisk.refresh_configuration                     if WhiskeyDisk.has_config_repo?
-    WhiskeyDisk.initialize_all_changes
-    WhiskeyDisk.run_post_setup_hooks
-    WhiskeyDisk.flush
-    WhiskeyDisk.summarize
+    @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 WhiskeyDisk.success?
+    exit(1) unless @whiskey_disk.success?
   end
   
   desc "Deploy now."
   task :now do
-    WhiskeyDisk.enable_staleness_checks
-    WhiskeyDisk.update_main_repository_checkout
-    WhiskeyDisk.update_configuration_repository_checkout  if WhiskeyDisk.has_config_repo?
-    WhiskeyDisk.refresh_configuration                     if WhiskeyDisk.has_config_repo?
-    WhiskeyDisk.run_post_deploy_hooks
-    WhiskeyDisk.flush
-    WhiskeyDisk.summarize
+    @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 WhiskeyDisk.success?
+    exit(1) unless @whiskey_disk.success?
   end
   
   task :post_setup do
-    env = WhiskeyDisk[:environment]
+    @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
-    env = WhiskeyDisk[:environment]
+    @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 --