vpsadmin-client 3.0.0.master.20240728.pre.0.dc5474cc → 3.0.0.master.202211181.pre.0.ac358990

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4026c63fa0871d4eed11bba4a6ebdea8663af7779f63cdf2057af32934b41c4
-  data.tar.gz: 36e4bbff971201e8ea36b887e3bb1e9102edfee78aeeb9c9183c7c35c01ec1f6
+  metadata.gz: 9014c08e0f38faa0c2ef3ff240d919521ff77609f7c638c3497fdf730d76a2d9
+  data.tar.gz: 4639e16cc11b5b4a81ebd787e6dedf15ec6da46177920de95e442ff8bc13ad86
 SHA512:
-  metadata.gz: 7538cc9db1cd0238951d7417d85cfaf23b1c00d95f7fda6edc937308fe471389fa75c7813c995fa0087a710af7e476905171ccfc4027d245384df305e2b882fe
-  data.tar.gz: dd97bc1054145663273e427e043e8c3d470a13277a1893710fa4894d525fd944359f98f32502a06b0d7b4f6397d5d03eff4cc84c68f1d691e693d14262d7b549
+  metadata.gz: 63cec139647a45f1b78e31189634c3f876d5531efd3abb9ab535146cb2d34d3e13cb27f9d9a1cdf0fe8c7031cd4bee87774f1d1f1387fa349f21dce5d1a87792
+  data.tar.gz: 5431b10cbef22f09b69e7a4968bf3b0959dae30df08e2e3f24363ca5513931bec674b98fd203a77b326abffe4f87e4377638473031db122fef50d86fa0ad4e40

data/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-group :development do
-  gem 'rake'
-end

data/Rakefile

@@ -1 +1,2 @@
 require 'bundler/gem_tasks'
+

data/lib/{terminal_size.rb → terminal-size.rb}

@@ -1,61 +1,55 @@
 class Terminal
-  class Size; VERSION = '0.0.6'.freeze end
+  class Size; VERSION = '0.0.6' end
   class << self
     def size
       size_via_low_level_ioctl or size_via_stty or nil
     end
-
-    def size!
-      size or _height_width_hash_from 25, 80
-    end
+    def size!; size or _height_width_hash_from 25, 80 end
 
     # These are experimental
-    def resize(direction, magnitude)
+    def resize direction, magnitude
       tmux 'resize-pane', "-#{direction}", magnitude
     end
 
     def tmux *cmd
-      system 'tmux', *cmd.map(&:to_s)
+      system 'tmux', *(cmd.map &:to_s)
     end
 
-    IOCTL_INPUT_BUF = "\x00" * 8
+    IOCTL_INPUT_BUF = "\x00"*8
     def size_via_low_level_ioctl
       # Thanks to runpaint for the general approach to this
       return unless $stdin.respond_to? :ioctl
-
       code = tiocgwinsz_value_for RUBY_PLATFORM
       return unless code
-
       buf = IOCTL_INPUT_BUF.dup
-      return if $stdout.ioctl(code, buf) != 0
-      return if buf == IOCTL_INPUT_BUF
-
+      return unless $stdout.ioctl(code, buf).zero?
+      return if IOCTL_INPUT_BUF == buf
       got = buf.unpack('S4')[0..1]
-      _height_width_hash_from(*got)
-    rescue StandardError
+      _height_width_hash_from *got
+    rescue
       nil
     end
 
-    def tiocgwinsz_value_for(platform)
+    def tiocgwinsz_value_for platform
       # This is as reported by <sys/ioctl.h>
       # Hard-coding because it seems like overkll to acutally involve C for this.
       {
         /linux/ => 0x5413,
-        /darwin/ => 0x40087468 # thanks to brandon@brandon.io for the lookup!
-      }.find { |k, _v| platform[k] }
+        /darwin/ => 0x40087468, # thanks to brandon@brandon.io for the lookup!
+      }.find{|k,v| platform[k]}
     end
 
     def size_via_stty
