nex_client 0.15.0 → 0.16.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cf9ee63f05c80c764ea3e0007a4933f40b62542
-  data.tar.gz: 1a0da520b96e8f0e29400bce6abc6c506091d63e
+  metadata.gz: 65ff74c01669c2d62ffd1ff2f86d968636376ff9
+  data.tar.gz: bc06abd22d617d961eadcaa2bb79c28a6244b5e2
 SHA512:
-  metadata.gz: 2e15e0f441bd717a8684f8a466223d79717feca4ac2cb4ad097f38c3b0db02382a64730ee2fa16d5110cb5e3c189fc420fba5a7ea598364af1ebf17e0b6389dc
-  data.tar.gz: 20f12b7be4e354f786939d0a639f717ad394ed197225429bb7d4e96fa7bf8ba137ee6d6a518922df5985ecf96258d9a7c89fd457121898226d3020abc173cc70
+  metadata.gz: 4f985e4a4926104ee1d5e3dbb7ca66a1b13c1ad3aeea7e9928a39766eb63ef3b44df13e763d1af8bf4150f1d126fa408960f5fc37a4561ee1ed624508ac640d7
+  data.tar.gz: 685bd46320361767df2d89cbc7faf30ec4e4eadd02cdcfa0f772fd0cc1bee48eed5270b156a973061516c4e9b98c4a4da2536129d331e899ff3b8c3494269f7f

data/lib/nex_client.rb

@@ -2,6 +2,7 @@
 require 'json_api_client'
 require 'active_support/all'
 require 'nex_client/version'
+require 'launchy'
 
 module NexClient
   autoload :Addon, 'nex_client/addon'

data/lib/nex_client/app.rb

@@ -23,5 +23,14 @@ module NexClient
 
     # GET <api_root>/apps/:id/logs
     custom_endpoint :logs, on: :member, request_method: :get
+
+    def preferred_url
+      domain = self.domains.first rescue NexClient::Domain.find('origin.name' => self.name).first
+      if domain
+        "#{domain.ssl_available ? 'https':'http'}://#{domain.cname}"
+      else
+        "#{self.ssl_enabled ? 'https' : 'http'}://#{self.url}"
+      end
+    end
   end
 end

data/lib/nex_client/cli.rb

@@ -294,9 +294,10 @@ module NexClient
         c.summary = 'Update apps settings'
         c.description = 'Update application settings'
         c.example 'change container size to 4', 'nex-cli apps:update myapp --size 4'
-        c.option '--size SIZE', Integer, 'change container size (default: 2, min: 1, max: 20). Container will have N shares of CPU and N*128M of memory. [restart required]'
-        c.option '--http-log-drain DRAIN_URL', String, 'specify the URL of a remote log drain. [restart required]'
         c.option '--desc DESCRIPTION', String, 'update the application description'
+        c.option '--http-log-drain DRAIN_URL', String, 'specify the URL of a remote log drain. [restart required]'
+        c.option '--image-tag IMAGE_TAG', String, 'update the docker image tag [restart required]'
+        c.option '--size SIZE', Integer, 'change container size (default: 2, min: 1, max: 20). Container will have N shares of CPU and N*128M of memory. [restart required]'
         c.option '--tags TAG_LIST', String, 'comma separated list of tags to use to describe the app'
         c.action do |args, options|
           NexClient::Commands::Apps.update(args,options)
@@ -323,6 +324,16 @@ module NexClient
         end
       end
 
+      command :'apps:open' do |c|
+        c.syntax = 'nex-cli apps:open APP_NAME'
+        c.summary = 'Open app url'
+        c.description = 'Open app in your browser'
+        c.example 'open app for myapp', 'nex-cli apps:open myapp'
+        c.action do |args, options|
+          NexClient::Commands::Apps.open(args,options)
+        end
+      end
+
       command :certs do |c|
         c.syntax = 'nex-cli certs [APP_OR_ORG_NAME] [options]'
         c.summary = 'Manage certs'
@@ -382,8 +393,18 @@ module NexClient
         end
       end
 
