whiskey_disk 0.0.7 → 0.3.0

data/.gitignore

@@ -1,2 +1 @@
-whiskey_disk.gemspec
 pkg/

data/README

@@ -1,39 +1,45 @@
 Whiskey Disk -- embarrassingly fast deployments.
 
-  A very opinionated deployment tool, designed to be as fast as technologically
-  possible.  (For more background, read the WHY.txt file)
+  A very opinionated deployment tool, designed to be as fast as technologically possible.  (For more background, read the WHY.txt file)
 
-  Should work with any project which is git hosted, not just Ruby / Ruby on Rails projects.
-  Allows for local deploys as well as remote.
+  Should work with any project which is git hosted, not just Ruby / Ruby on
+Rails projects.  Allows for local deploys as well as remote.
 
   Selling points:
 
-  - If you share the same opinions there's almost no code involved, almost no dependencies, 
-    and it uses stock *nix tools (ssh, bash, rsync) to get everything done.
+  - If you share the same opinions there's almost no code involved, almost no
+    dependencies, and it uses stock *nix tools (ssh, bash, rsync) to get
+everything done.
 
-  - Written completely spec-first for 100% coverage.  We even did that for the rake tasks, 
-    the init.rb and the plugin install.rb if you swing that way.
+  - Written completely spec-first for 100% coverage.  We even did that for the
+    rake tasks, the init.rb and the plugin install.rb if you swing that way.
 
-  - 1 ssh connection per rake task -- so everything needed to do a full setup is done in
-    one shot.  Everything needed to do a full deployment is done in one shot.  Having 8 
-    minute deploys failing because I was on cdma wireless on a train in india where the 
-    connection won't stay up for more than 2-3 minutes is not where I want to be.
+  - 1 ssh connection per rake task -- so everything needed to do a full setup
+    is done in one shot.  Everything needed to do a full deployment is done in
+one shot.  Having 8 minute deploys failing because I was on cdma wireless on a
+train in india where the connection won't stay up for more than 2-3 minutes is
+not where I want to be.
 
-  - You can do *local* deployments, by this I mean you can use whiskey_disk to manage your
-    local checkout with localized (aka non-production) configurations trivially.  This turns
-    out to be surprisingly handy (well, I was surprised).
+  - You can do *local* deployments, by this I mean you can use whiskey_disk to
+    deploy fully running instances of your application to the same machine
+you're developing on.  This turns out to be surprisingly handy (well, I was
+surprised).  *NOTE*:  be sure to set your deploy_to to a place other than the
+current local checkout.
 
-  - You can have per-developer configurations for environments (especially useful for
-    "local" or "development" enviroments).  Use .gitignore and everyone can have their own
-    local setup that just works.
+  - You can have per-developer configurations for environments (especially
+    useful for "local" or "development" enviroments).  Use .gitignore, or
+specify a config_branch and everyone can have their own local setup that just
+works.
 
-  - Deployment configuration is specified as YAML data, not as code.  Operations to perform
-    after setup or deployment are specified as rake tasks.
+  - Deployment configuration is specified as YAML data, not as code.
+    Operations to perform after setup or deployment are specified as rake
+tasks.
 
-  - There's no before_after_before_after hooks.  You've got plenty of flexibility with just
-    a handful of rake hook points to grab onto.
+  - There's no before_after_before_after hooks.  You've got plenty of
+    flexibility with just a handful of rake hook points to grab onto.
  
-  - rake deploy:setup and rake deploy:now are really all that are needed, best I can tell.
+  - rake deploy:setup and rake deploy:now are really all that are needed, best
+    I can tell.
 
 
 
@@ -63,7 +69,6 @@ Whiskey Disk -- embarrassingly fast deployments.
 
     - look in the examples/ directory for sample configuration files
     - main configuration is in <app_root>/config/deploy.yml