-      ints = `stty size`.scan(/\d+/).map(&:to_i)
-      _height_width_hash_from(*ints)
-    rescue StandardError
+      ints = `stty size`.scan(/\d+/).map &:to_i
+      _height_width_hash_from *ints
+    rescue
       nil
     end
 
     private
-
     def _height_width_hash_from *dimensions
-      { height: dimensions[0], width: dimensions[1] }
+      { :height => dimensions[0], :width => dimensions[1] }
     end
+
   end
 end

data/lib/vpsadmin/cli/commands/backup_dataset.rb

@@ -21,7 +21,7 @@ module VpsAdmin::CLI::Commands
         attempts: 10,
         checksum: true,
         delete_after: true,
-        sudo: true
+        sudo: true,
       }
 
       opts.on('-p', '--pretend', 'Print what would the program do') do
@@ -93,14 +93,14 @@ module VpsAdmin::CLI::Commands
 
         ds_id = read_dataset_id(fs)
 
-        ds = if ds_id
-               @api.dataset.show(ds_id)
-             else
-               dataset_chooser
-             end
+        if ds_id
+          ds = @api.dataset.show(ds_id)
+        else
+          ds = dataset_chooser
+        end
 
       elsif args.size != 2
-        warn 'Provide DATASET_ID and FILESYSTEM arguments'
+        warn "Provide DATASET_ID and FILESYSTEM arguments"
         exit(false)
 
       else
@@ -144,15 +144,15 @@ module VpsAdmin::CLI::Commands
       # This is the first run within this history id, no local snapshots are
       # present
       if !latest_local_snapshot && @opts[:init_snapshots]
-        remote_state[ds.current_history_id] =
+        remote_state[ds.current_history_id] = \
           remote_state[ds.current_history_id].last(@opts[:init_snapshots])
       end
 
       remote_state[ds.current_history_id].each do |snap|
         found = false
 
-        local_state.each_value do |local_snapshots|
-          found = local_snapshots.detect { |s| s.name == snap.name }
+        local_state.values.each do |snapshots|
+          found = snapshots.detect { |s| s.name == snap.name }
           break if found
         end
 
@@ -170,33 +170,33 @@ module VpsAdmin::CLI::Commands
       if for_transfer.empty?
         if found_latest
           exit_msg(
-            'Nothing to transfer: all snapshots with history id ' \
+            "Nothing to transfer: all snapshots with history id "+
             "#{ds.current_history_id} are already present locally",
             error: @opts[:no_snapshots_error]
           )
 
         else
-          exit_msg(<<~END
-            Unable to transfer: the common snapshot has not been found
+          exit_msg(<<END
+Unable to transfer: the common snapshot has not been found
 
-            This can happen when the latest local snapshot was deleted from the server,
-            i.e. you have not backed up this dataset for quite some time.
+This can happen when the latest local snapshot was deleted from the server,
+i.e. you have not backed up this dataset for quite some time.
 
-            You can either rename or destroy the whole current history id:
+You can either rename or destroy the whole current history id:
 
-              zfs rename #{fs}/#{ds.current_history_id} #{fs}/#{ds.current_history_id}.old
+  zfs rename #{fs}/#{ds.current_history_id} #{fs}/#{ds.current_history_id}.old
 
-            or
+or
 
-              zfs list -r -t all #{fs}/#{ds.current_history_id}
-              zfs destroy -r #{fs}/#{ds.current_history_id}
+  zfs list -r -t all #{fs}/#{ds.current_history_id}
+  zfs destroy -r #{fs}/#{ds.current_history_id}
 
-            which will destroy all snapshots with this history id.
+which will destroy all snapshots with this history id.
 
-            You can also destroy the local backup completely or backup to another dataset
-            and start anew.
-          END
-                  )
+You can also destroy the local backup completely or backup to another dataset
+and start anew.
+END
+          )
         end
       end
 
@@ -226,7 +226,9 @@ module VpsAdmin::CLI::Commands
         if shared_name
           shared = remote_state[ds.current_history_id].detect { |s| s.name == shared_name }
 
