kontena-cli 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3373d4421b6f61fd8e141235ecc1c00d98ff9953
-  data.tar.gz: 577e0ebe31f0536ac54376be8154278651ee2caa
+  metadata.gz: 7509ba73a33bfc06a0e681f8d61a7ab3d7288284
+  data.tar.gz: 5f7bdc77590bebc819880d555f55d779188a634b
 SHA512:
-  metadata.gz: 10a7dff3ac50b99808ca0754e8de9a77740f2535801dc304574d2c25082e79c32a5503765c6c39f15f7b66ed9fa70b6026c851e7ac9bd78ef0d6f9ec4b9c4e50
-  data.tar.gz: 54af8670055cbeac319144712d3add58bd1a334b385d48cab3a35acab0f5b324f70eb98557589e0ebfbeeeefd04b95e6ec3366c6f07058595371e56e92e08ca1
+  metadata.gz: c1c92dabc02bdf30be79976ccfff1e2f1a1422d1e91676a882782f02f64f92892eb7b49f2d70d9dbc67d55f2cddd7eec3816db202e9d2e98e603cca4f3955cd6
+  data.tar.gz: ada1b9cd60a4b602b1e9ac6eda9773e99cd6ca8364a9d5f992b91a983d86e3603716b74efabbe4d13b9060ed34cf77bf8ef9ed894445b4756da89dd80b2fc7e3

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.8.0

data/bin/kontena

@@ -10,5 +10,67 @@ $:.unshift File.expand_path('../../lib', bin_file)
 
 STDOUT.sync = true
 
-require 'commander/import'
-require 'kontena/cli/commands'
+require 'clamp'
+require 'kontena/client'
+require 'kontena/cli/common'
+require 'kontena/cli/app_command'
+require 'kontena/cli/register_command'
+require 'kontena/cli/login_command'
+require 'kontena/cli/logout_command'
+require 'kontena/cli/whoami_command'
+require 'kontena/cli/verify_account_command'
+require 'kontena/cli/invite_command'
+require 'kontena/cli/forgot_password_command'
+require 'kontena/cli/container_command'
+require 'kontena/cli/grid_command'
+require 'kontena/cli/node_command'
+require 'kontena/cli/service_command'
+require 'kontena/cli/vpn_command'
+require 'kontena/cli/registry_command'
+require 'kontena/cli/external_registry_command'
+require 'kontena/cli/deploy_command'
+require 'kontena/cli/app_command'
+require 'kontena/cli/version_command'
+
+class MainCommand < Clamp::Command
+
+  subcommand "app", "Grid specific commands", Kontena::Cli::AppCommand
+  subcommand "grid", "Grid specific commands", Kontena::Cli::GridCommand
+  subcommand "app", "App specific commands", Kontena::Cli::AppCommand
+  subcommand "service", "Service specific commands", Kontena::Cli::ServiceCommand
+  subcommand "deploy", "Create and deploy multiple services from YAML file", Kontena::Cli::DeployCommand
+  subcommand "node", "Node specific commands", Kontena::Cli::NodeCommand
+  subcommand "vpn", "VPN specific commands", Kontena::Cli::VpnCommand
+  subcommand "registry", "Registry specific commands", Kontena::Cli::RegistryCommand
+  subcommand "container", "Container specific commands", Kontena::Cli::ContainerCommand
+  subcommand "external-registry", "External registry specific commands", Kontena::Cli::ExternalRegistryCommand
+  subcommand "register", "Register Kontena Account", Kontena::Cli::RegisterCommand
+  subcommand "login", "Login to Kontena Master", Kontena::Cli::LoginCommand
+  subcommand "logout", "Logout from Kontena Master", Kontena::Cli::LogoutCommand
+  subcommand "whoami", "Shows current logged in user", Kontena::Cli::WhoamiCommand
+  subcommand "verify-account", "Verify registered account", Kontena::Cli::VerifyAccountCommand
+  subcommand "invite", "Invite user to Kontena Master", Kontena::Cli::InviteCommand
+  subcommand "forgot-password", "Request password reset for Kontena account", Kontena::Cli::ForgotPasswordCommand
+  subcommand "version", "Show version", Kontena::Cli::VersionCommand
+
+  def execute
+  end
+end
+
+begin
+  MainCommand.run
+rescue Excon::Errors::SocketError => exc
+  if exc.message.include?('Unable to verify certificate')
+    puts "The server uses a certificate signed by an unknown authority.".colorize(:red)
+    puts "Protip: you can bypass the certificate check by setting #{'SSL_IGNORE_ERRORS=true'.colorize(:yellow)} env variable, but any data you send to the server could be intercepted by others."
+    exit(1)
+  else
+    abort(exc.message)
+  end
+rescue => exc
+  if ENV['DEBUG']
+    raise exc
+  else
+    abort(exc.message)
+  end
+end

