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

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

@@ -5,7 +5,7 @@ module VpsAdmin::CLI::Commands
     include Curses
 
     REFRESH_RATE = 10
-    FILTERS = %i[limit user environment location node vps network_interface].freeze
+    FILTERS = %i(limit user environment location node vps network_interface)
 
     cmd :network, :top
     args ''
@@ -13,10 +13,10 @@ module VpsAdmin::CLI::Commands
 
     def options(opts)
       @opts = {
-        unit: :bits
+        unit: :bits,
       }
 
-      opts.on('--unit UNIT', %w[bytes bits], 'Select data unit (bytes or bits)') do |v|
+      opts.on('--unit UNIT', %w(bytes bits), 'Select data unit (bytes or bits)') do |v|
         @opts[:unit] = v.to_sym
       end
 
@@ -24,20 +24,19 @@ module VpsAdmin::CLI::Commands
         @opts[:limit] = v
       end
 
-      (FILTERS - %i[limit]).each do |f|
-        opts.on("--#{f.to_s.gsub('_', '-')} ID", Integer, "Filter network interfaces by #{f}") do |v|
+      (FILTERS - %i(limit)).each do |f|
+        opts.on("--#{f.to_s.gsub(/_/, '-')} ID", Integer, "Filter network interfaces by #{f}") do |v|
           @opts[f] = v
         end
       end
     end
 
-    def exec(_args)
+    def exec(args)
       if @global_opts[:list_output]
-        exclude = %i[id network_interface updated_at delta]
+        exclude = %i(id network_interface updated_at delta)
 
         @api.network_interface_monitor.actions[:index].params.each_key do |name|
           next if exclude.include?(name)
-
           puts name
         end
 
@@ -49,7 +48,7 @@ module VpsAdmin::CLI::Commands
       start_color
       crmode
       stdscr.keypad = true
-      curs_set(0) # hide cursor
+      curs_set(0)  # hide cursor
       use_default_colors
 
       init_pair(1, COLOR_BLACK, COLOR_WHITE)
@@ -89,25 +88,24 @@ module VpsAdmin::CLI::Commands
           clear
         end
       end
+
     rescue Interrupt
-      # break loop and exit
     ensure
       close_screen
     end
 
     protected
-
     def set_global_opts
-      @params = if @global_opts[:output]
-                  @global_opts[:output].split(',').map(&:to_sym)
-                else
-                  %i[bytes bytes_in bytes_out packets packets_in packets_out]
-                end
+      if @global_opts[:output]
+        @params = @global_opts[:output].split(',').map(&:to_sym)
+      else
+        @params = %i(bytes bytes_in bytes_out packets packets_in packets_out)
+      end
 
       if @global_opts[:sort]
-        sort_v = @global_opts[:sort]
-        @sort_desc = sort_v.start_with?('-')
-        @sort_param = (sort_v.start_with?('-') ? sort_v[1..] : sort_v).to_sym
+        v = @global_opts[:sort]
+        @sort_desc = v.start_with?('-')
+        @sort_param = (v.start_with?('-') ? v[1..-1] : v).to_sym
 
       else
         @sort_desc = true
@@ -119,21 +117,19 @@ module VpsAdmin::CLI::Commands
       @params.each do |p|
         title = p.to_s.split('_').map do |v|
           if @opts[:unit] == :bits
-            v.to_s.gsub('bytes', 'bits').capitalize
+            v.to_s.gsub(/bytes/, 'bits').capitalize
 
           else
             v.capitalize
           end
-        end.join
-
-        title << '/s'
+        end.join('') + '/s'
 
         size = title.size + 1
 
         @columns << {
           name: p,
-          title:,
-          width: [size, 8].max
+          title: title,
+          width: size < 8 ? 8 : size,
         }
       end
     end
@@ -141,12 +137,12 @@ module VpsAdmin::CLI::Commands
     def fetch
       return @data if @data
 
-      limit = @opts[:limit] || (lines - 6)
+      limit = @opts[:limit] || lines - 6
 
