kontena-cli 0.15.5 → 0.16.0.pre1

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class CreateCommand < Clamp::Command
+  class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class DeleteCommand < Clamp::Command
+  class DeleteCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class DeployCommand < Clamp::Command
+  class DeployCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

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

@@ -4,7 +4,7 @@ module Kontena::Cli::Services
   require_relative 'envs/list_command'
   require_relative 'envs/remove_command'
 
-  class EnvCommand < Clamp::Command
+  class EnvCommand < Kontena::Command
     subcommand ["list", "ls"], "List service environment variables", Envs::ListCommand
     subcommand "add", "Add environment variable", Envs::AddCommand
     subcommand ["remove", "rm"], "Remove environment variable", Envs::RemoveCommand

data/lib/kontena/cli/services/envs/add_command.rb

@@ -1,7 +1,7 @@
 require_relative '../services_helper'
 
 module Kontena::Cli::Services::Envs
-  class AddCommand < Clamp::Command
+  class AddCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Services::ServicesHelper

data/lib/kontena/cli/services/envs/list_command.rb

@@ -1,7 +1,7 @@
 require_relative '../services_helper'
 
 module Kontena::Cli::Services::Envs
-  class ListCommand < Clamp::Command
+  class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Services::ServicesHelper

data/lib/kontena/cli/services/envs/remove_command.rb

@@ -1,7 +1,7 @@
 require_relative '../services_helper'
 
 module Kontena::Cli::Services::Envs
-  class RemoveCommand < Clamp::Command
+  class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Services::ServicesHelper

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

@@ -2,7 +2,7 @@ require_relative '../grid_options'
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class LinkCommand < Clamp::Command
+  class LinkCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class ListCommand < Clamp::Command
+  class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

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

@@ -2,7 +2,7 @@ require_relative 'services_helper'
 require_relative '../helpers/log_helper'
 
 module Kontena::Cli::Services
-  class LogsCommand < Clamp::Command
+  class LogsCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Helpers::LogHelper

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class MonitorCommand < Clamp::Command
+  class MonitorCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class RemoveCommand < Clamp::Command
+  class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
     include ServicesHelper
 

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class RestartCommand < Clamp::Command
+  class RestartCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class ScaleCommand < Clamp::Command
+  class ScaleCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

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

@@ -3,7 +3,7 @@ module Kontena::Cli::Services
   require_relative 'secrets/link_command'
   require_relative 'secrets/unlink_command'
 
-  class SecretCommand < Clamp::Command
+  class SecretCommand < Kontena::Command
     subcommand "link", "Link secret from Vault", Secrets::LinkCommand
     subcommand "unlink", "Unlink secret from Vault", Secrets::UnlinkCommand
   end

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

@@ -1,7 +1,7 @@
 require_relative '../services_helper'
 
 module Kontena::Cli::Services::Secrets
-  class LinkCommand < Clamp::Command
+  class LinkCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Services::ServicesHelper

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

@@ -1,7 +1,7 @@
 require_relative '../services_helper'
 
 module Kontena::Cli::Services::Secrets
-  class UnlinkCommand < Clamp::Command
+  class UnlinkCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Services::ServicesHelper

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

@@ -1,6 +1,5 @@
 require 'kontena/client'
 require_relative '../common'
-require 'shell-spinner'
 
 module Kontena
   module Cli
@@ -97,7 +96,11 @@ module Kontena
           if service['env'].to_a.size > 0
             puts "  env: "
             service['env'].to_a.each do |e|
-              puts "    - #{e}"
+              if e.length > 50
+                puts "    - #{e[0..50]}..."
+              else
+                puts "    - #{e}"
+              end
             end
           end
 
@@ -215,7 +218,7 @@ module Kontena
         # @param [String] token
         # @param [String] name
         def wait_for_deploy_to_finish(token, name)
-          ShellSpinner " " do
+          spinner " " do
             sleep 1 # wait for master to process deploy request and change state to 'deploying'
             until client(token).get("services/#{name}")['state'] != 'deploying' do
               sleep 1

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class ShowCommand < Clamp::Command
+  class ShowCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class StartCommand < Clamp::Command
+  class StartCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class StatsCommand < Clamp::Command
+  class StatsCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class StopCommand < Clamp::Command
+  class StopCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

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

@@ -2,7 +2,7 @@ require_relative '../grid_options'
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class UnlinkCommand < Clamp::Command
+  class UnlinkCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class UpdateCommand < Clamp::Command
+  class UpdateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper

data/lib/kontena/cli/spinner.rb