data/kontena-cli.gemspec

@@ -20,7 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_runtime_dependency 'httpclient', '~> 2.3'
-  spec.add_runtime_dependency 'commander'
+  spec.add_runtime_dependency 'excon'
   spec.add_runtime_dependency 'colorize'
+  spec.add_runtime_dependency 'clamp'
+  spec.add_runtime_dependency 'highline'
+  spec.add_runtime_dependency 'shell-spinner'
 end

data/lib/kontena/cli/app_command.rb

@@ -0,0 +1,20 @@
+require_relative 'apps/init_command'
+require_relative 'apps/deploy_command'
+require_relative 'apps/start_command'
+require_relative 'apps/stop_command'
+require_relative 'apps/remove_command'
+require_relative 'apps/list_command'
+require_relative 'apps/logs_command'
+
+class Kontena::Cli::AppCommand < Clamp::Command
+
+  subcommand "init", "Init Kontena application", Kontena::Cli::Apps::InitCommand
+  subcommand "deploy", "Deploy Kontena services", Kontena::Cli::Apps::DeployCommand
+  subcommand "start", "Start services", Kontena::Cli::Apps::StartCommand
+  subcommand "stop", "Stop services", Kontena::Cli::Apps::StopCommand
+  subcommand ["remove","rm"], "Remove services", Kontena::Cli::Apps::RemoveCommand
+  subcommand ["ps", "list"], "List services", Kontena::Cli::Apps::ListCommand
+  subcommand ["logs"], "Show service logs", Kontena::Cli::Apps::LogsCommand
+  def execute
+  end
+end

data/lib/kontena/cli/apps/common.rb

@@ -0,0 +1,53 @@
+require_relative '../services/services_helper'
+
+module Kontena::Cli::Apps
+  module Common
+    include Kontena::Cli::Services::ServicesHelper
+
+    def load_services_from_yml
+      @service_prefix = project_name || current_dir
+
+      abort("File #{filename} does not exist") unless File.exists?(filename)
+      services = parse_yml_file(filename, nil, service_prefix)
+
+      services.delete_if { |name, service| !service_list.include?(name)} unless service_list.empty?
+      services
+    end
+
+    def token
+      @token ||= require_token
+    end
+
+    def prefixed_name(name)
+      "#{service_prefix}-#{name}"
+    end
+
+    def current_dir
+      File.basename(Dir.getwd)
+    end
+
+    def service_exists?(name)
+      get_service(token, prefixed_name(name)) rescue false
+    end
+
+    def parse_yml_file(file, name = nil, prefix='')
+      services = YAML.load(File.read(file) % {prefix: prefix})
+      services.each do |name, options|
+        if options.has_key?('extends')
+          extends = options['extends']
+          options.delete('extends')
+          services[name] = parse_yml_file(extends['file'], extends['service']).merge(options)
+        end
+        if options.has_key?('build') 
+          options.delete('build')
+        end
+
+      end
+      if name.nil?
+        services
+      else
+        services[name]
+      end
+    end
+  end
+end

data/lib/kontena/cli/{stacks/stacks.rb → apps/deploy_command.rb}

@@ -1,28 +1,22 @@
-require 'kontena/client'
 require 'yaml'
-require_relative '../common'
-require_relative '../services/services_helper'
+require_relative 'common'
 
-module Kontena::Cli::Stacks
-  class Stacks
+module Kontena::Cli::Apps
+  class DeployCommand < Clamp::Command
     include Kontena::Cli::Common
-    include Kontena::Cli::Services::ServicesHelper
+    include Common
 
-    attr_reader :services, :service_prefix, :deploy_queue
-    def initialize
-      @deploy_queue = []
-    end
+    option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
+    option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
 
-    def deploy(options)
-      require_api_url
-      require_token
+    parameter "[SERVICE] ...", "Services to start"
 