-      params = {
+      params =  {
         limit: limit > 0 ? limit : 25,
         order: "#{@sort_desc ? '-' : ''}#{@sort_param}",
-        meta: { includes: 'network_interface' }
+        meta: {includes: 'network_interface'},
       }
 
       FILTERS.each do |f|
@@ -192,11 +188,11 @@ module VpsAdmin::CLI::Commands
       unless @header
         fmt = (['%8s', '%-15s'] + @columns.map { |c| "%#{c[:width]}s" }).join(' ')
 
-        @header = format(
+        @header = sprintf(
           fmt,
           'VPS',
           'Interface',
-          *@columns.map { |c| c[:title] }
+          *@columns.map { |c| c[:title] },
         )
 
         @header << (' ' * (cols - @header.size)) << "\n"
@@ -206,30 +202,30 @@ module VpsAdmin::CLI::Commands
     end
 
     def print_row(data)
-      addstr(format(
-               '%8s %-15s',
-               data.network_interface.vps_id,
-               data.network_interface.name
-             ))
+      addstr(sprintf(
+        '%8s %-15s',
+        data.network_interface.vps_id,
+        data.network_interface.name,
+      ))
 
       @columns.each do |c|
         p = c[:name]
 
         attron(A_BOLD) if p == @sort_param
-        addstr(format(" %#{c[:width]}s", unitize_param(p, data.send(p), data.delta)))
+        addstr(sprintf(" %#{c[:width]}s", unitize_param(p, data.send(p), data.delta)))
         attroff(A_BOLD) if p == @sort_param
       end
     end
 
     def stats
-      fields = %i[bytes packets]
+      fields = %i(bytes packets)
       stats = {}
       delta_sum = 0
 
       fields.each do |f|
         stats[f] = 0
 
-        %i[in out].each do |dir|
+        %i(in out).each do |dir|
           stats[:"#{f}_#{dir}"] = 0
         end
       end
@@ -240,7 +236,7 @@ module VpsAdmin::CLI::Commands
         fields.each do |f|
           stats[f] += data.send(f)
 
-          %i[in out].each do |dir|
+          %i(in out).each do |dir|
             stats[:"#{f}_#{dir}"] += data.send("#{f}_#{dir}")
           end
         end
@@ -248,43 +244,41 @@ module VpsAdmin::CLI::Commands
 
       avg_delta = delta_sum.to_f / fetch.count
 
-      setpos(lines - 5, 0)
+      setpos(lines-5, 0)
       addstr('─' * cols)
 
       fmt = '%10s %10s %10s'
       unit = @opts[:unit].to_s.capitalize
 
-      setpos(lines - 4, 0)
-      addstr(format(
-               fmt,
-               '',
-               "#{unit}/s",
-               'Packets/s'
-             ))
+      setpos(lines-4, 0)
+      addstr(sprintf(
+        fmt,
+        '',
+        "#{unit}/s",
+        'Packets/s',
+      ))
 
-      setpos(lines - 3, 0)
-      addstr(format(fmt, 'In', *fields.map { |f| unitize_param(f, stats[:"#{f}_in"], avg_delta) }))
+      setpos(lines-3, 0)
+      addstr(sprintf(fmt, 'In', *fields.map { |f| unitize_param(f, stats[:"#{f}_in"], avg_delta) }))
 
-      setpos(lines - 2, 0)
-      addstr(format(fmt, 'Out', *fields.map { |f| unitize_param(f, stats[:"#{f}_out"], avg_delta) }))
+      setpos(lines-2, 0)
+      addstr(sprintf(fmt, 'Out', *fields.map { |f| unitize_param(f, stats[:"#{f}_out"], avg_delta) }))
 
-      setpos(lines - 1, 0)
+      setpos(lines-1, 0)
       attron(A_BOLD)
-      addstr(format(fmt, 'Total', *fields.map do |f|
-                                    unitize_param(f, stats[:"#{f}_in"] + stats[:"#{f}_out"], avg_delta)
-                                  end))
+      addstr(sprintf(fmt, 'Total', *fields.map { |f| unitize_param(f, stats[:"#{f}_in"] + stats[:"#{f}_out"], avg_delta) }))
       attroff(A_BOLD)
     end
 
     def unitize_bytes(n, delta)
-      per_s = if @opts[:unit] == :bytes
-                n / delta.to_f
-              else
-                n * 8 / delta.to_f
-              end
+      if @opts[:unit] == :bytes
+        per_s = n / delta.to_f
+      else
+        per_s = n * 8 / delta.to_f
+      end
 
       bits = 39
-      units = %w[T G M k]
+      units = %w(T G M k)
 
       units.each do |u|
         threshold = 2 << bits
@@ -300,7 +294,7 @@ module VpsAdmin::CLI::Commands
     def unitize_number(n, delta)
       per_s = n / delta.to_f
       threshold = 1_000_000_000_000
-      units = %w[T G M k]
+      units = %w(T G M k)
 
       units.each do |u|
         return "#{(per_s / threshold).round(2)}#{u}" if per_s >= threshold
@@ -318,7 +312,7 @@ module VpsAdmin::CLI::Commands
       when :packets, :packets_in, :packets_out
         unitize_number(n, delta)
       else
-        raise "unknown param to unitize: #{param.inspect}"
+        fail "unknown param to unitize: #{param.inspect}"
       end
     end
 
@@ -341,10 +335,10 @@ module VpsAdmin::CLI::Commands
 
       ips = @api.ip_address.list(addr: v)
       return false if ips.count < 1
-
       ips.first.id
+
     rescue HaveAPI::Client::ActionFailed
-      false
+      return false
     end
   end
 end

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

@@ -9,7 +9,7 @@ module VpsAdmin::CLI::Commands
         delete_after: true,
         send_mail: false,
         checksum: true,
-        format: 'archive'
+        format: 'archive',
       }
 
       opts.on('-f', '--format FORMAT', 'archive, stream or incremental_stream') do |f|
@@ -55,11 +55,11 @@ module VpsAdmin::CLI::Commands
     end
 
     def exec(args)
-      if args.empty? && $stdin.tty?
+      if args.size == 0 && STDIN.tty?
         @opts[:snapshot] = snapshot_chooser
 
       elsif args.size != 1
-        warn 'Provide exactly one SNAPSHOT_ID as an argument'
+        warn "Provide exactly one SNAPSHOT_ID as an argument"
         exit(false)
 
       else
@@ -75,7 +75,7 @@ module VpsAdmin::CLI::Commands
       pos = 0
 
       if @opts[:file] == '-'
-        f = $stdout
+        f = STDOUT
 
       elsif @opts[:file]
         f, action, pos = open_file(@opts[:file])
@@ -86,11 +86,11 @@ module VpsAdmin::CLI::Commands
 
       if created
         if action == :resume
-          warn 'Unable to resume the download: the file has been deleted from the server'
+          warn "Unable to resume the download: the file has been deleted from the server"
           exit(false)
         end
 
-        msg 'The download is being prepared...'
+        msg "The download is being prepared..."
         sleep(5)
 
       else
@@ -104,14 +104,16 @@ module VpsAdmin::CLI::Commands
           @api,
           dl,
           f,
-          progress: !@opts[:quiet] && (f == $stdout ? $stderr : $stdout),
+          progress: !@opts[:quiet] && (f == STDOUT ? STDERR : STDOUT),
           position: pos,
           max_rate: @opts[:max_rate],
-          checksum: @opts[:checksum]
+          checksum: @opts[:checksum],
         )
