dropup 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03c30c13c98abc02b9d87f010acc331123d3cf06
-  data.tar.gz: d4152baf7b405a3ab1aecfaaf83b6f9e76ca9018
+  metadata.gz: a03754a4747eef5b1938fe47b553685ab63be063
+  data.tar.gz: 92bedd3c2711fe348e1a1c4911811bcbabb0c0b8
 SHA512:
-  metadata.gz: 31c15038b0c35eb90d034a973b8e262dca67272f4a4d15c34778041cf5d4e5dea52416c55d2d49665b101d996a987962c35aa8f1ea01b2ade84939db47dd2bab
-  data.tar.gz: ff421385f1c942aaf864a133cbeddf2b5d9247112384470120244f906dcee1cd4577c3a901540b5dfbc3df499103df81e27060ef7d935f3847146feb912d7b05
+  metadata.gz: 1480e362f5fc041135570edde3b870b0f8601edd732efdf2adc20883b940e8dd28b0ec9b4c935a8311aee1449dc7dec7b2c6a3f6214ee3af5d357052dba66200
+  data.tar.gz: 4043a53236c625b587d0004664e397127a548e4f80eff2030e0d8f85a253a6ccd9f906c62ecc5e6a547a5be050f35e999991647e3b51323cca1458d5b352338f

data/bin/dropup

@@ -8,12 +8,14 @@ require 'time'
 require 'optparse'
 require 'open3'
 require 'terminal-notifier'
+require 'fileutils'
 
 options = {
   :size => 400, # in MB
   :keep => 0,   # number of backups to keep
   :verbose => false,
-  :notification => false
+  :notification => false,
+  :temp => '/tmp/backup-%.dmg'
 }
 
 opt_parser = OptionParser.new do |opt|
@@ -42,6 +44,10 @@ opt_parser = OptionParser.new do |opt|
   opt.on("-s", "--size SIZE", "size") do |size|
     options[:size] = size.to_i
   end
+
+  opt.on("-t", "--temp TEMP", "temp") do |temp|
+    options[:temp] = temp.to_s
+  end
 end
 
 opt_parser.parse!
@@ -51,59 +57,66 @@ if ARGV.length < 2
   exit
 end
 
-destination = File.expand_path(ARGV.pop)
+def backup(srcs, temp, password, size)
 
-backups = Dir[destination.gsub(/%/,'*')].sort.reverse
+  cmd = %W(
+    hdiutil create
+    -encryption AES-256
+    -stdinpass
+    -volname "Backup"
+    -format UDZO
+    -megabytes #{size}
+    #{srcs.map{|s| "-srcfolder \"#{File.expand_path(s)}\"" }.join(' ')}
+    "#{File.expand_path(temp)}"
+  ).join(' ')
+
+  Open3.popen3(cmd) do |stdin, stdout, stderr, wait|
+    stdin.printf(password)
+    stdin.close
 
-puts "Backups: #{backups}" if options[:verbose]
+    yield wait.value == 0
 
-while backups.length > options[:keep]
-  backup = backups.pop
-  puts "Deleting: #{backup}" if options[:verbose]
-  File.delete(backup)
+  end
 end
 
-backup = destination.gsub(/%/, Time.now.strftime("%Y%m%d%M%H%S%L"))
-
-puts "Creating: #{backup}" if options[:verbose]
+time = Time.now.strftime("%Y%m%d%M%H%S%L")
+temp_pattern = File.expand_path(options[:temp])
+dest_pattern = File.expand_path(ARGV.pop)
 
 password = %x[security find-internet-password -s dropup -a password -g 2>&1][/^password:\s"([^"]*)"/,1]
-
 if password.nil? || password.length == 0
   puts "Set a password: security add-internet-password -s dropup -U -T \"\" -a password -w <PASSWORD>"
   exit
 end
 
-cmd = %W(
-  hdiutil create
-  -encryption AES-256
-  -stdinpass
-  -volname "Backup"
-  -format UDZO
-  -megabytes #{options[:size]}
-  #{ARGV.map{|s| "-srcfolder \"#{File.expand_path(s)}\"" }.join(' ')}
-  "#{File.expand_path(backup)}"
-).join(' ')
+temp = temp_pattern.gsub(/%/, time)
+dest = dest_pattern.gsub(/%/, time)
 
-puts "Command: #{cmd}" if options[:verbose]
+puts "Creating: #{dest}" if options[:verbose]
 
-if not options[:dry]
-  Open3.popen3(cmd) do |stdin, stdout, stderr, wait|
-    stdin.printf(password)
-    stdin.close
+backup(ARGV, temp, password, options[:size]) do |success|
 
-    TerminalNotifier.notify('Backup Starting') if options[:notification]
-    puts "Building dmg" if options[:verbose]
+  TerminalNotifier.notify('Backup Starting') if options[:notification]
+  puts "Building dmg" if options[:verbose]
 
-    if wait.value == 0 then
+  if success then
 
-      TerminalNotifier.notify('Backup Successful', :title => 'Success') if options[:notification]
-      puts "Success" if options[:verbose]
+    TerminalNotifier.notify('Backup Successful', :title => 'Success') if options[:notification]
+    puts "Success" if options[:verbose]
 
-    else
+    backups = Dir[dest_pattern.gsub(/%/,'*')].sort.reverse
 
-      TerminalNotifier.notify('Backup Failed', :title => 'Error', :sound => 'default') if options[:notification]
-      puts "Error: #{stderr.read}" if options[:verbose]
+    while backups.length > options[:keep]
+      backup = backups.pop
+      puts "Deleting: #{backup}" if options[:verbose]
+      File.delete(backup)
     end
+
+    FileUtils.move(temp, dest)
+
+  else
+
+    TerminalNotifier.notify('Backup Failed', :title => 'Error', :sound => 'default') if options[:notification]
+    puts "Error: #{stderr.read}" if options[:verbose]
   end
 end

data/dropup.gemspec

@@ -1,7 +1,7 @@
 spec = Gem::Specification.new do |s|
   s.name          = 'dropup'
-  s.version       = '0.3'
-  s.date          = '2014-10-01'
+  s.version       = '0.4'
+  s.date          = '2014-10-02'
 
   s.authors       = [ 'Torsten Curdt' ]
   s.email         = [ 'tcurdt@vafer.org' ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dropup
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Torsten Curdt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-notifier