mite-backup 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e2a1de229359b4ec2c13e670f632669885c1fab3b3de816eae6890f924e3e4a
-  data.tar.gz: 4284bc243e1f88e5b3a71647a68cf08eb14907fad396796ca3fb69090c253bfa
+  metadata.gz: a117790317b4837a4f8e2cd95226457a36b089494e74a39ae443fa0fc6f03cf3
+  data.tar.gz: 278c4c22b657de5c21bbfab81c059d6d5beae1a9c2e5c15972142511456ff7c9
 SHA512:
-  metadata.gz: 6e2b252caf37075b1752da4f51b6f83a0be45be881916120b8af1386454e7702b3f5965b718f3ad114fa6cb313fb6e718aa6d7ff3a7153a349cf548874608632
-  data.tar.gz: 91615a738bfc2b0fd7ff2b18e88c30358dca80a07904e5f802bded1b5b3343664544356bf5caf673de3ce9994a52a11cba254884bc9b384dd648b4d8c146a0d7
+  metadata.gz: a0ed983b6beb773b1e5bf1cf95fee71464c2b26a1248f44078b49fc43b8990b786ced405a5e9bfa884a19a10d78e453b5e1d7d946259738767a510e79d3c585a
+  data.tar.gz: dafd207a7c3c4e29df78c69d74bc76c675bb23dd4c93b456b1bb7ad692ac2f15317d1e391e89fa15e75aa30e825bc19ae07c45a42bc270214400562969ff32e6

data/bin/mite-backup

@@ -5,7 +5,9 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'mite-backup'
 require 'optparse'
 
-@options = {}
+@options = {
+  "wait_for" => MiteBackup::DEFAULT_WAIT_FOR
+}
 
 parser = OptionParser.new do |opts|
   opts.banner = "Usage: mite-backup COMMAND [options]"
@@ -13,18 +15,25 @@ parser = OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Options:"
 
-  opts.on("-a", "--account [ACCOUNT-SUBDOMAIN]", "your mite account subdomain (without .mite.yo.lk)") do |account|
+  opts.on("-a", "--account ACCOUNT-SUBDOMAIN", "your mite account subdomain (without .mite.yo.lk)") do |account|
     @options["account"] = account
   end
 
-  opts.on("-e", "--email [EMAIL]", "mite.user email") do |email|
+  opts.on("-e", "--email EMAIL", "mite.user email") do |email|
     @options["email"] = email
   end
 
-  opts.on("-p", "--password [PASSWORD]", "mite.user password") do |password|
+  opts.on("-p", "--password PASSWORD", "mite.user password") do |password|
     @options["password"] = password
   end
 
+  opts.on(
+    "-w", "--wait-for SECONDS", Integer,
+    "Number of seconds to wait for backup to be ready. Defaults to 240 seconds."
+  ) do |seconds|
+    @options["wait_for"] = seconds
+  end
+
   opts.on("-c", "--clear", "Removes all config values from config file.") do
     @options["clear_config"] = true
   end
@@ -37,7 +46,7 @@ parser = OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Commands:"
   opts.separator "  get     Download backupfile and ouput xml to STDOUT (Default command)"
-  opts.separator "  setup    Write given options to config file ~/.mite-backup.yml, so you don't need to repeat the on ever get command."
+  opts.separator "  setup   Write given options to config file ~/.mite-backup.yml, so you don't need to repeat them on every get command."
   opts.separator ""
 end
 
@@ -53,4 +62,4 @@ else
   puts ""
   puts parser.help
   exit(1)
-end
+end

data/lib/mite-backup.rb

@@ -6,7 +6,7 @@ require 'zlib'
 require 'yaml'
 
 class MiteBackup
-  MAX_CHECKS              = 48
+  DEFAULT_WAIT_FOR = 240 # seconds
   SLEEP_BEFORE_EACH_CHECK = 5 # seconds
   CONFIG_FILE             = File.expand_path('~/.mite-backup.yml')
   USER_AGENT              = "mite-backup/#{MiteBackup::VERSION}"
@@ -17,6 +17,9 @@ class MiteBackup
     @account  = correct_account(options["account"]  || config["account"])
     @email    = options["email"]    || config["email"]
     @password = options["password"] || config["password"]
+    @max_checks = options["wait_for"] != DEFAULT_WAIT_FOR ?
+      options["wait_for"] / SLEEP_BEFORE_EACH_CHECK :
+      config["wait_for"] || DEFAULT_WAIT_FOR
   end
 
   def run
@@ -30,6 +33,8 @@ class MiteBackup
     (config["account"] = @account) || config.delete("account")
     (config["email"] = @email) || config.delete("email")
     (config["password"] = @password) || config.delete("password")
+    (config["wait_for"] = @options["wait_for"]) || config.delete("wait_for")
+    config.delete("wait_for") if config["wait_for"] == DEFAULT_WAIT_FOR
 
     if config.size == 0
       self.class.clear_config
@@ -59,7 +64,7 @@ class MiteBackup
     end
 
     def check
-      MAX_CHECKS.times do |i|
+      @max_checks.times do |i|
         sleep(SLEEP_BEFORE_EACH_CHECK)
         @ready = parse_json(perform_request(Net::HTTP::Get.new("/account/backup/#{@id}.json")))["ready"]
         break if @ready
@@ -77,7 +82,7 @@ class MiteBackup
         end
         puts gz.read
       else
-        failed "Backup was not ready for download after #{MAX_CHECKS*SLEEP_BEFORE_EACH_CHECK} seconds. Contact the mite support."
+        failed "Backup was not ready for download after #{@options["wait_for"]} seconds. Contact the mite.support."
       end
     end
 

data/lib/mite-backup/version.rb

@@ -1,3 +1,3 @@
 class MiteBackup
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mite-backup
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sebastian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json