kontena-cli 1.4.0.rc1 → 1.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39d120e6b214cdeb9ec9e545caa38a90049150aa
-  data.tar.gz: 7b1c08eda7f564c98b63147f869c6e3bef371be9
+  metadata.gz: f3520896ed976be156eb9509a49a55a8dc129dc7
+  data.tar.gz: eccc5f17766e2c451b991d2c6020209e28f750ce
 SHA512:
-  metadata.gz: 9648681339d5d260ab68bc3dde7bbfad0ff4e6696a6d6d70ce6d6198fe383b3d1f5b6eee0a15e601801de4227a61c7ccfebb5847e0b956aaef0b16ceeeea896f
-  data.tar.gz: a96851c14f507f48eafdee5704ec3e5fd22747c5ae7996ca43ed78e92fb33e3b41a9d7bde5415f89a6a4f32a4ea196928f1c1af545a16dd6995137ab84c3f0fd
+  metadata.gz: 1bef042707aaf438ed4a52aee5f296beb1bc95c0d0878af03d1d119c1358a9a51b0486c57ea4291db1f65b9a8ee8bd0ba83a74e0d2ad7140ae4a5cb507a7ef92
+  data.tar.gz: 3ba392ddaf00c0a6b3991dd8743f6970b8b2205ccd80f80c4e143704eb87998a9056b8ab219cdd7ed76c8d1d59881b2676e9ef001c4f59365d8a7ae87e3093a0

data/VERSION

@@ -1 +1 @@
-1.4.0.rc1
+1.4.0.rc2

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

@@ -45,6 +45,7 @@ module Kontena::Cli::Services
     option "--health-check-initial-delay", "DELAY", "Initial delay for health check"
     option "--health-check-port", "PORT", "Port for health check"
     option "--health-check-protocol", "PROTOCOL", "Protocol of health check"
+    option "--stop-signal", "STOP_SIGNAL", "Alternative signal to stop container"
     option "--stop-timeout", "STOP_TIMEOUT", "Timeout (duration) to stop a container"
     option "--read-only", :flag, "Read-only root fs for the container", default: false
 
@@ -95,6 +96,7 @@ module Kontena::Cli::Services
       health_check = parse_health_check
       data[:health_check] = health_check unless health_check.empty?
       data[:pid] = pid if pid
+      data[:stop_signal] = stop_signal if stop_signal
       data[:stop_grace_period] = stop_timeout if stop_timeout
       data[:read_only] = read_only?
       data

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

@@ -53,6 +53,9 @@ module Kontena
           puts "  scaling: #{service['instances'] }"
           puts "  strategy: #{service['strategy']}"
           puts "  read_only: #{service['read_only'] == true ? 'yes' : 'no'}"
+          unless service['stop_signal'].to_s.empty?
+            puts "  stop_signal: #{service['stop_signal']}"
+          end
           puts "  stop_grace_period: #{service['stop_grace_period']}s"
           puts "  deploy_opts:"
           if service['deploy_opts']['min_health']

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

@@ -42,6 +42,7 @@ module Kontena::Cli::Services
     option "--health-check-initial-delay", "DELAY", "Initial for HTTP health check"
     option "--health-check-port", "PORT", "Port for HTTP health check"
     option "--health-check-protocol", "PROTOCOL", "Protocol of health check"
+    option "--stop-signal", "STOP_SIGNAL", "Alternative signal to stop container"
     option "--stop-timeout", "STOP_TIMEOUT", "Timeout (duration) to stop a container"
 
     def execute
@@ -85,6 +86,7 @@ module Kontena::Cli::Services
       health_check = parse_health_check
       data[:health_check] = health_check unless health_check.empty?
       data[:pid] = pid if pid
+      data[:stop_signal] = stop_signal if stop_signal
       data[:stop_grace_period] = stop_timeout if stop_timeout
       data
     end

data/lib/kontena/cli/spinner.rb

@@ -168,6 +168,7 @@ module Kontena
               Kernel.puts msg
             end
           end
+          Thread.main['spinners'].delete(spin_thread)
         end
 
         exit(status) if status

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

@@ -66,6 +66,7 @@ module Kontena::Cli::Stacks
       data['certificates'] = options['certificates'] if options['certificates']
       data['build'] = parse_build_options(options) if options['build']
       data['health_check'] = parse_health_check(options)