-          for_transfer.insert(0, shared) if shared && !for_transfer.detect { |s| s.id == shared.id }
+          if shared && !for_transfer.detect { |s| s.id == shared.id }
+            for_transfer.insert(0, shared)
+          end
         end
 
         write_dataset_id!(ds, fs) unless written_dataset_id?
@@ -236,12 +238,13 @@ module VpsAdmin::CLI::Commands
     end
 
     protected
-
     def transfer(local_state, snapshots, hist_id, fs)
       ds = "#{fs}/#{hist_id}"
       no_local_snapshots = local_state[hist_id].nil? || local_state[hist_id].empty?
 
-      zfs(:create, nil, ds) if local_state[hist_id].nil?
+      if local_state[hist_id].nil?
+        zfs(:create, nil, ds)
+      end
 
       if no_local_snapshots
         msg "Performing a full receive of @#{snapshots.first.name} to #{ds}"
@@ -252,59 +255,60 @@ module VpsAdmin::CLI::Commands
         else
           run_piped(zfs_cmd(:recv, '-F', ds)) do
             SnapshotSend.new({}, @api).do_exec({
-                                                 snapshot: snapshots.first.id,
-                                                 send_mail: false,
-                                                 delete_after: @opts[:delete_after],
-                                                 max_rate: @opts[:max_rate],
-                                                 checksum: @opts[:checksum],
-                                                 quiet: @opts[:quiet]
-                                               })
+              snapshot: snapshots.first.id,
+              send_mail: false,
+              delete_after: @opts[:delete_after],
+              max_rate: @opts[:max_rate],
+              checksum: @opts[:checksum],
+              quiet: @opts[:quiet],
+            })
           end || exit_msg('Receive failed')
         end
       end
 
-      return unless !no_local_snapshots || snapshots.size > 1
+      if !no_local_snapshots || snapshots.size > 1
+        msg "Performing an incremental receive of "+
+            "@#{snapshots.first.name} - @#{snapshots.last.name} to #{ds}"
 
-      msg 'Performing an incremental receive of ' \
-          "@#{snapshots.first.name} - @#{snapshots.last.name} to #{ds}"
-
-      if @opts[:safe]
-        safe_download(ds, snapshots.last, snapshots.first)
+        if @opts[:safe]
+          safe_download(ds, snapshots.last, snapshots.first)
 
-      else
-        run_piped(zfs_cmd(:recv, '-F', ds)) do
-          SnapshotSend.new({}, @api).do_exec({
-                                               snapshot: snapshots.last.id,
-                                               from_snapshot: snapshots.first.id,
-                                               send_mail: false,
-                                               delete_after: @opts[:delete_after],
-                                               max_rate: @opts[:max_rate],
-                                               checksum: @opts[:checksum],
-                                               quiet: @opts[:quiet]
-                                             })
-        end || exit_msg('Receive failed')
+        else
+          run_piped(zfs_cmd(:recv, '-F', ds)) do
+            SnapshotSend.new({}, @api).do_exec({
+              snapshot: snapshots.last.id,
+              from_snapshot: snapshots.first.id,
+              send_mail: false,
+              delete_after: @opts[:delete_after],
+              max_rate: @opts[:max_rate],
+              checksum: @opts[:checksum],
+              quiet: @opts[:quiet],
+            })
+          end || exit_msg('Receive failed')
+        end
       end
     end
 
     def safe_download(ds, snapshot, from_snapshot = nil)
       part, full = snapshot_tmp_file(snapshot, from_snapshot)
 
