whiskey_disk 0.5.4 → 0.6.0

data/CHANGELOG

@@ -0,0 +1,129 @@
+
+0.6.0 / 2010-12-22 
+==================
+
+  * Version bump to 0.6.0
+  * Merge branch 'feature/multiple-domain-support' into develop
+  * adding a set of multi-domain examples
+  * adding a local deployment example
+  * updating output summary to be more readable
+  * updating README to document multi-domain deployments
+  * rake exit statuses reflect overall deployment/setup success
+  * adding WhiskeyDisk.success? method
+  * We now summarize runs, both local and remote.
+  * record results for local runs as well as remote ones
+  * now run SSH commands on multiple domains, serially, synchronously
+  * propagating changes allowed by normalizing 'domain' in config data
+  * normalize 'domain' values pulled from config files
+  * refactor config file writing in config spec
+  * WD.remote? now understands arrays of 'domain' entries in the config
+  * Merge branch 'release/0.5.4' into develop
+  * bump gemspec for 0.5.4 release
+  * Version bump to 0.5.4
+  * Removing Jeweler warning from Rakefile
+  * Merge branch 'feature/reduce-mocking-code-in-tests' into develop
+  * eliminating more stubbing specs from config_spec
+  * Removing more stub! calls from config specs
+  * removing YAML.load exception stub
+  * replacing some configuration_data stubs in config spec
+  * Remove CURRENT_FILE from config specs
+  * Removing CURRENT from config specs
+  * Removing more File.exists? stubs from config spec.
+  * Removing File.exists? stubs in config specs
+  * spec refactorings
+  * Removing has_config_repo? stubs from rake specs
+  * Using non-stubbed configuration in rake specs
+  * removing useless stub of :register_configuration
+  * And removing unneeded spec helper
+  * removing whiskey_disk config stubbing
+  * introducing use_config() spec helper
+  * Merge branch 'release/0.5.3' into develop
+  * updating gemspec for 0.5.3
+  * updating Contributors section of README
+  * Version bump to 0.5.3
+  * Merge branch 'feature/merge-pull-request-2' into develop
+  * Cosmetic and naming change in new config method
+  * fixing spec example description
+  * Reworking the config to append project name overrides to the env, since everything else is dependent thereupon
+  * tidying up the spec
+  * Allowing a manually specified project name in the bare config hash to be used as the parent project in the absence of one specified from the 'to' env setting
+  * Merge branch 'release/0.5.2' into develop
+  * updating gemspec for version 0.5.2
+  * Bumping version to 0.5.2
+  * Merge branch 'feature/ensure_target_needs_no_ruby' into develop
+  * Updating TODO list
+  * Updating README
+  * Merge branch 'feature/make_check_a_wd_option' into develop
+  * Updating TODO list
+  * Adding --check flag to wd command-line script
+  * Updating README with --check changes
+  * Merge branch 'feature/use_shallow_clone_on_setup' into develop
+  * Updating TODO list
+  * Adding lightning talk info to README
+  * Making shallow clones on initial setup
+  * Merge branch 'release/0.5.0' into develop
+  * updating gemspec for 0.5.0
+  * Version bump to 0.5.0
+  * Merge branch 'feature/alternate-hook-mechanism' into develop
+  * TODO list updates
+  * Make the rake test task do right by bacon
+  * Adding post_setup_script support
+  * Adding post_deploy_script support
+  * Reordering specs for post-setup/deployment tasks
+  * Updating README for post_*_script functionality
+  * TODO file updates
+  * Merge branch 'release/0.4.5' into develop
+  * new gemspec for 0.4.5 release
+  * Version bump to 0.4.5
+  * ENV settings now available to rake when searching for tasks
+  * Merge branch 'feature/refactor-methods' into develop
+  * refactoring common code for rake tasks
+  * further refactoring of clone_repository
+  * refactoring update checkout methods
+  * renaming conditional_clone
+  * Refactoring rake task code
+  * Merge branch 'release/0.4.4' into develop
+  * 0.4.4 gemspec
+  * Version bump to 0.4.4
+  * Merge branch 'feature/readme-updates' into develop
+  * TODO list tweakage
+  * README updates
+  * Merge branch 'release/0.4.3' into develop
+  * updating gemspec
+  * Version bump to 0.4.3
+  * Updating TODO
+  * Smarter setups
+  * TODO updates
+  * Version bump to 0.4.2
+  * Taking a different approach to rake task detection
+  * bumping gemspec
+  * Version bump to 0.4.1
+  * Fixing post_* hook edge case
+  * More README updates
+  * updating README
+  * updated gemspec
+  * adding staleness check docs to README
+  * Version bump to 0.4.0
+  * Make the staleness check actually work with bash.
+  * Adding "else" block to provide feedback when not stale
+  * More complete implementation of staleness checks
+  * Removing earlier abortive implementation of staleness checking
+  * Support for staleness checks
+  * Adding first pass at conditional staleness checks
+  * updating TODO list
+  * README note about post_* rake task dependencies
+  * updated gemspec
+  * Version bump to 0.3.1
+  * No longer require a Rakefile when --path isn't used
+  * We no longer do per-target config file overrides
+  * Don't run post_{setup,deploy} rake tasks without a deployed Rakefile
+  * use 'target' instead of 'environment' in README
+  * encoding < and >
+  * more README tweaks
+  * readme formatting tweak
+  * make sure README.markdown is displayed on install
+  * new and improved README
+  * adding a simple deploy.yml example to the README
+  * add link to live presentation to README
+  * adding a check flag for use with staleness checks
+  * english spike of staleness check in todo file