+      command :'cubes:download' do |c|
+        c.syntax = 'nex-cli cubes:download CUBE_ID REMOTE_SRC_PATH [DST_LOCAL_PATH]'
+        c.summary = 'Download a file from a container'
+        c.description = 'Download a file from a container'
+        c.example 'download file /tmp/foo.txt locally', 'nex-cli cubes:download mycube /tmp/foo.txt'
+        c.action do |args, options|
+          NexClient::Commands::CubeInstances.download(args,options)
+        end
+      end
+
       command :'cubes:events' do |c|
-        c.syntax = 'nex-cli cubes:events APP_NAME [options]'
+        c.syntax = 'nex-cli cubes:events ID [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'
@@ -395,6 +416,16 @@ module NexClient
         end
       end
 
+      command :'cubes:info' do |c|
+        c.syntax = 'nex-cli cubes:info ID [options]'
+        c.summary = 'Display information on a cube'
+        c.description = 'Display information about a given cube'
+        c.example 'display info for mycube', 'nex-cli cubes:info mycube'
+        c.action do |args, options|
+          NexClient::Commands::CubeInstances.info(args,options)
+        end
+      end
+
       command :'cubes:logs' do |c|
         c.syntax = 'nex-cli cubes:logs APP_NAME [options]'
         c.summary = 'Gather cube logs'
@@ -447,6 +478,17 @@ module NexClient
         end
       end
 
+      command :'cubes:upload' do |c|
+        c.syntax = 'nex-cli cubes:upload CUBE_ID LOCAL_SRC_PATH [DEST_PATH]'
+        c.summary = 'Upload a file to a container'
+        c.description = 'Upload a file to a container. If no DEST_PATH is specified then file will be created in /tmp.'
+        c.example 'upload file foo.txt to remote /tmp directory', 'nex-cli cubes:upload mycube ./foo.txt'
+        c.example 'upload file foo.txt to remote data directory', 'nex-cli cubes:upload mycube ./foo.txt /data/'
+        c.action do |args, options|
+          NexClient::Commands::CubeInstances.upload(args,options)
+        end
+      end
+
       command :cube_templates do |c|
         c.syntax = 'nex-cli cube_templates [options]'
         c.summary = 'Manage cube_templates [platform admin][legacy]'
@@ -523,6 +565,27 @@ module NexClient
         end
       end
 
+      command :'racks:download' do |c|
+        c.syntax = 'nex-cli racks:download IP_ADDRESS REMOTE_SRC_PATH [DST_LOCAL_PATH]'
+        c.summary = 'Download a file from a rack'
+        c.description = 'Download a file from a rack'
+        c.example 'download file /tmp/foo.txt locally', 'nex-cli racks:download 10.0.1.1 /tmp/foo.txt'
+        c.action do |args, options|
+          NexClient::Commands::Racks.download(args,options)
+        end
+      end
+
+      command :'racks:upload' do |c|
+        c.syntax = 'nex-cli racks:upload IP_ADDRESS LOCAL_SRC_PATH [DEST_PATH]'
+        c.summary = 'Upload a file to a rack'
+        c.description = 'Upload a file to a rack. If no DEST_PATH is specified then file will be created in /tmp.'
+        c.example 'upload file foo.txt to remote /tmp directory', 'nex-cli racks:upload 10.0.1.1 foo.txt'
+        c.example 'upload file foo.txt to remote data directory', 'nex-cli racks:upload 10.0.1.1 foo.txt /data/'
+        c.action do |args, options|
+          NexClient::Commands::Racks.upload(args,options)
+        end
+      end
+
       command :'racks:ssh' do |c|
         c.syntax = 'nex-cli racks:ssh IP_ADDRESS [options]'
         c.summary = 'SSH to racks [platform admin]'

data/lib/nex_client/commands/addons.rb

@@ -8,9 +8,6 @@ module NexClient
       ADDONS_TITLE = "Addons".colorize(:red)
       ADDONS_HEADERS = ['name','status','service','size','nodes','app'].map(&:upcase)
 
-      VARS_TITLE = "Environment Variables".colorize(:blue)
-      VARS_HEADERS = ['key','value'].map(&:upcase)
-
       OPTS_TITLE = "Options".colorize(:blue)
       OPTS_HEADERS = ['key','value'].map(&:upcase)
 
@@ -223,16 +220,6 @@ module NexClient
         puts "\n"
       end
 
