kontena-cli 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5baeda0d4df6a6196b0699b865a9d57540b93a1b
-  data.tar.gz: 6960f65d1af20e840c4548fb681b140e86ff314a
+  metadata.gz: a146f1bd72f47a1f7805aaeb88ef87dda561a6d3
+  data.tar.gz: be7453435a084c1aedf71e571afabad1bf26b358
 SHA512:
-  metadata.gz: 79f0ec2b76d58825a7ae8eb7ae273ab4a51405ce9369cda3803797649f0371746d12f808059b05f8a999d07a95963b22fff208f9454cb97976648e3e782dc7bb
-  data.tar.gz: 344f40e9a1f3fc49efc2e11dd3a4eacb23f7facbbb976240745bae4cbe2345e6cdd6b2f932c2531a738af02e25fb17b26f4338e8cbb53ed7018507f88b7aafe0
+  metadata.gz: c8ef20d0fa01a285f9aba9868fd0ba46da56208e3e6965e3a59a3c583d69c7f3925188947a0a70494e24b32b7015cc6f1a42f62c6967a7042d0873c7c52da37c
+  data.tar.gz: 55a70a37241fbf825c0fe41b2d7198f74104884d6a8517c06dcc94789debdc0135bfb4db6a80ef836f6c9e0077a7ceacebcb1bba26c949674dd93956cc803eb2

data/VERSION

@@ -1 +1 @@
-0.11.3
+0.11.4

data/lib/kontena/cli/app_command.rb

@@ -3,6 +3,7 @@ require_relative 'apps/build_command'
 require_relative 'apps/deploy_command'
 require_relative 'apps/start_command'
 require_relative 'apps/stop_command'
+require_relative 'apps/restart_command'
 require_relative 'apps/remove_command'
 require_relative 'apps/list_command'
 require_relative 'apps/logs_command'
@@ -18,6 +19,7 @@ class Kontena::Cli::AppCommand < Clamp::Command
   subcommand "scale", "Scale services", Kontena::Cli::Apps::ScaleCommand
   subcommand "start", "Start services", Kontena::Cli::Apps::StartCommand
   subcommand "stop", "Stop services", Kontena::Cli::Apps::StopCommand
+  subcommand "restart", "Restart services", Kontena::Cli::Apps::RestartCommand
   subcommand "show", "Show service details", Kontena::Cli::Apps::ShowCommand
   subcommand ["ps", "list"], "List services", Kontena::Cli::Apps::ListCommand
   subcommand ["logs"], "Show service logs", Kontena::Cli::Apps::LogsCommand

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

@@ -12,6 +12,7 @@ module Kontena::Cli::Apps
     option ['--no-build'], :flag, 'Don\'t build an image, even if it\'s missing', default: false
     option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
     option '--async', :flag, 'Run deploys async/parallel'
+    option '--force-deploy', :flag, 'Force deploy even if service does not have any changes'
 
     parameter "[SERVICE] ...", "Services to start"
 
@@ -31,12 +32,14 @@ module Kontena::Cli::Apps
 
     private
 
+    # @param [Hash] services
     def create_or_update_services(services)
       services.each do |name, config|
         create_or_update_service(name, config)
       end
     end
 
+    # @param [Array] queue
     def deploy_services(queue)
       queue.each do |service|
         name = service['id'].split('/').last
@@ -50,6 +53,8 @@ module Kontena::Cli::Apps
       end
     end
 
+    # @param [String] name
+    # @param [Hash] options
     def create_or_update_service(name, options)
       # skip if service is already processed or it's not present
       return nil if in_deploy_queue?(name) || !services.keys.include?(name)
@@ -75,10 +80,13 @@ module Kontena::Cli::Apps
       deploy_queue.push service
     end
 
+    # @param [String] name
     def find_service_by_name(name)
       get_service(token, prefixed_name(name)) rescue nil
     end
 
+    # @param [String] name
+    # @param [Hash] options
     def create(name, options)
       puts "creating #{name.colorize(:cyan)}"
       name = prefixed_name(name)
@@ -87,17 +95,22 @@ module Kontena::Cli::Apps
       create_service(token, current_grid, data)
     end
 
+    # @param [String] id
+    # @param [Hash] options
     def update(id, options)
       puts "updating #{id.colorize(:cyan)}"
       id = prefixed_name(id)
       data = parse_data(options)
       update_service(token, id, data)
+      deploy_service(token, id, {force: true}) if force_deploy?
     end
 
+    # @param [String] name
     def in_deploy_queue?(name)
       deploy_queue.find {|service| service['name'] == prefixed_name(name)} != nil
     end
 
+    # @param [Hash] options
     def merge_env_vars(options)
       return unless options['env_file']
 
@@ -111,6 +124,7 @@ module Kontena::Cli::Apps
       options['environment'].uniq! {|s| s.split('=').first}
     end
 
+    # @param [Hash] options
     def merge_external_links(options)
       if options['external_links']
         options['links'] ||= []
@@ -119,6 +133,7 @@ module Kontena::Cli::Apps
       end
     end
 
+    # @param [String] path
     def read_env_file(path)
       File.readlines(path).delete_if { |line| line.start_with?('#') || line.empty? }
     end
