kontena-cli 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32f7df3c75d9dd5cde332f7cf19267508230be21
-  data.tar.gz: ed374c9d0f1a69e216ff547d7927b67c9b09ae1b
+  metadata.gz: 7da42d25b33946f8887d78d4c1e966ddce0836d4
+  data.tar.gz: 9cc5dbbd4eae20285b82d9c06a790560deface6c
 SHA512:
-  metadata.gz: 59b51892ecc57e51c305823aa39450a9f07970ac5aa91d23a9a7bec7682f5ec141918f70d87590071c46864e1b46a5b182f055e30bfaebce9e29be88fc548a67
-  data.tar.gz: 438d344f304461f7d518020125d67882e92067f2dec89a0bd0c4763ad345ff84882abf202a59e5a25a0bd1a2efe61900a8f2968b57894b929230294a612658af
+  metadata.gz: 3375614c89cd186046754ae837082edb85c894dabf54ec97ac35a45281f16c173490889ac814bf503e8211baf904b358717707a377f15702e0356bc05388c30e
+  data.tar.gz: 967ee20ab75a338ae4a6ca872b193a3fe8087d79c1c20d56a6f9b72cab1f0fa80a131af6f84e34992fe64ddb3b88277345fa05b1a586e0ec65632253bdc1c404

data/Dockerfile

@@ -0,0 +1,16 @@
+FROM gliderlabs/alpine:edge
+MAINTAINER jari@kontena.io
+
+RUN apk update && \
+  apk --update add ruby ruby-json ca-certificates libssl1.0 openssl libstdc++ && \
+  gem install kontena-cli --no-rdoc --no-ri
+
+
+RUN adduser kontena -D -h /home/kontena -s /bin/sh
+RUN chown -R kontena.kontena /home/kontena
+
+
+VOLUME ["/home/kontena"]
+WORKDIR /home/kontena
+USER kontena
+ENTRYPOINT ["/usr/bin/kontena"]

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in kontena-cli.gemspec
 gemspec
+group :development, :test do
+  gem "rspec"
+end

data/Rakefile

@@ -1,2 +1,6 @@
 require "bundler/gem_tasks"
 
+Dir.glob('tasks/*.rake').each { |r| import r }
+
+task :default => :spec
+

data/kontena-docker.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+docker inspect kontena-cli-data > /dev/null 2>&1 ||
+  docker create --name kontena-cli-data kontena/cli:latest > /dev/null
+
+docker run -it --rm --volumes-from kontena-cli-data kontena/cli:latest $@

data/lib/kontena/cli/commands.rb

@@ -16,4 +16,5 @@ require_relative 'server/commands'
 require_relative 'containers/commands'
 require_relative 'grids/commands'
 require_relative 'nodes/commands'
-require_relative 'services/commands'
+require_relative 'services/commands'
+require_relative 'stacks/commands'

data/lib/kontena/cli/common.rb

@@ -28,6 +28,10 @@ module Kontena
         @client
       end
 
+      def reset_client
+        @client = nil
+      end
+
       def settings_filename
         File.join(Dir.home, '/.kontena_client.json')
       end

data/lib/kontena/cli/grids/commands.rb

@@ -3,6 +3,7 @@ module Kontena::Cli::Grids; end;
 require_relative 'grids'
 require_relative 'users'
 require_relative 'audit_log'
+require_relative 'vpn'
 
 
 command 'grid list' do |c|
@@ -87,3 +88,30 @@ command 'grid remove-user' do |c|
     Kontena::Cli::Grids::Users.new.remove(args[0])
   end
 end
+
+
+command 'vpn create' do |c|
+  c.syntax = 'kontena vpn create'
+  c.description = 'Create vpn service'
+  c.option '--node STRING', String, 'Node name'
+  c.option '--ip STRING', String, 'Node ip'
+  c.action do |args, options|
+    Kontena::Cli::Grids::Vpn.new.create(options)
+  end
+end
+
+command 'vpn delete' do |c|
+  c.syntax = 'kontena vpn delete'
+  c.description = 'Delete vpn service'
+  c.action do |args, options|
+    Kontena::Cli::Grids::Vpn.new.delete
+  end
+end
+
+command 'vpn config' do |c|
+  c.syntax = 'kontena vpn config'
+  c.description = 'Show vpn client config'
+  c.action do |args, options|
+    Kontena::Cli::Grids::Vpn.new.config
+  end
+end

