poolparty 0.2.84 → 1.2.2

data/vendor/chef/apache2/templates/default/web_app.conf.erb

@@ -0,0 +1,43 @@
+<VirtualHost *:80>
+  ServerName <%= @params[:server_name] %>
+  ServerAlias <% @params[:server_aliases].each do |a| %><%= "#{a}" %> <% end %>
+  DocumentRoot <%= @params[:docroot] %>
+  RewriteEngine On
+  
+  <Directory <%= @params[:docroot] %>>
+    Options FollowSymLinks
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+  </Directory>
+  
+  <Directory />
+    Options FollowSymLinks
+    AllowOverride None
+  </Directory>
+
+  <Location /server-status>
+    SetHandler server-status
+
+    Order Deny,Allow
+    Deny from all
+    Allow from 127.0.0.1
+  </Location>
+
+  LogLevel info
+  ErrorLog <%= @node[:apache][:log_dir] %>/<%= @params[:name] %>-error.log
+  CustomLog <%= @node[:apache][:log_dir] %>/<%= @params[:name] %>-access.log combined
+
+  RewriteEngine On
+  RewriteLog <%= @node[:apache][:log_dir] %>/<%= @application_name %>-rewrite.log
+  RewriteLogLevel 0
+
+  # Canonical host, <%= @params[:server_name] %>
+  RewriteCond %{HTTP_HOST}   !^<%= @params[:server_name] %> [NC]
+  RewriteCond %{HTTP_HOST}   !^$
+  RewriteRule ^/(.*)$        http://<%= @params[:server_name] %>/$1 [L,R=301]
+
+  RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
+  RewriteCond %{SCRIPT_FILENAME} !maintenance.html
+  RewriteRule ^.*$ /system/maintenance.html [L]
+</VirtualHost>

data/vendor/chef/chef-deploy/LICENSE

@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/vendor/chef/chef-deploy/README.rdoc

@@ -0,0 +1,24 @@
+== chef-deploy
+
+A gem that provides resources and providers for deploying ruby web apps from chef recipes
+
+
+Uses the same directory layout as capistrano and steals the git remote cached deploy strategy 
+from cap and adapts it to work without cap and under chef
+
+ deploy "/data/#{app}" do
+   repo "git://github.com/engineyard/rack-app.git"
+   branch "HEAD"
+   user "ez"
+   enable_submodules true
+   migrate true
+   migration_command "rake db:migrate"
+   environment "production"
+   shallow_clone true
+   revision '0xbeadbeef'
+   action :deploy # or :rollback
+ end
+
+
+Currently only supports doing the cached git checkout, rsyncing it into place and doing the symlink dance.
+Does not restart servers or have hooks(yet)

data/vendor/chef/chef-deploy/Rakefile