data/README.markdown

@@ -57,6 +57,12 @@ current local checkout.
     do hands-free automated deployments whenever code is pushed to your
     deployment branch of choice!
 
+  - 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.
+
+
 ### Assumptions ###
 
  - your project is managed via git
@@ -100,7 +106,7 @@ As a rails plugin:
 
 Known config file settings (if you're familiar with capistrano and vlad these should seem eerily familiar):
  
-    domain:              host on which to deploy (this is an ssh connect string) 
+    domain:              host or list of hosts on which to deploy (these are ssh connect strings)
     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 (default: master)
@@ -116,7 +122,7 @@ Known config file settings (if you're familiar with capistrano and vlad these sh
 A simple config/deploy.yml might look like:
   
     qa:
-      domain: "ogc@www.ogtastic.com"
+      domain: "ogc@qa.ogtastic.com"
       deploy_to: "/var/www/www.ogtastic.com"
       repository: "git@ogtastic.com:www.ogtastic.com.git"
       branch: "stable"
@@ -132,6 +138,19 @@ of deploy:setup
 at the end of deploy:now
 
 
+For deploying to multiple hosts, the config/deploy.yml might look like:
+
+    qa:
+      domain:
+      - "ogc@qa1.ogtastic.com"
+      - "ogc@qa2.ogtastic.com""
+      deploy_to: "/var/www/www.ogtastic.com"
+      repository: "git@ogtastic.com:www.ogtastic.com.git"
+      branch: "stable"
+      rake_env:
+        RAILS_ENV: 'production'
+
+
 ### post\_deploy\_script and post\_setup\_script ###
 
 Whiskey\_disk provides rake task hooks (deploy:post\_setup and deploy:post\_deploy) to allow running custom

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.6.0

data/examples/deploy-local.yml

@@ -0,0 +1,4 @@
+local:
+  deploy_to: "/Users/rick/deploy/whiskey_disk/local"
+  repository: "/Users/rick/git/whiskey_disk"
+  branch: "develop"

data/examples/deploy-multiple-remotes.yml

@@ -0,0 +1,14 @@
+multi:
+  domain:
+  - "ogc@hoenir.websages.com"
+  - "ogc@nerthus.websages.com"
+  deploy_to: "/tmp/test-deployment/"
+  repository: "git@git.ogtastic.com:whiskey_disk.git"
+  branch: "develop"
+badmulti:
+  domain:
+  - "ogc@hoenir.websages.com"
+  - "ogc@bogus.example.com"
+  deploy_to: "/tmp/test-deployment/"
+  repository: "git@git.ogtastic.com:whiskey_disk.git"
+  branch: "develop"

data/lib/whiskey_disk/config.rb

@@ -103,9 +103,20 @@ class WhiskeyDisk
         override_project_name!(data)
         { project_name => data }
       end
+      
+      def normalize_domain(data)
+        data.each_pair do |project, project_data|
+          project_data.each_pair do |target, target_data|
+            if target_data['domain']
+              cleaned = [ target_data['domain'] ].flatten.delete_if { |m| m.nil? or m == '' }
+              target_data['domain'] = (cleaned.empty? ? nil : cleaned)
+            end
+          end
+        end
+      end
 
       def normalize_data(data)
-        add_project_scoping(add_environment_scoping(data.clone))
+        normalize_domain(add_project_scoping(add_environment_scoping(data.clone)))
       end
 
       def load_data

data/lib/whiskey_disk/rake.rb

@@ -13,6 +13,9 @@ namespace :deploy do
     WhiskeyDisk.refresh_configuration                     if WhiskeyDisk.has_config_repo?
     WhiskeyDisk.run_post_setup_hooks
     WhiskeyDisk.flush
+    WhiskeyDisk.summarize
+
+    exit(1) unless WhiskeyDisk.success?
   end
   
   desc "Deploy now."
@@ -23,6 +26,9 @@ namespace :deploy do
     WhiskeyDisk.refresh_configuration                     if WhiskeyDisk.has_config_repo?
     WhiskeyDisk.run_post_deploy_hooks
     WhiskeyDisk.flush
+    WhiskeyDisk.summarize
+
+    exit(1) unless WhiskeyDisk.success?
   end
   
   task :post_setup do

data/lib/whiskey_disk.rb

@@ -3,11 +3,13 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'whiskey_disk', 'conf
 class WhiskeyDisk
   class << self
     attr_writer :configuration
+    attr_reader :results
     
     def reset
       @configuration = nil
       @buffer = nil
       @staleness_checks = nil
+      @results = nil
     end
     
     def buffer
@@ -39,7 +41,7 @@ class WhiskeyDisk
     end
     
     def remote?
-      ! (self[:domain].nil? or self[:domain] == '')
+      !! self[:domain]
     end
     
     def has_config_repo?
@@ -109,11 +111,48 @@ class WhiskeyDisk
     
     def run(cmd)
       needs(:domain)
-      system('ssh', '-v', self[:domain], "set -x; " + cmd)
+      self[:domain].each do |domain|
+        status = system('ssh', '-v', domain, "set -x; " + cmd)
+        record_result(domain, status)
+      end
     end
     
     def flush
-      remote? ? run(bundle) : system(bundle)
+      return run(bundle) if remote?
+      record_result('local', system(bundle))
+    end
+    
+    def record_result(domain, status)
+      @results ||= []
+      @results << { :domain => domain, :status => status }
+    end
+    
+    def summarize
+      puts
+      puts "Results:"
+      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
+        puts "Total: #{total} deployment#{total == 1 ? '' : 's'}, " +
+          "#{successes} success#{successes == 1 ? '' : 'es'}, " +
+          "#{failures} failure#{failures == 1 ? '' : 's'}."
+      else
+        puts "No deployments to report."
+      end       
+    end
+    
+    def success?
+      return true if !results or results.empty?
+      results.all? {|result| result[:status] }
     end
     
     def if_file_present(path, cmd)

data/spec/whiskey_disk/config_spec.rb

@@ -15,6 +15,10 @@ def build_temp_dir
   Dir.mktmpdir
 end
 
+def write_config_file(data)
+  File.open(@config_file, 'w') { |f| f.puts YAML.dump(data) }
+end
+
 describe WhiskeyDisk::Config do
   describe 'when computing the environment name' do
     it 'should return false when there is no ENV["to"] setting' do
@@ -106,53 +110,53 @@ describe WhiskeyDisk::Config do
     end
 
     it 'should fail if the configuration file does not define data for this environment' do
-      File.open(@config_file, 'w') {|f| f.puts YAML.dump({'foo' => { 'production' => { 'a' => 'b'}}}) }
+      write_config_file('foo' => { 'production' => { 'a' => 'b'} })
       lambda { WhiskeyDisk::Config.fetch }.should.raise
     end
 
     it 'should return the configuration yaml file data for this environment as a hash' do
       staging = { 'foo' => 'bar', 'repository' => 'xyzzy' }
-      File.open(@config_file, 'w') {|f| f.puts YAML.dump({'foo' => { 'production' => { 'repository' => 'b'}, 'staging' => staging }}) }
+      write_config_file('foo' => { 'production' => { 'repository' => 'b'}, 'staging' => staging })
       result = WhiskeyDisk::Config.fetch
       staging.each_pair do |k,v|
         result[k].should == v
       end
     end
-
+    
     it 'should not include configuration information for other environments in the returned hash' do
       staging = { 'foo' => 'bar', 'baz' => 'xyzzy' }
-      File.open(@config_file, 'w') {|f| f.puts YAML.dump({ 'production' => { 'repository' => 'c', 'a' => 'b'}, 'staging' => staging }) }
+      write_config_file('production' => { 'repository' => 'c', 'a' => 'b'}, 'staging' => staging)
       WhiskeyDisk::Config.fetch['a'].should.be.nil
     end
 
     it 'should include the environment in the hash' do
       staging = { 'foo' => 'bar', 'baz' => 'xyzzy' }
-      File.open(@config_file, 'w') {|f| f.puts YAML.dump({'foo' => { 'production' => { 'repository' => 'b'}, 'staging' => staging }}) }
+      write_config_file('foo' => { 'production' => { 'repository' => 'b'}, 'staging' => staging })
       WhiskeyDisk::Config.fetch['environment'].should == 'staging'
     end
 
     it 'should not allow overriding the environment in the configuration file' do
       staging = { 'foo' => 'bar', 'repository' => 'xyzzy', 'environment' => 'production' }
-      File.open(@config_file, 'w') {|f| f.puts YAML.dump({'foo' => { 'production' => { 'repository' => 'b'}, 'staging' => staging }}) }
+      write_config_file('foo' => { 'production' => { 'repository' => 'b'}, 'staging' => staging })
       WhiskeyDisk::Config.fetch['environment'].should == 'staging'
     end
 
     it 'should include the project handle in the hash' do
       staging = { 'foo' => 'bar', 'repository' => 'xyzzy' }
-      File.open(@config_file, 'w') {|f| f.puts YAML.dump({'foo' => { 'production' => { 'repository' => 'b'}, 'staging' => staging }}) }
+      write_config_file('foo' => { 'production' => { 'repository' => 'b'}, 'staging' => staging })
       WhiskeyDisk::Config.fetch['project'].should == 'foo'
     end
 
     it 'should not allow overriding the project handle in the configuration file when a project root is specified' do
       staging = { 'foo' => 'bar', 'repository' => 'xyzzy', 'project' => 'diskey_whisk' }
-      File.open(@config_file, 'w') {|f| f.puts YAML.dump({'foo' => { 'production' => { 'repository' => 'b'}, 'staging' => staging }}) }
+      write_config_file('foo' => { 'production' => { 'repository' => 'b'}, 'staging' => staging })
       WhiskeyDisk::Config.fetch['project'].should == 'foo'
     end
 
     it 'should allow overriding the project handle in the configuration file when a project root is not specified' do
       ENV['to'] = @env = 'staging'
       staging = { 'foo' => 'bar', 'repository' => 'xyzzy', 'project' => 'diskey_whisk' }
-      File.open(@config_file, 'w') {|f| f.puts YAML.dump({'production' => { 'repository' => 'b'}, 'staging' => staging }) }
+      write_config_file('production' => { 'repository' => 'b'}, 'staging' => staging)
       WhiskeyDisk::Config.fetch['project'].should == 'diskey_whisk'
     end
   end
@@ -198,16 +202,83 @@ describe WhiskeyDisk::Config do
     end
 
     it 'should return a normalized version of the un-YAMLized configuration data' do
-      File.open(@config_file, 'w') { |f| f.puts YAML.dump({ 'repository' => 'x'}) }
+      write_config_file('repository' => 'x')
       WhiskeyDisk::Config.load_data.should == { 'foo' => { 'bar' => { 'repository' => 'x' } } }
     end
+    
+    describe 'normalizing domains' do
+      before do
+        write_config_file(
+          'foo' => { 
+            'bar' => { 'repository' => 'x', 'domain' => [ 'user@example.com', nil, 'foo@domain.com', '' ]}, 
+            'baz' => { 'repository' => 'x', 'domain' => [ 'bar@example.com', 'baz@domain.com' ]},
+            'xyz' => { 'repository' => 'x' },
+            'abc' => { 'repository' => 'x', 'domain' => 'what@example.com' },
+            'eee' => { 'repository' => 'x', 'domain' => '' }
+          },
+          'zyx' => {
+            'def' => { 'repository' => 'x', 'domain' => [ 'user@example.com', nil, 'foo@domain.com', '' ]}, 
+            'hij' => { 'repository' => 'x', 'domain' => [ 'bar@example.com', 'baz@domain.com' ]},
+            'xyz' => { 'repository' => 'x' },
+            'abc' => { 'repository' => 'x', 'domain' => 'what@example.com' },
+            'eee' => { 'repository' => 'x', 'domain' => '' }
+          }
+        )
+      end
+    
+      describe 'and no domain has been specified' do
+        it 'should leave the domain as nil' do
+          WhiskeyDisk::Config.load_data['foo']['xyz']['domain'].should.be.nil     
+        end
+        
+        it 'should handle nil domains across all projects and targets' do
+          WhiskeyDisk::Config.load_data['zyx']['xyz']['domain'].should.be.nil     
+        end
+      end
+    
+      describe 'and a single domain has been specified' do
+        it 'should return domain as nil if the specified domain was empty' do
+          WhiskeyDisk::Config.load_data['foo']['eee']['domain'].should.be.nil       
+        end
+        
+        it 'should handle empty specified domains across all projects and targets' do
+          WhiskeyDisk::Config.load_data['zyx']['eee']['domain'].should.be.nil                 
+        end
+      
+        it 'should return domain as a single list of the specified domain if the specified domain was not empty' do
+          WhiskeyDisk::Config.load_data['foo']['abc']['domain'].should == ['what@example.com']
+        end
+    
+        it 'should handle single specified domains across all projects and targets' do
+          WhiskeyDisk::Config.load_data['zyx']['abc']['domain'].should == ['what@example.com']
+        end
+      end
+    
+      describe 'and a list of domains was specified' do
+        it 'should return the list of domains' do
+          WhiskeyDisk::Config.load_data['foo']['baz']['domain'].should == [ 'bar@example.com', 'baz@domain.com' ]
+        end
+      
+        it 'should handle lists of domains across all projects and targets' do
+          WhiskeyDisk::Config.load_data['zyx']['hij']['domain'].should == [ 'bar@example.com', 'baz@domain.com' ]
+        end
+      
+        it 'should remove any blank or nil domains from the list' do
+          WhiskeyDisk::Config.load_data['foo']['bar']['domain'].should == ['user@example.com', 'foo@domain.com' ]
+        end
+    
+        it 'should handle cleaning up blanks and nils across all projects and targets' do
+          WhiskeyDisk::Config.load_data['zyx']['def']['domain'].should == ['user@example.com', 'foo@domain.com' ]
+        end
+      end
+    end
   end
 
   describe 'normalizing YAML data from the configuration file' do
     before do
       ENV['to'] = @env = 'foo:staging'
 
-      @bare_data  = { 'repository' => 'git://foo/bar.git', 'domain' => 'ogc@ogtastic.com' }
+      @bare_data  = { 'repository' => 'git://foo/bar.git', 'domain' => ['ogc@ogtastic.com'] }
       @env_data   = { 'staging' => @bare_data }
       @proj_data  = { 'foo' => @env_data }
     end

data/spec/whiskey_disk/rake_spec.rb

@@ -25,20 +25,23 @@ describe 'rake tasks' do
         :update_configuration_repository_checkout,
         :refresh_configuration,
         :run_post_setup_hooks, 
-        :flush
+        :flush,
+        :summarize
       ].each do |meth| 
-        WhiskeyDisk.stub!(meth) 
+        WhiskeyDisk.stub!(meth)
       end
+
+      WhiskeyDisk.stub!(:success?).and_return(true)
     end
     
     it 'should make changes on the specified domain when a domain is specified' do
-      WhiskeyDisk.configuration = { 'domain' => 'some domain' }
+      WhiskeyDisk.configuration = { 'domain' => [ 'some domain' ] }
       @rake["deploy:setup"].invoke
       WhiskeyDisk.should.be.remote
     end
     
     it 'should make changes on the local system when no domain is specified' do
-      WhiskeyDisk.configuration = { 'domain' => '' }
+      WhiskeyDisk.configuration = { 'domain' => nil }
       WhiskeyDisk.should.not.be.remote
     end
     
@@ -126,6 +129,20 @@ describe 'rake tasks' do
       WhiskeyDisk.should.receive(:flush)
       @rake["deploy:setup"].invoke
     end
+    
+    it 'should summarize the results of the setup run' do
+      WhiskeyDisk.should.receive(:summarize)
+      @rake["deploy:setup"].invoke
+    end
+  
+    it 'should not exit in error if all setup runs were successful' do
+      lambda { @rake["deploy:setup"].invoke }.should.not.raise(SystemExit)
+    end
+    
+    it 'should exit in error if some setup run was unsuccessful' do
+      WhiskeyDisk.stub!(:success?).and_return(false)
+      lambda { @rake["deploy:setup"].invoke }.should.raise(SystemExit)
+    end
   end
   
   describe 'deploy:now' do
@@ -137,14 +154,17 @@ describe 'rake tasks' do
         :update_configuration_repository_checkout,
         :refresh_configuration,
         :run_post_deploy_hooks,
-        :flush
+        :flush, 
+        :summarize
       ].each do |meth| 
         WhiskeyDisk.stub!(meth) 
       end