data/lib/kontena/cli/grids/vpn.rb

@@ -0,0 +1,71 @@
+require 'kontena/client'
+require_relative '../common'
+
+module Kontena::Cli::Grids
+  class Vpn
+    include Kontena::Cli::Common
+
+    def create(opts)
+      require_api_url
+      token = require_token
+      preferred_node = opts.node
+
+      vpn = client(token).get("services/vpn") rescue nil
+      raise ArgumentError.new('Vpn already exists') if vpn
+
+      nodes = client(token).get("grids/#{current_grid}/nodes")
+      if preferred_node.nil?
+        node = nodes['nodes'].find{|n| n['connected']}
+        raise ArgumentError.new('Cannot find any online nodes') if node.nil?
+      else
+        node = nodes['nodes'].find{|n| n['connected'] && n['name'] == preferred_node }
+        raise ArgumentError.new('Node not found') if node.nil?
+      end
+
+      public_ip = opts.ip || node['public_ip']
+
+      data = {
+        name: 'vpn',
+        stateful: true,
+        image: 'kontena/openvpn:latest',
+        ports: [
+          {
+            container_port: '1194',
+            node_port: '1194',
+            protocol: 'udp'
+          }
+        ],
+        cap_add: ['NET_ADMIN'],
+        env: ["OVPN_SERVER_URL=udp://#{public_ip}:1194"],
+        affinity: ["node==#{node['name']}"]
+      }
+      client(token).post("grids/#{current_grid}/services", data)
+      result = client(token).post("services/vpn/deploy", {})
+      print 'deploying '
+      until client(token).get("services/vpn")['state'] != 'deploying' do
+        print '.'
+        sleep 1
+      end
+      puts ' done'
+      puts "OpenVPN service is now started (udp://#{public_ip}:1194)."
+      puts "Use 'kontena vpn config' to fetch OpenVPN client config to your machine (it takes a while until config is ready)."
+    end
+
+    def delete
+      require_api_url
+      token = require_token
+
+      vpn = client(token).get("services/vpn") rescue nil
+      raise ArgumentError.new("VPN service does not exist") if vpn.nil?
+
+      client(token).delete("services/vpn")
+    end
+
+    def config
+      require_api_url
+      payload = {cmd: ['/usr/local/bin/ovpn_getclient', 'KONTENA_VPN_CLIENT']}
+      stdout, stderr = client(require_token).post("containers/vpn-1/exec", payload)
+      puts stdout
+    end
+  end
+end

data/lib/kontena/cli/nodes/nodes.rb

@@ -38,6 +38,7 @@ module Kontena::Cli::Nodes
       puts "  id: #{node['id']}"
       puts "  connected: #{node['connected'] ? 'yes': 'no'}"
       puts "  last connect: #{node['updated_at']}"
+      puts "  public ip: #{node['public_ip']}"
       puts "  os: #{node['os']}"
       puts "  driver: #{node['driver']}"
       puts "  kernel: #{node['kernel_version']}"

data/lib/kontena/cli/server/user.rb

@@ -21,7 +21,17 @@ module Kontena::Cli::Server
       if response
         settings['server']['token'] = response['access_token']
         save_settings
-        print color('Login Successful', :green)
+        puts ''
+        puts "Welcome #{response['user']['name'].green}"
+        puts ''
+        reset_client
+        grid = client(require_token).get('grids')['grids'][0]
+        if grid
+          self.current_grid = grid
+          puts "Using grid: #{grid['name'].cyan}"
+        else
+          clear_current_grid
+        end
         true
       else
         print color('Login Failed', :red)

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

@@ -15,12 +15,30 @@ module Kontena::Cli::Services
         query_params = last_id.nil? ? '' : "from=#{last_id}"
         result = client(token).get("services/#{service_id}/container_logs?#{query_params}")
         result['logs'].each do |log|
-          puts log['data']
+          color = color_for_container(log['container_id'])
+          puts "#{log['container_id'][0..12].colorize(color)} | #{log['data']}"
           last_id = log['id']
         end
         break unless options.follow
         sleep(2)
       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, :yellow, :magenta, :cyan, :red,
+          :light_green, :light_yellow, :ligh_magenta, :light_cyan, :light_red]
+      end
+      @colors
+    end
   end
-end
+end

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