@@ -0,0 +1,57 @@
+require 'rubygems'
+require 'rake/gempackagetask'
+require 'rubygems/specification'
+require 'date'
+require 'spec/rake/spectask'
+
+GEM = "chef-deploy"
+GEM_VERSION = "0.0.9"
+AUTHOR = "Ezra Zygmuntowicz"
+EMAIL = "Your Email"
+HOMEPAGE = "http://example.com"
+SUMMARY = "A gem that provides..."
+
+spec = Gem::Specification.new do |s|
+  s.name = GEM
+  s.version = GEM_VERSION
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE", 'TODO']
+  s.summary = SUMMARY
+  s.description = s.summary
+  s.author = AUTHOR
+  s.email = EMAIL
+  s.homepage = HOMEPAGE
+  
+  # Uncomment this to add a dependency
+  # s.add_dependency "foo"
+  
+  s.require_path = 'lib'
+  s.autorequire = GEM
+  s.files = %w(LICENSE README.rdoc Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
+end
+
+task :default => :spec
+
+desc "Run specs"
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = %w(-fs --color)
+end
+
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.gem_spec = spec
+end
+
+desc "install the gem locally"
+task :install => [:package] do
+  sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
+end
+
+desc "create a gemspec file"
+task :make_spec do
+  File.open("#{GEM}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
+  end
+end

data/vendor/chef/chef-deploy/TODO

@@ -0,0 +1,4 @@
+TODO:
+Fix LICENSE with your name
+Fix Rakefile with your name and contact info
+Add your code to lib/<%= name %>.rb

data/vendor/chef/chef-deploy/lib/chef-deploy/cached_deploy.rb

@@ -0,0 +1,230 @@
+# stolen wholesale from capistrano, thanks Jamis!
+require 'yaml'
+class ChefDeployFailure < StandardError
+end
+
+class CachedDeploy
+  # Executes the SCM command for this strategy and writes the REVISION
+  # mark file to each host.
+  def deploy
+    @configuration[:release_path] = "#{@configuration[:deploy_to]}/releases/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}"
+    if @configuration[:revision] == ''
+       @configuration[:revision] = source.query_revision(@configuration[:branch]) {|cmd| run cmd}
+    end
+    Chef::Log.info "deploying branch: #{@configuration[:branch]} rev: #{@configuration[:revision]}"
+    Chef::Log.info "updating the cached checkout"
+    run(update_repository_cache)
+    Chef::Log.info "copying the cached version to #{configuration[:release_path]}"
+    run(copy_repository_cache)
+    install_gems
+    callback(:before_migrate)
+    migrate
+    callback(:before_symlink)
+    symlink
+    callback(:before_restart)
+    restart
+    callback(:after_restart)
+    cleanup
+  end
+  
+  def restart
+    unless @configuration[:restart_command].empty?
+      Chef::Log.info "restarting app: #{latest_release}"
+      Chef::Log.info run("cd #{current_path} && #{@configuration[:restart_command]}")
+    end
+  end
+  
+  def install_gems
+    if File.exist?("#{latest_release}/gems.yml")
+      gems = YAML.load(IO.read("#{latest_release}/gems.yml"))
+      resources = []
+      gems.each do |g|
+        next if has_gem?(g[:name], g[:version])
+        r = Chef::Resource::GemPackage.new(g[:name], nil, @configuration[:node])
+        r.version g[:version]
+        r.source "http://gems.github.com"
+        resources << r
+      end
+      resources.each do |r|
+        r.run_action(:install)
+      end
+    end
+  end
+  
+  def has_gem?(name, version=nil)
+    if !$GEM_LIST_DEPLOY
+      gems = {}
+      `gem list --local`.each_line do |line|
+        gems[$1.to_sym] = $2.split(/, /) if line =~ /^(.*) \(([^\)]*)\)$/
+      end
+      $GEM_LIST_DEPLOY = gems
+    end
+    if $GEM_LIST_DEPLOY[name.to_sym]
+      if version
+        if $GEM_LIST_DEPLOY[name.to_sym].include?(version) 
+          Chef::Log.info("Gem: #{name}:#{version} already installed, skipping")
+          return true
+        end  
+      else
+        Chef::Log.info("Gem: #{name} already installed, skipping")
+        return true
+      end
+    end
+    false
+  end
+  
+  # before_symlink
+  # before_restart
+  def callback(what)
+    if File.exist?("#{latest_release}/deploy/#{what}.rb")
+      Chef::Log.info "running deploy hook: #{latest_release}/deploy/#{what}.rb"
+      Chef::Log.info run("cd #{latest_release} && ruby deploy/#{what}.rb #{@configuration[:environment]} #{@configuration[:role]}")
+    end
+  end
+  
+  def latest_release
+    all_releases.last
+  end
+  
+  def previous_release(current=latest_release)
+    index = all_releases.index(current)
+    all_releases[index-1]
+  end
+  
+  def oldest_release
+    all_releases.first
+  end
+  
+  def all_releases
+    `ls #{release_path}`.split("\n").sort.map{|r| File.join(release_path, r)}
+  end
+  
+  def cleanup
+    while all_releases.size >= 5
+      FileUtils.rm_rf oldest_release
+    end
+  end
+  
+  def rollback
+    Chef::Log.info "rolling back to previous release"
+    symlink(previous_release)
+    FileUtils.rm_rf latest_release
+    Chef::Log.info "restarting with previous release"
+    restart
+  end
+  
+  def migrate
+    if @configuration[:migrate]
+      run "ln -nfs #{shared_path}/config/database.yml #{latest_release}/config/database.yml"
+      Chef::Log.info "Migrating: cd #{latest_release} && RAILS_ENV=#{@configuration[:environment]} #{@configuration[:migration_command]}"
+      Chef::Log.info run("cd #{latest_release} && RAILS_ENV=#{@configuration[:environment]} #{@configuration[:migration_command]}")
+    end
+  end
+  
+  def user
+    @configuration[:user] || 'nobody'
+  end
+  
+  def current_path
+    "#{@configuration[:deploy_to]}/current"
+  end
+
+  def shared_path
+    configuration[:shared_path]
+  end
+  
+  def release_path
+    "#{@configuration[:deploy_to]}/releases"
+  end
+  
+  def symlink(release_to_link=latest_release)
+    Chef::Log.info "symlinking and finishing deploy"
+    symlink = false
+    begin
+      run [ "chmod -R g+w #{release_to_link}",
+            "rm -rf #{release_to_link}/log #{release_to_link}/public/system #{release_to_link}/tmp/pids",
+            "mkdir -p #{release_to_link}/tmp",
+            "ln -nfs #{shared_path}/log #{release_to_link}/log",
+            "mkdir -p #{release_to_link}/public",
+            "mkdir -p #{release_to_link}/config",
+            "ln -nfs #{shared_path}/system #{release_to_link}/public/system",
+            "ln -nfs #{shared_path}/pids #{release_to_link}/tmp/pids",
+            "ln -nfs #{shared_path}/config/database.yml #{release_to_link}/config/database.yml",
+            "chown -R #{user}:#{user} #{release_to_link}"
+          ].join(" && ")
+
+      symlink = true
+      run "rm -f #{current_path} && ln -nfs #{release_to_link} #{current_path} && chown -R #{user}:#{user} #{current_path}"
+    rescue => e
+      run "rm -f #{current_path} && ln -nfs #{previous_release(release_to_link)} #{current_path} && chown -R #{user}:#{user} #{current_path}" if symlink
+      run "rm -rf #{release_to_link}"
+      raise e
+    end
+  end
+  
+  def run(cmd)
+    res = `#{cmd}`
+    raise(ChefDeployFailure, res) unless $? == 0
+    res
+  end
+  
+  # :repository_cache
+  # :shared_path
+  # :repository
+  # :release_path
+  # :copy_exclude
+  # :revision
+  # :user
+  # :group
+  def initialize(opts={})
+    @configuration = opts
+    @configuration[:shared_path] = "#{@configuration[:deploy_to]}/shared"
+  end
+  
+  def configuration
+    @configuration
+  end
+  
+  def source
+    #@source ||= case configuration[:scm]
+    #when 'git'
+      Git.new configuration
+    #when 'svn'
+    #  Subversion.new configuration
+    #end
+  end
+
+  private
+
+    def repository_cache
+      File.join(configuration[:shared_path], configuration[:repository_cache] || "cached-copy")
+    end
+
+    def update_repository_cache
+      command = "if [ -d #{repository_cache} ]; then " +
+        "#{source.sync(revision, repository_cache)}; " +
+        "else #{source.checkout(revision, repository_cache)}; fi"
+      command
+    end
+
+    def copy_repository_cache
+      if copy_exclude.empty? 
+        return "cp -RPp #{repository_cache} #{configuration[:release_path]} && #{mark}"
+      else
+        exclusions = copy_exclude.map { |e| "--exclude=\"#{e}\"" }.join(' ')
+        return "rsync -lrpt #{exclusions} #{repository_cache}/* #{configuration[:release_path]} && #{mark}"
+      end
+    end
+    
+    def revision
+      configuration[:revision]
+    end
+    
+    def mark
+      "(echo #{revision} > #{configuration[:release_path]}/REVISION)"
+    end
+    
+    def copy_exclude
+      @copy_exclude ||= Array(configuration.fetch(:copy_exclude, []))
+    end
+end

data/vendor/chef/chef-deploy/lib/chef-deploy/git.rb

@@ -0,0 +1,132 @@
+# stolen wholesale from capistrano, thanks Jamis!
+
+class Git
+  # Performs a clone on the remote machine, then checkout on the branch
+  # you want to deploy.
+  
+  def initialize(opts={})
+    @configuration = opts
+  end
+  
+  def configuration
+    @configuration
+  end
+  
+  def git
+    "git"
+  end
+  
+  def respository
+    configuration[:repository]
+  end
+  
+  def checkout(revision, destination)
+    remote = origin
+
+    args = []
+    args << "-o #{remote}" unless remote == 'origin'
+    if depth = configuration[:git_shallow_clone]
+      args << "--depth #{depth}"
+    end
+
+    execute = []
+    if args.empty?
+      execute << "#{git} clone #{verbose} #{configuration[:repository]} #{destination}"
+    else
+      execute << "#{git} clone #{verbose} #{args.join(' ')} #{configuration[:repository]} #{destination}"
+    end
+
+    # checkout into a local branch rather than a detached HEAD
+    execute << "cd #{destination} && #{git} checkout #{verbose} -b deploy #{revision}"
+    
+    if configuration[:git_enable_submodules]
+      execute << "#{git} submodule #{verbose} init"
+      execute << "#{git} submodule #{verbose} update"
+    end
+
+    execute.join(" && ")
+  end
+  
+  # An expensive export. Performs a checkout as above, then
+  # removes the repo.
+  def export(revision, destination)
+    checkout(revision, destination) << " && rm -Rf #{destination}/.git"
+  end
+
+  # Merges the changes to 'head' since the last fetch, for remote_cache
+  # deployment strategy
+  def sync(revision, destination)
+    remote  = origin
+
+    execute = []
+    execute << "cd #{destination}"
+
+    # Use git-config to setup a remote tracking branches. Could use
+    # git-remote but it complains when a remote of the same name already
+    # exists, git-config will just silenty overwrite the setting every
+    # time. This could cause wierd-ness in the remote cache if the url
+    # changes between calls, but as long as the repositories are all
+    # based from each other it should still work fine.
+    if remote != 'origin'
+      execute << "#{git} config remote.#{remote}.url #{configuration[:repository]}"
+      execute << "#{git} config remote.#{remote}.fetch +refs/heads/*:refs/remotes/#{remote}/*"
+    end
+
+    # since we're in a local branch already, just reset to specified revision rather than merge
+    execute << "#{git} fetch #{verbose} #{remote} && #{git} reset #{verbose} --hard #{revision}"
+
+    if configuration[:git_enable_submodules]
+      execute << "#{git} submodule #{verbose} init"
+      execute << "#{git} submodule #{verbose} update"
+    end
+
+    execute.join(" && ")
+  end
+
+  # Returns a string of diffs between two revisions
+  def diff(from, to=nil)
+    from << "..#{to}" if to
+    scm :diff, from
+  end
+
+  # Returns a log of changes between the two revisions (inclusive).
+  def log(from, to=nil)
+    scm :log, "#{from}..#{to}"
+  end
+
+  # Getting the actual commit id, in case we were passed a tag
+  # or partial sha or something - it will return the sha if you pass a sha, too
+  def query_revision(revision)
+    raise ArgumentError, "Deploying remote branches is no longer supported.  Specify the remote branch as a local branch for the git repository you're deploying from (ie: '#{revision.gsub('origin/', '')}' rather than '#{revision}')." if revision =~ /^origin\//
+    return revision if revision =~ /^[0-9a-f]{40}$/
+    command = scm('ls-remote', configuration[:repository], revision)
+    result = yield(command)
+    rev, ref = result.split(/[\t\n]/)
+    newrev = nil
+    if ref.sub(/refs\/.*?\//, '').strip == revision
+      newrev = rev
+    end
+    raise "Unable to resolve revision for '#{revision}' on repository '#{configuration[:repository]}'." unless newrev =~ /^[0-9a-f]{40}$/
+    return newrev
+  end
+  
+  def scm(*args)
+    [git, *args].compact.join(" ")
+  end
+  
+  def head
+    configuration[:branch] || 'HEAD'
+  end
+
+  def origin
+    configuration[:remote] || 'origin'
+  end
+
+  private
+
+    # If verbose output is requested, return nil, otherwise return the
+    # command-line switch for "quiet" ("-q").
+    def verbose
+      nil#configuration[:scm_verbose] ? nil : "-q"
+    end
+end