easy_backup 0.0.4 → 0.0.5

data/lib/easy_backup/adapter/db/postgre_sql.rb

@@ -49,13 +49,13 @@ module EasyBackup
         end
 
         def zip
-          zip_file "#{File.basename(dump_file, '.*')}.zip"
+          zip_file lambda { "#{File.basename(dump_file, '.*')}.zip" }
         end
 
         def send_to(storages)
           dump_file_name = path_to(dump_file)
           zip_file_name = path_to(zip_file)
-          
+
           FileUtils.mkpath File.dirname(dump_file_name) unless Dir.exist? File.dirname(dump_file_name)
 
           EasyBackup.logger.info "[PostgreSQL] Dump postgres://#{username}:*****@#{host}:#{port}/#{database}\n#{' '*15}to #{dump_file_name}"
@@ -64,9 +64,11 @@ module EasyBackup
             if t.value.success?
               if zip_file
                 EasyBackup.logger.info "#{(' '*14)}zip #{zip_file_name}"
-                ZipFile.open(zip_file_name, ZipFile::CREATE) { |zip| zip.add dump_file, dump_file_name }
+                ZipFile.open(zip_file_name, ZipFile::CREATE) do |zip|
+                  zip.add File.basename(dump_file_name), dump_file_name
+                end
               end
-              storages.each { |s| s.save path_to(zip_file ? zip_file : dump_file) }
+              storages.each { |s| s.save(zip_file ? zip_file_name : dump_file_name) }
             else
               EasyBackup.logger.error "[PostgreSQL] Error: #{e.readlines.join}"
             end

data/lib/easy_backup/adapter/file_system.rb

@@ -41,7 +41,7 @@ module EasyBackup
             (files | folders).each do |resource|
               if Dir.exist? resource
                 EasyBackup.logger.info "#{' '*13}add #{resource}"
-                Dir["#{resource}/**/**"].each do |r|
+                Dir.glob("#{resource}/**/**", File::FNM_DOTMATCH).reject{|entry| entry.end_with? '/.'}.each do |r|
                   EasyBackup.logger.info "#{' '*13}add #{r}" unless Dir.exist? r
                   zip.add "#{File.basename(resource)}/#{r.gsub("#{resource}/", '')}", r
                 end

data/lib/easy_backup/adapter/sftp.rb

@@ -25,12 +25,35 @@ module EasyBackup
 
       def save(resource)
         Net::SFTP.start(host, username, :password => password) do |sftp|
-          EasyBackup.logger.info "[SFTP] Saving #{resource}\n#{' '*9}into #{host} | #{username} | #{folder}"
+          sftp_folder = folder
+          EasyBackup.logger.info "[SFTP] Saving #{resource}\n#{' '*9}into #{host} | #{username} | #{sftp_folder}"
 
-          sftp.mkpath! folder
-          sftp.upload! resource, "#{folder}/#{File.basename(resource)}"
+          sftp.mkpath! sftp_folder, :progress => SFTPHandler.new
+          sftp.upload! resource, "#{sftp_folder}/#{File.basename(resource)}", :progress => SFTPHandler.new
         end
       end
     end
+
+    class SFTPHandler
+      def on_open(uploader, file)
+        EasyBackup.logger.info "#{' '*9}starting upload: #{file.local} -> #{file.remote} (#{file.size} bytes)"
+      end
+
+      def on_put(uploader, file, offset, data)
+        EasyBackup.logger.info "#{' '*9}#{data.length} bytes to #{file.remote} starting at #{offset}"
+      end
+
+      def on_close(uploader, file)
+        EasyBackup.logger.info "#{' '*9}finished with #{file.remote}"
+      end
+
+      def on_mkdir(uploader, path)
+        EasyBackup.logger.info "#{' '*9}creating directory #{path}"
+      end
+
+      def on_finish(uploader)
+        EasyBackup.logger.info "#{' '*9}all done!"
+      end
+    end
   end
 end

data/lib/easy_backup/extension/net_sftp_session.rb

@@ -1,10 +1,10 @@
 module Net
   module SFTP
     class Session
-      def mkpath!(path)
+      def mkpath!(path, options={})
         path.split('/').inject(nil) do |previous, relative|
           current = previous ? "#{previous}/#{relative}" : relative
-          mkdir! current if dir.glob('.', current).empty?
+          mkdir! current, options if dir.glob('.', current).empty?
           current
         end
       end

data/lib/easy_backup/version.rb

@@ -1,3 +1,3 @@
 module EasyBackup
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_backup
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &20087976 !ruby/object:Gem::Requirement
+  requirement: &24129288 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20087976
+  version_requirements: *24129288
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &20087652 !ruby/object:Gem::Requirement
+  requirement: &24129000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20087652
+  version_requirements: *24129000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &20087256 !ruby/object:Gem::Requirement
+  requirement: &24128676 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *20087256
+  version_requirements: *24128676
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &20103144 !ruby/object:Gem::Requirement
+  requirement: &24128412 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20103144
+  version_requirements: *24128412
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &20102436 !ruby/object:Gem::Requirement
+  requirement: &24128124 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20102436
+  version_requirements: *24128124
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &20101428 !ruby/object:Gem::Requirement
+  requirement: &24127860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20101428
+  version_requirements: *24127860
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &20100696 !ruby/object:Gem::Requirement
+  requirement: &24127596 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20100696
+  version_requirements: *24127596
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &20100180 !ruby/object:Gem::Requirement
+  requirement: &24127344 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20100180
+  version_requirements: *24127344
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20099568 !ruby/object:Gem::Requirement
+  requirement: &24127092 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20099568
+  version_requirements: *24127092
 description: Easy DSL to program backups
 email:
 - gabynaiman@gmail.com