@@ -1,9 +1,11 @@
 require 'kontena/client'
 require_relative '../common'
+require_relative 'services_helper'
 
 module Kontena::Cli::Services
   class Services
     include Kontena::Cli::Common
+    include Kontena::Cli::Services::ServicesHelper
 
     def list
       require_api_url
@@ -21,7 +23,7 @@ module Kontena::Cli::Services
       require_api_url
       token = require_token
 
-      service = client(token).get("services/#{service_id}")
+      service = get_service(token, service_id)
       puts "#{service['id']}:"
       puts "  status: #{service['state'] }"
       puts "  stateful: #{service['stateful'] == true ? 'yes' : 'no' }"
@@ -43,8 +45,8 @@ module Kontena::Cli::Services
       end
       puts "  links: "
       if service['links']
-        service['links'].each do |p|
-          puts "    - #{p['alias']}"
+        service['links'].each do |l|
+          puts "    - #{l['alias']}"
         end
       end
       puts "  containers:"
@@ -55,6 +57,7 @@ module Kontena::Cli::Services
         puts "      node: #{container['node']['name']}"
         puts "      dns: #{container['id']}.kontena.local"
         puts "      ip: #{container['network_settings']['ip_address']}"
+        puts "      public ip: #{container['node']['public_ip']}"
         if container['status'] == 'unknown'
           puts "      status: #{container['status'].colorize(:yellow)}"
         else
@@ -71,33 +74,23 @@ module Kontena::Cli::Services
     def deploy(service_id, options)
       require_api_url
       token = require_token
-
       data = {}
       data[:strategy] = options.strategy if options.strategy
       data[:wait_for_port] = options.wait_for_port if options.wait_for_port
-      result = client(token).post("services/#{service_id}/deploy", data)
-
-      print 'deploying '
-      until client(token).get("services/#{service_id}")['state'] != 'deploying' do
-        print '.'
-        sleep 1
-      end
-      puts ' done'
-      puts ''
+      deploy_service(token, service_id, data)
       self.show(service_id)
     end
 
+
     def restart(service_id)
       require_api_url
       token = require_token
-
       result = client(token).post("services/#{service_id}/restart", {})
     end
 
     def stop(service_id)
       require_api_url
       token = require_token
-
       result = client(token).post("services/#{service_id}/stop", {})
     end
 
@@ -111,55 +104,22 @@ module Kontena::Cli::Services
     def create(name, image, options)
       require_api_url
       token = require_token
-      if options.ports
-        ports = parse_ports(options.ports)
-      end
       data = {
         name: name,
         image: image,
         stateful: !!options.stateful
       }
-      if options.link
-        links = parse_links(options.link)
-      end
-      data[:ports] = ports if options.ports
-      data[:links] = links if options.link
-      data[:volumes] = options.volume if options.volume
-      data[:volumes_from] = options.volumes_from if options.volumes_from
-      data[:memory] = parse_memory(options.memory) if options.memory
-      data[:memory_swap] = parse_memory(options.memory_swap) if options.memory_swap
-      data[:cpu_shares] = options.cpu_shares if options.cpu_shares
-      data[:affinity] = options.affinity if options.affinity
-      data[:env] = options.env if options.env
-      data[:container_count] = options.instances if options.instances
-      data[:cmd] = options.cmd.split(" ") if options.cmd
-      data[:user] = options.user if options.user
-      data[:cpu] = options.cpu if options.cpu
-      data[:cap_add] = options.cap_add if options.cap_add
-      data[:cap_drop] = options.cap_drop if options.cap_drop
-      if options.memory
-        memory = human_size_to_number(options.memory)
-        raise ArgumentError.new('Invalid --memory')
-        data[:memory] = memory
-      end
-      data[:memory] = options.memory if options.memory
-      client(token).post("grids/#{current_grid}/services", data)
+      data.merge!(parse_data_from_options(options))
+      create_service(token, current_grid, data)
     end
 
+
     def update(service_id, options)
       require_api_url
       token = require_token
 
-      data = {}
-      data[:env] = options.env if options.env
-      data[:container_count] = options.instances if options.instances
-      data[:cmd] = options.cmd.split(" ") if options.cmd
-      data[:ports] = parse_ports(options.ports) if options.ports
-      data[:image] = options.image if options.image
-      data[:cap_add] = options.cap_add if options.cap_add
-      data[:cap_drop] = options.cap_drop if options.cap_drop
-
-      client(require_token).put("services/#{service_id}", data)
+      data = parse_data_from_options(options)
+      update_service(token, service_id, data)
     end
 
     def destroy(service_id)