+      
+      WhiskeyDisk.stub!(:success?).and_return(true)
     end
     
     it 'should make changes on the specified domain when a domain is specified' do
-      WhiskeyDisk.configuration = { 'domain' => 'some domain'}
+      WhiskeyDisk.configuration = { 'domain' => [ 'some domain' ]}
       @rake["deploy:now"].invoke
       WhiskeyDisk.should.be.remote
     end
@@ -202,6 +222,20 @@ describe 'rake tasks' do
       WhiskeyDisk.should.receive(:flush)
       @rake["deploy:now"].invoke
     end
+    
+    it 'should summarize the results of the deployment run' do
+      WhiskeyDisk.should.receive(:summarize)
+      @rake["deploy:now"].invoke
+    end
+    
+    it 'should not exit in error if all deployment runs were successful' do
+      lambda { @rake["deploy:now"].invoke }.should.not.raise(SystemExit)
+    end
+    
+    it 'should exit in error if some deployment run was unsuccessful' do
+      WhiskeyDisk.stub!(:success?).and_return(false)
+      lambda { @rake["deploy:now"].invoke }.should.raise(SystemExit)
+    end
   end
       
   describe 'deploy:post_setup' do

data/spec/whiskey_disk_spec.rb

@@ -2,6 +2,21 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper.rb'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'whiskey_disk'))
 require 'rake'
 
