nex_client 0.14.0 → 0.15.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b85a0da3bcdc2e97be481dea0a1d82c6734cfe55
-  data.tar.gz: 226353cfb77a81de88917aa5004bc599499afd2b
+  metadata.gz: e6596e2a8eccfe2e5d1a0054ecf642bca67d6d56
+  data.tar.gz: bbf86956bcc6faac34a728b6db4278de2d93b213
 SHA512:
-  metadata.gz: 0c97820ae8892d92b7dc605bf828998de377cb1b1dcf6c8f7e1c2ab0ddd6bc159d4d76821d58b74087e4b3e752909c18531b840303d8ec47896be036124853a7
-  data.tar.gz: 0b0164bbbb7683305afeb91f4db7f3a2c19bf33cace71c159d7a1f7c9d1fc9ead289d4be8826fa94793b48fa54c2373f372bab0485768782ef03b93aa743328d
+  metadata.gz: 5e868e2ddcd3176f509aacfd58902ca31273ba97c998603242fff6875eff33d234abb4f177e93aeeefe2f574035023631c42ab2aa7b71aaa6b0e7638a6545775
+  data.tar.gz: 079862bc6e1112454e209b589fdb4ae167e5658bd381656a8e2551d644a531b84ad83aab4ce4c4c2e3ddb7bc8f465423011d8f89a5de48c7ecf59b8702d003a7

data/README.md

