kontena-cli 1.2.0.rc1 → 1.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1303357caabb58711e52c64fef54b12a9afc989
-  data.tar.gz: 8ce9069dcf068450f990cb23fddac6792a7956c6
+  metadata.gz: 916851395849968592a3880129bc0a0b0bbfc364
+  data.tar.gz: 0f69d57751a082bd8749a81c71a035725ab88287
 SHA512:
-  metadata.gz: 7df9880f68b96488d865427015884e99af34a56c9b4b0c52df1c4614e15e5e3686f386fa672ea1310c42801cb6e8b6d82a2387dca9439800f3b2e980e06ae01a
-  data.tar.gz: d1447a0ac64a834660c7b4857e50e533757247af83664d875644c812075b6622bdd53397e18c2fb1bb12cc4924319e17c9b9c788d46b6dbb6de1288d034e1399
+  metadata.gz: d880cca2f0f153718ec34096d9c4586753b90bf25c78b3b4e72cb07637234aee9afdb318d978585bebeefe86af6478f6dd5c900530b433ebce3aa4c9065d743e
+  data.tar.gz: fe3b778aa2fc733953c6b6e43bd5050e6aa2512bc11233df5be747af261e4d55ea55653b8b5f9150491cf9a0320c220d4da156eed3db5e6b00a7168b6ef3b63e

data/VERSION

@@ -1 +1 @@
-1.2.0.rc1
+1.2.0.rc2

data/kontena-cli.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "semantic", "~> 1.5"
   spec.add_runtime_dependency "safe_yaml", "~> 1.0"
   spec.add_runtime_dependency "liquid", "~> 4.0.0"
+  spec.add_runtime_dependency "tty-table", "~> 0.8.0"
 end

data/lib/kontena/cli/cloud/login_command.rb

@@ -48,6 +48,7 @@ module Kontena::Cli::Cloud
       reset_cloud_client
       display_logo
       display_login_info(only: :account)
+      true
     end
 
     def web_flow

data/lib/kontena/cli/common.rb

@@ -3,8 +3,8 @@ require 'pastel'
 require 'uri'
 require 'io/console'
 
-require_relative 'config'
-require_relative 'spinner'
+require 'kontena/cli/config'
+require 'kontena/cli/spinner'
 
 module Kontena
   module Cli

data/lib/kontena/cli/containers/exec_command.rb

@@ -1,5 +1,3 @@
-require_relative '../grid_options'
-
 module Kontena::Cli::Containers
   class ExecCommand < Kontena::Command
     include Kontena::Cli::Common

data/lib/kontena/cli/containers/list_command.rb

@@ -1,5 +1,3 @@
-require_relative '../grid_options'
-
 module Kontena::Cli::Containers
   class ListCommand < Kontena::Command
     include Kontena::Util

data/lib/kontena/cli/containers/logs_command.rb

@@ -1,4 +1,3 @@
-require_relative '../grid_options'
 require_relative '../helpers/log_helper'
 
 module Kontena::Cli::Containers

data/lib/kontena/cli/services/link_command.rb

@@ -1,4 +1,3 @@
-require_relative '../grid_options'
 require_relative 'services_helper'
 
 module Kontena::Cli::Services

data/lib/kontena/cli/services/unlink_command.rb

@@ -1,4 +1,3 @@
-require_relative '../grid_options'
 require_relative 'services_helper'
 
 module Kontena::Cli::Services

data/lib/kontena/cli/subcommand_loader.rb

@@ -1,3 +1,4 @@
+require 'kontena_cli'
 module Kontena::Cli
   class SubcommandLoader
     attr_reader :path

data/lib/kontena/cli/version_command.rb

@@ -1,4 +1,4 @@
-require_relative 'version'
+require 'kontena/cli/version'
 
 class Kontena::Cli::VersionCommand < Kontena::Command
   include Kontena::Cli::Common

data/lib/kontena/cli/volumes/list_command.rb

@@ -9,12 +9,13 @@ module Kontena::Cli::Volumes
     requires_current_master_token
 
     def execute
+      require 'tty-table'
+      
       volumes = client.get("volumes/#{current_grid}")['volumes']
-      columns = '%-25.25s %-25.25s %-25.25s %-25.25s'
-      puts columns % ['NAME', 'SCOPE', 'DRIVER', 'CREATED AT']
-      volumes.each do |volume|
-        puts columns % [volume['name'], volume['scope'], volume['driver'], volume['created_at']]
-      end
+      table = TTY::Table.new ['NAME', 'SCOPE', 'DRIVER', 'CREATED AT'], volumes.map { |volume|
+        [volume['name'], volume['scope'], volume['driver'], volume['created_at']]
+      }
+      puts table.render(:basic)
     end
 
   end

data/lib/kontena/client.rb

@@ -6,12 +6,9 @@ require 'socket'
 require 'openssl'
 require 'uri'
 require 'time'
-require_relative 'errors'
-require_relative 'cli/version'
-begin
-  require_relative 'cli/config'
-rescue LoadError
-end
+require 'kontena/errors'
+require 'kontena/cli/version'
+require 'kontena/cli/config'
 
 module Kontena
   class Client