+# WhiskeyDisk subclass that allows us to test in what order ssh commands are 
+#   issued by WhiskeyDisk.run
+class TestOrderedExecution < WhiskeyDisk
+  class << self
+    def commands
+      @commands
+    end
+    
+    def system(*args)
+      @commands ||= []
+      @commands << args.join(' ')
+    end
+  end
+end
+
 describe 'requiring the main library' do
   before do
     Rake.application = @rake = Rake::Application.new
@@ -36,19 +51,19 @@ describe 'WhiskeyDisk' do
       lambda { WhiskeyDisk.remote?(:foo) }.should.raise(ArgumentError)
     end
     
-    it 'should return true if the configuration includes a non-empty domain setting' do
-      @parameters['domain'] = 'smeghost'
-      WhiskeyDisk.remote?.should == true
-    end
-    
     it 'should return false if the configuration includes a nil domain setting' do
       @parameters['domain'] = nil
       WhiskeyDisk.remote?.should == false
     end
+
+    it 'should return true if the configuration includes a non-empty domain setting' do
+      @parameters['domain'] = ['smeghost']
+      WhiskeyDisk.remote?.should == true
+    end
     
-    it 'should return false if the configuration includes a blank domain setting' do
-      @parameters['domain'] = ''
-      WhiskeyDisk.remote?.should == false
+    it 'should return true if the configuration includes a multiple domain settings' do
+      @parameters['domain'] = ['smeghost', 'faphost']
+      WhiskeyDisk.remote?.should == true
     end
   end
   