@@ -145,6 +160,7 @@ module Kontena::Cli::Apps
       data[:cap_add] = options['cap_add'] if options['cap_add']
       data[:cap_drop] = options['cap_drop'] if options['cap_drop']
       data[:net] = options['net'] if options['net']
+      data[:pid] = options['pid'] if options['pid']
       data[:log_driver] = options['log_driver'] if options['log_driver']
       data[:log_opts] = options['log_opt'] if options['log_opt'] && !options['log_opt'].empty?
 
@@ -162,6 +178,5 @@ module Kontena::Cli::Apps
 
       data
     end
-
   end
 end

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

@@ -0,0 +1,39 @@
+require_relative 'common'
+
+module Kontena::Cli::Apps
+  class RestartCommand < 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
+      require_config_file(filename)
+
+      @service_prefix = project_name || current_dir
+      @services = load_services(filename, service_list, service_prefix)
+      if services.size > 0
+        restart_services(services)
+      elsif !service_list.empty?
+        puts "No such service: #{service_list.join(', ')}".colorize(:red)
+      end
+
+    end
+
+    def restart_services(services)
+      services.each do |service_name, opts|
+        if service_exists?(service_name)
+          puts "restarting #{prefixed_name(service_name)}"
+          restart_service(token, prefixed_name(service_name))
+        else
+          puts "No such service: #{service_name}".colorize(:red)
+        end
+      end
+    end
+  end
+end

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

@@ -6,12 +6,15 @@ module Kontena::Cli::Services
     include ServicesHelper
 
     parameter "NAME", "Service name"
+    option '--force-deploy', :flag, 'Force deploy even if service does not have any changes'
 
     def execute
       require_api_url
       token = require_token
       service_id = name
-      deploy_service(token, service_id, {})
+      data = {}
+      data[:force] = true if force_deploy?
+      deploy_service(token, service_id, data)
     end
   end
 end

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

@@ -10,7 +10,7 @@ module Kontena::Cli::Services
     def execute
       require_api_url
       token = require_token
-      result = client(token).post("services/#{parse_service_id(name)}/restart", {})
+      restart_service(token, name, {})
     end
   end
 end

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

@@ -209,6 +209,13 @@ module Kontena
           client(token).post("services/#{param}/stop", {})
         end
 
+        # @param [String] token
+        # @param [String] service_id
+        def restart_service(token, service_id)
+          param = parse_service_id(service_id)          
+          client(token).post("services/#{param}/restart", {})
+        end
+
         # @param [String] token
         # @param [String] service_id
         def delete_service(token, service_id)

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

@@ -10,7 +10,7 @@ module Kontena::Cli::Services
     def execute
       require_api_url
       token = require_token
-      result = client(token).post("services/#{parse_service_id(name)}/start", {})
+      start_service(token, name)
     end
   end
 end

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

@@ -10,7 +10,7 @@ module Kontena::Cli::Services
     def execute
       require_api_url
       token = require_token
-      result = client(token).post("services/#{parse_service_id(name)}/stop", {})
+      stop_service(token, name)
     end
   end
 end

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

@@ -0,0 +1,20 @@
+module Kontena::Cli::Vault
+  class UpdateCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter 'NAME', 'Secret name'
+    parameter '[VALUE]', 'Secret value'
+
+    def execute
+      require_api_url
+      token = require_token
+      secret = value
+      if secret.to_s == ''
+        secret = STDIN.read
+      end
+      abort('No value provided') if secret.to_s == ''
+      data = {value: secret}
+      client(token).put("grids/#{current_grid}/secrets/#{name}", data)
+    end
+  end
+end

data/lib/kontena/cli/vault_command.rb

@@ -2,12 +2,14 @@ require_relative 'vault/write_command'
 require_relative 'vault/list_command'
 require_relative 'vault/read_command'
 require_relative 'vault/remove_command'
+require_relative 'vault/update_command'
 
 class Kontena::Cli::VaultCommand < Clamp::Command
 
-  subcommand "write", "Write a secret", Kontena::Cli::Vault::WriteCommand
   subcommand ["list", "ls"], "List secrets", Kontena::Cli::Vault::ListCommand
+  subcommand "write", "Write a secret", Kontena::Cli::Vault::WriteCommand
   subcommand "read", "Read secret", Kontena::Cli::Vault::ReadCommand
+  subcommand "update", "Update secret", Kontena::Cli::Vault::UpdateCommand
   subcommand ["remove", "rm"], "Remove secret", Kontena::Cli::Vault::RemoveCommand
 
   def execute

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,6 +139,7 @@ files:
 - lib/kontena/cli/apps/logs_command.rb
 - lib/kontena/cli/apps/monitor_command.rb
 - lib/kontena/cli/apps/remove_command.rb
+- lib/kontena/cli/apps/restart_command.rb
 - lib/kontena/cli/apps/scale_command.rb
 - lib/kontena/cli/apps/show_command.rb
 - lib/kontena/cli/apps/start_command.rb
@@ -246,6 +247,7 @@ files:
 - lib/kontena/cli/vault/list_command.rb
 - lib/kontena/cli/vault/read_command.rb
 - lib/kontena/cli/vault/remove_command.rb
+- lib/kontena/cli/vault/update_command.rb
 - lib/kontena/cli/vault/write_command.rb
 - lib/kontena/cli/vault_command.rb
 - lib/kontena/cli/verify_account_command.rb