whiskey_disk 0.4.0 → 0.4.1

data/README.markdown

@@ -55,11 +55,11 @@ rake, ssh, git, rsync on the deployment target server (affectionately referred t
 
 #### Assumptions ####
 
- - you have a Rakefile in the top directory of your project's checkout
- - you are deploying over ssh
  - your project is managed via git
- - you are comfortable defining post-setup and post-deployment actions with rake
+ - you are deploying over ssh, or deploying locally and have a bash-compatible shell
+ - you are comfortable defining (optional) post-setup and post-deployment actions with rake
  - you have an optional second git repository for per-application/per-target configuration files
+ - you have an optional Rakefile in the top directory of your project's checkout
 
 ### Installation ###
 
@@ -290,17 +290,11 @@ overlaid on top of the most recent checkout of the project.  Snap.
     a gist showing a bit more interesting deploy.rake file for post_setup and
 post_deploy work:  [https://gist.github.com/47e23f2980943531beeb](https://gist.github.com/47e23f2980943531beeb)
 
-On the radar for an upcoming release are:
 
- - common post_* recipes being specifiable by symbol names in deploy.yml ?
- - 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')
-            Rake::Task['db:migrate'].invoke
-          end
-        end
+### Future Directions ###
 
+Check out the [TODO.txt](http://github.com/flogic/whiskey_disk/raw/master/TODO.txt) file 
+to see what we have in mind for the near future.
 
 ### Resources ###
 

data/TODO.txt

@@ -1,6 +1,8 @@
-
- - 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
+ - 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
+     
+   - some sort of simple API to access the detected changes:
      require 'whiskey_disk/rake'
    
      namespace :deploy do

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/whiskey_disk.rb

@@ -118,6 +118,10 @@ class WhiskeyDisk
       "if [ -e #{path} ]; then #{cmd}; fi"
     end
     
+    def if_task_defined(task, cmd)
+      %Q{if [[ `rake --silent -T #{task}` != "" ]]; then #{cmd}; fi}
+    end
+    
     def ensure_main_parent_path_is_present
       needs(:deploy_to)
       enqueue "mkdir -p #{parent_path(self[:deploy_to])}"
@@ -164,14 +168,16 @@ class WhiskeyDisk
       needs(:deploy_to)
       enqueue "cd #{self[:deploy_to]}"
       enqueue(if_file_present("#{self[:deploy_to]}/Rakefile", 
-                               "#{env_vars} rake --trace deploy:post_setup to=#{self[:environment]}"))
+                if_task_defined("deploy:post_setup",
+                  "#{env_vars} rake --trace deploy:post_setup to=#{self[:environment]}")))
     end
 
     def run_post_deploy_hooks
       needs(:deploy_to)
       enqueue "cd #{self[:deploy_to]}"
       enqueue(if_file_present("#{self[:deploy_to]}/Rakefile", 
-                               "#{env_vars} rake --trace deploy:post_deploy to=#{self[:environment]}"))
+                if_task_defined("deploy:post_deploy",
+                  "#{env_vars} rake --trace deploy:post_deploy to=#{self[:environment]}")))
     end
   end
 end

data/spec/whiskey_disk_spec.rb

@@ -362,6 +362,11 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{if \[ -e /path/to/main/repo/Rakefile \]; then .*; fi})
     end
     
+    it 'should make the post deployment rake tasks conditional on the deploy:post_deploy rake task being defined' do
+      WhiskeyDisk.run_post_setup_hooks
+      WhiskeyDisk.buffer.join(' ').should.match(%r{if \[\[ \`rake --silent -T deploy:post_setup\` != "" \]\]; })      
+    end
+
     it 'should attempt to run the post setup rake tasks' do
       WhiskeyDisk.run_post_setup_hooks
       WhiskeyDisk.buffer.join(' ').should.match(%r{rake.*deploy:post_setup})
@@ -406,6 +411,11 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{if \[ -e /path/to/main/repo/Rakefile \]; then .*; fi})
     end
     
+    it 'should make the post deployment rake tasks conditional on the deploy:post_deploy rake task being defined' do
+      WhiskeyDisk.run_post_deploy_hooks
+      WhiskeyDisk.buffer.join(' ').should.match(%r{if \[\[ \`rake --silent -T deploy:post_deploy\` != "" \]\]; })      
+    end
+    
     it 'should attempt to run the post deployment rake tasks' do
       WhiskeyDisk.run_post_deploy_hooks
       WhiskeyDisk.buffer.join(' ').should.match(%r{rake.*deploy:post_deploy})

data/whiskey_disk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whiskey_disk}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rick Bradley"]
-  s.date = %q{2010-07-09}
+  s.date = %q{2010-07-13}
   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: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Rick Bradley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 -05:00
+date: 2010-07-13 00:00:00 -05:00
 default_executable: wd
 dependencies: 
 - !ruby/object:Gem::Dependency