easy_backup 0.0.3 → 0.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/lib/easy_backup/adapter/db/postgre_sql.rb +15 -8
  2. data/lib/easy_backup/adapter/file_system.rb +7 -5
  3. data/lib/easy_backup/version.rb +1 -1
  4. metadata +19 -19
data/lib/easy_backup/adapter/db/postgre_sql.rb CHANGED
@@ -41,7 +41,11 @@ module EasyBackup
41
41
  end
42
42
 
43
43
  def zip_file(file_name=nil)
44
- file_name ? @zip_file = file_name : @zip_file
44
+ if file_name
45
+ @zip_file = file_name
46
+ else
47
+ @zip_file.is_a?(Proc) ? @zip_file.call : @zip_file
48
+ end
45
49
  end
46
50
 
47
51
  def zip
@@ -49,15 +53,18 @@ module EasyBackup
49
53
  end
50
54
 
51
55
  def send_to(storages)
52
- FileUtils.mkpath File.dirname(path_to(dump_file)) unless Dir.exist? File.dirname(path_to(dump_file))
56
+ dump_file_name = path_to(dump_file)
57
+ zip_file_name = path_to(zip_file)
58
+
59
+ FileUtils.mkpath File.dirname(dump_file_name) unless Dir.exist? File.dirname(dump_file_name)
53
60
 
54
- EasyBackup.logger.info "[PostgreSQL] Dump postgres://#{username}:*****@#{host}:#{port}/#{database}\n#{' '*15}to #{path_to(dump_file)}"
61
+ EasyBackup.logger.info "[PostgreSQL] Dump postgres://#{username}:*****@#{host}:#{port}/#{database}\n#{' '*15}to #{dump_file_name}"
55
62
 
56
- Open3.popen3 "pg_dump -h #{host} -p #{port} -U #{username} #{database} > #{path_to(dump_file)}" do |i, o, e, t|
63
+ Open3.popen3 "pg_dump -h #{host} -p #{port} -U #{username} #{database} > #{dump_file_name}" do |i, o, e, t|
57
64
  if t.value.success?
58
65
  if zip_file
59
- EasyBackup.logger.info "#{(' '*14)}zip #{path_to(zip_file)}"
60
- ZipFile.open(path_to(zip_file), ZipFile::CREATE) { |zip| zip.add dump_file, path_to(dump_file) }
66
+ EasyBackup.logger.info "#{(' '*14)}zip #{zip_file_name}"
67
+ ZipFile.open(zip_file_name, ZipFile::CREATE) { |zip| zip.add dump_file, dump_file_name }
61
68
  end
62
69
  storages.each { |s| s.save path_to(zip_file ? zip_file : dump_file) }
63
70
  else
@@ -65,8 +72,8 @@ module EasyBackup
65
72
  end
66
73
  end
67
74
 
68
- FileUtils.rm path_to(dump_file) if File.exist? path_to(dump_file)
69
- FileUtils.rm path_to(zip_file) if zip_file && File.exist?(path_to(zip_file))
75
+ FileUtils.rm dump_file_name if File.exist? dump_file_name
76
+ FileUtils.rm zip_file_name if zip_file && File.exist?(zip_file_name)
70
77
  end
71
78
 
72
79
  private
data/lib/easy_backup/adapter/file_system.rb CHANGED
@@ -33,9 +33,11 @@ module EasyBackup
33
33
 
34
34
  def send_to(storages)
35
35
  if zip_file
36
- EasyBackup.logger.info "[FileSystem] Zip #{zip_path(zip_file)}"
37
- FileUtils.mkpath File.dirname(zip_path(zip_file))
38
- ZipFile.open(zip_path(zip_file), ZipFile::CREATE) do |zip|
36
+ zip_file_name = zip_path(zip_file)
37
+
38
+ EasyBackup.logger.info "[FileSystem] Zip #{zip_file_name}"
39
+ FileUtils.mkpath File.dirname(zip_file_name)
40
+ ZipFile.open(zip_file_name, ZipFile::CREATE) do |zip|
39
41
  (files | folders).each do |resource|
40
42
  if Dir.exist? resource
41
43
  EasyBackup.logger.info "#{' '*13}add #{resource}"
@@ -49,8 +51,8 @@ module EasyBackup
49
51
  end
50
52
  end
51
53
  end
52
- storages.each { |s| s.save zip_path(zip_file) }
53
- FileUtils.rm zip_path(zip_file)
54
+ storages.each { |s| s.save zip_file_name }
55
+ FileUtils.rm zip_file_name
54
56
  else
55
57
  (files | folders).each do |resource|
56
58
  storages.each { |s| s.save resource } if File.exist? resource
data/lib/easy_backup/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EasyBackup
2
- VERSION = '0.0.3'
2
+ VERSION = '0.0.4'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: easy_backup
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3
4
+ version: 0.0.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-06-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rubyzip
16
- requirement: &19629228 !ruby/object:Gem::Requirement
16
+ requirement: &20087976 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *19629228
24
+ version_requirements: *20087976
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: net-sftp
27
- requirement: &19628904 !ruby/object:Gem::Requirement
27
+ requirement: &20087652 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *19628904
35
+ version_requirements: *20087652
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: activesupport
38
- requirement: &19628508 !ruby/object:Gem::Requirement
38
+ requirement: &20087256 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 3.0.0
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *19628508
46
+ version_requirements: *20087256
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: i18n
49
- requirement: &19644384 !ruby/object:Gem::Requirement
49
+ requirement: &20103144 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *19644384
57
+ version_requirements: *20103144
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: chronic
60
- requirement: &19643676 !ruby/object:Gem::Requirement
60
+ requirement: &20102436 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *19643676
68
+ version_requirements: *20102436
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rufus-scheduler
71
- requirement: &19642668 !ruby/object:Gem::Requirement
71
+ requirement: &20101428 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *19642668
79
+ version_requirements: *20101428
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: sequel
82
- requirement: &19641936 !ruby/object:Gem::Requirement
82
+ requirement: &20100696 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *19641936
90
+ version_requirements: *20100696
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: pg
93
- requirement: &19641420 !ruby/object:Gem::Requirement
93
+ requirement: &20100180 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *19641420
101
+ version_requirements: *20100180
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rspec
104
- requirement: &19640808 !ruby/object:Gem::Requirement
104
+ requirement: &20099568 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *19640808
112
+ version_requirements: *20099568
113
113
  description: Easy DSL to program backups
114
114
  email:
115
115
  - gabynaiman@gmail.com