nex_client 0.15.0.pre1 → 0.15.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6596e2a8eccfe2e5d1a0054ecf642bca67d6d56
-  data.tar.gz: bbf86956bcc6faac34a728b6db4278de2d93b213
+  metadata.gz: 4623d879686e7a0ba5588bb81ff60fccb49166f0
+  data.tar.gz: 9ecb670afcc265e4ddbbbdef066e44616b42f47a
 SHA512:
-  metadata.gz: 5e868e2ddcd3176f509aacfd58902ca31273ba97c998603242fff6875eff33d234abb4f177e93aeeefe2f574035023631c42ab2aa7b71aaa6b0e7638a6545775
-  data.tar.gz: 079862bc6e1112454e209b589fdb4ae167e5658bd381656a8e2551d644a531b84ad83aab4ce4c4c2e3ddb7bc8f465423011d8f89a5de48c7ecf59b8702d003a7
+  metadata.gz: 57621a0f904473f7db5edb7cd9c41d345cc4eab5d18e3168e8395d75618f11bce68a5b60e36ab440b01ee0af5ce83e2512b70005fa45e0f3e65366aaf2e5b938
+  data.tar.gz: 634af28770112f3ae4e3cd19cca0ea36e2a02544b7c8d64cb3f8f0716459d7258d9f204ec9540bbec2089eccfb7b89810186288f532e1f35c47de33155217307

data/lib/nex_client/cli.rb

@@ -83,6 +83,7 @@ module NexClient
         c.summary = 'Show information about an addon'
         c.description = 'Show all details about an addon'
         c.example 'show details about myaddon', 'nex-cli addons:info myaddon'
+        c.option '--full-vars', 'do not truncate environment variables'
         c.action do |args, options|
           NexClient::Commands::Addons.info(args,options)
         end
@@ -215,6 +216,7 @@ module NexClient
         c.summary = 'Show information about an app'
         c.description = 'Show all details about an app'
         c.example 'show details about myapp', 'nex-cli apps:info myapp'
+        c.option '--full-vars', 'do not truncate environment variables'
         c.action do |args, options|
           NexClient::Commands::Apps.info(args,options)
         end
@@ -312,6 +314,7 @@ module NexClient
         c.example 'Add env variables to myapp from file and prefix all vars with foo (foo_myvar)', 'nex-cli apps:vars myapp --env-file ~/myenvfile --env-prefix foo'
         c.option '--add MYVAR=value,MYVAR2=value,...', Array, 'comma separated list of env variables'
         c.option '--delete MYVAR,MYVAR2,...', Array, 'comma separated list of env variables'
+        c.option '--full-vars', 'do not truncate environment variables'
         c.option '--env-file FILE', String, 'newline separated list of env variables (MYVAR=1) or YAML file. Note that YAML parsing is recursive.'
         c.option '--env-prefix PREFIX', String, 'prefix all variables contained in the env file with the specified prefix (PREFIX_MYVAR)'
         c.option '--raw', 'vars are returned in a environment file format (key=value)'
@@ -370,10 +373,7 @@ module NexClient
         c.example 'list cube xyz', 'nex-cli cubes --name xyz'
         c.option '--all', 'list all cubes (no filtering)'
         c.option '--status <provisioning|running|stopped|terminated>', String, 'list all cubes in a given status'
-        c.option '--ssl', 'list all cubes with SSL enabled'
         c.option '--storage', 'list all cubes with persistent storage'
-        c.option '--soa', 'list all apps with soa enabled [legacy]'
-        c.option '--dns DNS_NAME', 'list cube by dns (xyz.domain.com) or root dns (xyz)'
         c.option '--app APP_NAME', 'list all cubes attached to the specified app'
         c.option '--addon ADDON_NAME', 'list all cubes attached to the specified addon'
         c.option '--owner HANDLE', 'list all cubes for the specified owner'

data/lib/nex_client/commands/addons.rb

@@ -54,7 +54,7 @@ module NexClient
         self.display_addons(e)
 
         # Display all vars
-        self.display_vars(e.all_vars)
+        self.display_vars(e.all_vars,!opts.full_vars)
 
         # Display options
         self.display_options(e.opts) if e.respond_to?(:opts)

data/lib/nex_client/commands/apps.rb

@@ -60,7 +60,7 @@ module NexClient
         self.display_apps(e)
 
         # Display all vars
-        self.display_vars(e.all_vars)
+        self.display_vars(e.all_vars,!opts.full_vars)
 
         # Display options
         self.display_options(e.opts) if e.respond_to?(:opts)
@@ -344,7 +344,7 @@ module NexClient
         if opts.raw
           self.display_raw_vars(e.all_vars)
         else
-          self.display_vars(e.all_vars)
+          self.display_vars(e.all_vars,!opts.full_vars)
         end
       end
 
@@ -405,10 +405,13 @@ module NexClient
         puts "\n"
       end
 
-      def self.display_vars(list)
+      def self.display_vars(list,truncate = true)
         table = Terminal::Table.new title: VARS_TITLE, headings: VARS_HEADERS do |t|
           [list].flatten.compact.each do |e|
-            e.sort_by { |k, v| k }.each { |k,v| t.add_row([k,v]) }
+            e.sort_by { |k, v| k }.each do |k,v|
+              val = truncate ? v.to_s.truncate(100) : v
+              t.add_row([k,val])
+            end
           end
         end
         puts table

data/lib/nex_client/commands/cube_instances.rb

@@ -10,15 +10,12 @@ module NexClient
       def self.list(args,opts)
         filters = {}
         filters[:status] = opts.status if opts.status.present?
-        filters[:soa_enabled] = opts.soa if opts.soa.present?
-        filters[:ssl_enabled] = opts.ssl if opts.ssl.present?
         filters[:persistent_storage] = opts.storage if opts.storage.present?
 
         # All option
         filters = {} if opts.all
 
         # Identification options
-        filters[:dns] = opts.dns if opts.dns.present?
         filters[:'app.name'] = opts.app if opts.app.present?
         filters[:'addon.name'] = opts.addon if opts.addon.present?
 
@@ -98,12 +95,12 @@ module NexClient
       end
 
       def self.format_record(record)
-        dns = self.format_dns(record)
         cluster = self.format_cluster(record)
+        container_status = record.respond_to?(:container_status) ? record.container_status : '-'
         [
           record.uuid,
           record.status,
-          record.container_status,
+          container_status,
           record.region,
           record.persistent_storage,
           record.ip_address || '-',
@@ -112,10 +109,6 @@ module NexClient
         ]
       end
 
-      def self.format_dns(record)
-        record.dns || '-'
-      end
-
       def self.format_cluster(record)
         return '-' unless o = record.cluster
         "#{o.type.singularize}:#{o.name}"

data/lib/nex_client/commands/helpers.rb

@@ -36,14 +36,23 @@ module NexClient
         filters = {}
         filters[:'source.name'] = args.first
         filters[:event] = opts.type if opts.type
+        tail_size = (opts.tail || 50).to_i
+
+        events = NexClient::Event.where(filters).order(id: :desc)
+        list = events.to_a
+        while list.count < tail_size
+          events = events.pages.next
+          break unless events
+          list |= events.to_a
+        end
+        list = list.first(tail_size)
 
-        events = NexClient::Event.paginate(per_page: opts.tail || 50).where(filters).order(created_at: :desc)
-        self.display_events(events.to_a)
+        self.display_events(list.to_a)
       end
 
       # Display a list of events
       def display_events(events)
-        events.sort_by { |e| e.id }.each do |e|
+        events.sort_by { |e| e.id.to_i }.each do |e|
           puts [e.created_at,e.event.ljust(12,' '),e.level.ljust(6,' '),e.message].join(" | ")
         end
         puts "\n"

data/lib/nex_client/version.rb

@@ -1,3 +1,3 @@
 module NexClient
-  VERSION ||= '0.15.0.pre1'
+  VERSION ||= '0.15.0.pre2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nex_client
 version: !ruby/object:Gem::Version
-  version: 0.15.0.pre1
+  version: 0.15.0.pre2
 platform: ruby
 authors:
 - Arnaud Lachaume
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-05 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client