whiskey_disk 0.4.2 → 0.4.3

data/TODO.txt

@@ -1,3 +1,5 @@
+ Q - how do we track registries of deployment files (do we recommend people use larry/puppet or is something else going on?)
+
  - 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)
      we can use the ml/cl part of staleness checking to get the "before" versions of the main and config repos (i.e., leave that part in always, just not the conditional stuff), and have the main run a script which dumps the relative paths of changed files as a .whiskey_disk-paths-changed in the main checkout

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/whiskey_disk.rb

@@ -122,6 +122,11 @@ class WhiskeyDisk
       %Q{if [[ `rake -P | grep #{task}` != "" ]]; then #{cmd}; fi}
     end
     
+    def conditional_clone(repo, path)
+      "if [ -e #{path} ]; then echo 'Repository already cloned to [#{path}].  Skipping.'; " +
+      "else git clone #{repo} #{tail_path(path)} ; fi"
+    end
+    
     def ensure_main_parent_path_is_present
       needs(:deploy_to)
       enqueue "mkdir -p #{parent_path(self[:deploy_to])}"
@@ -131,17 +136,17 @@ class WhiskeyDisk
       needs(:deploy_config_to)
       enqueue "mkdir -p #{parent_path(self[:deploy_config_to])}"
     end
-    
+
     def checkout_main_repository
       needs(:deploy_to, :repository)
       enqueue "cd #{parent_path(self[:deploy_to])}"
-      enqueue "git clone #{self[:repository]} #{tail_path(self[:deploy_to])} ; true"
+      enqueue conditional_clone(self[:repository], self[:deploy_to])
     end
     
     def checkout_configuration_repository
       needs(:deploy_config_to, :config_repository)
       enqueue "cd #{parent_path(self[:deploy_config_to])}"
-      enqueue "git clone #{self[:config_repository]} #{tail_path(self[:deploy_config_to])} ; true"
+      enqueue conditional_clone(self[:config_repository], self[:deploy_config_to])
     end
     
     def update_main_repository_checkout

data/spec/whiskey_disk_spec.rb

@@ -170,14 +170,14 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.not.match(%r{cd /path/to/main/repo})
     end
     
-    it 'should attempt to clone the main repository to the repository checkout path' do
+    it 'should make the main repository clone conditional on the lack of a main repository checkout' do
       WhiskeyDisk.checkout_main_repository
-      WhiskeyDisk.buffer.join(' ').should.match(%r{clone #{@parameters['repository']} repo})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{if \[ -e #{@parameters['deploy_to']} \]; then .*; fi})
     end
     
-    it 'should ignore errors from failing to clone an existing repository' do
+    it 'should attempt to clone the main repository to the repository checkout path' do
       WhiskeyDisk.checkout_main_repository
-      WhiskeyDisk.buffer.join(' ').should.match(%r{; true})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{clone #{@parameters['repository']} repo})
     end
   end
   
@@ -205,16 +205,16 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/config})
       WhiskeyDisk.buffer.join(' ').should.not.match(%r{cd /path/to/config/repo})
     end
+    
+    it 'should make the configuration repository clone conditional on the lack of a main repository checkout' do
+      WhiskeyDisk.checkout_configuration_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{if \[ -e #{@parameters['deploy_config_to']} \]; then .*; fi})
+    end
 
     it 'should attempt to clone the configuration repository to the repository checkout path' do
       WhiskeyDisk.checkout_configuration_repository
       WhiskeyDisk.buffer.join(' ').should.match(%r{clone #{@parameters['config_repository']} repo})
     end
-
-    it 'should ignore errors from failing to clone an existing repository' do
-      WhiskeyDisk.checkout_configuration_repository
-      WhiskeyDisk.buffer.join(' ').should.match(%r{; true})
-    end    
   end
   
   describe 'updating the main repository checkout' do

data/whiskey_disk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whiskey_disk}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rick Bradley"]
-  s.date = %q{2010-07-15}
+  s.date = %q{2010-07-23}
   s.default_executable = %q{wd}
   s.description = %q{Opinionated gem for doing fast git-based server deployments.}
   s.email = %q{rick@rickbradley.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whiskey_disk
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Rick Bradley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 -05:00
+date: 2010-07-23 00:00:00 -05:00
 default_executable: wd
 dependencies: 
 - !ruby/object:Gem::Dependency