-      filename = options.file || './kontena.yml'
-      @service_prefix = options.prefix || current_dir
-
-      @services = YAML.load(File.read(filename) % {prefix: service_prefix})
-      @services = @services.delete_if { |name, service| !options.service.include?(name)} if options.service
+    attr_reader :services, :service_prefix
 
+    def execute
+      require_api_url
+      require_token
+      @services = load_services_from_yml
       Dir.chdir(File.dirname(filename))
       init_services(services)
       deploy_services(deploy_queue)
@@ -65,7 +59,7 @@ module Kontena::Cli::Stacks
 
       merge_env_vars(options)
 
-      if find_service_by_name(name)
+      if service_exists?(name)
         service = update(name, options)
       else
         service = create(name, options)
@@ -100,14 +94,6 @@ module Kontena::Cli::Stacks
       deploy_queue.find {|service| service['id'] == prefixed_name(name)} != nil
     end
 
-    def prefixed_name(name)
-      "#{service_prefix}-#{name}"
-    end
-
-    def current_dir
-      File.basename(Dir.getwd)
-    end
-
     def merge_env_vars(options)
       return unless options['env_file']
 
@@ -137,7 +123,7 @@ module Kontena::Cli::Stacks
       data[:memory] = parse_memory(options['mem_limit']) if options['mem_limit']
       data[:memory_swap] = parse_memory(options['memswap_limit']) if options['memswap_limit']
       data[:cpu_shares] = options['cpu_shares'] if options['cpu_shares']
-      data[:volumes] = options['volume'] if options['volume']
+      data[:volumes] = options['volumes'] if options['volumes']
       data[:volumes_from] = options['volumes_from'] if options['volumes_from']
       data[:cmd] = options['command'].split(" ") if options['command']
       data[:affinity] = options['affinity'] if options['affinity']
@@ -148,8 +134,8 @@ module Kontena::Cli::Stacks
       data
     end
 
-    def token
-      @token ||= require_token
+    def deploy_queue
+      @deploy_queue ||= []
     end
   end
-end
+end

data/lib/kontena/cli/apps/init_command.rb

@@ -0,0 +1,101 @@
+require 'yaml'
+
+module Kontena::Cli::Apps
+  class InitCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    option ["-f", "--file"], "FILE", "Specify a docker-compose file", attribute_name: :docker_compose_file, default: 'docker-compose.yml'
+    option ["-i", "--image-name"], "IMAGE_NAME", "Specify a docker image name"
+    option ["-b", "--base-image"], "BASE_IMAGE_NAME", "Specify a docker base image name", default: "kontena/buildstep"
+
+    def execute
+      require 'highline/import'
+
+      if File.exist?('Dockerfile')
+        puts 'Found Dockerfile'
+      else
+        create_dockerfile if create_dockerfile?
+      end
+
+      if File.exist?(docker_compose_file)
+        puts "Found #{docker_compose_file}."
+      else
+        create_docker_compose_yml if create_docker_compose_yml?
+      end
+
+      services = generate_kontena_services(docker_compose_file)
+      if File.exist?('kontena.yml')
+        merge_kontena_yml!(services)
+        puts "#{'kontena.yml'.colorize(:cyan)} updated."
+      else
+        puts "Creating #{'kontena.yml'.colorize(:cyan)}"
+      end
+      create_yml(services, 'kontena.yml')
+
+      puts "You are ready to go!".colorize(:green)
+    end
+
+
+    protected
+    def create_dockerfile?
+      %w(y yes).include? ask('Dockerfile not found. Do you want to create it? [Yn]: ').downcase
+    end
+
+    def current_user
+      token = require_token
+      client(token).get('user')
+    end
+
+    def create_dockerfile
+      puts "Creating #{'Dockerfile'.colorize(:cyan)}"
+      dockerfile = File.new('Dockerfile', 'w')
+      dockerfile.puts "FROM #{base_image}"
+      dockerfile.puts "MAINTAINER #{current_user['email']}"
+      dockerfile.close
+    end
+
+    def merge_kontena_yml!(services)
+      puts "kontena.yml already exists. Merging changes."
+      kontena_services = YAML.load(File.read('kontena.yml'))
+      services.each do |name, options|
+        if kontena_services[name]
+          services[name].merge!(kontena_services[name])
+        end
+      end
+    end
+
+    def create_docker_compose_yml?
+      %w(y yes).include? ask("#{docker_compose_file} not found. Do you want to create it? [Yn]: ").downcase
+    end
+
+    def create_docker_compose_yml
+      puts "Creating #{docker_compose_file.colorize(:cyan)}"
+      create_yml({'app' => { 'build' => '.'}}, docker_compose_file)
+    end
+
+    def generate_kontena_services(docker_compose = nil)
+      services = {}
+      if docker_compose && File.exist?(docker_compose)
+        compose_services = YAML.load(File.read(docker_compose))
+        compose_services.each do |name, options|
+          services[name] = {'extends' => { 'file' => 'docker-compose.yml', 'service' => name }}
+          if options.has_key?('build')
+            image = image_name || "registry.kontena.local/#{File.basename(Dir.getwd)}-#{name}:latest"
+            services[name]['image'] = image
+            options.delete('build')
+          end
+        end
+      else
+        services = {'app' => { 'image' => "registry.kontena.local/#{File.basename(Dir.getwd)}:latest" }}
+      end
+      services
+    end
+
+    def create_yml(services, file='kontena.yml')
+      yml = File.new(file, 'w')
+      yml.puts services.to_yaml
+      yml.close
+    end
+
+  end
+end

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

