capistrano-sync 0.0.1 → 0.1.0

data/README

@@ -12,4 +12,8 @@ Defined three task:
 
 Add to you Gmefile:
 
-    gem "capistrano-sync", :git => "git://github.com/dima-exe/capistrano-sync.git"
+    gem "capistrano-sync"
+
+and to you Capfile:
+    
+    require 'capistrano-sync'

data/Rakefile

@@ -7,6 +7,7 @@ begin
     gemspec.email = "dima.exe@gmail.com"
     gemspec.homepage = "http://github.com/dima-exe/capistrano-sync"
     gemspec.authors = ["Dmitry Galinsky"]
+    gemspec.files = Dir.glob('lib/**/*.rb')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/capistrano-sync.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano-sync}
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dmitry Galinsky"]
-  s.date = %q{2011-10-06}
+  s.date = %q{2011-10-07}
   s.description = %q{Sync db or directories recipes for Capistrano}
   s.email = %q{dima.exe@gmail.com}
   s.extra_rdoc_files = [
@@ -25,11 +25,10 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/dima-exe/capistrano-sync}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Sync db or directories recipes for Capistrano}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/capistrano-sync/sync.rb

@@ -15,7 +15,7 @@ module CapistranoSyncTask
       cap.logger.info *args
     end
 
-    # missing capture task
+    # missing capture
     def _capture(command, options={})
       output = ""
       cap.invoke_command(command, options.merge(:once => true)) do |ch, stream, data|
@@ -26,6 +26,14 @@ module CapistranoSyncTask
       end
       output
     end
+    
+    def check_deps
+      system "which pv 2> /dev/null"
+      unless ($?.to_i == 0)
+        puts "FATAL: pv (Pipe Viewer) command not found, please install 'port install pv' or 'brew install pv'"
+        exit(1)
+      end
+    end
   end
 
   class Db
@@ -40,6 +48,7 @@ module CapistranoSyncTask
     end
 
     def sync
+      check_deps
       remote_config = remote_database_config
       local_config  = local_database_config
 
@@ -58,9 +67,9 @@ module CapistranoSyncTask
       load_command    = __send__(load_method, local_config)
       ssh_cmd, server = get_ssh_command
 
-      log "Drop and create local database"
+      log "drop and create local database"
       drop_and_create_local_db
-      log "Dump from #{server} and load to local #{local_rails_env} db (see progress)"
+      log "dump from #{server} and load to local #{local_rails_env} db (see progress)"
 
       cmd = "#{ssh_cmd} #{dump_command} | pv | #{load_command}"
       system cmd
@@ -152,22 +161,39 @@ module CapistranoSyncTask
     def sync
       check_deps
       ssh_cmd, server = get_ssh_command
-      log "Download and extract #{server}:#{from} -> local:#{to} (see progress)"
+      log "rsync #{server}:#{from} -> local:#{to} (see progress)"
       cmd = "#{ssh_cmd} \"tar -cC #{from} .\" |pv -s #{total} | tar -x -C #{to}"
+      cmd = [rsync_command, cat_files_command, pv_command, trash_output_command].join(" | ")
       system cmd
     end
 
     private
-    def check_deps
-      system "which pv > /dev/null"
-      unless ($?.to_i == 0)
-        puts "FATAL: pv (Pipe Viewer) command not found, please install 'port install pv' or 'brew install pv'"
-        exit(1)
-      end
+
+    def rsync_command
+      server = cap.find_servers.first
+      rsh = "ssh"
+      rsh = "#{rsh} -p #{server.port}" if server.port
+      cmd = "rsync --verbose --archive --compress --copy-links --delete --rsh='#{rsh}'"
+      cmd << " #{cap[:user]}@#{server.host}:#{from}/"
+      cmd << " #{to}/ 2> /dev/null"
+    end
+
+    def cat_files_command
+      t = to.strip.to_s.gsub(/\/$/, '')
+      %{ruby -e "p=l='_' ; begin ; l.strip! ; puts File.read('#{t}/'+p) if File.file?('#{t}/'+p) ; p=l ; end  while l=gets"}
+    end
+
+    def pv_command
+      "pv -s #{total}"
+    end
+
+    def trash_output_command
+      "cat > /dev/null"
     end
+
     def total
       unless @total
-        log "Calculate files size"
+        log "calculate files size"
         @total = _capture("du -sb #{from} | awk '{print $1}'", :once => true).to_i
         log "TOTAL: #{proxy.number_to_human_size @total}"
       end
@@ -194,12 +220,12 @@ module CapistranoSyncTask
           namespace :dir do
             desc "sync directory"
             task :default, :roles => :app do
-              from_path = deploy_to + "/" + ENV["FROM"]
-              to_path = ENV["TO"]
-              if !from_path || !to_path
+              if (ENV["FROM"].blank? || ENV["TO"].blank?)
                 puts "Usage cap sync:dir FROM=<..> TO=<..>"
                 exit(1)
               end
+              from_path = deploy_to + "/" + ENV["FROM"]
+              to_path = ENV["TO"]
               s = CapistranoSyncTask::Dir.new(self, from_path, to_path)
               s.sync
             end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-sync
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Dmitry Galinsky
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 +04:00
+date: 2011-10-07 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Sync db or directories recipes for Capistrano