@@ -171,31 +131,27 @@ module Kontena::Cli::Services
 
     private
 
-    def parse_ports(port_options)
-      port_options.map{|p|
-        node_port, container_port, protocol = p.split(':')
-        if node_port.nil? || container_port.nil?
-          raise ArgumentError.new("Invalid port value #{p}")
-        end
-        {
-          container_port: container_port,
-          node_port: node_port,
-          protocol: protocol || 'tcp'
-        }
-      }
-    end
-
-    def parse_links(link_options)
-      link_options.map{|l|
-        service_name, alias_name = l.split(':')
-        if service_name.nil? || alias_name.nil?
-          raise ArgumentError.new("Invalid link value #{l}")
-        end
-        {
-            name: service_name,
-            alias: alias_name
-        }
-      }
+    ##
+    # parse given options to hash
+    # @return [Hash]
+    def parse_data_from_options(options)
+      data = {}
+      data[:ports] = parse_ports(options.ports) if options.ports
+      data[:links] = parse_links(options.link) if options.link
+      data[:volumes] = options.volume if options.volume
+      data[:volumes_from] = options.volumes_from if options.volumes_from
+      data[:memory] = parse_memory(options.memory) if options.memory
+      data[:memory_swap] = parse_memory(options.memory_swap) if options.memory_swap
+      data[:cpu_shares] = options.cpu_shares if options.cpu_shares
+      data[:affinity] = options.affinity if options.affinity
+      data[:env] = options.env if options.env
+      data[:container_count] = options.instances if options.instances
+      data[:cmd] = options.cmd.split(" ") if options.cmd
+      data[:user] = options.user if options.user
+      data[:image] = options.image if options.image
+      data[:cap_add] = options.cap_add if options.cap_add
+      data[:cap_drop] = options.cap_drop if options.cap_drop
+      data
     end
   end
 end

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

@@ -0,0 +1,77 @@
+require 'kontena/client'
+require_relative '../common'
+
+module Kontena
+  module Cli
+    module Services
+      module ServicesHelper
+        include Kontena::Cli::Common
+
+        def create_service(token, grid_id, data)
+          client(token).post("grids/#{grid_id}/services", data)
+        end
+
+        def update_service(token, service_id, data)
+          client(token).put("services/#{service_id}", data)
+        end
+
+        def get_service(token, service_id)
+          client(token).get("services/#{service_id}")
+        end
+
+        def deploy_service(token, service_id, data)
+          client(token).post("services/#{service_id}/deploy", data)
+          print 'deploying '
+          until client(token).get("services/#{service_id}")['state'] != 'deploying' do
+            print '.'
+            sleep 1
+          end
+          puts ' done'
+          puts ''
+        end
+
+        def parse_ports(port_options)
+          port_options.map{|p|
+            node_port, container_port, protocol = p.split(':')
+            if node_port.nil? || container_port.nil?
+              raise ArgumentError.new("Invalid port value #{p}")
+            end
+            {
+                container_port: container_port,
+                node_port: node_port,
+                protocol: protocol || 'tcp'
+            }
+          }
+        end
+
+        def parse_links(link_options)
+          link_options.map{|l|
+            service_name, alias_name = l.split(':')
+            if service_name.nil?
+              raise ArgumentError.new("Invalid link value #{l}")
+            end
+            alias_name = service_name if alias_name.nil?
+            {
+                name: service_name,
+                alias: alias_name
+            }
+          }
+        end
+
+        def parse_memory(memory)
+          if memory.end_with?('k')
+            memory.to_i * 1000
+          elsif memory.end_with?('m')
+            memory.to_i * 1000000
+          elsif memory.end_with?('g')
+            memory.to_i * 1000000000
+          else
+            memory.to_i
+          end
+        end
+
+
+      end
+    end
+  end
+end

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

@@ -51,20 +51,6 @@ module Kontena::Cli::Services
       network_out = stat['network'].nil? ? 'N/A' : filesize_to_human(stat['network']['tx_bytes'])
       puts '%-30.30s %-15s %-20s %-15s %-15s' % [ stat['container_id'], "#{cpu}%", "#{memory} / #{memory_limit}", "#{memory_pct}", "#{network_in}/#{network_out}"]
     end
