easy_backup 0.0.7 → 0.0.8

data/easy_backup.gemspec

@@ -21,9 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rubyzip'
   s.add_dependency 'net-sftp'
   s.add_dependency 'rufus-scheduler'
-  #s.add_dependency 'activesupport', '>= 3.0.0'
-  #s.add_dependency 'i18n'
-  #s.add_dependency 'chronic'
+  s.add_dependency 'chronic'
 
   s.add_development_dependency 'json'
   s.add_development_dependency 'sequel'

data/lib/easy_backup.rb

@@ -3,16 +3,19 @@ require 'zip/zip'
 require 'net/sftp'
 require 'open3'
 require 'rufus-scheduler'
-
-require 'easy_backup/configuration'
-require 'easy_backup/specification'
+require 'chronic'
 
 require 'easy_backup/resources/file_system'
 require 'easy_backup/resources/sftp'
 require 'easy_backup/resources/postgres'
 
+require 'easy_backup/configuration'
+require 'easy_backup/specification'
+
 require 'easy_backup/extension/net_sftp_session'
 
+include EasyBackup::Resources
+
 module EasyBackup
 
   def self.configuration

data/lib/easy_backup/resources/file_system.rb

@@ -26,11 +26,11 @@ module EasyBackup
       end
 
       def zip(file_name)
-        @zip_file = file_name
+        @zip = file_name
       end
 
       def zip_file
-        zip_path(@zip_file.is_a?(Proc) ? @zip_file.call : @zip_file)
+        @zip_file || update_zip_file
       end
 
       def save(resource)
@@ -47,7 +47,7 @@ module EasyBackup
       end
 
       def send_to(*storages)
-        if zip_file
+        if update_zip_file
           EasyBackup.configuration.logger.info "[EasyBackup] Zip #{zip_file}"
           FileUtils.mkpath File.dirname(zip_file) unless Dir.exist? File.dirname(zip_file)
           ZipFile.open(zip_file, ZipFile::CREATE) do |zip|
@@ -75,9 +75,9 @@ module EasyBackup
 
       private
 
-      def zip_path(file_name)
-        return nil unless file_name
-        "#{EasyBackup.configuration.tmp_path}/zip/#{file_name}"
+      def update_zip_file
+        return nil unless @zip
+        @zip_file = "#{EasyBackup.configuration.tmp_path}/zip/#{@zip.is_a?(Proc) ? @zip.call : @zip}"
       end
 
     end

data/lib/easy_backup/resources/postgres.rb

@@ -29,36 +29,30 @@ module EasyBackup
 
       def dump_file(file_name=nil)
         if file_name
-          @dump_file = file_name
+          @dump = file_name
         else
-          if @dump_file
-            path_to(@dump_file.is_a?(Proc) ? @dump_file.call : @dump_file)
-          else
-            path_to "#{database}_#{Time.now.strftime('%Y%m%d%H%M%S')}.sql"
-          end
+          @dump_file || update_dump_file
         end
       end
 
-      def zip_file(file_name=nil)
-        if file_name
-          @zip_file = file_name
-        else
-          path_to(@zip_file.is_a?(Proc) ? @zip_file.call : @zip_file)
-        end
+      def zip_file
+        @zip_file || update_zip_file
       end
 
       def zip
-        zip_file lambda { "#{File.basename(dump_file, '.*')}.zip" }
+        @zip = lambda { "#{File.basename(dump_file, '.*')}.zip" }
       end
 
       def send_to(*storages)
+        update_dump_file
+
         FileUtils.mkpath File.dirname(dump_file) unless Dir.exist? File.dirname(dump_file)
 
         EasyBackup.configuration.logger.info "[EasyBackup] Dump postgres://#{username}:*****@#{host}:#{port}/#{database} to #{dump_file}"
 
         Open3.popen3 "pg_dump -h #{host} -p #{port} -U #{username} #{database} > #{dump_file}" do |i, o, e, t|
           if t.value.success?