@@ -532,6 +547,7 @@ describe 'WhiskeyDisk' do
     
     describe 'when running locally' do
       before do
+        WhiskeyDisk.reset
         WhiskeyDisk.configuration = { 'deploy_to' => '/path/to/main/repo' }
         WhiskeyDisk.stub!(:bundle).and_return('command string')
         WhiskeyDisk.stub!(:system)
@@ -548,6 +564,18 @@ describe 'WhiskeyDisk' do
         WhiskeyDisk.should.receive(:system).with('command string')
         WhiskeyDisk.flush
       end
+      
+      it 'should record a failure result when the system command fails' do
+        WhiskeyDisk.stub!(:system).and_return(false)
+        WhiskeyDisk.flush
+        WhiskeyDisk.results.should == [ { :domain => 'local', :status => false } ]
+      end
+      
+      it 'should record a success result when the system command succeeds' do
+        WhiskeyDisk.stub!(:system).and_return(true)
+        WhiskeyDisk.flush
+        WhiskeyDisk.results.should == [ { :domain => 'local', :status => true } ]
+      end
     end
   end
   
@@ -753,6 +781,7 @@ describe 'WhiskeyDisk' do
   
   describe 'when running a command string remotely' do
     before do
+      WhiskeyDisk.reset
       @domain = 'ogc@ogtastic.com'
       WhiskeyDisk.configuration = { 'domain' => @domain }
       WhiskeyDisk.stub!(:system)      