-    ##
-    # @param [String] memory
-    # @return [Integer]
-    def parse_memory(memory)
-      if memory.end_with?('k')
-        memory.to_i * 1000
-      elsif memory.end_with?('m')
-        memory.to_i * 1000000
-      elsif memory.end_with?('g')
-        memory.to_i * 1000000000
-      else
-        memory.to_i
-      end
-    end
 
     ##
     # @param [Integer] size

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

@@ -0,0 +1,12 @@
+module Kontena::Cli::Stacks; end;
+require_relative 'stacks'
+
+command 'deploy' do |c|
+  c.syntax = 'kontena deploy'
+  c.description = 'Create and deploy multiple services from YAML file'
+  c.option '-f', '--file String', 'path to kontena.yml file, default: current directory'
+  c.option '-p', '--prefix String', 'prefix of service names, default: name of the current directory'
+  c.action do |args, options|
+    Kontena::Cli::Stacks::Stacks.new.deploy(options)
+  end
+end

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

@@ -0,0 +1,148 @@
+require 'kontena/client'
+require 'yaml'
+require_relative '../common'
+require_relative '../services/services_helper'
+
+module Kontena::Cli::Stacks
+  class Stacks
+    include Kontena::Cli::Common
+    include Kontena::Cli::Services::ServicesHelper
+
+    attr_reader :services, :service_prefix, :deploy_queue
+    def initialize
+      @deploy_queue = []
+    end
+
+    def deploy(options)
+      require_api_url
+      require_token
+
+      filename = options.file || './kontena.yml'
+      @services = YAML.load(File.read(filename))
+      @service_prefix = options.prefix || current_dir
+
+      Dir.chdir(File.dirname(filename))
+      init_services(services)
+      deploy_services(deploy_queue)
+    end
+
+    private
+
+    def init_services(services)
+      services.each do |name, config|
+        create_or_update_service(prefixed_name(name), config)
+      end
+    end
+
+    def deploy_services(queue)
+      queue.each do |service|
+        puts "deploying #{service['id']}"
+        data = {}
+        if service['deploy']
+          data[:strategy] = service['deploy']['strategy'] if service['deploy']['strategy']
+          data[:wait_for_port] = service['deploy']['wait_for_port'] if service['deploy']['wait_for_port']
+        end
+        deploy_service(token, service['id'], data)
+      end
+    end
+
+    def create_or_update_service(name, options)
+      # skip if service is already created or updated
+      return nil if in_deploy_queue?(name)
+
+      # create/update linked services recursively before continuing
+      unless options['links'].nil?
+        parse_links(options['links']).each_with_index do |linked_service, index|
+          # change prefixed service name also to links options
+          options['links'][index] = "#{prefixed_name(linked_service[:name])}:#{linked_service[:alias]}"
+
+          create_or_update_service(prefixed_name(linked_service[:name]), services[linked_service[:name]]) unless in_deploy_queue?(prefixed_name(linked_service[:name]))
+        end
+      end
+
+      merge_env_vars(options)
+
+      if find_service_by_name(name)
+        service = update(name, options)
+      else
+        service = create(name, options)
+      end
+
+      # add deploy options to service
+      service['deploy'] = options['deploy']
+
+      deploy_queue.push service
+    end
+
+    def find_service_by_name(name)
+      get_service(token, name) rescue nil
+    end
+
+    def create(name, options)
+      puts "creating #{name}"
+      data = {name: name}
+      data.merge!(parse_data(options))
+      create_service(token, current_grid, data)
+    end
+
+    def update(id, options)
+      data = parse_data(options)
+      puts "updating #{id}"
+      update_service(token, id, data)
+    end
+
+    def in_deploy_queue?(name)
+      deploy_queue.find {|service| service['id'] == 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']
+
+      options['env_file'] = [options['env_file']] if options['env_file'].is_a?(String)
+      options['environment'] = [] unless options['environment']
+
+      options['env_file'].each do |env_file|
+        options['environment'].concat(read_env_file(env_file))
+      end
+
+      options['environment'].uniq! {|s| s.split('=').first}
+    end
+
+    def read_env_file(path)
+      File.readlines(path).delete_if { |line| line.start_with?('#') || line.empty? }
+    end
+
+    def parse_data(options)
+      data = {}
+      data[:image] = options['image']
+      data[:env] = options['environment']
+      data[:container_count] = options['instances']
+      data[:links] = parse_links(options['links']) if options['links']
+      data[:ports] = parse_ports(options['ports']) if options['ports']
+      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_from] = options['volumes_from'] if options['volumes_from']
+      data[:cmd] = options['command'].split(" ") if options['command']
+      data[:affinity] = options['affinity'] if options['affinity']
+      data[:user] = options['user'] if options['user']
+      data[:stateful] = options['stateful'] == true
+      data[:cap_add] = options['cap_add'] if options['cap_add']
+      data[:cap_drop] = options['cap_drop'] if options['cap_drop']
+      data
+    end
+
+    def token
+      @token ||= require_token
+    end
+  end
+end

