vpsadmin-client 2.3.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 306006d7f2b4824401856a6f22c2a882d64557c9
-  data.tar.gz: 5c1ef15cbda427d8880ad818695f7de944819f85
+  metadata.gz: ba8192c7d8fd4f47bb344a6edfa0b27a30d850f0
+  data.tar.gz: 0fec21ca7c50c3fba23e15a50c4ecf2618e04423
 SHA512:
-  metadata.gz: 7538ed7acad5ef3e69653456c1bc955eba14c55bfa0b42fbf3784d001408d393ded37446d3362deaeea0839a211606850f5929fed8f9b8391e9bda64c024c420
-  data.tar.gz: 9feb2731a3f8321bc00d9681241e005838e330206f7793b76376954a490361f75fabdf6cddc84da01640f2435c718236cdccd4d8c7b887ef7ab878569c726125
+  metadata.gz: 743be4bedeccfb27de7355fea993dc1ee381e20f80cfbaa5bb1cebd43ff79c612bee0f505a073d71dc80965c51ba8dc0cdfaec2e9ddb2f3d7e7eda3a501aab1b
+  data.tar.gz: 15ef4a6f1a62934f78c60d2a97c37c80e5332e268096c7186fe7aec19f89374eee396e0ceeb5bb2d93a14d807a54893349aea9226e1e12ffd10855b21d33d4a9

data/CHANGELOG

@@ -1,3 +1,8 @@
+- New command ip_traffic top
+
+* Fri Jun 24 2016 - version 2.4.0
+- No changes
+
 * Tue Jun 14 2016 - version 2.3.2
 - Don't set download progress on new request
 

data/lib/vpsadmin/cli.rb

@@ -22,3 +22,4 @@ require 'vpsadmin/cli/commands/snapshot_download'
 require 'vpsadmin/cli/commands/snapshot_send'
 require 'vpsadmin/cli/commands/backup_dataset'
 require 'vpsadmin/cli/commands/backup_vps'
+require 'vpsadmin/cli/commands/ip_traffic_top'

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