@@ -0,0 +1,122 @@
+module Kontena
+  module Cli
+    class Spinner
+      
+      CHARS = ['\\', '|', '/', '-']
+      CHARS_LENGTH = CHARS.length
+
+      def self.spin(msg, &block)
+        unless $stdout.tty?
+          Kernel.puts " [....] #{msg}"
+          result = nil
+          status = nil
+          begin
+            result = yield
+          rescue SystemExit => ex
+            status = ex.status
+            if status == 0
+              Kernel.puts " [done] #{msg}"
+            else
+              Kernel.puts " [fail] #{msg}"
+            end
+          rescue Exception => ex
+            Kernel.puts " [fail] #{msg}"
+            if ENV["DEBUG"]
+              Kernel.puts "#{ex} #{ex.message}\n#{ex.backtrace.join("\n")}"
+            end
+            raise ex
+          end
+          exit(status) if status
+          Kernel.puts " [done] #{msg}"
+          return result
+        end
+
+        Thread.main['spinners'] ||= []
+        unless Thread.main['spinners'].empty?
+          Thread.main['spinners'].each do |thread|
+            thread['pause'] = true
+          end
+          Kernel.puts "\r [#{'....'.colorize(:yellow)}] #{Thread.main['spinners'].last['msg']}"
+        end
+
+        Thread.main['spinner_msgs'] = []
+        spin_thread = Thread.new do
+          Thread.current['msg'] = msg
+          message = "    *   #{msg} .. "
+          Kernel.print(message + CHARS.first)
+          curr_index = 0
+          loop do
+            if Thread.current['pause']
+              sleep 0.1 until !Thread.current['pause']
+              Kernel.print "\r#{message}#{CHARS[curr_index]}"
+            else
+              if Thread.main['spinner_msgs']
+                Kernel.print "\r#{' ' * (message.gsub(/\e.+?m/, '').length + 1)}\r"
+                while Thread.main['spinner_msgs'].size > 0
+                  Kernel.puts "\r#{Thread.main['spinner_msgs'].shift}"
+                end
+                Kernel.print "\r#{message + CHARS[curr_index]}"
+              end
+              sleep 0.1
+              Kernel.print "\b#{CHARS[curr_index]}"
+              curr_index = curr_index == CHARS_LENGTH - 1 ? 0 : curr_index + 1
+            end
+          end
+        end
+
+        Thread.main['spinners'] << spin_thread
+
+        status = nil
+        result = nil
+        begin
+          result = yield
+          spin_thread.kill
+          Kernel.puts "\r [" + "done".colorize(:green) + "] #{msg}     "
+        rescue SystemExit => ex
+          spin_thread.kill
+          if ex.status == 0
+            Kernel.puts "\r [" + "done".colorize(:green)   + "] #{msg}     "
+          else
+            Kernel.puts "\r [" + "fail".colorize(:red)   + "] #{msg}     "
+          end
+          status = ex.status
+        rescue Exception => ex
+          spin_thread.kill
+          Kernel.puts "\r [" + "fail".colorize(:red)   + "] #{msg}     "
+          if ENV["DEBUG"]
+            puts "#{ex} #{ex.message}\n#{ex.backtrace.join("\n")}"
+          end
+          raise ex
+        end
+        exit(status) if status
+        Thread.main['spinners'].pop
+        unless Thread.main['spinners'].empty?
+          Thread.main['spinners'].last['pause'] = false
+        end
+        result
+      end
+    end
+
+    module ShellSpinner
+      def spinner(msg = "", &block)
+        Kontena::Cli::Spinner.spin(msg, &block)
+      end
+
+      def puts(*msgs)
+        if Thread.main['spinners'] && !Thread.main['spinners'].empty?
+          msgs.each { |msg| Thread.main['spinner_msgs'] << msg }
+        else
+          super(*msgs)
+        end
+      end
+
+      def print(*msgs)
+        if Thread.main['spinners'] && !Thread.main['spinners'].empty?
+          Thread.main['spinner_msgs'] << msgs.join
+        else
+          super(*msgs)
+        end
+      end
+    end
+  end
+end

data/lib/kontena/cli/stack_command.rb

@@ -5,7 +5,7 @@ require_relative 'stacks/update_command'
 require_relative 'stacks/list_command'
 require_relative 'stacks/show_command'
 
-class Kontena::Cli::StackCommand < Clamp::Command
+class Kontena::Cli::StackCommand < Kontena::Command
 
   subcommand "create", "Create stack", Kontena::Cli::Stacks::CreateCommand
   subcommand ["ls", "list"], "List stacks", Kontena::Cli::Stacks::ListCommand

data/lib/kontena/cli/stacks/create_command.rb

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Stacks
-  class CreateCommand < Clamp::Command
+  class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

data/lib/kontena/cli/stacks/deploy_command.rb

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Stacks
-  class DeployCommand < Clamp::Command
+  class DeployCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Stacks
-  class ListCommand < Clamp::Command
+  class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

data/lib/kontena/cli/stacks/remove_command.rb

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Stacks
-  class RemoveCommand < Clamp::Command
+  class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

data/lib/kontena/cli/stacks/show_command.rb

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Stacks
-  class ShowCommand < Clamp::Command
+  class ShowCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

data/lib/kontena/cli/stacks/update_command.rb

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Stacks
-  class UpdateCommand < Clamp::Command
+  class UpdateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common