+
       rescue VpsAdmin::CLI::DownloadError => e
         warn e.message
         exit(false)
+
       ensure
         f.close
       end
@@ -120,28 +122,27 @@ module VpsAdmin::CLI::Commands
     end
 
     protected
-
     def open_file(path)
       f = action = nil
       pos = 0
 
-      if File.exist?(path) && File.size(path) > 0
+      if File.exists?(path) && File.size(path) > 0
         if @opts[:resume]
           action = :resume
 
         elsif @opts[:force]
           action = :overwrite
 
-        elsif $stdin.tty?
+        elsif STDIN.tty?
           while action.nil?
-            $stderr.write("'#{path}' already exists. [A]bort, [r]esume or [o]verwrite? [a]: ")
-            $stderr.flush
+            STDERR.write("'#{path}' already exists. [A]bort, [r]esume or [o]verwrite? [a]: ")
+            STDERR.flush
 
             action = {
               'r' => :resume,
               'o' => :overwrite,
-              '' => false
-            }[$stdin.readline.strip.downcase]
+              '' => false,
+            }[STDIN.readline.strip.downcase]
           end
 
         else
@@ -185,7 +186,7 @@ module VpsAdmin::CLI::Commands
         snapshots = ds.snapshot.index
         next if snapshots.empty?
 
-        if (vps = ds_map[ds.id])
+        if vps = ds_map[ds.id]
           puts "VPS ##{vps.id}"
 
         else
@@ -200,15 +201,15 @@ module VpsAdmin::CLI::Commands
       end
 
       if snap_map.empty?
-        warn 'There are no snapshots to choose from, create one first.'
+        warn "There are no snapshots to choose from, create one first."
         exit(false)
       end
 
       loop do