@@ -0,0 +1,333 @@
+require 'curses'
+
+module VpsAdmin::CLI::Commands
+  class IpTrafficTop < BackupDataset
+    include Curses
+
+    REFRESH_RATE = 10
+    FILTERS = %i(limit ip_address ip_version environment location network ip_range node vps)
+
+    cmd :ip_traffic, :top
+    args ''
+    desc 'Live IP traffic monitor'
+    
+    def options(opts)
+      @opts = {
+          unit: :bits,
+      }
+
+      opts.on('--unit UNIT', %w(bytes bits), 'Select data unit (bytes or bits)') do |v|
+        @opts[:unit] = v.to_sym
+      end
+      
+      opts.on('--limit LIMIT', Integer, 'Number of IP addresses to monitor') do |v|
+        @opts[:limit] = v
+      end
+      
+      opts.on('--ip-address ADDR', 'ADDR or ID of IP addresses to monitor') do |v|
+        id = ip_address_id(v)
+
+        if id
+          @opts[:ip_address] = id
+
+        else
+          warn "IP address '#{v}' not found"
+          exit(1)
+        end
+      end
+      
+      opts.on('--ip-version VER', [4, 6], 'Filter IP addresses by version') do |v|
+        @opts[:ip_version] = v
+      end
+    
+      (FILTERS - %i(limit ip_address ip_version)).each do |f|
+        opts.on("--#{f.to_s.gsub(/_/, '-')} ID", Integer, "Filter IP addresses by #{f}") do |v|
+          @opts[f] = v
+        end
+      end
+    end
+
+    def exec(args)
+      if @global_opts[:list_output]
+        exclude = %i(id ip_address user updated_at delta)
+
+        @api.ip_traffic_monitor.actions[:index].params.each_key do |name|
+          next if exclude.include?(name)
+          puts name
+        end
+        exit
+      end
+
+      set_global_opts
+      init_screen
+      start_color
+      crmode
+      stdscr.keypad = true
+      curs_set(0)  # hide cursor
+      use_default_colors
+
+      init_pair(1, COLOR_BLACK, COLOR_WHITE)
+      last = nil
+
+      loop do
+        now = Time.now
+
+        if @refresh || last.nil? || (now - last) >= REFRESH_RATE
+          @refresh = false
+          render(now, true)
+          last = Time.now
+          self.timeout = REFRESH_RATE * 1000
+
+        else
+          render(last, false)
+          self.timeout = (REFRESH_RATE - (now - last)) * 1000
+        end
+
+        case getch
+        when 'q'
+          break
+
+        when Key::LEFT
+          clear
+          sort_next(-1)
+
+        when Key::RIGHT
+          clear
+          sort_next(+1)
+
+        when Key::UP, Key::DOWN
+          clear
+          sort_inverse
+
+        when Key::RESIZE
+          clear
+        end
+      end
+
+    rescue Interrupt
+    ensure
+      close_screen
+    end
+
+    protected
+    def set_global_opts
+      if @global_opts[:output]
+        @params = @global_opts[:output].split(',').map(&:to_sym)
+
+      else
+        @params = %i(bytes_in bytes_out bytes)
+      end
+
+      if @global_opts[:sort]
+        v = @global_opts[:sort]
+        @sort_desc = v.start_with?('-')
+        @sort_param = (v.start_with?('-') ? v[1..-1] : v).to_sym
+
+      else
+        @sort_desc = true
+        @sort_param = :bytes
+      end
+
+      @columns = []
+
+      @params.each do |p|
+        title = p.to_s.split('_').map do |v|
+          if @opts[:unit] == :bits
+            v.to_s.gsub(/bytes/, 'bits').capitalize
+
+          else
+            v.capitalize
+          end
+        end.join('') + '/s'
+
+        size = title.size + 1
+
+        @columns << {
+            name: p,
+            title: title,
+            width: size < 8 ? 8 : size,
+        }
+      end
+    end
+
+    def fetch
+      return @data if @data
+
+      limit = @opts[:limit] || lines - 6
+
+      params =  {
+          limit: limit > 0 ? limit : 25,
+          order: "#{@sort_desc ? '-' : ''}#{@sort_param}",
+          meta: {includes: 'ip_address'}
+      }
+
+      FILTERS.each do |f|
+        next unless @opts[f]
+
+        params[f] = @opts[f]
+      end
+
+      @data = @api.ip_traffic_monitor.list(params)
+    end
+
+    def render(t, refresh)
+      if refresh
+        @data = nil
+        @header = nil
+      end
+
+      setpos(0, 0)
+      addstr("#{File.basename($0)} ip_traffic top - #{t.strftime('%H:%M:%S')}, ")
+      addstr("next update at #{(t + REFRESH_RATE).strftime('%H:%M:%S')}")
+
+      attron(color_pair(1))
+      setpos(2, 0)
+      header
+      attroff(color_pair(1))
+
+      i = 3
+      
+      fetch.each do |data|
+        setpos(i, 0)
+        print_row(data)
+        
+        i += 1
+
+        break if i >= (lines - 5)
+      end
+
+      stats
+      refresh
+    end
+
+    def header
+      unless @header
+        fmt = (['%-30s', '%6s'] + @columns.map { |c| "%#{c[:width]}s" }).join(' ')
+
+        @header = sprintf(
+            fmt,
+            'IP Address',
+            'VPS',
+            *@columns.map { |c| c[:title] },
+        )
+
+        @header << (' ' * (cols - @header.size)) << "\n"
+      end
+      
+      addstr(@header)
+    end
+
+    def print_row(data)
+      addstr(sprintf('%-30s %6s', data.ip_address.addr, data.ip_address.vps_id))
+
+      @columns.each do |c|
+        p = c[:name]
+
+        attron(A_BOLD) if p == @sort_param
+        addstr(sprintf(" %#{c[:width]}s", unitize(data.send(p), data.delta)))
+        attroff(A_BOLD) if p == @sort_param
+      end
+    end
+
+    def stats
+      fields = %i(packets bytes public_bytes private_bytes)
+      stats = {}
+      delta_sum = 0
+
+      fields.each do |f|
+        stats[f] = 0
+        
+        %i(in out).each do |dir|
+          stats[:"#{f}_#{dir}"] = 0
+        end
+      end
+
+      fetch.each do |data|
+        delta_sum += data.delta
+
+        fields.each do |f|
+          stats[f] += data.send(f)
+          
+          %i(in out).each do |dir|
+            stats[:"#{f}_#{dir}"] += data.send("#{f}_#{dir}")
+          end
+        end
+      end
+
+      avg_delta = delta_sum.to_f / fetch.count
+
+      setpos(lines-5, 0)
+      addstr('─' * cols)
+
+      fmt = '%10s %10s %10s %14s %14s'
+      unit = @opts[:unit].to_s.capitalize
+
+      setpos(lines-4, 0)
+      addstr(sprintf(
+          fmt,
+          '',
+          'Packets/s',
+          "#{unit}/s",
+          "Public#{unit}/s",
+          "Private#{unit}/s"
+      ))
+
+      setpos(lines-3, 0)
+      addstr(sprintf(fmt, 'In', *fields.map { |f| unitize(stats[:"#{f}_in"], avg_delta) }))
+      
+      setpos(lines-2, 0)
+      addstr(sprintf(fmt, 'Out', *fields.map { |f| unitize(stats[:"#{f}_out"], avg_delta) }))
+      
+      setpos(lines-1, 0)
+      attron(A_BOLD)
+      addstr(sprintf(fmt, 'Total', *fields.map { |f| unitize(stats[:"#{f}_in"] + stats[:"#{f}_out"], avg_delta) }))
+      attroff(A_BOLD)
+    end
+
+    def unitize(n, delta)
+      if @opts[:unit] == :bytes
+        per_s = n / delta.to_f
+      else
+        per_s = n * 8 / delta.to_f
+      end
+
+      bits = 39
+      units = %i(T G M K)
+
+      units.each do |u|
+        threshold = 2 << bits
+
+        return "#{(per_s / threshold).round(2)}#{u}" if per_s >= threshold
+
+        bits -= 10
+      end
+
+      per_s.round(2).to_s
+    end
+
+    def sort_next(n)
+      cur_i = @params.index(@sort_param)
+      next_i = cur_i + n
+      return unless @params[next_i]
+
+      @sort_param = @params[next_i]
+      @refresh = true
+    end
+
+    def sort_inverse
+      @sort_desc = !@sort_desc
+      @refresh = true
+    end
+
+    def ip_address_id(v)
+      return v if /^\d+$/ =~ v
+
+      ips = @api.ip_address.list(addr: v)
+      return false if ips.count < 1
+      ips.first.id
+
+    rescue HaveAPI::Client::ActionFailed
+      return false
+    end
+  end
+end