-      def self.display_vars(list)
-        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]) }
-          end
-        end
-        puts table
-        puts "\n"
-      end
-
       def self.display_options(list)
         table = Terminal::Table.new title: OPTS_TITLE, headings: OPTS_HEADERS do |t|
           [list].flatten.compact.each do |e|

data/lib/nex_client/commands/apps.rb

@@ -10,9 +10,6 @@ module NexClient
       APPS_TITLE = "App Details".colorize(:green)
       APPS_HEADERS = ['name','status','image','ssl','storage','preferred region','size','nodes','owner','description','tags'].map(&:upcase)
 
-      VARS_TITLE = "Environment Variables".colorize(:blue)
-      VARS_HEADERS = ['key','value'].map(&:upcase)
-
       OPTS_TITLE = "Options".colorize(:blue)
       OPTS_HEADERS = ['key','value'].map(&:upcase)
 
@@ -81,6 +78,20 @@ module NexClient
         CubeInstances.display_cubes(e.cube_instances)
       end
 
+      # Open application in Browser
+      def self.open(args,opts)
+        name = args.first
+        app = NexClient::App.includes(:domains).find(name: name).first
+        # Display error
+        unless app
+          error("Error! Could not find app: #{name}")
+          return false
+        end
+        url = app.preferred_url
+        success "Opening #{url}"
+        Launchy.open(url)
+      end
+
       # Retrieve application logs from all containers
       def self.logs(args,opts)
         name = args.first
@@ -187,6 +198,7 @@ module NexClient
         attrs[:container_size] = opts.size if opts.size.present?
         attrs[:description] = opts.desc if opts.desc.present?
         attrs[:tag_list] = opts.tags if opts.tags.present?
+        attrs[:image_tag] = opts.image_tag if opts.image_tag.present?
 
         # Option: HTTP Log Drain
         if opts.http_log_drain.present?
@@ -400,27 +412,6 @@ module NexClient
         puts "\n"
       end
 
-      def self.display_raw_vars(list)
-        table = [list].flatten.compact.map do |e|
-          e.sort_by { |k, v| k }.map { |k,v| "#{k}=#{v}" }
-        end.flatten
-        puts table
-        puts "\n"
-      end
-
-      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 do |k,v|
-              val = truncate ? v.to_s.truncate(100) : v
-              t.add_row([k,val])
-            end
-          end
-        end
-        puts table
-        puts "\n"
-      end
-
       def self.display_options(list)
         table = Terminal::Table.new title: OPTS_TITLE, headings: OPTS_HEADERS do |t|
           [list].flatten.compact.each do |e|
@@ -441,14 +432,13 @@ module NexClient
         puts "\n"
       end
 