-      unless File.exist?(full)
+      if !File.exists?(full)
         attempts = 0
 
         begin
           SnapshotDownload.new({}, @api).do_exec({
-                                                   snapshot: snapshot.id,
-                                                   from_snapshot: from_snapshot && from_snapshot.id,
-                                                   format: from_snapshot ? :incremental_stream : :stream,
-                                                   file: part,
-                                                   max_rate: @opts[:max_rate],
-                                                   checksum: @opts[:checksum],
-                                                   quiet: @opts[:quiet],
-                                                   resume: true,
-                                                   delete_after: @opts[:delete_after],
-                                                   send_mail: false
-                                                 })
+            snapshot: snapshot.id,
+            from_snapshot: from_snapshot && from_snapshot.id,
+            format: from_snapshot ? :incremental_stream : :stream,
+            file: part,
+            max_rate: @opts[:max_rate],
+            checksum: @opts[:checksum],
+            quiet: @opts[:quiet],
+            resume: true,
+            delete_after: @opts[:delete_after],
+            send_mail: false,
+          })
+
         rescue Errno::ECONNREFUSED,
                Errno::ETIMEDOUT,
                Errno::EHOSTUNREACH,
@@ -314,11 +318,11 @@ module VpsAdmin::CLI::Commands
           attempts += 1
 
           if attempts >= @opts[:attempts]
-            warn 'Run out of attempts'
+            warn "Run out of attempts"
             exit(false)
 
           else
-            warn 'Retry in 60 seconds'
+            warn "Retry in 60 seconds"
             sleep(60)
             retry
           end
@@ -335,15 +339,15 @@ module VpsAdmin::CLI::Commands
     end
 
     def rotate(fs, pretend: false)
-      msg 'Rotating snapshots'
-      local_state = pretend || parse_tree(fs)
+      msg "Rotating snapshots"
+      local_state = pretend ? pretend : parse_tree(fs)
 
       # Order snapshots by date of creation
       snapshots = local_state.values.flatten.sort do |a, b|
         a.creation <=> b.creation
       end
 
-      cnt = local_state.values.inject(0) { |sum, local_snapshots| sum + local_snapshots.count }
+      cnt = local_state.values.inject(0) { |sum, snapshots| sum + snapshots.count }
       deleted = 0
       oldest = Time.now.to_i - (@opts[:max_age] * 60 * 60 * 24)
 
@@ -359,16 +363,16 @@ module VpsAdmin::CLI::Commands
         local_state[s.hist_id].delete(s)
 
         msg "Destroying #{ds}@#{s.name}"
-        zfs(:destroy, nil, "#{ds}@#{s.name}", pretend:)
+        zfs(:destroy, nil, "#{ds}@#{s.name}", pretend: pretend)
       end
 
-      local_state.each do |hist_id, local_snapshots|
-        next unless local_snapshots.empty?
+      local_state.each do |hist_id, snapshots|
+        next unless snapshots.empty?
 
         ds = "#{fs}/#{hist_id}"
 
         msg "Destroying #{ds}"
-        zfs(:destroy, nil, ds, pretend:)
+        zfs(:destroy, nil, ds, pretend: pretend)
       end
     end
 
@@ -378,15 +382,15 @@ module VpsAdmin::CLI::Commands
       # This is intentionally done by two zfs commands, because -d2 would include
       # nested subdatasets, which should not be there, but the user might create
       # them and it could confuse the program.
-      zfs(:list, '-r -d1 -tfilesystem -H -oname', fs).split("\n")[1..].each do |name|
+      zfs(:list, '-r -d1 -tfilesystem -H -oname', fs).split("\n")[1..-1].each do |name|
         last_name = name.split('/').last
         ret[last_name.to_i] = [] if dataset?(last_name)
       end
 
       zfs(
-        :get,
-        '-Hrp -d2 -tsnapshot -oname,property,value name,creation',
-        fs
+          :get,
+          '-Hrp -d2 -tsnapshot -oname,property,value name,creation',
+          fs
       ).split("\n").each do |line|
         name, property, value = line.split
         ds, snap_name = name.split('@')
@@ -395,7 +399,7 @@ module VpsAdmin::CLI::Commands
 
         hist_id = ds_name.to_i
 
-        if (snap = ret[hist_id].detect { |s| s.name == snap_name })
+        if snap = ret[hist_id].detect { |s| s.name == snap_name }
           snap.send("#{property}=", value)
 
         else