data/lib/vpsadmin/client/version.rb

@@ -1,5 +1,5 @@
 module VpsAdmin
   module Client
-    VERSION = '2.3.2'
+    VERSION = '2.5.0'
   end
 end

data/vpsadmin-client.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
 
-  spec.add_runtime_dependency 'haveapi-client', '~> 0.5.0'
+  spec.add_runtime_dependency 'haveapi-client', '~> 0.6.0'
   spec.add_runtime_dependency 'eventmachine', '~> 1.0.3'
   spec.add_runtime_dependency 'em-http-request', '~> 1.1.3'
   spec.add_runtime_dependency 'json', '~> 1.8.3'
   spec.add_runtime_dependency 'ruby-progressbar', '~> 1.7.5'
+  spec.add_runtime_dependency 'curses'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vpsadmin-client
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Jakub Skokan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.5
+- !ruby/object:Gem::Dependency
+  name: curses
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby API and CLI for vpsAdmin API
 email:
 - jakub.skokan@vpsfree.cz
@@ -128,6 +142,7 @@ files:
 - lib/vpsadmin/cli/commands/backup_dataset.rb
 - lib/vpsadmin/cli/commands/backup_vps.rb
 - lib/vpsadmin/cli/commands/base_download.rb
+- lib/vpsadmin/cli/commands/ip_traffic_top.rb
 - lib/vpsadmin/cli/commands/snapshot_download.rb
 - lib/vpsadmin/cli/commands/snapshot_send.rb
 - lib/vpsadmin/cli/commands/vps_migrate_many.rb
@@ -156,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby API and CLI for vpsAdmin API