@@ -770,11 +799,119 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.configuration = {}
       lambda { WhiskeyDisk.run('ls') }.should.raise
     end
-    
+
     it 'should pass the string to ssh with verbosity enabled' do
       WhiskeyDisk.should.receive(:system).with('ssh', '-v', @domain, "set -x; ls")
       WhiskeyDisk.run('ls')
     end
+    
+    describe 'and multiple domains are specified' do
+      before do
+        @domains = [ 'ogc@ogtastic.com', 'foo@example.com' ]
+      end
+            
+      it 'should run the command via ssh on each domain in the order specified in the configuration file' do
+        TestOrderedExecution.configuration = { 'domain' => @domains }
+        TestOrderedExecution.run('ls')
+        TestOrderedExecution.commands.should == [
+          "ssh -v ogc@ogtastic.com set -x; ls", 
+          "ssh -v foo@example.com set -x; ls"
+        ]
+      end
+      
+      it 'should not fail if an ssh command fails' do
+        WhiskeyDisk.configuration = { 'domain' => @domains }
+        WhiskeyDisk.stub!(:system).with('ssh', '-v', 'ogc@ogtastic.com', 'set -x; ls').and_return(false)
+        lambda { WhiskeyDisk.run('ls') }.should.not.raise(RuntimeError)
+      end
+      
+      it 'should continue to run the remaining ssh commands when an ssh fails' do
+        WhiskeyDisk.configuration = { 'domain' => @domains }
+        WhiskeyDisk.stub!(:system).with('ssh', '-v', 'ogc@ogtastic.com', 'set -x; ls').and_return(false)
+        WhiskeyDisk.should.receive(:system).with('ssh', '-v', 'foo@example.com', 'set -x; ls')
+        WhiskeyDisk.run('ls')   
+      end
+      
+      it 'should record failure and success status for issued ssh commands' do
+        WhiskeyDisk.configuration = { 'domain' => @domains }
+        WhiskeyDisk.stub!(:system).with('ssh', '-v', 'ogc@ogtastic.com', 'set -x; ls').and_return(false)
+        WhiskeyDisk.stub!(:system).with('ssh', '-v', 'foo@example.com', 'set -x; ls').and_return(true)
+        WhiskeyDisk.run('ls')   
+        WhiskeyDisk.results.should == [ { :domain => 'ogc@ogtastic.com', :status => false }, 
+                                        { :domain => 'foo@example.com', :status => true} ]
+      end
+    end
+  end
+  
+  describe 'determining if all the deployments succeeded' do
+    before do
+      WhiskeyDisk.reset
+    end
+    
+    it 'should work without arguments' do
+      lambda { WhiskeyDisk.success? }.should.not.raise(ArgumentError)
+    end
+    
+    it 'should not allow arguments' do
+      lambda { WhiskeyDisk.success?(:foo) }.should.raise(ArgumentError)
+    end
+    
+    it 'should return true if there are no results recorded' do
+      WhiskeyDisk.success?.should.be.true
+    end
+    
+    it 'should return true if all recorded results have true statuses' do
+      WhiskeyDisk.record_result('1', true)
+      WhiskeyDisk.record_result('2', true)
+      WhiskeyDisk.record_result('3', true)
+      WhiskeyDisk.success?.should.be.true
+    end
+    
+    it 'should return false if any recorded result has a false status' do
+      WhiskeyDisk.record_result('1', true)
+      WhiskeyDisk.record_result('2', false)
+      WhiskeyDisk.record_result('3', true)
+      WhiskeyDisk.success?.should.be.false      
+    end
+  end
+  
+  describe 'summarizing the results of a run' do
+    before do
+      WhiskeyDisk.reset
+      WhiskeyDisk.stub!(:puts)
+    end
+    
+    it 'should work without arguments' do
+      lambda { WhiskeyDisk.summarize }.should.not.raise(ArgumentError)
+    end
+    
+    it 'should not allow arguments' do
+      lambda { WhiskeyDisk.summarize(:foo) }.should.raise(ArgumentError)      
+    end
+    
+    it 'should output a no runs message when no results are recorded' do
+      WhiskeyDisk.should.receive(:puts).with('No deployments to report.')
+      WhiskeyDisk.summarize
+    end
+    
+    describe 'and there are results recorded' do
+      before do
+        WhiskeyDisk.record_result('foo@bar.com', false)
+        WhiskeyDisk.record_result('ogc@ogtastic.com', true)
+        WhiskeyDisk.record_result('user@example.com', true)
+      end
+      
+      it 'should output a status line for each recorded deployment run' do
+        WhiskeyDisk.should.receive(:puts).with('foo@bar.com => failed.')
+        WhiskeyDisk.should.receive(:puts).with('ogc@ogtastic.com => succeeded.')
+        WhiskeyDisk.should.receive(:puts).with('user@example.com => succeeded.')
+        WhiskeyDisk.summarize
+      end
+    
+      it 'should output a summary line including the total runs, count of failures and count of successes.' do
+        WhiskeyDisk.should.receive(:puts).with('Total: 3 deployments, 2 successes, 1 failure.')        
+        WhiskeyDisk.summarize
+      end
+    end
   end
 end