+      data['stop_signal'] = options['stop_signal'] if options['stop_signal']
       data['stop_grace_period'] = options['stop_grace_period'] if options['stop_grace_period']
       data['read_only'] = options['read_only'] || false
       data

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

@@ -80,6 +80,7 @@ module Kontena::Cli::Stacks::YAML
           'interval' => optional('integer'),
           'initial_delay' => optional('integer')
         }),
+        'stop_signal' => optional('string'),
         'stop_grace_period' => optional(/(\d+(?:\.\d+)?)([hms])/),
         'read_only' => optional('boolean')
       }

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

@@ -16,7 +16,7 @@ module Kontena::Cli::Volumes
     end
 
     def fields
-      quiet? ? ['id'] : %w(name scope driver created_at)
+      quiet? ? ['name'] : %w(name scope driver created_at)
     end
 
     def execute
@@ -25,6 +25,5 @@ module Kontena::Cli::Volumes
         row['created_at'] = time_ago(row['created_at'])
       end
     end
-
   end
 end

data/spec/kontena/cli/volumes/list_command_spec.rb

@@ -0,0 +1,50 @@
+require 'kontena/cli/volumes/list_command'
+
+describe Kontena::Cli::Volumes::ListCommand do
+  include ClientHelpers
+  include OutputHelpers
+  include RequirementsHelper
+
+  expect_to_require_current_master
+  expect_to_require_current_master_token
+
+  mock_current_master
+
+  let(:subject) { described_class.new("kontena") }
+  let(:response)  do
+    {
+      'volumes' => [
+        { 'id' => 'test-grid/testvol',
+          'name' => 'testvol',
+          'scope' => 'testscope',
+          'driver' => 'testdriver',
+          'created_at' => Time.parse('2001-01-01 12:00:00').to_s
+        },
+        { 'id' => 'test-grid/testvol2',
+          'name' => 'testvol2',
+          'scope' => 'testscope2',
+          'driver' => 'testdriver2',
+          'created_at' => Time.parse('2001-01-02 12:00:00').to_s
+        }
+      ]
+    }
+  end
+
+  it 'lists volumes' do
+    expect(client).to receive(:get).with('volumes/test-grid').and_return(response)
+    expect{subject.run(['--no-long'])}.to output_table [
+      ['testvol',  'testscope', 'testdriver', a_string_matching(/\d+ days ago/)],
+      ['testvol2', 'testscope2', 'testdriver2', a_string_matching(/\d+ days ago/)]
+    ]
+  end
+
+  context '--quiet' do
+    it 'lists volume names' do
+      expect(client).to receive(:get).with('volumes/test-grid').and_return(response)
+      expect{subject.run(['-q'])}.to output_table([
+        ['testvol'],
+        ['testvol2']
+      ]).without_header
+    end
+  end
+end

data/spec/support/output_helpers.rb

@@ -55,7 +55,7 @@ module OutputHelpers
         @real.zip(@expected) do |real, expected|
           line += 1
           fields = real.split(/\s{2,}/)
-          unless values_match?(fields, expected)
+          unless values_match?(expected, fields)
             @errors << [
               "on line #{line}:",
               " expected: #{expected}",
@@ -93,7 +93,7 @@ module OutputHelpers
       @expected = lines.flatten
       @actual = CaptureStdoutLines.capture(block)
 
-      values_match?(@actual, @expected)
+      values_match?(@expected, @actual)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc1
+  version: 1.4.0.rc2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -637,6 +637,7 @@ files:
 - spec/kontena/cli/vault/update_command_spec.rb
 - spec/kontena/cli/vault/write_command_spec.rb
 - spec/kontena/cli/version_command_spec.rb
+- spec/kontena/cli/volumes/list_command_spec.rb
 - spec/kontena/cli/vpn/create_command_spec.rb
 - spec/kontena/client_spec.rb
 - spec/kontena/config_spec.rb
@@ -677,7 +678,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Kontena command line tool
@@ -795,6 +796,7 @@ test_files:
 - spec/kontena/cli/vault/update_command_spec.rb
 - spec/kontena/cli/vault/write_command_spec.rb
 - spec/kontena/cli/version_command_spec.rb
+- spec/kontena/cli/volumes/list_command_spec.rb
 - spec/kontena/cli/vpn/create_command_spec.rb
 - spec/kontena/client_spec.rb
 - spec/kontena/config_spec.rb