kontena-cli 0.11.7 → 0.12.0

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

@@ -3,33 +3,11 @@ require "kontena/cli/services/restart_command"
 
 describe Kontena::Cli::Services::RestartCommand do
 
-  let(:subject) do
-    described_class.new(File.basename($0))
-  end
-
-  let(:client) do
-    double
-  end
-
-  let(:token) do
-    '1234567'
-  end
-
-  let(:settings) do
-    {'current_server' => 'alias',
-     'servers' => [
-         {'name' => 'some_master', 'url' => 'some_master'},
-         {'name' => 'alias', 'url' => 'someurl', 'token' => token}
-     ]
-    }
-  end
+  include ClientHelpers
 
   describe '#execute' do
 
     before(:each) do
-      allow(subject).to receive(:client).with(token).and_return(client)
-      allow(subject).to receive(:current_grid).and_return('test-grid')
-      allow(subject).to receive(:settings).and_return(settings)
       allow(subject).to receive(:restart_service).and_return({})
     end
 

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

@@ -0,0 +1,43 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/services/unlink_command"
+
+describe Kontena::Cli::Services::UnlinkCommand do
+
+  include ClientHelpers
+
+  describe '#execute' do
+    before(:each) do
+      allow(client).to receive(:get).and_return({
+        'links' => [
+          {'alias' => 'service-b', 'grid_service_id' => "grid/service-b"}
+        ]
+      })
+    end
+
+    it 'requires api url' do
+      expect(subject).to receive(:require_api_url).once
+      subject.run(['service-a', 'service-b'])
+    end
+
+    it 'requires token' do
+      expect(subject).to receive(:require_token).and_return(token)
+      subject.run(['service-a', 'service-b'])
+    end
+
+    it 'aborts if service is not linked' do
+      allow(client).to receive(:get).and_return({
+        'links' => []
+      })
+      expect {
+        subject.run(['service-a', 'service-b'])
+      }.to raise_error(SystemExit)
+    end
+
+    it 'sends link to master' do
+      expect(client).to receive(:put).with(
+        'services/test-grid/service-a', {links: []}
+      )
+      subject.run(['service-a', 'service-b'])
+    end
+  end
+end

data/spec/kontena/cli/version_command_spec.rb

@@ -0,0 +1,17 @@
+require_relative "../../spec_helper"
+require "kontena/cli/version_command"
+
+describe Kontena::Cli::VersionCommand do
+
+  include ClientHelpers
+
+  describe '#execute' do
+    before(:each) do
+      allow(subject).to receive(:client).and_return(client)
+    end
+
+    it 'runs without errors' do
+      subject.run([])
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -18,5 +18,10 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-
+  config.before(:each) do
+    allow(Dir).to receive(:home).and_return('/tmp/')
+  end
 end
+
+require_relative 'support/client_helpers'
+require_relative 'support/fixtures_helpers'

data/spec/support/client_helpers.rb

@@ -0,0 +1,31 @@
+module ClientHelpers
+
+  def self.included(base)
+    base.let(:subject) do
+      described_class.new(File.basename($0))
+    end
+
+    base.let(:client) do
+      spy(:client)
+    end
+
+    base.let(:token) do
+      '1234567'
+    end
+
+    base.let(:settings) do
+      {'current_server' => 'alias',
+       'servers' => [
+           {'name' => 'some_master', 'url' => 'some_master'},
+           {'name' => 'alias', 'url' => 'someurl', 'token' => token}
+       ]
+      }
+    end
+
+    base.before(:each) do
+      allow(subject).to receive(:client).with(token).and_return(client)
+      allow(subject).to receive(:current_grid).and_return('test-grid')
+      allow(subject).to receive(:settings).and_return(settings)
+    end
+  end
+end

data/spec/support/fixtures_helpers.rb

@@ -0,0 +1,7 @@
+module FixturesHelpers
+  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures/'
+
+  def fixture(file)
+    IO.read(FIXTURES_PATH+file)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.11.7
+  version: 0.12.0
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_dig
+  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'
 description: Kontena command line tool
 email:
 - info@kontena.io