@@ -414,15 +418,14 @@ module VpsAdmin::CLI::Commands
     def read_dataset_id(fs)
       ds_id = zfs(:get, '-H -ovalue cz.vpsfree.vpsadmin:dataset_id', fs).strip
       return nil if ds_id == '-'
-
       @dataset_id = ds_id.to_i
     end
 
     def check_dataset_id!(ds, fs)
-      return unless @dataset_id && @dataset_id != ds.id
-
-      warn "Dataset '#{fs}' is used to backup remote dataset with id '#{@dataset_id}', not '#{ds.id}'"
-      exit(false)
+      if @dataset_id && @dataset_id != ds.id
+        warn "Dataset '#{fs}' is used to backup remote dataset with id '#{@dataset_id}', not '#{ds.id}'"
+        exit(false)
+      end
     end
 
     def written_dataset_id?
@@ -441,13 +444,13 @@ module VpsAdmin::CLI::Commands
 
       pids << Process.fork do
         r.close
-        $stdout.reopen(w)
+        STDOUT.reopen(w)
         block.call
       end
 
       pids << Process.fork do
         w.close
-        $stdin.reopen(r)
+        STDIN.reopen(r)
         Process.exec(cmd2)
       end
 
@@ -497,12 +500,11 @@ module VpsAdmin::CLI::Commands
       ds_map = {}
 
       @api.dataset.index(user: user.id).each do |ds|
-        if (vps = vps_map[ds.id])
+        if vps = vps_map[ds.id]
           puts "(#{i}) VPS ##{vps.id}"
 
         else
           next if vps_only
-
           puts "(#{i}) Dataset #{ds.name}"
         end
 
@@ -511,10 +513,10 @@ module VpsAdmin::CLI::Commands
       end
 
       loop do
-        $stdout.write('Pick a dataset to backup: ')
-        $stdout.flush
+        STDOUT.write('Pick a dataset to backup: ')
+        STDOUT.flush
 
-        i = $stdin.readline.strip.to_i
+        i = STDIN.readline.strip.to_i
         next if i <= 0 || ds_map[i].nil?
 
         return ds_map[i]
@@ -522,12 +524,12 @@ module VpsAdmin::CLI::Commands
     end
 
     def snapshot_tmp_file(s, from_s = nil)
-      base = if from_s
-               ".snapshot_#{from_s.id}-#{s.id}.inc.dat.gz"
+      if from_s
+        base = ".snapshot_#{from_s.id}-#{s.id}.inc.dat.gz"
 
-             else
-               ".snapshot_#{s.id}.dat.gz"
-             end
+      else
+        base = ".snapshot_#{s.id}.dat.gz"
+      end
 
       ["#{base}.part", base]
     end

data/lib/vpsadmin/cli/commands/backup_vps.rb

@@ -22,7 +22,7 @@ module VpsAdmin::CLI::Commands
         super([@api.vps.show(args[0].to_i).dataset_id, args[1]])
 
       else
-        super
+        super(args)
       end
     end
   end

data/lib/vpsadmin/cli/commands/base_download.rb

@@ -7,15 +7,15 @@ module VpsAdmin::CLI::Commands
     end
 
     protected
-
     def find_or_create_dl(opts, do_create = true)
       @api.snapshot_download.index(snapshot: opts[:snapshot]).each do |r|
-        next unless opts[:from_snapshot] == (r.from_snapshot && r.from_snapshot_id)
-        if r.format != opts[:format].to_s
-          raise "SnapshotDownload id=#{r.id} is in unusable format '#{r.format}' (needs '#{opts[:format]}')"
-        end
+        if opts[:from_snapshot] == (r.from_snapshot && r.from_snapshot_id)
+          if r.format != opts[:format].to_s
+            fail "SnapshotDownload id=#{r.id} is in unusable format '#{r.format}' (needs '#{opts[:format]}')"
+          end
 
-        return [r, false]
+          return [r, false]
+        end
       end
 
       if do_create