whiskey_disk 0.6.17 → 0.6.20

data/CHANGELOG

@@ -1,4 +1,38 @@
 
+0.6.20 / 2011-04-06 
+==================
+
+  * Output the entire command before running it when debugging.
+  * more anal git checkouts on clones to support older gits
+  * abort instead of raising in wd
+  * Neuter commandline output in wd command spec
+  * Make #changes work on setup
+  * Allow enabling debugger in specs w/ non-empty ENV['debug']
+  * Fix setup #changed? integration specs
+  * Improve example text for deployment #changed? integration specs
+  * Factor out snapshotting of git revision from WD.initialize_git_changes
+  * Fix the direction of the setup #changed? integration spec test
+  * Fixing jump_to_initial_commit spec helper
+  * Helper integration spec should use the correct branch when setting up.
+  * adjust env testing in integration specs
+  * update some specs to work with updated checkout/setup helpers
+  * use branches in integration checks so full checkouts will work
+  * when initializing git changes data, work from deployment path
+  * allow integration spec checkouts to switch to a specific branch
+  * record git changes for later use by #changed?
+  * capture rsync changes for later #changed? analysis
+  * capture initial git HEAD ref for later #changes comparisons
+  * clean out any prior git/rsync changes data before refreshing repos
+  * Add specs for version command-line argument
+  * Change spec helper run_command method set pwd to bin/
+  * integration spec for #changed? in post_setup tasks
+  * adding #changed? helper (and friends) to whiskey_disk/helpers
+  * spec_helper method to rewind a git repo to the beginning
+  * git project scenario changes to support integration testing of #changes helper
+  * refactor:  splitting up WD.summarize method
+  * README updates for #changed? helper functionality
+
+
 0.6.17 / 2011-03-25 
 ==================
 

data/README.markdown

@@ -86,12 +86,14 @@ current local checkout.
 
   - You can deploy to multiple remote targets at once.  Currently this is limited
     to one-after-the-other synchronous deployments, but we're thinking about 
-    doing them in parallel once we're happy with the stability of this (new)
-    feature.
+    doing them in parallel once we're happy with the stability of this feature.
 
   - Assign hosts to roles (e.g., "web", "db", "app") and vary the shell or rake 
     post-setup/post-deploy actions you run based on those roles.
 
+  - Limit the actions you run after deployment based on whether files of interest
+    *actually changed*.
+
 ### Assumptions ###
 
  - your project is managed via git
@@ -486,9 +488,37 @@ You can also define these tasks yourself if you want to eliminate the dependency
 deployment target system.
 
 
+### Doing things when files of interest change ###
+
+Do you want to run database migrations when no migrations have been added?  Why bother compressing front-end assets when none of them have changed?  Why restart your application server if only the project README changed?  Whiskey\_disk provides a `changed?` ruby helper method to allow you to decide whether to run expensive post deployment tasks, based on what files changed in the deployment.  Typically this would happen in your rake tasks, but it could happen from regular ruby code as well.
+
+
+    require 'whiskey_disk/helpers'
+
+    namespace :deploy do
+
+      task :run_migrations do
+        if role?(:db) and changed?('db/migrate')
+          puts "Running database migrations..."
+          Rake::Task['db:migrate'].invoke
+        end
+      end
+
+      task :compress_assets do
+        if changed?('public/stylesheets') or changed?('public/javascripts') 
+          puts "Getting my asset munge on..."
+          # do some expensive asset compression stuff
+        end
+      end
+
+      task :post_deploy => [ :run_migrations, :compress_assets ]
+    end
+
+
+
 ### Running via rake ###
 
-In your Rakefile:
+You can use rake tasks to do everything possible with whiskey\_disk (the `wd` command is just a front-end to the whiskey\_disk rake tasks).  In your Rakefile:
 
     require 'whiskey_disk/rake'
 

data/VERSION

@@ -1 +1 @@
-0.6.17
+0.6.20

data/bin/wd

@@ -43,10 +43,10 @@ rescue
   abort op.to_s 
 end
 
-raise op.to_s unless options[:target]
-raise op.to_s unless rest and rest.size == 1
+abort op.to_s unless options[:target]
+abort op.to_s unless rest and rest.size == 1
 command = rest.first
-raise op.to_s unless ['deploy', 'setup'].include?(command)
+abort op.to_s unless ['deploy', 'setup'].include?(command)
 
 ENV['to'] = options[:target]
 ENV['path'] = options[:path]

data/lib/whiskey_disk.rb

@@ -137,12 +137,14 @@ class WhiskeyDisk
     end
 
     def ssh(domain, cmd)
+      puts "Running command on [#{domain}]: [#{cmd}]" if Config.debug?
       args = [domain[:name], build_command(domain, cmd)]
       args.unshift '-v' if Config.debug?
       system('ssh', *args)
     end
     
     def shell(domain, cmd)
+      puts "Running command locally: [#{cmd}]" if Config.debug?
       system('bash', '-c', build_command(domain, cmd))
     end
     
@@ -160,22 +162,24 @@ class WhiskeyDisk
       @results ||= []
       @results << { :domain => domain, :status => status }
     end
+
+    def summarize_results(results)
+      successes = failures = 0
+      results.each do |result|
+        puts "#{result[:domain]} => #{result[:status] ? 'succeeded' : 'failed'}."
+        if result[:status]
+          successes += 1 
+        else
+          failures += 1
+        end
+      end
+      [successes + failures, successes, failures]
+    end
     
     def summarize