@@ -148,7 +162,6 @@ files:
 - lib/kontena/cli/container_command.rb
 - lib/kontena/cli/containers/exec_command.rb
 - lib/kontena/cli/containers/inspect_command.rb
-- lib/kontena/cli/deploy_command.rb
 - lib/kontena/cli/etcd/common.rb
 - lib/kontena/cli/etcd/get_command.rb
 - lib/kontena/cli/etcd/list_command.rb
@@ -159,11 +172,14 @@ files:
 - lib/kontena/cli/external_registries/add_command.rb
 - lib/kontena/cli/external_registries/delete_command.rb
 - lib/kontena/cli/external_registries/list_command.rb
+- lib/kontena/cli/external_registries/remove_command.rb
 - lib/kontena/cli/external_registry_command.rb
 - lib/kontena/cli/forgot_password_command.rb
 - lib/kontena/cli/grid_command.rb
+- lib/kontena/cli/grid_options.rb
 - lib/kontena/cli/grids/add_user_command.rb
 - lib/kontena/cli/grids/audit_log_command.rb
+- lib/kontena/cli/grids/cloud_config_command.rb
 - lib/kontena/cli/grids/common.rb
 - lib/kontena/cli/grids/create_command.rb
 - lib/kontena/cli/grids/current_command.rb
@@ -174,8 +190,8 @@ files:
 - lib/kontena/cli/grids/remove_command.rb
 - lib/kontena/cli/grids/remove_user_command.rb
 - lib/kontena/cli/grids/show_command.rb
+- lib/kontena/cli/grids/update_command.rb
 - lib/kontena/cli/grids/use_command.rb
-- lib/kontena/cli/invite_command.rb
 - lib/kontena/cli/login_command.rb
 - lib/kontena/cli/logout_command.rb
 - lib/kontena/cli/master/aws/create_command.rb
@@ -186,6 +202,11 @@ files:
 - lib/kontena/cli/master/digital_ocean_command.rb
 - lib/kontena/cli/master/list_command.rb
 - lib/kontena/cli/master/use_command.rb
+- lib/kontena/cli/master/users/add_role_command.rb
+- lib/kontena/cli/master/users/invite_command.rb
+- lib/kontena/cli/master/users/list_command.rb
+- lib/kontena/cli/master/users/remove_role_command.rb
+- lib/kontena/cli/master/users_command.rb
 - lib/kontena/cli/master/vagrant/create_command.rb
 - lib/kontena/cli/master/vagrant/restart_command.rb
 - lib/kontena/cli/master/vagrant/ssh_command.rb
@@ -195,6 +216,7 @@ files:
 - lib/kontena/cli/master/vagrant_command.rb
 - lib/kontena/cli/master_command.rb
 - lib/kontena/cli/node_command.rb
+- lib/kontena/cli/nodes/add_label_command.rb
 - lib/kontena/cli/nodes/aws/create_command.rb
 - lib/kontena/cli/nodes/aws/restart_command.rb
 - lib/kontena/cli/nodes/aws/terminate_command.rb
@@ -209,6 +231,7 @@ files:
 - lib/kontena/cli/nodes/digital_ocean_command.rb
 - lib/kontena/cli/nodes/list_command.rb
 - lib/kontena/cli/nodes/remove_command.rb
+- lib/kontena/cli/nodes/remove_label_command.rb
 - lib/kontena/cli/nodes/show_command.rb
 - lib/kontena/cli/nodes/ssh_command.rb
 - lib/kontena/cli/nodes/update_command.rb
@@ -222,20 +245,25 @@ files:
 - lib/kontena/cli/register_command.rb
 - lib/kontena/cli/registry/create_command.rb
 - lib/kontena/cli/registry/delete_command.rb
+- lib/kontena/cli/registry/remove_command.rb
 - lib/kontena/cli/registry_command.rb
 - lib/kontena/cli/reset_password_command.rb
 - lib/kontena/cli/service_command.rb
 - lib/kontena/cli/services/add_env_command.rb