@@ -0,0 +1,41 @@
+require 'yaml'
+require_relative 'common'
+
+module Kontena::Cli::Apps
+  class ListCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Common
+
+    option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
+    option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
+
+    parameter "[SERVICE] ...", "Services to start"
+
+    attr_reader :services, :service_prefix
+
+    def execute
+      @services = load_services_from_yml
+      if services.size > 0
+        Dir.chdir(File.dirname(filename))
+        show_services(services)
+      elsif !service_list.empty?
+        puts "No such service: #{service_list.join(', ')}".colorize(:red)
+      end
+
+    end
+
+    def show_services(services)
+      puts "%-30.30s %-50.50s %-15s %-10.10s %-15.20s %-50s" % ['NAME', 'IMAGE', 'INSTANCES', 'STATEFUL', 'STATE', 'PORTS']
+
+      services.each do |service_name, opts|
+        service = get_service(token, prefixed_name(service_name)) rescue false
+        if service
+          state = service['stateful'] ? 'yes' : 'no'
+
+          ports = service['ports'].map{|p| "#{p['ip']}:#{p['node_port']}->#{p['container_port']}/#{p['protocol']}"}.join(", ")
+          puts "%-30.30s %-50.50s %-15.10s %-10.10s %-15.20s %-50s" % [service['name'], service['image'], service['container_count'], state, service['state'], ports]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+require 'yaml'
+require_relative 'common'
+
+module Kontena::Cli::Apps
+  class LogsCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Common
+
+    option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
+    option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
+
+    parameter "[SERVICE] ...", "Services to start"
+
+    attr_reader :services, :service_prefix
+
+    def execute
+      @services = load_services_from_yml
+      if services.size > 0
+        Dir.chdir(File.dirname(filename))
+        show_logs(services)
+      elsif !service_list.empty?
+        puts "No such service: #{service_list.join(', ')}".colorize(:red)
+      end
+
+    end
+
+    def show_logs(services)
+      logs = []
+      services.each do |service_name, opts|
+        service = get_service(token, prefixed_name(service_name)) rescue false
+        result = client(token).get("services/#{service['id']}/container_logs")
+        logs = logs + result['logs']
+      end
+      logs.sort!{|x,y| DateTime.parse(x['created_at']) <=> DateTime.parse(y['created_at'])}
+      logs.each do |log|
+        color = color_for_container(log['name'])
+        puts "#{log['name'].colorize(color)} | #{log['data']}"
+      end
+    end
+
+    def color_for_container(container_id)
+      color_maps[container_id] = colors.shift unless color_maps[container_id]
+      color_maps[container_id].to_sym
+    end
+
+    def color_maps
+      @color_maps ||= {}
+    end
+
+    def colors
+      if(@colors.nil? || @colors.size == 0)
+        @colors = [:green, :magenta, :yellow, :cyan, :red,
+                   :light_green, :light_yellow, :ligh_magenta, :light_cyan, :light_red]
+      end
+      @colors
+    end
+  end
+end