-

data/whiskey_disk.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{whiskey_disk}
-  s.version = "0.5.4"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rick Bradley"]
-  s.date = %q{2010-10-26}
+  s.date = %q{2010-12-22}
   s.default_executable = %q{wd}
   s.description = %q{Opinionated gem for doing fast git-based server deployments.}
   s.email = %q{rick@rickbradley.com}
@@ -18,46 +18,47 @@ Gem::Specification.new do |s|
     "README.markdown"
   ]
   s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "TODO.txt",
-     "VERSION",
-     "WHY.txt",
-     "bin/wd",
-     "examples/deploy-staging.yml",
-     "examples/deploy.rake",
-     "examples/deploy.yml",
-     "init.rb",
-     "install.rb",
-     "lib/whiskey_disk.rb",
-     "lib/whiskey_disk/config.rb",
-     "lib/whiskey_disk/rake.rb",
-     "spec/.bacon",
-     "spec/init_spec.rb",
-     "spec/install_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/wd_command_spec.rb",
-     "spec/whiskey_disk/config_spec.rb",
-     "spec/whiskey_disk/rake_spec.rb",
-     "spec/whiskey_disk_spec.rb",
-     "tasks/deploy.rake",
-     "whiskey_disk.gemspec"
+    "CHANGELOG",
+    "MIT-LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "TODO.txt",
+    "VERSION",
+    "WHY.txt",
+    "bin/wd",
+    "examples/deploy-local.yml",
+    "examples/deploy-multiple-remotes.yml",
+    "examples/deploy-staging.yml",
+    "examples/deploy.rake",
+    "examples/deploy.yml",
+    "init.rb",
+    "install.rb",
+    "lib/whiskey_disk.rb",
+    "lib/whiskey_disk/config.rb",
+    "lib/whiskey_disk/rake.rb",
+    "spec/.bacon",
+    "spec/init_spec.rb",
+    "spec/install_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/wd_command_spec.rb",
+    "spec/whiskey_disk/config_spec.rb",
+    "spec/whiskey_disk/rake_spec.rb",
+    "spec/whiskey_disk_spec.rb",
+    "tasks/deploy.rake",
+    "whiskey_disk.gemspec"
   ]
   s.homepage = %q{http://github.com/flogic/whiskey_disk}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{embarrassingly fast deployments.}
   s.test_files = [
     "spec/init_spec.rb",
-     "spec/install_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/wd_command_spec.rb",
-     "spec/whiskey_disk/config_spec.rb",
-     "spec/whiskey_disk/rake_spec.rb",
-     "spec/whiskey_disk_spec.rb"
+    "spec/install_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/wd_command_spec.rb",
+    "spec/whiskey_disk/config_spec.rb",
+    "spec/whiskey_disk/rake_spec.rb",
+    "spec/whiskey_disk_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whiskey_disk
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 4
-  version: 0.5.4
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Rick Bradley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -05:00
+date: 2010-12-22 00:00:00 -05:00
 default_executable: wd
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,7 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
-- .gitignore
+- CHANGELOG
 - MIT-LICENSE
 - README.markdown
 - Rakefile
@@ -49,6 +49,8 @@ files:
 - VERSION
 - WHY.txt
 - bin/wd
+- examples/deploy-local.yml
+- examples/deploy-multiple-remotes.yml
 - examples/deploy-staging.yml
 - examples/deploy.rake
 - examples/deploy.yml
@@ -72,8 +74,8 @@ homepage: http://github.com/flogic/whiskey_disk
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1 +0,0 @@
-pkg/