@@ -61,7 +58,7 @@ module Kontena
         ssl_verify_peer: ignore_ssl_errors? ? false : true
       }
       if ENV["DEBUG"]
-        require_relative 'debug_instrumentor'
+        require 'kontena/debug_instrumentor'
         excon_opts[:instrumentor] = Kontena::DebugInstrumentor
       end
 

data/lib/kontena/command.rb

@@ -1,5 +1,9 @@
 require 'clamp'
-require_relative 'cli/subcommand_loader'
+require 'kontena/cli/subcommand_loader'
+require 'kontena/cli/common'
+require 'kontena/util'
+require 'kontena/cli/bytes_helper'
+require 'kontena/cli/grid_options'
 
 class Kontena::Command < Clamp::Command
 
@@ -225,4 +229,4 @@ class Kontena::Command < Clamp::Command
   end
 end
 
-require_relative 'callback'
+require 'kontena/callback'

data/lib/kontena/main_command.rb

@@ -1,10 +1,4 @@
-require 'clamp'
-require_relative 'cli/common'
-require_relative 'util'
-require_relative 'command'
-require_relative 'callback'
-require_relative 'cli/bytes_helper'
-require_relative 'cli/grid_options'
+require 'kontena/command'
 
 class Kontena::MainCommand < Kontena::Command
   include Kontena::Util

data/lib/kontena/scripts/completer.rb

@@ -86,11 +86,26 @@ class Helper
     []
   end
 
+  def subcommand_tree(cmd = nil, base = nil)
+    puts "#{cmd} ".strip
+    if base.has_subcommands?
+      base.recognised_subcommands.each do |sc|
+        subcommand_tree("#{cmd} #{sc.names.first}", sc.subcommand_class)
+      end
+    end
+  end
 end
 
 helper = Helper.new
 
 words = ARGV
+
+if words.first == '--subcommand-tree'
+  require 'kontena/main_command'
+  helper.subcommand_tree("kontena", Kontena::MainCommand)
+  exit 0
+end
+
 words.delete_at(0)
 
 completion = []

data/lib/kontena/stacks_client.rb

@@ -1,4 +1,4 @@
-require_relative 'client'
+require 'kontena/client'
 
 module Kontena
   class StacksClient < Client

data/lib/kontena_cli.rb

@@ -108,11 +108,11 @@ require 'ruby_dig'
 require 'shellwords'
 require "safe_yaml"
 SafeYAML::OPTIONS[:default_mode] = :safe
-require_relative 'kontena/cli/version'
-require_relative 'kontena/cli/common'
-require_relative 'kontena/command'
-require_relative 'kontena/client'
-require_relative 'kontena/stacks_cache'
-require_relative 'kontena/plugin_manager'
-require_relative 'kontena/main_command'
-require_relative 'kontena/cli/spinner'
+require 'kontena/cli/version'
+require 'kontena/cli/common'
+require 'kontena/command'
+require 'kontena/client'
+require 'kontena/stacks_cache'
+require 'kontena/plugin_manager'
+require 'kontena/main_command'
+require 'kontena/cli/spinner'

data/spec/kontena/cli/app/deploy_command_spec.rb

@@ -1,4 +1,3 @@
-require 'kontena/cli/grid_options'
 require "kontena/cli/apps/deploy_command"
 
 describe Kontena::Cli::Apps::DeployCommand do

data/spec/kontena/cli/app/logs_command_spec.rb

@@ -1,4 +1,3 @@
-require 'kontena/cli/grid_options'
 require "kontena/cli/apps/logs_command"
 
 describe Kontena::Cli::Apps::LogsCommand do

data/spec/kontena/cli/containers/list_command_spec.rb

@@ -1,4 +1,3 @@
-require 'kontena/cli/grid_options'
 require "kontena/cli/containers/list_command"
 
 describe Kontena::Cli::Containers::ListCommand do

data/spec/kontena/cli/containers/logs_command_spec.rb

@@ -1,4 +1,3 @@
-require 'kontena/cli/grid_options'
 require "kontena/cli/containers/logs_command"
 
 describe Kontena::Cli::Containers::LogsCommand do

data/spec/kontena/cli/services/secrets/link_command_spec.rb

@@ -1,4 +1,3 @@
-require "kontena/cli/grid_options"
 require "kontena/cli/services/secrets/link_command"
 
 describe Kontena::Cli::Services::Secrets::LinkCommand do

data/spec/kontena/cli/services/secrets/unlink_command_spec.rb

@@ -1,4 +1,3 @@
-require "kontena/cli/grid_options"
 require "kontena/cli/services/secrets/unlink_command"
 
 describe Kontena::Cli::Services::Secrets::UnlinkCommand do

data/spec/kontena/cli/services/update_command_spec.rb

@@ -1,4 +1,3 @@
-require "kontena/cli/grid_options"
 require "kontena/cli/services/update_command"
 
 describe Kontena::Cli::Services::UpdateCommand do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc1
+  version: 1.2.0.rc2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: tty-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 description: Command-line client for the Kontena container and microservices platform
 email:
 - info@kontena.io