data/lib/kontena/cli/version.rb

@@ -1,5 +1,5 @@
 module Kontena
   module Cli
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/lib/kontena/client.rb

@@ -171,7 +171,11 @@ module Kontena
     end
 
     def handle_error_response(response)
-      raise Kontena::Errors::StandardError.new(response.status, response.body)
+      message = response.body
+      if response.status == 404 && message == ''
+        message = 'Not found'
+      end
+      raise Kontena::Errors::StandardError.new(response.status, message)
     end
   end
 end

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

@@ -0,0 +1,103 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/services/services_helper"
+
+module Kontena::Cli::Services
+  describe ServicesHelper do
+    subject{klass.new}
+
+    let(:klass) { Class.new { include ServicesHelper } }
+
+    let(:client) do
+      double
+    end
+
+    let(:token) do
+      'token'
+    end
+
+    before(:each) do
+      allow(subject).to receive(:client).with(token).and_return(client)
+    end
+
+    describe '#create_service' do
+      it 'creates POST grids/:id/services request to Kontena Server' do
+        expect(client).to receive(:post).with('grids/1/services', {'name' => 'test-service'})
+        subject.create_service(token, '1', {'name' => 'test-service'})
+      end
+    end
+
+    describe '#update_service' do
+      it 'creates PUT services/:id request to Kontena Server' do
+        expect(client).to receive(:put).with('services/1', {'name' => 'test-service'})
+        subject.update_service(token, '1', {'name' => 'test-service'})
+      end
+    end
+
+    describe '#get_service' do
+      it 'creates GET services/:id request to Kontena Server' do
+        expect(client).to receive(:get).with('services/test-service')
+        subject.get_service(token, 'test-service')
+      end
+    end
+
+    describe '#deploy_service' do
+      it 'creates POST services/:id/deploy request to Kontena Server' do
+        allow(client).to receive(:get).with('services/1').and_return({'state' => 'running'})
+        expect(client).to receive(:post).with('services/1/deploy', {'strategy' => 'ha'})
+        subject.deploy_service(token, '1', {'strategy' => 'ha'})
+      end
+
+      it 'polls Kontena Server until service is running' do
+        allow(client).to receive(:post).with('services/1/deploy', anything)
+        expect(client).to receive(:get).with('services/1').twice.and_return({'state' => 'deploying'}, {'state' => 'running'})
+
+        subject.deploy_service(token, '1', {'strategy' => 'ha'})
+      end
+    end
+
+    describe '#parse_ports' do
+      it 'raises error if node_port is missing' do
+        expect{
+          subject.parse_ports(["80"])
+        }.to raise_error(ArgumentError)
+      end
+
+      it 'raises error if container_port is missing' do
+        expect{
+          subject.parse_ports(["80:"])
+        }.to raise_error(ArgumentError)
+      end
+
+      it 'returns hash of port options' do
+        valid_result = [{
+            container_port: '80',
+            node_port: '80',
+            protocol: 'tcp'
+        }]
+        port_options = subject.parse_ports(['80:80'])
+
+        expect(port_options).to eq(valid_result)
+
+      end
+    end
+
+    describe '#parse_links' do
+      it 'raises error if service name is missing' do
+        expect{
+          subject.parse_links([""])
+        }.to raise_error(ArgumentError)
+      end
+
+      it 'returns hash of link options' do
+        valid_result = [{
+                            name: 'db',
+                            alias: 'mysql',
+                        }]
+        link_options = subject.parse_links(['db:mysql'])
+
+        expect(link_options).to eq(valid_result)
+
+      end
+    end
+  end
+end