-      puts
-      puts "Results:"
+      puts "\nResults:"
       if results and not results.empty?
-        successes = failures = total = 0
-        results.each do |result|
-          total += 1
-          if result[:status]
-            successes += 1 
-          else
-            failures += 1
-          end
-          
-          puts "#{result[:domain]} => #{result[:status] ? 'succeeded' : 'failed'}."
-        end
+        total, successes, failures = summarize_results(results)
         puts "Total: #{total} deployment#{total == 1 ? '' : 's'}, " +
           "#{successes} success#{successes == 1 ? '' : 'es'}, " +
           "#{failures} failure#{failures == 1 ? '' : 's'}."
@@ -198,7 +202,7 @@ class WhiskeyDisk
     end
     
     def safe_branch_checkout(path, my_branch)
-      %Q(cd #{path} && git checkout -b #{my_branch} origin/#{my_branch} || git checkout #{my_branch})
+      %Q(cd #{path} && git checkout -b #{my_branch} origin/#{my_branch} || git checkout #{my_branch} origin/#{my_branch} || git checkout #{my_branch})
     end
     
     def clone_repository(repo, path, my_branch)
@@ -251,13 +255,44 @@ class WhiskeyDisk
       clone_repository(self[:config_repository], self[:deploy_config_to], config_branch)
     end
     
+    def snapshot_git_revision
+      needs(:deploy_to)
+      enqueue "cd #{self[:deploy_to]}"
+      enqueue %Q{ml=\`cat .git/refs/heads/#{branch}\`}
+    end
+    
+    def initialize_git_changes
+      needs(:deploy_to)
+      enqueue "rm -f #{self[:deploy_to]}/.whiskey_disk_git_changes"
+      snapshot_git_revision
+    end
+    
+    def initialize_rsync_changes
+      needs(:deploy_to)
+      enqueue "rm -f #{self[:deploy_to]}/.whiskey_disk_rsync_changes"
+    end
+    
+    def initialize_all_changes
+      needs(:deploy_to)
+      initialize_git_changes
+      initialize_rsync_changes
+    end
+    
+    def capture_git_changes
+      needs(:deploy_to)
+      enqueue "git diff --name-only ${ml}..HEAD > #{self[:deploy_to]}/.whiskey_disk_git_changes"
+    end
+    
     def update_main_repository_checkout
       needs(:deploy_to)
+      initialize_git_changes
       refresh_checkout(self[:deploy_to], branch)
+      capture_git_changes
     end
     
     def update_configuration_repository_checkout
       needs(:deploy_config_to)
+      initialize_rsync_changes
       refresh_checkout(self[:deploy_config_to], config_branch)
     end
     
@@ -265,7 +300,9 @@ class WhiskeyDisk
       needs(:deploy_to, :deploy_config_to)
       raise "Must specify project name when using a configuration repository." unless project_name_specified?
       enqueue "echo Rsyncing configuration..."
-      enqueue("rsync -a#{'v --progress' if Config.debug?} #{self[:deploy_config_to]}/#{self[:project]}/#{self[:config_target]}/ #{self[:deploy_to]}/")
+      enqueue("rsync -a#{'v --progress' if Config.debug?} " +
+              "--log-file=#{self[:deploy_to]}/.whiskey_disk_rsync_changes " +
+              "#{self[:deploy_config_to]}/#{self[:project]}/#{self[:config_target]}/ #{self[:deploy_to]}/")
     end
     
     def run_post_setup_hooks

data/lib/whiskey_disk/helpers.rb

@@ -3,4 +3,46 @@
 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(%r{/}).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

@@ -11,6 +11,7 @@ namespace :deploy 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.initialize_all_changes
     WhiskeyDisk.run_post_setup_hooks
     WhiskeyDisk.flush
     WhiskeyDisk.summarize

data/spec/spec_helper.rb

@@ -3,6 +3,13 @@ require 'bacon'
 require 'facon'
 require 'fileutils'
 
+if ENV['DEBUG'] and ENV['DEBUG'] != ''
+  STDERR.puts "Enabling debugger for spec runs..."
+  require 'rubygems'
+  require 'ruby-debug'
+  Debugger.start
+end
+
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 
 # local target directory, integration spec workspace
@@ -50,9 +57,19 @@ def scenario_config(path)
 end
 
 # clone a git repository locally (as if a "wd setup" had been deployed)
-def checkout_repo(repo_name, name = '')
+def checkout_repo(repo_name, branch = nil)
   repo_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'scenarios', 'git_repositories', "#{repo_name}.git"))
-  system("cd #{deployment_root} && git clone #{repo_path} #{name} >/dev/null 2>/dev/null")
+  system("cd #{deployment_root} && git clone #{repo_path} >/dev/null 2>/dev/null")
+  checkout_branch(repo_name, branch)
+end
+
+def checkout_branch(repo_name, branch = nil)
+  return unless branch
+  system("cd #{deployment_root}/#{repo_name} && git checkout #{branch} >/dev/null 2>/dev/null")
+end
+
+def jump_to_initial_commit(path)
+  system(%Q(cd #{File.join(deployment_root, path)} && git reset --hard `git log --oneline | tail -1 | awk '{print $1}'` >/dev/null 2>/dev/null))
 end
 
 def run_log

data/spec/wd_command_spec.rb

@@ -2,13 +2,24 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 require 'rake'
 
 def run_command
-  eval File.read(File.join(File.dirname(__FILE__), *%w[.. bin wd]))
+  cmd_path = File.expand_path(File.join(File.dirname(__FILE__), *%w[.. bin wd]))
+  path = File.expand_path(File.dirname(cmd_path))
+  file = File.read(cmd_path)
+
+  Dir.chdir(path) do |path|
+    eval(file)
+  end
 end
 
 describe 'wd command' do
   before do
+    @stderr, @stdout, $stderr, $stdout = $stderr, $stdout, StringIO.new, StringIO.new
     ENV['to'] = ENV['path'] = nil
   end
+
+  after do
+    @stderr, @stdout, $stderr, $stdout = $stderr, $stdout, @stderr, @stdout
+  end
   
   describe 'when no command-line arguments are specified' do
     before do
@@ -21,25 +32,56 @@ describe 'wd command' do
       lambda { run_command }
     end
   
-    it 'should fail' do
-      lambda { run_command }.should.raise
+    it 'should exit' do
+      lambda { run_command }.should.raise(SystemExit)
+    end
+    
+    it 'should exit with a failure status' do
+      begin
+        run_command
+      rescue Exception => e
+        e.success?.should == false
+      end
     end
   end
 
   it 'should output usage without a backtrace when --help is specified' do
     Object.send(:remove_const, :ARGV)
     ARGV = ['--help']
-    self.stub!(:abort).and_raise(SystemExit)  # primarily to drop extraneous output
     lambda { run_command }.should.raise(SystemExit)
   end
   
   it 'should output usage without a backtrace when garbage options are specified' do
     Object.send(:remove_const, :ARGV)
     ARGV = ['--slkjfsdflkj']
-    self.stub!(:abort).and_raise(SystemExit)  # primarily to drop extraneous output
     lambda { run_command }.should.raise(SystemExit)
   end
   
+  describe 'when --version argument is specified' do
+    before do
+      Object.send(:remove_const, :ARGV)
+      ARGV = ['--version']
+    end
+  
+    # it 'should output the version stored in the VERSION file' do
+    #   version = File.read(File.expand_path(File.join(File.dirname(__FILE__), '..', 'VERSION'))).chomp
+    #   # TODO: capture version output
+    #   lambda{ run_command }
+    # end
+  
+    it 'should exit' do
+      lambda { run_command }.should.raise(SystemExit)
+    end
+  
+    it 'should exit successfully' do
+      begin
+        run_command
+      rescue SystemExit => e
+        e.success?.should == true
+      end
+    end
+  end
+
   describe "when the 'setup' command is specified" do
     before do
       Object.send(:remove_const, :ARGV)
@@ -51,9 +93,17 @@ describe 'wd command' do
         Rake::Application.should.receive(:new).never
         lambda { run_command }
       end
-  
-      it 'should fail' do
-        lambda { run_command }.should.raise
+
+      it 'should exit when a target is specified' do
+        lambda { run_command }.should.raise(SystemExit)
+      end
+
+      it 'should exit with a failing status when a target is specified' do
+        begin
+          run_command
+        rescue SystemExit => e
+          e.success?.should == false
+        end
       end
     end
 
@@ -432,8 +482,16 @@ describe 'wd command' do
         lambda { run_command }
       end
   
-      it 'should fail' do
-        lambda { run_command }.should.raise
+      it 'should exit when a target is specified' do
+        lambda { run_command }.should.raise(SystemExit)
+      end
+
+      it 'should exit with a failing status when a target is specified' do
+        begin
+          run_command
+        rescue SystemExit => e
+          e.success?.should == false
+        end
       end
     end
     
@@ -854,13 +912,36 @@ describe 'wd command' do
       ARGV = ['frazzlebazzle', 'shizzlebizzle']
     end
     
-    it 'should fail if no target is specified' do
-      lambda { run_command }.should.raise
+    describe 'when no target is specified' do
+      it 'should exit when a target is specified' do
+        lambda { run_command }.should.raise(SystemExit)
+      end
+
+      it 'should exit with a failing status when a target is specified' do
+        begin
+          run_command
+        rescue SystemExit => e
+          e.success?.should == false
+        end
+      end
     end
-    
-    it 'should fail even if a target is specified' do
-      ARGV.push('--to=foo')
-      lambda { run_command }.should.raise
+
+    describe 'when a target is specified' do
+      before do
+        ARGV.push('--to=foo')        
+      end
+      
+      it 'should exit when a target is specified' do
+        lambda { run_command }.should.raise(SystemExit)
+      end
+
+      it 'should exit with a failing status when a target is specified' do
+        begin
+          run_command
+        rescue SystemExit => e
+          e.success?.should == false
+        end
+      end
     end
   end
   
@@ -870,13 +951,36 @@ describe 'wd command' do
       ARGV = ['frazzlebazzle']
     end
     
-    it 'should fail when no target is specified' do
-      lambda { run_command }.should.raise
+    describe 'when no target is specified' do
+      it 'should exit when a target is specified' do
+        lambda { run_command }.should.raise(SystemExit)
+      end
+
+      it 'should exit with a failing status when a target is specified' do
+        begin
+          run_command
+        rescue SystemExit => e
+          e.success?.should == false
+        end
+      end
     end
-    
-    it 'should fail when a target is specified' do
-      ARGV.push('--to=foo')
-      lambda { run_command }.should.raise
+
+    describe 'when a target is specified' do
+      before do
+        ARGV.push('--to=foo')        
+      end
+      
+      it 'should exit when a target is specified' do
+        lambda { run_command }.should.raise(SystemExit)
+      end
+
+      it 'should exit with a failing status when a target is specified' do
+        begin
+          run_command
+        rescue SystemExit => e
+          e.success?.should == false
+        end
+      end
     end
   end
 end

data/spec/whiskey_disk/helpers_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper.rb'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'whiskey_disk', 'helpers'))
 
-describe '#role?' do
+describe 'when checking for a role during setup or deployment' do
   it 'should accept a role string' do
     lambda { role?('web') }.should.not.raise(ArgumentError)
   end
@@ -41,3 +41,401 @@ describe '#role?' do
   end
 end
 
+def set_git_changes(changes)
+  self.stub!(:git_changes).and_return(changes)
+end
+
+def set_rsync_changes(changes)
+  self.stub!(:rsync_changes).and_return(changes)
+end
+
+describe 'when determining if certain files changed when a deployment was run' do
+  before do
+    @matching_file     = '/path/to/file'
+    @matching_path     = '/path/to'
+    @non_matching_file = '/nowhere/file'
+    @substring_file    = '/nowhere/filething'
+    @random_file       = '/random/path'
+    
+    set_git_changes([])
+    set_rsync_changes([])
+  end
+  
+  it 'should accept a path' do
+    lambda { changed?('foo') }.should.not.raise(ArgumentError)
+  end
+  
+  it 'should require a path' do
+    lambda { changed? }.should.raise(ArgumentError)
+  end
+  
+  it 'should be true when the specified file is in the list of git changes' do
+    set_git_changes([ @matching_file, @random_file])
+    changed?(@matching_file).should.be.true
+  end
+  
+  it 'should ignore trailing "/"s in the provided path when doing an exact git change match' do
+    set_git_changes([ @matching_file, @random_file])
+    changed?(@matching_file + '///').should.be.true    
+  end
+  
+  it 'should be true when the specified path is a full path prefix in the list of git changes' do
+    set_git_changes([ @matching_file , @random_file])
+    changed?(@matching_path).should.be.true    
+  end
+  
+  it 'should ignore trailing "/"s in the provided path when doing a path git change match' do
+    set_git_changes([ @matching_file , @random_file])
+    changed?(@matching_path + '///').should.be.true    
+  end
+
+  it 'should be true when the specified file is in the list of rsync changes' do    
+    set_rsync_changes([ @matching_file, @random_file])
+    changed?(@matching_file).should.be.true
+  end
+
+  it 'should ignore trailing "/"s in the provided path when doing an exact rsync change match' do
+    set_rsync_changes([ @matching_file, @random_file])
+    changed?(@matching_file + "///").should.be.true
+  end
+
+  it 'should be true when the specified path is a full path prefix in the list of git changes' do
+    set_rsync_changes([ @matching_file , @random_file])
+    changed?(@matching_path).should.be.true    
+  end
+  
+  it 'should ignore trailing "/"s in the provided path when doing a path rsync change match' do
+    set_rsync_changes([ @matching_file , @random_file])
+    changed?(@matching_path + '///').should.be.true    
+  end
+  
+  it 'should ignore regex metacharacters when looking for a git match' do
+    set_git_changes([ '/path/to/somestring'])
+    changed?('/path/to/some.*').should.be.false
+  end
+  
+  it 'should ignore regex metacharacters when looking for an rsync match' do
+    set_rsync_changes([ '/path/to/somestring'])
+    changed?('/path/to/some.*').should.be.false
+  end
+  
+  it 'should be true when the git changes file cannot be found' do
+    set_git_changes(nil)
+    changed?(@matching_file).should.be.true    
+  end
+  
+  it 'should be false if not path or file matches the specified file' do
+    set_git_changes([@matching_file, @matching_path, @random_file, @substring_file])
+    set_rsync_changes([@matching_file, @matching_path, @random_file, @substring_file])
+    changed?(@non_matching_file).should.be.false
+  end
+end
+
+describe "when finding files changed by git in a deployment" do
+  before do
+    @contents = 'CHANGELOG
+README.markdown
+Rakefile
+VERSION
+lib/whiskey_disk.rb
+lib/whiskey_disk/config.rb
+lib/whiskey_disk/helpers.rb
+scenarios/git_repositories/project.git/objects/04/26e152e66c8cd42974279bdcae09be9839c172
+scenarios/git_repositories/project.git/objects/04/f4de85eaf72ef1631dc6d7424045c0a749b757
+scenarios/git_repositories/project.git/refs/heads/bad_rakefile
+scenarios/git_repositories/project.git/refs/heads/master
+scenarios/remote/deploy.yml
+spec/integration/deployment_failures_spec.rb
+spec/integration/post_rake_tasks_spec.rb
+spec/integration/staleness_checks_spec.rb
+spec/spec_helper.rb
+spec/whiskey_disk/config_spec.rb
+spec/whiskey_disk/helpers_spec.rb
+spec/whiskey_disk_spec.rb
+whiskey_disk.gemspec
+'   
+  end
+    
+  it 'should work without arguments' do
+    lambda { git_changes }.should.not.raise(ArgumentError)
+  end
+  
+  it 'should not allow arguments' do
+    lambda { git_changes(:foo) }.should.raise(ArgumentError)
+  end
+  
+  it 'should return nil when a git changes file cannot be found' do
+    self.stub!(:read_git_changes_file).and_raise
+    git_changes.should.be.nil
+  end
+  
+  it 'should return an empty list if no files are found in the git changes file' do
+    self.stub!(:read_git_changes_file).and_return('')
+    git_changes.should == []
+  end
+  
+  it 'should return a list of all filenames mentioned in the git changes file' do
+    self.stub!(:read_git_changes_file).and_return(@contents)
+    git_changes.should == @contents.split("\n")
+  end
+  
+  it 'should strip duplicates from filenames mentioned in the git changes file' do
+    lines = @contents.split("\n")
+    duplicates = @contents + lines.first + "\n" + lines.last + "\n"
+    self.stub!(:read_git_changes_file).and_return(duplicates)
+    git_changes.sort.should == @contents.split("\n").sort
+  end
+end
+
+describe "when finding files changed by rsync in a deployment" do
+  before do
+    @contents = '2011/02/27 20:11:42 [36728] receiving file list
+2011/02/27 20:11:42 [36728] sent 24 bytes  received 9 bytes  total size 0
+2011/02/27 20:11:58 [36780] receiving file list
+2011/02/27 20:11:58 [36780] sent 24 bytes  received 9 bytes  total size 0
+2011/02/27 20:12:09 [36808] receiving file list
+2011/02/27 20:12:09 [36808] sent 24 bytes  received 9 bytes  total size 0
+2011/02/27 20:12:19 [36835] receiving file list
+2011/02/27 20:12:19 [36835] .d..t.... ./
+2011/02/27 20:12:19 [36835] cd+++++++ Application Support/
+2011/02/27 20:12:19 [36835] cd+++++++ Application Support/Google/
+2011/02/27 20:12:19 [36835] cd+++++++ Application Support/Google/GoogleTalkPlugin.app/
+2011/02/27 20:12:19 [36835] cd+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/
+2011/02/27 20:12:19 [36835] >f+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/Info.plist
+2011/02/27 20:12:19 [36835] cd+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/
+2011/02/27 20:12:19 [36835] cd+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/
+2011/02/27 20:12:19 [36835] cL+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/GoogleBreakpad -> Versions/Current/GoogleBreakpad
+2011/02/27 20:12:19 [36835] cL+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Resources -> Versions/Current/Resources
+2011/02/27 20:12:19 [36835] cd+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Versions/
+2011/02/27 20:12:19 [36835] cL+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Versions/Current -> A
+2011/02/27 20:12:19 [36835] cd+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Versions/A/
+2011/02/27 20:12:19 [36835] cd+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Versions/A/Resources/
+2011/02/27 20:12:19 [36835] cd+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Versions/A/Resources/Reporter.app/
+2011/02/27 20:12:19 [36835] cd+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Versions/A/Resources/Reporter.app/Contents/
+2011/02/27 20:12:19 [36835] cd+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/MacOS/
+2011/02/27 20:12:20 [36835] >f+++++++ Application Support/Google/GoogleTalkPlugin.app/Contents/MacOS/GoogleTalkPlugin
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/googletalkbrowserplugin.plugin/
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/googletalkbrowserplugin.plugin/Contents/
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/googletalkbrowserplugin.plugin/Contents/MacOS/
+2011/02/27 20:12:20 [36835] >f+++++++ Internet Plug-Ins/googletalkbrowserplugin.plugin/Contents/MacOS/googletalkbrowserplugin
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/googletalkbrowserplugin.plugin/Contents/Resources/
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/npgtpo3dautoplugin.plugin/
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/
+2011/02/27 20:12:20 [36835] >f+++++++ Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Info.plist
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks/
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks/Cg.framework/
+2011/02/27 20:12:20 [36835] cL+++++++ Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks/Cg.framework/Cg -> Versions/Current/Cg
+2011/02/27 20:12:20 [36835] cL+++++++ Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks/Cg.framework/Resources -> Versions/Current/Resources
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks/Cg.framework/Versions/
+2011/02/27 20:12:20 [36835] cL+++++++ Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks/Cg.framework/Versions/Current -> 1.0
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks/Cg.framework/Versions/1.0/
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/MacOS/
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Resources/
+2011/02/27 20:12:20 [36835] cd+++++++ Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Resources/English.lproj/
+2011/02/27 20:12:20 [36835] cd+++++++ QuickTime/
+2011/02/27 20:12:20 [36835] cd+++++++ QuickTime/Google Camera Adapter 0.component/
+2011/02/27 20:12:20 [36835] cd+++++++ QuickTime/Google Camera Adapter 0.component/Contents/
+2011/02/27 20:12:20 [36835] cd+++++++ QuickTime/Google Camera Adapter 0.component/Contents/MacOS/
+2011/02/27 20:12:20 [36835] cd+++++++ QuickTime/Google Camera Adapter 0.component/Contents/Resources/
+2011/02/27 20:12:20 [36835] cd+++++++ QuickTime/Google Camera Adapter 1.component/
+2011/02/27 20:12:20 [36835] cd+++++++ QuickTime/Google Camera Adapter 1.component/Contents/
+2011/02/27 20:12:20 [36835] >f+++++++ QuickTime/Google Camera Adapter 1.component/Contents/Info.plist
+2011/02/27 20:12:20 [36835] cd+++++++ QuickTime/Google Camera Adapter 1.component/Contents/MacOS/
+2011/02/27 20:12:20 [36835] cd+++++++ QuickTime/Google Camera Adapter 1.component/Contents/Resources/
+2011/02/27 20:12:20 [36835] sent 386 bytes  received 1431 bytes  total size 5229466
+'
+
+    @changes = [
+        "Application Support",
+        "Application Support/Google",
+        "Application Support/Google/GoogleTalkPlugin.app",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/GoogleBreakpad -> Versions/Current/GoogleBreakpad",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Resources -> Versions/Current/Resources",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Versions",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Versions/A",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Versions/A/Resources",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Versions/A/Resources/Reporter.app",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Versions/A/Resources/Reporter.app/Contents",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents/Frameworks/GoogleBreakpad.framework/Versions/Current -> A",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents/Info.plist",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents/MacOS",
+        "Application Support/Google/GoogleTalkPlugin.app/Contents/MacOS/GoogleTalkPlugin",
+        "Internet Plug-Ins",
+        "Internet Plug-Ins/googletalkbrowserplugin.plugin",
+        "Internet Plug-Ins/googletalkbrowserplugin.plugin/Contents",
+        "Internet Plug-Ins/googletalkbrowserplugin.plugin/Contents/MacOS",
+        "Internet Plug-Ins/googletalkbrowserplugin.plugin/Contents/MacOS/googletalkbrowserplugin",
+        "Internet Plug-Ins/googletalkbrowserplugin.plugin/Contents/Resources",
+        "Internet Plug-Ins/npgtpo3dautoplugin.plugin",
+        "Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents",
+        "Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks",
+        "Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks/Cg.framework",
+        "Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks/Cg.framework/Cg -> Versions/Current/Cg",
+        "Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks/Cg.framework/Resources -> Versions/Current/Resources",
+        "Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks/Cg.framework/Versions",
+        "Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks/Cg.framework/Versions/1.0",
+        "Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Frameworks/Cg.framework/Versions/Current -> 1.0",
+        "Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Info.plist",
+        "Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/MacOS",
+        "Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Resources",
+        "Internet Plug-Ins/npgtpo3dautoplugin.plugin/Contents/Resources/English.lproj",
+        "QuickTime",
+        "QuickTime/Google Camera Adapter 0.component",
+        "QuickTime/Google Camera Adapter 0.component/Contents",
+        "QuickTime/Google Camera Adapter 0.component/Contents/MacOS",
+        "QuickTime/Google Camera Adapter 0.component/Contents/Resources",
+        "QuickTime/Google Camera Adapter 1.component",
+        "QuickTime/Google Camera Adapter 1.component/Contents",
+        "QuickTime/Google Camera Adapter 1.component/Contents/Info.plist",
+        "QuickTime/Google Camera Adapter 1.component/Contents/MacOS",
+        "QuickTime/Google Camera Adapter 1.component/Contents/Resources",
+      ]
+  end
+
+  it 'should work without arguments' do
+    lambda { rsync_changes }.should.not.raise(ArgumentError)
+  end
+
+  it 'should not allow arguments' do
+    lambda { rsync_changes(:foo) }.should.raise(ArgumentError)
+  end
+
+  it 'should return nil when an rsync changes file cannot be found' do
+    self.stub!(:read_rsync_changes_file).and_raise
+    rsync_changes.should.be.nil
+  end
+
+  it 'should return an empty list if no files are found in the rsync changes file' do
+    self.stub!(:read_rsync_changes_file).and_return('')
+    rsync_changes.should == []
+  end
+
+  it 'should return a list of all changed filenames mentioned in the rsync changes file, excluding "."' do
+    self.stub!(:read_rsync_changes_file).and_return(@contents)
+    rsync_changes.sort.first.should == @changes.sort.first
+  end
+end
+
+describe 'when reading the git-related changes for a deployment' do
+  before do
+    @contents = 'git changes'
+    @changes_path = '/path/to/git/changes'
+    self.stub!(:git_changes_path).and_return(@changes_path)
+    File.stub!(:read).with(@changes_path).and_return(@contents)
+  end
+  
+  it 'should work without arguments' do
+    lambda { read_git_changes_file }.should.not.raise(ArgumentError)
+  end
+  
+  it 'should not allow arguments' do
+    lambda { read_git_changes_file(:foo) }.should.raise(ArgumentError)
+  end
+  
+  it 'should read the git changes file' do
+    File.should.receive(:read) do |arg|
+      arg.should == @changes_path
+      @contents
+    end
+    read_git_changes_file
+  end
+  
+  it 'should return the contents of the git changes file' do
+    read_git_changes_file.should == @contents
+  end
+  
+  it 'should fail if the git changes file cannot be read' do
+    File.stub!(:read).with(@changes_path).and_raise(Errno::ENOENT)
+    lambda { read_git_changes_file }.should.raise(Errno::ENOENT)
+  end
+end
+
+describe 'when reading the rsync-related changes for a deployment' do
+  before do
+    @contents = 'rsync changes'
+    @changes_path = '/path/to/rsync/changes'
+    self.stub!(:rsync_changes_path).and_return(@changes_path)
+    File.stub!(:read).with(@changes_path).and_return(@contents)
+  end
+  
+  it 'should work without arguments' do
+    lambda { read_rsync_changes_file }.should.not.raise(ArgumentError)
+  end
+  
+  it 'should not allow arguments' do
+    lambda { read_rsync_changes_file(:foo) }.should.raise(ArgumentError)
+  end
+  
+  it 'should read the rsync changes file' do
+    File.should.receive(:read) do |arg|
+      arg.should == @changes_path
+      @contents
+    end
+    read_rsync_changes_file
+  end
+  
+  it 'should return the contents of the rsync changes file' do
+    read_rsync_changes_file.should == @contents
+  end
+  
+  it 'should fail if the rsync changes file cannot be read' do
+    File.stub!(:read).with(@changes_path).and_raise(Errno::ENOENT)
+    lambda { read_rsync_changes_file }.should.raise(Errno::ENOENT)
+  end
+end
+
+describe 'computing the path to the git changes file' do
+  before do
+    @git_path = '/path/to/toplevel'
+    @io_handle = ''
+    IO.stub!(:popen).with("git rev-parse --show-toplevel").and_return(@io_handle)
+    @io_handle.stub!(:read).and_return(@git_path + "\n")
+  end
+  
+  it 'should work without arguments' do
+    lambda { git_changes_path }.should.not.raise(ArgumentError)
+  end
+  
+  it 'should not allow arguments' do
+    lambda { git_changes_path(:foo) }.should.raise(ArgumentError)
+  end
+  
+  it 'should return the path to the .whiskey_disk_git_changes file in the git top-level path' do
+    git_changes_path.should == File.join(@git_path, '.whiskey_disk_git_changes')
+  end
+  
+  it 'should return the path to the .whiskey_disk_git_changes file in the current directory of the git top-level cannot be found' do
+    @io_handle.stub!(:read).and_return('')
+    git_changes_path.should == File.join(Dir.pwd, '.whiskey_disk_git_changes')    
+  end
+end
+
+describe 'computing the path to the rsync changes file' do
+  before do
+    @rsync_path = '/path/to/toplevel'
+    @io_handle = ''
+    IO.stub!(:popen).with("git rev-parse --show-toplevel").and_return(@io_handle)
+    @io_handle.stub!(:read).and_return(@rsync_path + "\n")
+  end
+  
+  it 'should work without arguments' do
+    lambda { rsync_changes_path }.should.not.raise(ArgumentError)
+  end
+  
+  it 'should not allow arguments' do
+    lambda { rsync_changes_path(:foo) }.should.raise(ArgumentError)
+  end
+  
+  it 'should return the path to the .whiskey_disk_rsync_changes file in the git top-level path' do
+    rsync_changes_path.should == File.join(@rsync_path, '.whiskey_disk_rsync_changes')
+  end
+  
+  it 'should return the path to the .whiskey_disk_rsync_changes file in the current directory of the git top-level cannot be found' do
+    @io_handle.stub!(:read).and_return('')
+    rsync_changes_path.should == File.join(Dir.pwd, '.whiskey_disk_rsync_changes')    
+  end
+end

data/spec/whiskey_disk/rake_spec.rb

@@ -24,6 +24,7 @@ describe 'rake tasks' do
         :update_main_repository_checkout,
         :update_configuration_repository_checkout,
         :refresh_configuration,
+        :initialize_all_changes,
         :run_post_setup_hooks, 
         :flush,
         :summarize
@@ -87,6 +88,11 @@ describe 'rake tasks' do
       end
     end
     
+    it 'should clear any tracked git or rsync changes' do
+      WhiskeyDisk.should.receive(:initialize_all_changes)
+      @rake["deploy:setup"].invoke
+    end
+    
     describe 'when no configuration repository is specified' do
       it 'should update the configuration repository checkout' do
         WhiskeyDisk.should.not.receive(:update_configuration_repository_checkout)

data/spec/whiskey_disk_spec.rb

@@ -221,9 +221,14 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout -b master origin/master})
     end
     
+    it 'should fall back to a regular checkout of the master branch with origin branch when no branch is specified' do
+      WhiskeyDisk.checkout_main_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| git checkout master origin/master})
+    end
+    
     it 'should fall back to a regular checkout of the master branch when no branch is specified' do
       WhiskeyDisk.checkout_main_repository
-      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| git checkout master})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| git checkout master origin/master \|\| git checkout master})
     end
     
     it 'should do a branch creation checkout of the specified branch when a branch is specified' do
@@ -232,10 +237,16 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout -b production origin/production})
     end
 
+    it 'should fall back to a regular checkout of the specified branch with origin branch when a branch is specified' do
+      WhiskeyDisk.configuration = @parameters.merge({'branch' => 'production'})
+      WhiskeyDisk.checkout_main_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| git checkout production origin/production})
+    end
+
     it 'should fall back to a regular checkout of the specified branch when a branch is specified' do
       WhiskeyDisk.configuration = @parameters.merge({'branch' => 'production'})
       WhiskeyDisk.checkout_main_repository
-      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| git checkout production})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| git checkout production origin/production \|\| git checkout production})
     end
 
     it 'should do branch checkouts from the repository path' do
@@ -280,11 +291,34 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout -b master origin/master})
     end
     
+    it 'should fall back to a regular checkout of the master branch with origin branch when no branch is specified' do
+      WhiskeyDisk.checkout_configuration_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| git checkout master origin/master})
+    end
+    
+    it 'should fall back to a regular checkout of the master branch when no branch is specified' do
+      WhiskeyDisk.checkout_configuration_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| git checkout master origin/master \|\| git checkout master})
+    end
+    
     it 'should do a branch creation checkout of the specified branch when a branch is specified' do
       WhiskeyDisk.configuration = @parameters.merge({'config_branch' => 'production'})
       WhiskeyDisk.checkout_configuration_repository
       WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout -b production origin/production})
     end
+
+    it 'should fall back to a regular checkout of the specified branch with origin branch when a branch is specified' do
+      WhiskeyDisk.configuration = @parameters.merge({'config_branch' => 'production'})
+      WhiskeyDisk.checkout_configuration_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| git checkout production origin/production})
+    end
+    
+    it 'should fall back to a regular checkout of the specified branch when a branch is specified' do
+      WhiskeyDisk.configuration = @parameters.merge({'config_branch' => 'production'})
+      WhiskeyDisk.checkout_configuration_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| git checkout production origin/production \|\| git checkout production})
+    end
+    
   end
   
   describe 'updating the main repository checkout' do
@@ -303,15 +337,20 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main/repo})
     end
     
-    it 'should work from the default branch if no branch is specified' do
+    it 'should clear out any existing git changes data' do
       WhiskeyDisk.update_main_repository_checkout
-      WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout master})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{rm -f /path/to/main/repo/.whiskey_disk_git_changes})
     end
-
-    it 'should work from the specified branch if one is specified' do
+        
+    it 'should capture the current git HEAD ref for the specified branch' do
       WhiskeyDisk.configuration = @parameters.merge({'branch' => 'production'})
       WhiskeyDisk.update_main_repository_checkout
-      WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout production})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{ml=\`cat .git/refs/heads/production\`})
+    end
+    
+    it 'should capture the current git HEAD ref for the master branch if no branch is specified' do
+      WhiskeyDisk.update_main_repository_checkout
+      WhiskeyDisk.buffer.join(' ').should.match(%r{ml=\`cat .git/refs/heads/master\`})
     end
     
     it 'should attempt to fetch only the master branch from the origin if no branch is specified' do
@@ -325,6 +364,17 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{git fetch origin \+refs/heads/production:refs/remotes/origin/production})
     end
 
+    it 'should work from the default branch if no branch is specified' do
+      WhiskeyDisk.update_main_repository_checkout
+      WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout master})
+    end
+
+    it 'should work from the specified branch if one is specified' do
+      WhiskeyDisk.configuration = @parameters.merge({'branch' => 'production'})
+      WhiskeyDisk.update_main_repository_checkout
+      WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout production})
+    end
+
     it 'should attempt to reset the master branch from the origin if no branch is specified' do
       WhiskeyDisk.update_main_repository_checkout
       WhiskeyDisk.buffer.join(' ').should.match(%r{git reset --hard origin/master})
@@ -335,11 +385,16 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.update_main_repository_checkout
       WhiskeyDisk.buffer.join(' ').should.match(%r{git reset --hard origin/production})
     end
+    
+    it 'should collect git changes data' do
+      WhiskeyDisk.update_main_repository_checkout
+      WhiskeyDisk.buffer.join(' ').should.match(%r{git diff --name-only \$\{ml\}\.\.HEAD > /path/to/main/repo/\.whiskey_disk_git_changes})
+    end
   end
   
   describe 'updating the configuration repository checkout' do
     before do
-      @parameters = { 'deploy_config_to' => '/path/to/config/repo' }
+      @parameters = { 'deploy_config_to' => '/path/to/config/repo', 'deploy_to' => '/path/to/main/repo' }
       WhiskeyDisk.configuration = @parameters
     end
     
@@ -353,6 +408,11 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/config/repo})
     end
     
+    it 'should clear out any existing rsync changes data' do
+      WhiskeyDisk.update_configuration_repository_checkout
+      WhiskeyDisk.buffer.join(' ').should.match(%r{rm -f /path/to/main/repo/.whiskey_disk_rsync_changes})
+    end
+    
     it 'should attempt to fetch only the master branch from the origin if no configuration branch is specified' do
       WhiskeyDisk.update_configuration_repository_checkout
       WhiskeyDisk.buffer.join(' ').should.match(%r{git fetch origin \+refs/heads/master:refs/remotes/origin/master})
@@ -407,6 +467,11 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.refresh_configuration
       WhiskeyDisk.buffer.last.should.match(%r{rsync.* /path/to/config/repo/whiskey_disk/staging/ /path/to/main/repo/})
     end
+    
+    it 'should capture rsync change data' do
+      WhiskeyDisk.refresh_configuration
+      WhiskeyDisk.buffer.last.should.match(%r{rsync.* --log-file=/path/to/main/repo/.whiskey_disk_rsync_changes })
+    end
   end
 
   describe 'running post setup hooks' do
@@ -931,6 +996,7 @@ describe 'WhiskeyDisk' do
       @domain = { :name => @domain_name }
       WhiskeyDisk.configuration = { 'domain' => [ @domain ] }
       WhiskeyDisk.stub!(:system)
+      WhiskeyDisk.stub!(:puts)
     end
     
     it 'should accept a domain and a command string' do
@@ -980,6 +1046,7 @@ describe 'WhiskeyDisk' do
       @domain = { :name => @domain_name }
       WhiskeyDisk.configuration = { 'domain' => [ @domain ] }
       WhiskeyDisk.stub!(:system)
+      WhiskeyDisk.stub!(:puts)
     end
     
     it 'should accept a domain and a command string' do

data/whiskey_disk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whiskey_disk}
-  s.version = "0.6.17"
+  s.version = "0.6.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rick Bradley"]
-  s.date = %q{2011-03-25}
+  s.date = %q{2011-04-06}
   s.description = %q{Opinionated gem for doing fast git-based server deployments.}
   s.email = %q{rick@rickbradley.com}
   s.executables = ["wd_role", "wd"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whiskey_disk
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 6
-  - 17
-  version: 0.6.17
+  - 20
+  version: 0.6.20
 platform: ruby
 authors: 
 - Rick Bradley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -05:00
+date: 2011-04-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency