whiskey_disk 0.6.20 → 0.6.21

data/CHANGELOG

@@ -1,4 +1,13 @@
 
+0.6.21 / 2011-04-06 
+==================
+
+  * change rsync changes capturing mechanism to be more portable
+  * upgrade integration spec to test rsync/#changed?/config repo
+  * helpers spec now tests root path rsync changes
+  * deploy.yml to test rsync changes w/ config repo
+  * integration spec project and config changes to stored git repos
+
 0.6.20 / 2011-04-06 
 ==================
 

data/VERSION

@@ -1 +1 @@
-0.6.20
+0.6.21

data/lib/whiskey_disk.rb

@@ -300,9 +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?} " +
-              "--log-file=#{self[:deploy_to]}/.whiskey_disk_rsync_changes " +
-              "#{self[:deploy_config_to]}/#{self[:project]}/#{self[:config_target]}/ #{self[:deploy_to]}/")
+      enqueue("rsync -a#{'v --progress' if Config.debug?} " + '--log-format="%t [%p] %i %n" ' +
+              "#{self[:deploy_config_to]}/#{self[:project]}/#{self[:config_target]}/ #{self[:deploy_to]}/ " + 
+              "> #{self[:deploy_to]}/.whiskey_disk_rsync_changes")
     end
     
     def run_post_setup_hooks

data/lib/whiskey_disk/helpers.rb

@@ -21,7 +21,9 @@ end
 
 def rsync_changes
   changes = read_rsync_changes_file.split("\n")
-  changes.map {|c| c.sub(/^[^ ]* [^ ]* [^ ]* [^ ]* /, '') }.grep(%r{/}).map {|s| s.sub(%r{/$}, '') } - ['.']
+  changes.map {|c| c.sub(/^[^ ]* [^ ]* [^ ]* /, '') }.
+          grep(/^[^ ]{9} /).map {|c| c.sub(/^[^ ]{9} /, '') }.
+          map {|s| s.sub(%r{/$}, '') } - ['.']
 rescue Exception
   nil
 end

data/spec/whiskey_disk/helpers_spec.rb

@@ -197,6 +197,7 @@ describe "when finding files changed by rsync in a deployment" do
 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] >f+++++++ Info.plist
 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/
@@ -247,6 +248,7 @@ describe "when finding files changed by rsync in a deployment" do
 '
 
     @changes = [
+        "Info.plist",
         "Application Support",
         "Application Support/Google",
         "Application Support/Google/GoogleTalkPlugin.app",

data/spec/whiskey_disk_spec.rb

@@ -470,7 +470,7 @@ describe 'WhiskeyDisk' do
     
     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 })
+      WhiskeyDisk.buffer.last.should.match(%r{rsync.* --log-format="%t \[%p\] %i %n".*> /path/to/main/repo/.whiskey_disk_rsync_changes})
     end
   end
 

data/whiskey_disk.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whiskey_disk}
-  s.version = "0.6.20"
+  s.version = "0.6.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rick Bradley"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whiskey_disk
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 0
   - 6
-  - 20
-  version: 0.6.20
+  - 21
+  version: 0.6.21
 platform: ruby
 authors: 
 - Rick Bradley