data/spec/kontena/cli/stacks/stacks_spec.rb

@@ -0,0 +1,179 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/stacks/stacks"
+
+module Kontena::Cli::Stacks
+  describe Stacks do
+    let(:settings) do
+      {'server' => {'url' => 'http://kontena.test', 'token' => token}}
+    end
+
+    let(:token) do
+      '1234567'
+    end
+
+
+    let(:services) do
+      {
+          'wordpress' => {
+              'image' => 'wordpress:latest',
+              'links' => ['mysql:db'],
+              'ports' => ['80:80'],
+              'instances' => 2,
+              'deploy' => {
+                  'strategy' => 'ha'
+              }
+          },
+          'mysql' => {
+              'image' => 'mysql:5.6',
+              'stateful' => true
+          }
+      }
+    end
+
+    let(:client) do
+      double
+    end
+
+    let(:options) do
+      options = double({prefix: false, file: false})
+    end
+
+    let(:env_vars) do
+      ["#comment line", "TEST_ENV_VAR=test", "MYSQL_ADMIN_PASSWORD=abcdef"]
+    end
+
+    let(:dot_env) do
+      ["TEST_ENV_VAR=test2","", "TEST_ENV_VAR2=test3"]
+    end
+
+    describe '#deploy' do
+      context 'when api_url is nil' do
+        it 'raises error' do
+          allow(subject).to receive(:settings).and_return({'server' => {}})
+          expect{subject.deploy({})}.to raise_error(ArgumentError)
+        end
+      end
+
+      context 'when token is nil' do
+        it 'raises error' do
+          allow(subject).to receive(:settings).and_return({'server' => {'url' => 'http://kontena.test'}})
+          expect{subject.deploy({})}.to raise_error(ArgumentError)
+        end
+      end
+
+      context 'when api url and token are valid' do
+        before(:each) do
+          allow(subject).to receive(:settings).and_return(settings)
+          allow(YAML).to receive(:load).and_return(services)
+          allow(File).to receive(:read)
+          allow(subject).to receive(:get_service).and_raise(Kontena::Errors::StandardError.new(404, 'Not Found'))
+          allow(subject).to receive(:create_service).and_return({'id' => 'kontena-test-mysql'},{'id' => 'kontena-test-wordpress'})
+          allow(subject).to receive(:current_grid).and_return('1')
+          allow(subject).to receive(:deploy_service).and_return(nil)
+        end
+
+        it 'reads ./kontena.yml file by default' do
+          allow(subject).to receive(:settings).and_return(settings)
+
+          expect(File).to receive(:read).with('./kontena.yml')
+          expect(options).to receive(:file).once.and_return(false)
+          subject.deploy(options)
+        end
+
+        it 'reads given yml file' do
+          expect(options).to receive(:file).once.and_return('custom.yml')
+          expect(File).to receive(:read).with('custom.yml')
+          subject.deploy(options)
+        end
+
+        it 'uses current directory as service name prefix by default' do
+          current_dir = '/kontena/tests/stacks'
+          allow(Dir).to receive(:getwd).and_return(current_dir)
+          expect(File).to receive(:basename).with(current_dir)
+          subject.deploy(options)
+        end
+
+        context 'when yml file has multiple env files' do
+          it 'merges environment variables correctly' do
+            allow(subject).to receive(:current_dir).and_return("kontena-test")
+            services['wordpress']['environment'] = ['MYSQL_ADMIN_PASSWORD=password']
+            services['wordpress']['env_file'] = %w(/path/to/env_file .env)
+
+            expect(File).to receive(:readlines).with('/path/to/env_file').and_return(env_vars)
+            expect(File).to receive(:readlines).with('.env').and_return(dot_env)
+
+            data = {
+                :name =>"kontena-test-wordpress",
+                :image=>"wordpress:latest",
+                :env=>["MYSQL_ADMIN_PASSWORD=password", "TEST_ENV_VAR=test", "TEST_ENV_VAR2=test3"],
+                :container_count=>2,
+                :stateful=>false,
+                :links=>[{:name=>"kontena-test-mysql", :alias=>"db"}],
+                :ports=>[{:container_port=>"80", :node_port=>"80", :protocol=>"tcp"}]
+            }
+
+            expect(subject).to receive(:create_service).with('1234567', '1', data)
+            subject.deploy(options)
+          end
+        end
+
+        context 'when yml file has one env file' do
+          it 'merges environment variables correctly' do
+            allow(subject).to receive(:current_dir).and_return("kontena-test")
+            services['wordpress']['environment'] = ['MYSQL_ADMIN_PASSWORD=password']
+            services['wordpress']['env_file'] = '/path/to/env_file'
+
+            expect(File).to receive(:readlines).with('/path/to/env_file').and_return(env_vars)
+
+            data = {
+                :name =>"kontena-test-wordpress",
+                :image=>"wordpress:latest",
+                :env=>["MYSQL_ADMIN_PASSWORD=password", "TEST_ENV_VAR=test"],
+                :container_count=>2,
+                :stateful=>false,
+                :links=>[{:name=>"kontena-test-mysql", :alias=>"db"}],
+                :ports=>[{:container_port=>"80", :node_port=>"80", :protocol=>"tcp"}]
+            }
+
+            expect(subject).to receive(:create_service).with('1234567', '1', data)
+            subject.deploy(options)
+          end
+        end
+
+        it 'creates mysql service before wordpress' do
+          allow(subject).to receive(:current_dir).and_return("kontena-test")
+          data = {:name =>"kontena-test-mysql", :image=>'mysql:5.6', :env=>nil, :container_count=>nil, :stateful=>true}
+          expect(subject).to receive(:create_service).with('1234567', '1', data)
+
+          subject.deploy(options)
+        end
+
+        it 'creates wordpress service' do
+          allow(subject).to receive(:current_dir).and_return("kontena-test")
+
+          data = {
+              :name =>"kontena-test-wordpress",
+              :image=>"wordpress:latest",
+              :env=>nil,
+              :container_count=>2,
+              :stateful=>false,
+              :links=>[{:name=>"kontena-test-mysql", :alias=>"db"}],
+              :ports=>[{:container_port=>"80", :node_port=>"80", :protocol=>"tcp"}]
+          }
+          expect(subject).to receive(:create_service).with('1234567', '1', data)
+
+          subject.deploy(options)
+        end
+
+        it 'deploys services' do
+          allow(subject).to receive(:current_dir).and_return("kontena-test")
+          expect(subject).to receive(:deploy_service).with('1234567', 'kontena-test-mysql', {})
+          expect(subject).to receive(:deploy_service).with('1234567', 'kontena-test-wordpress', {:strategy => 'ha'})
+          subject.deploy(options)
+        end
+
+
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+
+end