@@ -24,9 +24,13 @@ gem update nex_client
 
 Configure your environment and get started with the tool
 ```bash
-# Set authentication and environment
-export NEX_API_KEY=my-nex-key
+# Setup environment
 export NEX_ENV=<development|uat|production> # optional - defaulting to 'uat' at the moment
+# OR
+export NEX_ENDPOINT=https://api.somenexhost.com
+
+# Set authentication
+export NEX_API_KEY=my-nex-key
 
 # Display all available commands
 nex-cli --help

data/lib/nex_client.rb

@@ -11,6 +11,7 @@ module NexClient
   autoload :CubeInstance, 'nex_client/cube_instance'
   autoload :CubeTemplate, 'nex_client/cube_template'
   autoload :Domain, 'nex_client/domain'
+  autoload :Event, 'nex_client/event'
   autoload :GatewayRack, 'nex_client/gateway_rack'
   autoload :Me, 'nex_client/me'
   autoload :Organization, 'nex_client/organization'

data/lib/nex_client/cli.rb

@@ -65,6 +65,19 @@ module NexClient
         end
       end
 
+      command :'addons:events' do |c|
+        c.syntax = 'nex-cli addons:events APP_NAME [options]'
+        c.summary = 'Gather system events'
+        c.description = 'Gather system events for a given addon'
+        c.example 'display events for myaddon', 'nex-cli addons:events myaddon'
+        c.example 'display 100 events for myaddon', 'nex-cli addons:events --tail 100 myaddon'
+        c.option '--tail NUMBER', String, 'number of events to retrieve (default: 50)'
+        c.option '--type TYPE', String, 'filter events on type (e.g. status, container)'
+        c.action do |args, options|
+          NexClient::Commands::Addons.events(args,options)
+        end
+      end
+
       command :'addons:info' do |c|
         c.syntax = 'nex-cli addons:info ADDON_NAME [options]'
         c.summary = 'Show information about an addon'
@@ -134,7 +147,7 @@ module NexClient
         c.option '--status <active|terminated>', String, 'list all apps in a given status'
         c.option '--ssl', 'list all apps with SSL enabled'
         c.option '--storage', 'list all apps with persistent storage'
-        c.option '--owner HANDLE', 'list all apps for the specified owner'
+        c.option '--owner HANDLE', 'list all apps for the specified owner. Use "@self" to display your apps including any organization you are part of'
         c.option '--image IMAGE', 'list the app with this image'
         c.option '--tags TAG_LIST', Array, 'comma separated list of tags to filter on'
         c.action do |args, options|
@@ -184,6 +197,19 @@ module NexClient
         end
       end
 
+      command :'apps:events' do |c|
+        c.syntax = 'nex-cli apps:events APP_NAME [options]'
+        c.summary = 'Gather system events'
+        c.description = 'Gather system events for a given app'
+        c.example 'display events for myapp', 'nex-cli apps:events myapp'
+        c.example 'display 100 events for myapp', 'nex-cli apps:events --tail 100 myapp'
+        c.option '--tail NUMBER', String, 'number of events to retrieve (default: 50)'
+        c.option '--type TYPE', String, 'filter events on type (e.g. status, container)'
+        c.action do |args, options|
+          NexClient::Commands::Apps.events(args,options)
+        end
+      end
+
       command :'apps:info' do |c|
         c.syntax = 'nex-cli apps:info APP_NAME [options]'
         c.summary = 'Show information about an app'
@@ -336,8 +362,8 @@ module NexClient
         c.syntax = 'nex-cli cubes [options]'
         c.summary = 'Manage cubes [platform admin]'
         c.description = 'List, create, manage, scale and delete cubes'
-        c.example 'list all running cubes', 'nex-cli cubes'
-        c.example 'list all running cubes for owner myorg', 'nex-cli cubes --owner myorg'
+        c.example 'list all cubes', 'nex-cli cubes'
+        c.example 'list all cubes for owner myorg', 'nex-cli cubes --owner myorg'
         c.example 'list all terminated cubes', 'nex-cli cubes --status terminated'
         c.example 'list all terminated cubes for owner myorg', 'nex-cli cubes --status terminated --owner myorg'
         c.example 'list cube xyz.domain.co', 'nex-cli cubes --name xyz.domain.co'
@@ -356,6 +382,31 @@ module NexClient
         end
       end
 
+      command :'cubes:events' do |c|
+        c.syntax = 'nex-cli cubes:events APP_NAME [options]'
+        c.summary = 'Gather system events'
+        c.description = 'Gather system events for a given cube'
+        c.example 'display events for mycube', 'nex-cli cubes:events mycube'
+        c.example 'display 100 events for mycube', 'nex-cli cubes:events --tail 100 mycube'
+        c.option '--tail NUMBER', String, 'number of events to retrieve (default: 50)'
+        c.option '--type TYPE', String, 'filter events on type (e.g. status, container)'
+        c.action do |args, options|
+          NexClient::Commands::CubeInstances.events(args,options)
+        end
+      end
+
+      command :'cubes:logs' do |c|
+        c.syntax = 'nex-cli cubes:logs APP_NAME [options]'
+        c.summary = 'Gather cube logs'
+        c.description = 'Gather container logs for a given cube'
+        c.example 'gather logs for mycube', 'nex-cli cubes:logs mycube'
+        c.example 'gather logs for mycube with a tail of 50', 'nex-cli cubes:logs --tail 50 mycube'
+        c.option '--tail NUMBER', String, 'number of lines to retrieve (default: 30)'
+        c.action do |args, options|
+          NexClient::Commands::CubeInstances.logs(args,options)
+        end
+      end
+
       command :'cubes:restart' do |c|
         c.syntax = 'nex-cli cubes:restart CUBE_ID'
         c.summary = 'Restart a cube'

data/lib/nex_client/commands/apps.rb

@@ -24,7 +24,7 @@ module NexClient
         filters[:status] = opts.status || ['active','restarting']
         filters[:ssl_enabled] = opts.ssl if opts.ssl.present?
         filters[:persistent_storage] = opts.storage if opts.storage.present?
-        filters[:'owner.handle'] = opts.owner || '@self'
+        filters[:'owner.handle'] = opts.owner if opts.owner.present?
         filters[:image] = opts.image if opts.image.present?
         filters[:tags] = opts.tags if opts.tags.present?
 
@@ -78,6 +78,7 @@ module NexClient
         Addons.display_addons(e.addons.select { |a| a.status == 'active'})
       end
 
+      # Retrieve application logs from all containers
       def self.logs(args,opts)
         name = args.first
         e = NexClient::App.find(name: name).first

data/lib/nex_client/commands/cube_instances.rb

@@ -5,11 +5,11 @@ module NexClient
       extend Helpers
 
       CUBES_TITLE = "Cube Instances".colorize(:blue)
-      CUBES_HEADERS = ['id','status','region','ssl','storage','SOA','ip','port','dns','cluster'].map(&:upcase)
+      CUBES_HEADERS = ['id','status','container','region','storage','ip','port','cluster'].map(&:upcase)
 
       def self.list(args,opts)
         filters = {}
-        filters[:status] = opts.status || 'running'
+        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?
@@ -34,6 +34,22 @@ module NexClient
         end
       end
 
+      # Retrieve application logs from all containers
+      def self.logs(args,opts)
+        name = args.first
+        e = NexClient::CubeInstance.find(uuid: name).first
+
+        # Display error
+        unless e
+          error("Error! Could not find cube: #{name}")
+          return false
+        end
+
+        # Retrieve logs and display them
+        logs = e.logs(tail: opts.tail).first
+        self.display_logs(logs.log_ret)
+      end
+
       def self.trigger_action(action,args,opts)
         id = args.first
         e = NexClient::CubeInstance.find(uuid: id).first
@@ -87,13 +103,11 @@ module NexClient
         [
           record.uuid,
           record.status,
+          record.container_status,
           record.region,
-          record.ssl_enabled,
           record.persistent_storage,
-          record.soa_enabled,
           record.ip_address || '-',
           record.port || '-',
-          dns,
           cluster
         ]
       end
@@ -106,6 +120,11 @@ module NexClient
         return '-' unless o = record.cluster
         "#{o.type.singularize}:#{o.name}"
       end
+
+      def self.display_logs(logs)
+        puts logs
+        puts "\n"
+      end
     end
   end
 end

data/lib/nex_client/commands/helpers.rb

@@ -31,6 +31,24 @@ module NexClient
         puts "\n"
       end
 
+      # Retrieve resource events
+      def events(args,opts)
+        filters = {}
+        filters[:'source.name'] = args.first
+        filters[:event] = opts.type if opts.type
+
+        events = NexClient::Event.paginate(per_page: opts.tail || 50).where(filters).order(created_at: :desc)
+        self.display_events(events.to_a)
+      end
+
+      # Display a list of events
+      def display_events(events)
+        events.sort_by { |e| e.id }.each do |e|
+          puts [e.created_at,e.event.ljust(12,' '),e.level.ljust(6,' '),e.message].join(" | ")
+        end
+        puts "\n"
+      end
+
       # Perform an SSH command based on a template
       # Fetch current user key and username
       def perform_ssh_cmd(ssh_cmd_template)

data/lib/nex_client/cube_instance.rb

@@ -9,13 +9,16 @@ module NexClient
     property :persistent_storage, type: :boolean
     property :port, type: :int
 
-    # PATCH <api_root>/apps/:id/restart
+    # GET <api_root>/cube_instances/:id/logs
+    custom_endpoint :logs, on: :member, request_method: :get
+
+    # PATCH <api_root>/cube_instances/:id/restart
     custom_endpoint :restart, on: :member, request_method: :patch
 
-    # PATCH <api_root>/apps/:id/start
+    # PATCH <api_root>/cube_instances/:id/start
     custom_endpoint :start, on: :member, request_method: :patch
 
-    # PATCH <api_root>/apps/:id/stop
+    # PATCH <api_root>/cube_instances/:id/stop
     custom_endpoint :stop, on: :member, request_method: :patch
   end
 end

data/lib/nex_client/event.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+module NexClient
+  class Event < BaseResource
+    property :created_at, type: :time
+    property :updated_at, type: :time
+  end
+end

data/lib/nex_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nex_client
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0.pre1
 platform: ruby
 authors:
 - Arnaud Lachaume
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -139,6 +139,7 @@ files:
 - lib/nex_client/cube_instance.rb
 - lib/nex_client/cube_template.rb
 - lib/nex_client/domain.rb
+- lib/nex_client/event.rb
 - lib/nex_client/gateway_rack.rb
 - lib/nex_client/me.rb
 - lib/nex_client/organization.rb
@@ -166,9 +167,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1