-    - per-environment configurations can be stored in <app_root>/config/deploy-<environment>.yml
     - config files are YAML, with a section for each environment.
 
       Known config file settings (if you're familiar with capistrano and vlad these
@@ -72,94 +77,136 @@ Whiskey Disk -- embarrassingly fast deployments.
       - domain:            host on which to deploy (this is an ssh connect string) 
       - deploy_to:         path to which to deploy main application
       - repository:        git repo path for main application
-      - branch:            git branch to deploy from main application git repo
+      - branch:            git branch to deploy from main application git repo (default: master)
       - deploy_config_to:  where to deploy the configuration repository
       - config_repository: git repository for configuration files
+      - config_branch:     git branch to deploy from configuration git repo (default: master)
       - project:           project name (used to compute path in configuration checkout)
       - rake_env:          hash of environment variables to set when running post_setup and post_deploy rake tasks
 
-    - defining a deploy:<environment>:post_setup rake task (e.g., in lib/tasks/ or in 
-      your project's Rakefile) will cause that task to be run at the end of deploy:setup
+    - defining a deploy:<environment>:post_setup rake task (e.g., in lib/tasks/
+      or in your project's Rakefile) will cause that task to be run at the end
+of deploy:setup
 
-    - defining a deploy:<environment>:post_deploy rake task (e.g., in lib/tasks/ or in 
-      your project's Rakefile) will cause that task to be run at the end of deploy:now
+    - defining a deploy:<environment>:post_deploy rake task (e.g., in
+      lib/tasks/ or in your project's Rakefile) will cause that task to be run
+at the end of deploy:now
 
-  Running:
 
-  - rake deploy:setup to=<environment>   (e.g., "staging", "production", etc.)
-  - rake deploy:now   to=<environment>
+  Running via rake:
+
+  ... in your Rakefile:
+
+  require 'whiskey_disk/rake'
+
+  Then, from the command-line:
+
+  % rake deploy:setup to=<target>   (e.g., "staging", "production", etc.)
+  % rake deploy:now   to=<target>
+
+  or, specifying the project name:
+
+  % rake deploy:setup to=<project>:<target>   (e.g., "foo:staging", "bar:production", etc.)
+  % rake deploy:now   to=<project>:<target>
+
+
+  Running from the command-line:
+  
+  % wd setup --to=<target>
+  % wd setup --to=<project>:<target>
+  % wd setup --to=foo:staging --path=/etc/whiskey_disk/deploy.yml
+
+  % wd deploy --to=<target>
+  % wd deploy --to=<project>:<target>
+  % wd deploy --to=foo:staging --path=/etc/whiskey_disk/deploy.yml
+
+
+  Note that the wd command (unlike rake, which requires a Rakefile in the current directory) can be run from anywhere, so you can deploy any project, working from any path, and can even specify where to find the deployment YAML configuration file.
+  
+  The --path argument can take either a file or a directory.  When given a file it will use that file as the configuration file.  When given a directory it will look in that directory for deploy/<project>/<target>.yml, then deploy/<project>.yml, then deploy/<target>.yml, then <target>.yml, and finally, deploy.yml.
+  
+  All this means you can manage a large number of project deployments (local or remote) and have a single scripted deployment manager that keeps them up to date.  Configurations can live in a centralized location, and developers don't have to be actively involved in ensuring code gets shipped up to a server.  Win.
 
 
   Configuration Repository
 
     What's all this about a second repository for configuration stuff?
 
-    Well, we're going to make it optional probably in another release, but we really
-    are digging this, so maybe you should try it.  Basically it goes like this...
-
-    We have a number of web applications that we manage.  Usually there's a customer, 
-    there might be third-party developers, or the customer might have access to the git
-    repo, or their designer might, etc.  We also tend to run a few instances of any given
-    app, for any given customer.  So, we'll run a "production" site, which is the public-
-    facing, world-accessible main site.  We'll usually also run a "staging" site, which is 
-    roughly the same code, maybe the same data, running on a different URL, which the customer
-    can look at to see if the functionality there is suitable for deploying out to production.
-    We sometimes run a "development" site which is even less likely to be the same code as
-    production, etc., but gives visibility into what might end up in production one day soon.
-
-    So we'll store the code for all of these versions of a site in the same git repo, typically
-    using a different remote branch for each environment ("production", "staging", "development").
-
-    One thing that comes up pretty quickly is that there are various files associated with
-    the application which have more to do with configuration of a running instance than they
-    have to do with the application in general.  In the rails world these files are probably
-    in config, or config/initializers/.  Think database connection information, search engine
-    settings, exception notification plugin data, email configuration, Amazon S3 credentials, 
-    e-commerce back-end configuration, etc.
-
-    We don't want the production site using the same database as the development site.  We don't
-    want staging using (and re-indexing, re-starting, etc.) production's search engine server.
-    We don't want any site other than production to send account reset emails, or to push orders
-    out to fulfillment, etc.
-
-    For some reason, the answer to this with cap and/or vlad has been to have recipes which
-    reference various files up in a shared area on the server, do copying or symlinking, etc.
-    Where did those files come from?  How did they get there?  How are they managed over time?
-    If they got there via a configuration tool, why (a) are they not in the right place, or 
-    (b) do we have to do work to get them into the right place?
-
-    So, we decided that we'd change how we deal with the issue.  Instead of moving files around
-    or symlinking every time we deploy, we will manage the configuration data just like we 
-    manage other files required by our projects -- with git.
-
-    So, each project we deploy is associated with a config repo in our git repository.  Usually
-    many projects are in the same repo, because we're the only people to see the data and 
-    there's no confidentiality issue.  But, if a customer has access to their git information
-    then we'll make a separate config repo for all that customers' projects.  (This is easier
-    to manage than it sounds if you're using gitosis, btw.)
-
-    Anyway, a config repo is just a git repo.  In it are directories for every project
-    whose configuration information is managed in that repo.  For example, there's a "larry"
-    directory in our main config repo, because we're deploying the larry project
-    (http://github.com/rick/larry) to manage our high-level configuration data.
-
-    Note, if you set the 'project' setting in deploy.yml, that determines the name of the
-    top-level project directory whiskey_disk will hunt for in your config repo.  If you don't
-    it uses the 'repository' setting (i.e., the git URL) to try to guess what the project
-    name might be.  So if the URL ends in foo/bar.git, or foo:bar.git, or /bar, or :bar, 
-    whiskey_disk is going to guess "bar".  If it's all bitched up, just set 'project' manually
-    in deploy.yml.
-
-    Inside the project directory is a directory named for each environment we might
-    deploy to.  Frankly, we've been using "production", "staging", "development", and "local"
-    on just about everything.
-
-    Inside the environment directory is a tree of files.  So, e.g., there's config/, which 
-    has initializers/ and database.yml in it.
-
-    Long story short, load up whatever configuration files you're using into the repo 
-    as described, and come deployment time exactly those files will be overlaid on top of
-    the most recent checkout of the project.  Snap.
+    This is completely optional, but we really are digging this, so maybe 
+you should try it.  Basically it goes like this...
+
+    We have a number of web applications that we manage.  Usually there's a
+customer, there might be third-party developers, or the customer might have
+access to the git repo, or their designer might, etc.  We also tend to run a
+few instances of any given app, for any given customer.  So, we'll run a
+"production" site, which is the public- facing, world-accessible main site.
+We'll usually also run a "staging" site, which is roughly the same code, maybe
+the same data, running on a different URL, which the customer can look at to
+see if the functionality there is suitable for deploying out to production.  We
+sometimes run a "development" site which is even less likely to be the same
+code as production, etc., but gives visibility into what might end up in
+production one day soon.
+
+    So we'll store the code for all of these versions of a site in the same git
+repo, typically using a different remote branch for each environment
+("production", "staging", "development").
+
+    One thing that comes up pretty quickly is that there are various files
+associated with the application which have more to do with configuration of a
+running instance than they have to do with the application in general.  In the
+rails world these files are probably in config, or config/initializers/.  Think
+database connection information, search engine settings, exception notification
+plugin data, email configuration, Amazon S3 credentials, e-commerce back-end
+configuration, etc.
+
+    We don't want the production site using the same database as the
+development site.  We don't want staging using (and re-indexing, re-starting,
+etc.) production's search engine server.  We don't want any site other than
+production to send account reset emails, or to push orders out to fulfillment,
+etc.
+
+    For some reason, the answer to this with cap and/or vlad has been to have
+recipes which reference various files up in a shared area on the server, do
+copying or symlinking, etc.  Where did those files come from?  How did they get
+there?  How are they managed over time?  If they got there via a configuration
+tool, why (a) are they not in the right place, or (b) do we have to do work to
+get them into the right place?
+
+    So, we decided that we'd change how we deal with the issue.  Instead of
+moving files around or symlinking every time we deploy, we will manage the
+configuration data just like we manage other files required by our projects --
+with git.
+
+    So, each project we deploy is associated with a config repo in our git
+repository.  Usually many projects are in the same repo, because we're the only
+people to see the data and there's no confidentiality issue.  But, if a
+customer has access to their git information then we'll make a separate config
+repo for all that customers' projects.  (This is easier to manage than it
+sounds if you're using gitosis, btw.)
+
+    Anyway, a config repo is just a git repo.  In it are directories for every
+project whose configuration information is managed in that repo.  For example,
+there's a "larry" directory in our main config repo, because we're deploying
+the larry project (http://github.com/rick/larry) to manage our high-level
+configuration data.
+
+    Note, if you set the 'project' setting in deploy.yml, that determines the
+name of the top-level project directory whiskey_disk will hunt for in your
+config repo.  If you don't it uses the 'repository' setting (i.e., the git URL)
+to try to guess what the project name might be.  So if the URL ends in
+foo/bar.git, or foo:bar.git, or /bar, or :bar, whiskey_disk is going to guess
+"bar".  If it's all bitched up, just set 'project' manually in deploy.yml.
+
+    Inside the project directory is a directory named for each environment we
+might deploy to.  Frankly, we've been using "production", "staging",
+"development", and "local" on just about everything.
+
+    Inside the environment directory is a tree of files.  So, e.g., there's
+config/, which has initializers/ and database.yml in it.
+
+    Long story short, load up whatever configuration files you're using into
+the repo as described, and come deployment time exactly those files will be
+overlaid on top of the most recent checkout of the project.  Snap.
 
     project-config/
       |
@@ -201,28 +248,25 @@ Whiskey Disk -- embarrassingly fast deployments.
     http://github.com/rick/larry/blob/master/config/deploy.yml
     http://github.com/rick/larry/blob/master/lib/tasks/deploy.rake
 
-    Note that you can also provide per-environment config settings, 
-    outside of deploy.yml.  This is most useful for handling per-developer
-    local deployments, though you could use it to override some settings 
-    if that makes sense in some context.  Here's a simple example of that:
+    Note that you can also provide per-environment config settings, outside of
+deploy.yml.  This is most useful for handling per-developer local deployments,
+though you could use it to override some settings if that makes sense in some
+context.  Here's a simple example of that:
 
     http://github.com/rick/larry/blob/master/config/deploy-local.yml.example
 
 
   - We are using it on a private project with lots of config files, but here's
     a gist showing a bit more interesting deploy.rake file for post_setup and
-    post_deploy work:
+post_deploy work:
 
     https://gist.github.com/47e23f2980943531beeb
 
-
-
   On the radar for an upcoming release are:
 
   - common post_* recipes being specifiable by symbol names in deploy.yml ?
-  - making the config repo stuff optional if you don't need that at all
-  - bringing in a very simplified version of mislav/git-deploy post-{receive,reset}
-    hooks, and a little sugar so you can say:
+  - bringing in a very simplified version of mislav/git-deploy
+    post-{receive,reset} hooks, and a little sugar so you can say:
 
     task :post_deploy do
       if has_changes?('db/migrate') or has_changes?('config/database.yml')

data/TODO.txt

@@ -1,16 +1,36 @@
- - common post-deploy tasks (including db:migrate, server bounce)
-   - some sort of simple API for hooks to check which files have changed (either via git rev differences or rsync output), so then the rake task would just do something like:
+ - would be nice to have the ability to say if a project is out of date (meaning that, based upon this config file, either the checked out project repo or the checked out config repo is older than the upstream) so we can do some sort of automated / conditional deployments.  We could implement this as a config file option (check for out of date before deploying), but questions about how to "force" if necessary.  Could also be done as a flag.
+ 
+ - do git-deploy style change detection:  get the current branch ref, then do the fetch/reset, get the current branch ref; find the differences, make them available to the rake task(s)
+   - some sort of simple API to access the detected changes
+     require 'whiskey_disk/rake'
    
-   require 'whiskey_disk/rake'
-   
-   namespace :deploy do
-     task :post_deploy do 
-       if changed_in?('db/migrate') or changed?('config/database.yml')
-         Rake::Task['db:migrate'].invoke
+     namespace :deploy do
+       task :post_deploy do 
+         if changed_in?('db/migrate') or changed?('config/database.yml')
+           Rake::Task['db:migrate'].invoke
+         end
+         # etc. ...
        end
-       # etc. ...
      end
-   end
+
+---
+
+ - [Q] how to specify readily which projects need to be deployed?  Metaconfig?:
    
- - install hooks (look at maybe git-deploy for good examples)
- - make sure the config repo stuff is optional
+     --- 
+     - config: /path/to/config
+       project: larry
+       target: staging
+     - config: /path/to/config
+       project: larry
+       target: production
+
+ - [Q] what about per-environment rake tasks, do we just store these in the config repo?  does this work?
+ 
+ - [Q] ditto, maintenance pages(?) (i.e., a pre-deploy hook)
+
+ - [Q] do we want a mechanism to manage the config repo?  (add a repo, add a project, add an environment, put a file into the config repo for an environment?)
+
+ - [Q] do we need actual support for "rollbacks"?
+
+ - [Q] do we want to support multi-system deployments (i.e., deploy and rollback on 4 simultaneous app servers, other bullshit running on the db server, etc.)?  If we get into this, we have the original :role problem that cap faced -- i.e., we only want to run the database operations on certain hosts.

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.3.0

data/bin/wd

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby 
+
+require 'optparse'
+require 'whiskey_disk/rake'
+
+$0 = "#{$0} setup|deploy"  # jesus, this is a hack.
+
+options = {}
+op = OptionParser.new do |opts|
+  opts.on('-t=TARGET', '--to=TARGET', "deployment target") do |target| 
+    options[:target] = target
+  end
+  
+  opts.on('-p=TARGET', '--path=TARGET', "configuration path") do |path|
+    options[:path] = path
+  end
+    
+  opts.on_tail('-h', '--help', 'show this message') do
+    raise opts.to_s
+  end
+end
+
+rest = op.parse(ARGV)
+raise op.to_s unless options[:target]
+raise op.to_s unless rest and rest.size == 1
+command = rest.first
+raise op.to_s unless ['deploy', 'setup'].include?(command)
+
+ENV['to'] = options[:target]
+ENV['path'] = options[:path]
+
+if command == 'deploy'
+  Rake::Task['deploy:now'].invoke
+else
+  Rake::Task['deploy:setup'].invoke
+end

data/lib/whiskey_disk/config.rb

@@ -4,73 +4,114 @@ class WhiskeyDisk
   class Config
     class << self
       def environment_name
-        (ENV['to'] && ENV['to'] != '') ? ENV['to'] : false
+        return false unless (ENV['to'] && ENV['to'] != '')
+        return ENV['to'] unless ENV['to'] =~ /:/
+        ENV['to'].split(/:/)[1]
+      end
+      
+      def specified_project_name
+        return false unless (ENV['to'] && ENV['to'] =~ /:/)
+        ENV['to'].split(/:/).first
+      end
+      
+      def path
+        (ENV['path'] && ENV['path'] != '') ? ENV['path'] : false
       end
       
       def contains_rakefile?(path)
         File.exists?(File.expand_path(File.join(path, 'Rakefile')))
       end
       
-      def base_path
+      def find_rakefile_from_current_path
         while (!contains_rakefile?(Dir.pwd))
           raise "Could not find Rakefile in the current directory tree!" if Dir.pwd == '/'
           Dir.chdir('..')
         end
-        Dir.pwd
+        File.join(Dir.pwd, 'config')
       end
       
-      def main_configuration_file
-        File.expand_path(File.join(base_path, 'config', 'deploy.yml'))
+      def base_path
+        return path if path
+        find_rakefile_from_current_path
       end
       
-      def main_configuration_data
-        raise "Main configuration file [#{main_configuration_file}] not found!" unless File.exists?(main_configuration_file)
-        File.read(main_configuration_file)
+      def configuration_file
+        return path if path and File.file?(path)
+        
+        files = []
+
+        files += [
+          File.join(base_path, 'deploy', specified_project_name, "#{environment_name}.yml"),  # /deploy/foo/staging.yml
+          File.join(base_path, 'deploy', "#{specified_project_name}.yml") # /deploy/foo.yml
+        ] if specified_project_name
+        
+        files += [ 
+          File.join(base_path, 'deploy', "#{environment_name}.yml"),  # /deploy/staging.yml
+          File.join(base_path, "#{environment_name}.yml"), # /staging.yml
+          File.join(base_path, 'deploy.yml') # /deploy.yml
+        ]
+        
+        files.each { |file|  return file if File.exists?(file) }
+        
+        raise "Could not locate configuration file in path [#{base_path}]"
       end
       
-      def environment_configuration_file
-        raise "Cannot determine current environment -- try rake ... to=staging, for example." unless environment_name
-        File.expand_path(File.join(base_path, 'config', "deploy-#{environment_name}.yml"))
+      def configuration_data
+        raise "Configuration file [#{configuration_file}] not found!" unless File.exists?(configuration_file)
+        File.read(configuration_file)
       end
       
-      def environment_configuration_data
-        File.exists?(environment_configuration_file) ? File.read(environment_configuration_file) : nil
-      rescue Exception => e
-        raise %Q{Could not read configuration file [#{environment_configuration_file}] for environment [#{environment_name}]: "#{e}"}
+      def project_name
+        specified_project_name || 'unnamed_project'
+      end
+
+      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
       
-      def project_name(config)
-        return '' unless config['repository'] and config['repository'] != ''
-        config['repository'].sub(%r{^.*[/:]}, '').sub(%r{\.git$}, '')
+      # is this data hash a bottom-level data hash without an environment name?
+      def needs_environment_scoping?(data)
+        repository_depth(data) == 0
       end
       
-      def load_main_data
-        YAML.load(main_configuration_data)
+      # is this data hash an environment data hash without a project name?
+      def needs_project_scoping?(data)
+        repository_depth(data) == 1
+      end
+
+      def add_environment_scoping(data)
+        return data unless needs_environment_scoping?(data)
+        { environment_name => data }
+      end
+
+      def add_project_scoping(data)        
+        return data unless needs_project_scoping?(data)
+        { project_name => data }
+      end
+
+      def normalize_data(data)
+        add_project_scoping(add_environment_scoping(data.clone))
+      end      
+      
+      def load_data
+        normalize_data(YAML.load(configuration_data))
       rescue Exception => e
-        raise %Q{Error reading configuration file [#{main_configuration_file}]: "#{e}"}
+        raise %Q{Error reading configuration file [#{configuration_file}]: "#{e}"}
       end
       
-      def load_environment_data        
-        begin
-          env = environment_configuration_data ? YAML.load(environment_configuration_data) : nil
-        rescue Exception => e
-          raise %Q{Error reading configuration file [#{environment_configuration_file}]: "#{e}"}
-        end
-        raise "Configuration file [#{environment_configuration_file}] does not define data for environment [#{environment_name}]" if env and !env[environment_name]
-        env || {}
+      def filter_data(data)
+        raise "No configuration file defined data for environment [#{environment_name}]" unless data[project_name][environment_name]
+        data[project_name][environment_name].merge({
+          'environment' => environment_name, 
+          'project' => project_name
+        })
       end
       
       def fetch
         raise "Cannot determine current environment -- try rake ... to=staging, for example." unless environment_name
-        main, env = load_main_data, load_environment_data
-        raise "No configuration file defined data for environment [#{environment_name}]" unless main[environment_name] or env[environment_name]
-        config = (main[environment_name] || {}).merge(env[environment_name] || {}).merge({'environment' => environment_name})
-        { 'project' => project_name(config) }.merge(config)
-      end
-    
-      def filenames
-        raise "Cannot determine current environment -- try rake ... to=staging, for example." unless environment_name
-        [ main_configuration_file, environment_configuration_file ]
+        filter_data(load_data)
       end
     end
   end

data/lib/whiskey_disk/rake.rb

@@ -0,0 +1,36 @@
+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
+    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.run_post_setup_hooks
+    WhiskeyDisk.flush
+  end
+  
+  desc "Deploy now."
+  task :now do
+    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
+  end
+  
+  task :post_setup do
+    env = WhiskeyDisk[: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]
+    Rake::Task["deploy:#{env}:post_deploy"].invoke if Rake::Task.task_defined? "deploy:#{env}:post_deploy"      
+  end
+end