data/tasks/rspec.rake

@@ -0,0 +1,5 @@
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,12 +89,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/kontena
 - kontena-cli.gemspec
+- kontena-docker.sh
 - lib/kontena/cli/commands.rb
 - lib/kontena/cli/common.rb
 - lib/kontena/cli/containers/commands.rb
@@ -103,6 +105,7 @@ files:
 - lib/kontena/cli/grids/commands.rb
 - lib/kontena/cli/grids/grids.rb
 - lib/kontena/cli/grids/users.rb
+- lib/kontena/cli/grids/vpn.rb
 - lib/kontena/cli/nodes/commands.rb
 - lib/kontena/cli/nodes/nodes.rb
 - lib/kontena/cli/server/commands.rb
@@ -112,10 +115,17 @@ files:
 - lib/kontena/cli/services/containers.rb
 - lib/kontena/cli/services/logs.rb
 - lib/kontena/cli/services/services.rb
+- lib/kontena/cli/services/services_helper.rb
 - lib/kontena/cli/services/stats.rb
+- lib/kontena/cli/stacks/commands.rb
+- lib/kontena/cli/stacks/stacks.rb
 - lib/kontena/cli/version.rb
 - lib/kontena/client.rb
 - lib/kontena/errors.rb
+- spec/kontena/cli/services/services_helper_spec.rb
+- spec/kontena/cli/stacks/stacks_spec.rb
+- spec/spec_helper.rb
+- tasks/rspec.rake
 homepage: http://www.kontena.io
 licenses:
 - Apache-2.0
@@ -140,4 +150,7 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Kontena command line tool
-test_files: []
+test_files:
+- spec/kontena/cli/services/services_helper_spec.rb
+- spec/kontena/cli/stacks/stacks_spec.rb
+- spec/spec_helper.rb