-            if zip_file
+            if update_zip_file
               EasyBackup.configuration.logger.info "[EasyBackup] Zip #{dump_file} to #{zip_file}"
               ZipFile.open(zip_file, ZipFile::CREATE) do |zip|
                 zip.add File.basename(dump_file), dump_file
@@ -76,6 +70,19 @@ module EasyBackup
 
       private
 
+      def update_dump_file
+        if @dump
+          @dump_file = path_to(@dump.is_a?(Proc) ? @dump.call : @dump)
+        else
+          @dump_file = path_to "#{database}_#{Time.now.strftime('%Y%m%d%H%M%S')}.sql"
+        end
+      end
+
+      def update_zip_file
+        return nil unless @zip
+        @zip_file = path_to(@zip.call)
+      end
+
       def path_to(file_name)
         return nil unless file_name
         "#{EasyBackup.configuration.tmp_path}/pg_dump/#{file_name}"

data/lib/easy_backup/version.rb

@@ -1,3 +1,3 @@
 module EasyBackup
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/file_system_spec.rb

@@ -131,6 +131,24 @@ describe FileSystem do
       storage.received.should eq [fs.zip_file]
     end
 
+    it 'Zipped with lambda expression' do
+      sample_file = "#{DATA_PATH}/sample.json"
+      sample_folder = "#{DATA_PATH}/txt"
+
+      fs = FileSystem.new do
+        file sample_file
+        folder sample_folder
+        zip lambda { "sample_#{Time.now.strftime('%Y%m%d%H%M%S')}.zip" }
+      end
+
+      storage = FakeStorage.new
+
+      fs.send_to storage
+
+      sleep 1
+
+      storage.received.should eq [fs.zip_file]
+    end
   end
 
 end

data/spec/postgres_spec.rb

@@ -66,6 +66,26 @@ describe Postgres do
       storage.received.should eq ["#{EasyBackup.configuration.tmp_path}/pg_dump/backup.sql"]
     end
 
+    it 'Dump with lambda expression' do
+      db = PostgresHelper.configuration
+
+      pg = Postgres.new do
+        host db['host']
+        database db['database']
+        port db['port']
+        username db['username']
+        password db['password']
+      end
+
+      storage = FakeStorage.new
+
+      pg.send_to storage
+
+      sleep 1
+
+      storage.received.should eq [pg.dump_file]
+    end
+
     it 'Zip after dump' do
       db = PostgresHelper.configuration
 
@@ -86,6 +106,27 @@ describe Postgres do
       storage.received.should eq ["#{EasyBackup.configuration.tmp_path}/pg_dump/backup.zip"]
     end
 
+    it 'Zip with lambda expression' do
+      db = PostgresHelper.configuration
+
+      pg = Postgres.new do
+        host db['host']
+        database db['database']
+        port db['port']
+        username db['username']
+        password db['password']
+        zip
+      end
+
+      storage = FakeStorage.new
+
+      pg.send_to storage
+
+      sleep 1
+
+      storage.received.should eq [pg.zip_file]
+    end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ require 'sequel'
 require 'json'
 
 include EasyBackup
-include EasyBackup::Resources
 
 DATA_PATH = "#{File.dirname(__FILE__)}/files/data"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_backup
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &21699300 !ruby/object:Gem::Requirement
+  requirement: &26623260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21699300
+  version_requirements: *26623260
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &21698880 !ruby/object:Gem::Requirement
+  requirement: &26622996 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21698880
+  version_requirements: *26622996
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &21698568 !ruby/object:Gem::Requirement
+  requirement: &26622708 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21698568
+  version_requirements: *26622708
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: &26622408 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *26622408
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21891084 !ruby/object:Gem::Requirement
+  requirement: &26622072 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21891084
+  version_requirements: *26622072
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &21890436 !ruby/object:Gem::Requirement
+  requirement: &26621712 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21890436
+  version_requirements: *26621712
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &21889392 !ruby/object:Gem::Requirement
+  requirement: &26621316 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21889392
+  version_requirements: *26621316
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21888984 !ruby/object:Gem::Requirement
+  requirement: &26620752 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21888984
+  version_requirements: *26620752
 description: Simple DSL to program backups
 email:
 - gabynaiman@gmail.com