-
       def self.format_record(record)
         owner = self.format_owner(record)
         node_count = self.format_node_count(record)
         [
           record.name,
           record.status,
-          record.image,
+          [record.image,record.image_tag].compact.join(':'),
           record.ssl_enabled,
           record.persistent_storage,
           record.preferred_region,

data/lib/nex_client/commands/cube_instances.rb

@@ -31,6 +31,14 @@ module NexClient
         end
       end
 
+      def self.info(args,opts)
+        id = args.first
+        e = NexClient::CubeInstance.includes(:cluster).find(uuid: id).first
+
+        # Display cube information
+        self.display_cubes(e)
+      end
+
       # Retrieve application logs from all containers
       def self.logs(args,opts)
         name = args.first
@@ -84,6 +92,98 @@ module NexClient
         perform_ssh_cmd(e.ssh_cmd_template)
       end
 
+      # Download a file from a container
+      def self.download(args,opts)
+        id = args.first
+        remote_path = args[1]
+        local_path = args[2] || './'
+        e = NexClient::CubeInstance.includes(:compute_rack).find(uuid: id).first
+
+        # Display error
+        unless e
+          error("Error! Could not find cube: #{id}")
+          return false
+        end
+
+        # Get rack and file details
+        rack = e.compute_rack
+        filename = File.basename(remote_path)
+
+        # Copy and download file
+        with_cert_identity do |username,pv_key_path|
+          cmds = []
+          tmp_folder = "/home/#{username}/tmp"
+          tmp_path = "#{tmp_folder}/#{filename}"
+          ssh_cmd = format_cmd(rack.ssh_cmd_template, username: username, certfile: pv_key_path)
+
+          # Format tmp folder creation command
+          cmds << "#{ssh_cmd} mkdir -p #{tmp_folder}"
+
+          # Format container copy command
+          cmds << "#{ssh_cmd} sudo docker cp #{e.container}:#{remote_path} #{tmp_folder}/"
+
+          # Format server copy command
+          cmds << format_cmd(rack.scp_cmd_template,
+            username: username,
+            certfile: pv_key_path,
+            remote_path: tmp_path,
+            dst_local_file: local_path
+          )
+
+          # Cleanup
+          cmds << "#{ssh_cmd} rm -f #{tmp_path}"
+
+          # Execute commands
+          cmds.each { |cmd| system(cmd) }
+        end
+      end
+
+      # Upload a file to the container
+      def self.upload(args,opts)
+        id = args.first
+        local_path = args[1]
+        remote_path = args[2] || "/tmp/"
+        e = NexClient::CubeInstance.includes(:compute_rack).find(uuid: id).first
+
+        # Display error
+        unless e
+          error("Error! Could not find cube: #{id}")
+          return false
+        end
+
+        # Get rack and file details
+        rack = e.compute_rack
+        filename = File.basename(local_path)
+
+        # Upload and copy file
+        with_cert_identity do |username,pv_key_path|
+          cmds = []
+          tmp_folder = "/home/#{username}/tmp"
+          tmp_path = "#{tmp_folder}/#{filename}"
+          ssh_cmd = format_cmd(rack.ssh_cmd_template, username: username, certfile: pv_key_path)
+
+          # Format tmp folder creation command
+          cmds << "#{ssh_cmd} mkdir -p #{tmp_folder}"
+
+          # Format server copy command
+          cmds << format_cmd(rack.scp_cmd_template,
+            username: username,
+            certfile: pv_key_path,
+            src_local_file: local_path,
+            remote_path: tmp_path
+          )
+
+          # Format container copy command
+          cmds << "#{ssh_cmd} sudo docker cp #{tmp_path} #{e.container}:#{remote_path}"
+
+          # Cleanup
+          cmds << "#{ssh_cmd} rm -f #{tmp_path}"
+
+          # Execute commands
+          cmds.each { |cmd| system(cmd) }
+        end
+      end
+
       def self.display_cubes(list)
         table = Terminal::Table.new title: CUBES_TITLE, headings: CUBES_HEADERS do |t|
           [list].flatten.compact.each do |e|

data/lib/nex_client/commands/helpers.rb

@@ -4,6 +4,8 @@ module NexClient
   module Commands
     module Helpers
       LOG_COLORS = [:cyan,:green,:red,:yellow,:magenta]
+      VARS_TITLE = "Environment Variables".colorize(:blue)
+      VARS_HEADERS = ['key','value'].map(&:upcase)
 
       def display_record_errors(record)
         record.errors.messages.each do |k,v|
@@ -52,19 +54,27 @@ module NexClient
 
       # Display a list of events
       def display_events(events)
+        # Content
         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(" | ")
+          username = e&.username || 'system'
+          session_id = e&.session_id || '-'
+          puts [
+            e.created_at,
+            e.event.ljust(12,' '),
+            username.ljust(15,' '),
+            session_id.ljust(6,' '),
+            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)
+      def with_cert_identity
         # Fetch user
         me = NexClient::Me.find.first
         if me.api_only
-          error("Error! Cannot SSH with an api-only user")
+          error('Error! Cannot SSH with an api-only user')
           return false
         end
 
@@ -77,17 +87,43 @@ module NexClient
         pv_key_file.write(pv_key)
         pv_key_file.close
 
-        # Format command
-        ssh_cmd = ssh_cmd_template.gsub("{{certfile}}",pv_key_file.path).gsub("{{username}}",username)
-
-        # Launch SSH session
         begin
-          system(ssh_cmd)
+          yield(username,pv_key_file.path)
         ensure
           pv_key_file.unlink # delete tmp file
         end
       end
 
+      def format_cmd(cmd,values = {})
+        formatted = cmd
+
+        # Replace declared values
+        values.each do |k,v|
+          formatted = formatted.gsub("{{#{k}}}",v)
+        end
+
+        # Remove remaining template values
+        formatted.gsub(/{{[^{}]+}}/,'')
+      end
+
+      # Perform an SSH command based on a template
+      # Fetch current user key and username
+      def perform_ssh_cmd(ssh_cmd_template, exec_cmd = nil)
+        unless ssh_cmd_template
+          error('Error! Cannot perform SSH. Command Template was empty. Are you sure the app is running ?')
+          return false
+        end
+
+        with_cert_identity do |username,pv_key_path|
+          # Format command
+          ssh_cmd = format_cmd(ssh_cmd_template, username: username, certfile: pv_key_path)
+          ssh_cmd += " #{exec_cmd}" if exec_cmd
+
+          # Run command
+          system(ssh_cmd)
+        end
+      end
+
       # Parse plain or yaml file
       def vars_from_file(file,prefix = nil,&block)
         # YAML file
@@ -122,6 +158,27 @@ module NexClient
           yield(key,val)
         end
       end
+
+      def display_raw_vars(list)
+        table = [list].flatten.compact.map do |e|
+          e.sort_by { |k, v| k }.map { |k,v| "#{k}=#{v}" }
+        end.flatten
+        puts table
+        puts "\n"
+      end
+
+      def 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 do |k,v|
+              val = truncate ? v.to_s.truncate(100) : v
+              t.add_row([k,val])
+            end
+          end
+        end
+        puts table
+        puts "\n"
+      end
     end
   end
 end

data/lib/nex_client/commands/racks.rb

@@ -83,16 +83,7 @@ module NexClient
       def self.ssh(args,opts)
         # Find server
         id = args.first
-        rack = nil
-        [
-          NexClient::ComputeRack,
-          NexClient::GatewayRack,
-          NexClient::RoutingRack,
-          NexClient::StorageRack
-        ].each do |server_type|
-          rack ||= server_type.where(private_ip_address: id).first ||
-            server_type.where(ip_address: id).first
-        end
+        rack = find_rack_by_ip(id)
 
         # Display error
         unless rack
@@ -104,6 +95,80 @@ module NexClient
         perform_ssh_cmd(rack.ssh_cmd_template)
       end
 
+      # Download a file from a container
+      def self.download(args,opts)
+        id = args.first
+        remote_path = args[1]
+        local_path = args[2] || './'
+        rack = find_rack_by_ip(id)
+
+        # Display error
+        unless rack
+          error("Error! Could not find rack: #{id}")
+          return false
+        end
+
+        # Download file
+        with_cert_identity do |username,pv_key_path|
+          # Format server copy command
+          cmd = format_cmd(rack.scp_cmd_template,
+            username: username,
+            certfile: pv_key_path,
+            remote_path: remote_path,
+            dst_local_file: local_path
+          )
+
+          # Execute commands
+          system(cmd)
+        end
+      end
+
+      # Upload a file to the container
+      def self.upload(args,opts)
+        id = args.first
+        local_path = args[1]
+        remote_path = args[2] || "/tmp/"
+
+        # Find server
+        rack = find_rack_by_ip(id)
+
+        # Display error
+        unless rack
+          error("Error! Could not find rack: #{id}")
+          return false
+        end
+
+        # Upload file
+        with_cert_identity do |username,pv_key_path|
+          # Format server copy command
+          cmd = format_cmd(rack.scp_cmd_template,
+            username: username,
+            certfile: pv_key_path,
+            src_local_file: local_path,
+            remote_path: remote_path
+          )
+
+          # Execute command
+          system(cmd)
+        end
+      end
+
+      def self.find_rack_by_ip(ip_address)
+        rack = nil
+
+        [
+          NexClient::ComputeRack,
+          NexClient::GatewayRack,
+          NexClient::RoutingRack,
+          NexClient::StorageRack
+        ].each do |server_type|
+          rack ||= server_type.where(private_ip_address: ip_address).first ||
+            server_type.where(ip_address: ip_address).first
+        end
+
+        return rack
+      end
+
       def self.display_compute_racks(list)
         table = Terminal::Table.new title: COMPUTE_RACKS_TITLE, headings: RACKS_HEADERS do |t|
           [list].flatten.compact.each do |e|

data/lib/nex_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nex_client
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0.pre1
 platform: ruby
 authors:
 - Arnaud Lachaume
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -167,12 +181,12 @@ 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
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Maestrano Nex!™ Client