+- lib/kontena/cli/services/add_secret_command.rb
 - lib/kontena/cli/services/container_command.rb
 - lib/kontena/cli/services/containers_command.rb
 - lib/kontena/cli/services/create_command.rb
 - lib/kontena/cli/services/delete_command.rb
 - lib/kontena/cli/services/deploy_command.rb
 - lib/kontena/cli/services/envs_command.rb
+- lib/kontena/cli/services/link_command.rb
 - lib/kontena/cli/services/list_command.rb
 - lib/kontena/cli/services/logs_command.rb
 - lib/kontena/cli/services/monitor_command.rb
+- lib/kontena/cli/services/remove_command.rb
 - lib/kontena/cli/services/remove_env_command.rb
+- lib/kontena/cli/services/remove_secret_command.rb
 - lib/kontena/cli/services/restart_command.rb
 - lib/kontena/cli/services/scale_command.rb
 - lib/kontena/cli/services/services_helper.rb
@@ -243,7 +271,9 @@ files:
 - lib/kontena/cli/services/start_command.rb
 - lib/kontena/cli/services/stats_command.rb
 - lib/kontena/cli/services/stop_command.rb
+- lib/kontena/cli/services/unlink_command.rb
 - lib/kontena/cli/services/update_command.rb
+- lib/kontena/cli/users_command.rb
 - lib/kontena/cli/vault/list_command.rb
 - lib/kontena/cli/vault/read_command.rb
 - lib/kontena/cli/vault/remove_command.rb
@@ -256,6 +286,7 @@ files:
 - lib/kontena/cli/vpn/config_command.rb
 - lib/kontena/cli/vpn/create_command.rb
 - lib/kontena/cli/vpn/delete_command.rb
+- lib/kontena/cli/vpn/remove_command.rb
 - lib/kontena/cli/vpn_command.rb
 - lib/kontena/cli/whoami_command.rb
 - lib/kontena/client.rb
@@ -274,6 +305,8 @@ files:
 - lib/kontena/machine/azure/master_provisioner.rb
 - lib/kontena/machine/azure/node_destroyer.rb
 - lib/kontena/machine/azure/node_provisioner.rb
+- lib/kontena/machine/cloud_config/cloudinit.yml
+- lib/kontena/machine/cloud_config/node_generator.rb
 - lib/kontena/machine/common.rb
 - lib/kontena/machine/digital_ocean.rb
 - lib/kontena/machine/digital_ocean/cloudinit.yml
@@ -292,18 +325,32 @@ files:
 - lib/kontena/machine/vagrant/node_provisioner.rb
 - lib/kontena/scripts/completer
 - lib/kontena/scripts/init
+- spec/fixtures/docker-compose.yml
+- spec/fixtures/kontena.yml
+- spec/fixtures/mysql.yml
+- spec/fixtures/wordpress-scaled.yml
+- spec/fixtures/wordpress.yml
 - spec/kontena/cli/app/common_spec.rb
 - spec/kontena/cli/app/deploy_command_spec.rb
 - spec/kontena/cli/app/docker_helper_spec.rb
 - spec/kontena/cli/app/scale_spec.rb
 - spec/kontena/cli/common_spec.rb
-- spec/kontena/cli/deploy_command_spec.rb
 - spec/kontena/cli/login_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
+- spec/kontena/cli/master/users/add_role_command_spec.rb
+- spec/kontena/cli/master/users/invite_command_spec.rb
+- spec/kontena/cli/master/users/remove_role_command_spec.rb
 - spec/kontena/cli/register_command_spec.rb
+- spec/kontena/cli/services/add_secret_command_spec.rb
+- spec/kontena/cli/services/link_command_spec.rb
+- spec/kontena/cli/services/remove_secret_command_spec.rb
 - spec/kontena/cli/services/restart_command_spec.rb
 - spec/kontena/cli/services/services_helper_spec.rb
+- spec/kontena/cli/services/unlink_command_spec.rb
+- spec/kontena/cli/version_command_spec.rb
 - spec/spec_helper.rb
+- spec/support/client_helpers.rb
+- spec/support/fixtures_helpers.rb
 - tasks/rspec.rake
 homepage: http://www.kontena.io
 licenses:
@@ -330,15 +377,29 @@ signing_key:
 specification_version: 4
 summary: Kontena command line tool
 test_files:
+- spec/fixtures/docker-compose.yml
+- spec/fixtures/kontena.yml
+- spec/fixtures/mysql.yml
+- spec/fixtures/wordpress-scaled.yml
+- spec/fixtures/wordpress.yml
 - spec/kontena/cli/app/common_spec.rb
 - spec/kontena/cli/app/deploy_command_spec.rb
 - spec/kontena/cli/app/docker_helper_spec.rb
 - spec/kontena/cli/app/scale_spec.rb
 - spec/kontena/cli/common_spec.rb
-- spec/kontena/cli/deploy_command_spec.rb
 - spec/kontena/cli/login_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
+- spec/kontena/cli/master/users/add_role_command_spec.rb
+- spec/kontena/cli/master/users/invite_command_spec.rb
+- spec/kontena/cli/master/users/remove_role_command_spec.rb
 - spec/kontena/cli/register_command_spec.rb
+- spec/kontena/cli/services/add_secret_command_spec.rb
+- spec/kontena/cli/services/link_command_spec.rb
+- spec/kontena/cli/services/remove_secret_command_spec.rb
 - spec/kontena/cli/services/restart_command_spec.rb
 - spec/kontena/cli/services/services_helper_spec.rb
+- spec/kontena/cli/services/unlink_command_spec.rb
+- spec/kontena/cli/version_command_spec.rb
 - spec/spec_helper.rb
+- spec/support/client_helpers.rb
+- spec/support/fixtures_helpers.rb

data/lib/kontena/cli/deploy_command.rb

@@ -1,164 +0,0 @@
-require 'yaml'
-require_relative 'services/services_helper'
-
-class Kontena::Cli::DeployCommand < Clamp::Command
-  include Kontena::Cli::Common
-  include Kontena::Cli::Services::ServicesHelper
-
-  option ['-f', '--file'], 'FILE', 'Path to kontena.yml file, default: current directory'
-  option ['-p', '--prefix'], 'PREFIX', 'Prefix of service names, default: name of the current directory'
-  option ['-s', '--service'], 'SERVICE', 'Services to deploy', multivalued: true
-
-  attr_reader :services, :service_prefix
-
-  def execute
-    puts "DEPRECATION WARNING: Support for 'kontena deploy' will be dropped. Use 'kontena app deploy' instead.".colorize(:red)
-    require_api_url
-    require_token
-
-    filename = file || './kontena.yml'
-    @service_prefix = prefix || current_dir
-
-    abort("File #{filename} does not exist") unless File.exists?(filename)
-
-    @services = YAML.load(File.read(filename) % {prefix: service_prefix})
-    @services = @services.delete_if { |name, service| !service_list.include?(name)} unless service_list.empty?
-
-    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(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'].split('/').last, data)
-    end
-  end
-
-  def create_or_update_service(name, options)
-
-    # skip if service is already created or updated or it's not present
-    return nil if in_deploy_queue?(name) || !services.keys.include?(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(linked_service[:name], services[linked_service[:name]]) unless in_deploy_queue?(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, prefixed_name(name)) rescue nil
-  end
-
-  def create(name, options)
-    name = prefixed_name(name)
-    puts "creating #{name}"
-    data = {name: name}
-    data.merge!(parse_data(options))
-    create_service(token, current_grid, data)
-  end
-
-  def update(id, options)
-    id = prefixed_name(id)
-    data = parse_data(options)
-    puts "updating #{id}"
-    update_service(token, id, data)
-  end
-
-  def in_deploy_queue?(name)
-    deploy_queue.find {|service| service['id'] == prefixed_name(name)} != nil
-  end
-
-  def prefixed_name(name)
-    return name if service_prefix.strip == ""
-
-    "#{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
-
-  ##
-  # @param [Hash] options
-  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['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']
-    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[:log_driver] = options['log_driver'] if options['log_driver']
-    data[:log_opts] = options['log_opt'] if options['log_opt'] && !options['log_opt'].empty?
-
-    data
-  end
-
-  def token
-    @token ||= require_token
-  end
-
-  def deploy_queue
-    @deploy_queue ||= []
-  end
-end