-        $stdout.write('Pick a snapshot for download: ')
-        $stdout.flush
+        STDOUT.write('Pick a snapshot for download: ')
+        STDOUT.flush
 
-        i = $stdin.readline.strip.to_i
+        i = STDIN.readline.strip.to_i
         next if i <= 0 || snap_map[i].nil?
 
         return snap_map[i].id

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

@@ -10,7 +10,7 @@ module VpsAdmin::CLI::Commands
       @opts = {
         delete_after: true,
         send_mail: false,
-        checksum: true
+        checksum: true,
       }
 
       opts.on('-I', '--from-snapshot SNAPSHOT_ID', Integer, 'Download snapshot incrementally from SNAPSHOT_ID') do |s|
@@ -41,7 +41,7 @@ module VpsAdmin::CLI::Commands
 
     def exec(args)
       if args.size != 1
-        warn 'Provide exactly one SNAPSHOT_ID as an argument'
+        warn "Provide exactly one SNAPSHOT_ID as an argument"
         exit(false)
       end
 
@@ -58,7 +58,7 @@ module VpsAdmin::CLI::Commands
       dl, created = find_or_create_dl(opts)
 
       if created
-        warn_msg 'The download is being prepared...'
+        warn_msg "The download is being prepared..."
         sleep(5)
 
       else
@@ -75,10 +75,11 @@ module VpsAdmin::CLI::Commands
             @api,
             dl,
             w,
-            progress: !opts[:quiet] && $stderr,
+            progress: !opts[:quiet] && STDERR,
             max_rate: opts[:max_rate],
-            checksum: opts[:checksum]
+            checksum: opts[:checksum],
           )
+
         rescue VpsAdmin::CLI::DownloadError => e
           warn e.message
           exit(false)
@@ -88,7 +89,7 @@ module VpsAdmin::CLI::Commands
       w.close
 
       gz = Zlib::GzipReader.new(r)
-      $stdout.write(gz.readpartial(16 * 1024)) until gz.eof?
+      STDOUT.write(gz.readpartial(16*1024)) while !gz.eof?
       gz.close
 
       Process.wait(pid)

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

@@ -42,15 +42,15 @@ module VpsAdmin::CLI::Commands
 
     def exec(args)
       if args.size < 2
-        puts 'provide at least two VPS IDs'
+        puts "provide at least two VPS IDs"
         exit(false)
 
       elsif @opts[:dst_node].nil?
-        puts 'provide --dst-node'
+        puts "provide --dst-node"
         exit(false)
       end
 
-      puts 'Verifying VPS IDs...'
+      puts "Verifying VPS IDs..."
       vpses = []
 
       args.each do |vps_id|
@@ -66,41 +66,44 @@ module VpsAdmin::CLI::Commands
 
       begin
         if @opts[:plan]
-          puts 'Reusing an existing migration plan...'
+          puts "Reusing an existing migration plan..."
           plan = @api.migration_plan.find(@opts[:plan])
 
           if plan.state != 'staged'
-            puts 'Cannot reuse a plan that has already left the staging phase'
+            puts "Cannot reuse a plan that has already left the staging phase"
             exit(false)
           end
 
         else
-          puts 'Creating a migration plan...'
+          puts "Creating a migration plan..."
           plan = @api.migration_plan.create(@opts)
         end
+
       rescue HaveAPI::Client::ActionFailed => e
         report_error(e)
       end
 
-      puts 'Scheduling VPS migrations...'
+      puts "Scheduling VPS migrations..."
       begin
         vpses.each do |vps_id|
           params = {
             vps: vps_id,
-            dst_node: @opts[:dst_node]
+            dst_node: @opts[:dst_node],
           }
           params[:outage_window] = @opts[:outage_window] unless @opts[:outage_window].nil?
           params[:cleanup_data] = @opts[:cleanup_data] unless @opts[:cleanup_data].nil?
 
           plan.vps_migration.create(params)
         end
+
       rescue HaveAPI::Client::ActionFailed => e
         report_error(e)
       end
 
-      puts 'Executing the migration plan'
+      puts "Executing the migration plan"
       begin
         ret = plan.start
+
       rescue HaveAPI::Client::ActionFailed => e
         report_error(e)
       end
@@ -109,7 +112,6 @@ module VpsAdmin::CLI::Commands
     end
 
     protected
-
     def report_error(e)
       puts e.message