kontena-cli 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1e5a53e26ad2076f513dbfccef1bb9db14a08d1
-  data.tar.gz: 69be6f178242be1570f20d97ba313f7c414364ca
+  metadata.gz: d82df3e1f060653421ebc2ba56833b28881e6d6e
+  data.tar.gz: 867c7924eb2a780599392f21fdbc5e6d8e30961d
 SHA512:
-  metadata.gz: 0c95b9cc92d040f599254e8c09abeef2b296e7175b89cf5ad35c3b56b73816320ae2bfa2b803d8ff517ef28366b5f7b677f5df1744c39bd4b086f848f73b677a
-  data.tar.gz: 8fe9f3c676c52d16477205c8962207da4bf6f46fabfcf1261824b0e661258d2168b54b8e98d325a5feb62386a72318169754ea98404f53cacb308c5670bb64f6
+  metadata.gz: 788d94e130ecad93547fb194564039d70a8b4686f2c8029649beea8f5e0d52c8ce42eba53aab463de49e5f11647c92f0b9d33659cd0339f7338c9892043d6cba
+  data.tar.gz: 2ce7bd1b2bc78591a7405ba7d09d6c4f192a290a15ed6c2f79e4cfdecc12ae69f1b224cca96ae842a2265c7626b68f66842d9c4d908ff85080409a81db386e82

data/VERSION

@@ -1 +1 @@
-0.15.0
+0.15.1

data/kontena-cli.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "shell-spinner"
   spec.add_runtime_dependency "ruby_dig"
   spec.add_runtime_dependency "dry-validation", "~> 0.8.0"
+  spec.add_runtime_dependency "dry-configurable", "~> 0.1.6"
 end

data/lib/kontena/cli/apps/yaml/reader.rb

@@ -2,10 +2,12 @@ require 'yaml'
 require_relative 'service_extender'
 require_relative 'validator'
 require_relative 'validator_v2'
+require_relative '../../../util'
 
 module Kontena::Cli::Apps
   module YAML
     class Reader
+      include Kontena::Util
       attr_reader :yaml, :file, :errors, :notifications
 
       def initialize(file, skip_validation = false)
@@ -177,14 +179,12 @@ module Kontena::Cli::Apps
 
       # @param [Hash] options - service config
       def normalize_build_args(options)
-        if v2? && options.dig('build', 'args')
-          if options['build']['args'].is_a?(Array)
-            args = options['build']['args'].dup
-            options['build']['args'] = {}
-            args.each do |arg|
-              k,v = arg.split('=')
-              options['build']['args'][k] = v
-            end
+        if v2? && safe_dig(options, 'build', 'args').is_a?(Array)
+          args = options['build']['args'].dup
+          options['build']['args'] = {}
+          args.each do |arg|
+            k,v = arg.split('=')
+            options['build']['args'][k] = v
           end
         end
       end

data/lib/kontena/cli/apps/yaml/service_extender.rb

@@ -1,8 +1,10 @@
 require 'yaml'
+require_relative '../../../util'
 
 module Kontena::Cli::Apps
   module YAML
     class ServiceExtender
+      include Kontena::Util
       attr_reader :service_config
 
       # @param [Hash] service_config
@@ -26,24 +28,12 @@ module Kontena::Cli::Apps
           service_config['build'] = {} unless service_config['build']
           service_config['build']['args'] = build_args
         end
-        
+
         from.merge(service_config)
       end
 
       private
 
-      # Compatibility between ruby_dig and Ruby 2.3. Ruby_dig returns
-      # nil when trying to dig into a string, Ruby 2.3 dig raises
-      # TypeError.
-      #
-      # @param [Hash] source_hash
-      # @param [*keys] list_of_keys
-      def safe_dig(hash, *keys)
-        hash.dig(*keys)
-      rescue TypeError
-        nil
-      end
-
       # @param [Array] from
       # @param [Array] to
       # @return [Array]

data/lib/kontena/cli/certificate/get_command.rb

@@ -6,6 +6,7 @@ module Kontena::Cli::Certificate
 
 
     option '--secret-name', 'SECRET_NAME', 'The name for the secret to store the certificate in'
+    option '--cert-type', 'CERT_TYPE', 'The type of certificate to get: fullchain, chain or cert', default: 'fullchain'
     parameter "DOMAIN ...", "Domain(s) to get certificate for"
 
 

data/lib/kontena/util.rb

@@ -1,6 +1,5 @@
 module Kontena
   module Util
-    
     def self.included(base)
         base.extend(ClassMethods)
     end
@@ -16,13 +15,26 @@ module Kontena
       end
       return nil
     end
+
+    # Compatibility between ruby_dig and Ruby 2.3. Ruby_dig returns
+    # nil when trying to dig into a string, Ruby 2.3 dig raises
+    # TypeError.
+    #
+    # @param [Hash] source_hash
+    # @param [*keys] list_of_keys
+    def safe_dig(hash, *keys)
+      hash.dig(*keys)
+    rescue TypeError
+      nil
+    end
+
     module_function(:which)
 
     module ClassMethods
       def experimental?
         ENV.has_key?('KONTENA_EXPERIMENTAL')
-      end   
+      end
     end
-    
+
   end
 end

data/spec/kontena/cli/app/yaml/reader_spec.rb

@@ -330,4 +330,66 @@ describe Kontena::Cli::Apps::YAML::Reader do
       expect(outcome[:services]['webapp']['build']['context']).to eq(File.expand_path('.'))
     end
   end
+
+  context 'normalize_build_args' do
+    context 'when build option is string' do
+      it 'skips normalizing' do
+        allow(File).to receive(:read)
+          .with(absolute_yaml_path('kontena.yml'))
+          .and_return(fixture('kontena_build_v2.yml'))
+        allow(subject).to receive(:v2?).and_return(true)
+
+        options = {
+          'build' => '.'
+        }
+        expect {
+          subject.send(:normalize_build_args, options)
+        }.not_to raise_error
+      end
+    end
+
+    context 'when build arguments option is Hash' do
+      it 'does not do anything' do
+        allow(File).to receive(:read)
+          .with(absolute_yaml_path('kontena.yml'))
+          .and_return(fixture('kontena_build_v2.yml'))
+        allow(subject).to receive(:v2?).and_return(true)
+
+        options = {
+          'build' => {
+            'context' => '.',
+            'args' => {
+              'foo' => 'bar'
+            }
+          }
+        }
+
+        subject.send(:normalize_build_args, options)
+        expect(options.dig('build', 'args')).to eq({
+          'foo' => 'bar'
+        })
+      end
+    end
+
+    context 'when build arguments option is Array' do
+      it 'converts it to array' do
+        allow(File).to receive(:read)
+          .with(absolute_yaml_path('kontena.yml'))
+          .and_return(fixture('kontena_build_v2.yml'))
+        allow(subject).to receive(:v2?).and_return(true)
+
+        options = {
+          'build' => {
+            'context' => '.',
+            'args' => ['foo=bar']
+          }
+        }
+
+        subject.send(:normalize_build_args, options)
+        expect(options.dig('build', 'args')).to eq({
+          'foo' => 'bar'
+        })
+      end
+    end
+  end
 end

data/spec/kontena/client_spec.rb

@@ -7,7 +7,7 @@ describe Kontena::Client do
   let(:http_client) { double(:http_client) }
 
   before(:each) do
-    allow(subject).to receive(:http_client)
+    allow(subject).to receive(:http_client).and_return(http_client)
   end
 
   describe '#get' do
@@ -40,7 +40,6 @@ describe Kontena::Client do
     let(:response_block) { Proc.new{ } }
 
     it 'passes path & response_block to client' do
-      allow(subject).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:get).with(
         hash_including(path: '/v1/foo', response_block: response_block)
       ).and_return(spy(:response, status: 200))
@@ -48,7 +47,6 @@ describe Kontena::Client do
     end
 
     it 'passes params to client' do
-      allow(subject).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:get).with(
         hash_including(query: {bar: 'baz'})
       ).and_return(spy(:response, status: 200))
@@ -56,7 +54,6 @@ describe Kontena::Client do
     end
 
     it 'passes params to client' do
-      allow(subject).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:get).with(
         hash_including(headers: hash_including(:'Some-Header' => 'value'))
       ).and_return(spy(:response, status: 200))
@@ -70,7 +67,6 @@ describe Kontena::Client do
     end
 
     it 'passes path and object to client' do
-      allow(subject).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:post).with(
         hash_including(path: '/v1/foo', body: kind_of(String))
       ).and_return(spy(:response, status: 200))
@@ -78,7 +74,6 @@ describe Kontena::Client do
     end
 
     it 'passes params to client' do
-      allow(subject).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:post).with(
         hash_including(query: {bar: 'baz'})
       ).and_return(spy(:response, status: 200))
@@ -86,7 +81,6 @@ describe Kontena::Client do
     end
 
     it 'passes params to client' do
-      allow(subject).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:post).with(
         hash_including(headers: hash_including(:'Some-Header' => 'value'))
       ).and_return(spy(:response, status: 200))
@@ -100,7 +94,6 @@ describe Kontena::Client do
     end
 
     it 'passes path and object to client' do
-      allow(subject).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:put).with(
         hash_including(path: '/v1/foo', body: kind_of(String))
       ).and_return(spy(:response, status: 200))
@@ -108,7 +101,6 @@ describe Kontena::Client do
     end
 
     it 'passes params to client' do
-      allow(subject).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:put).with(
         hash_including(query: {bar: 'baz'})
       ).and_return(spy(:response, status: 200))
@@ -116,7 +108,6 @@ describe Kontena::Client do
     end
 
     it 'passes params to client' do
-      allow(subject).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:put).with(
         hash_including(headers: hash_including(:'Some-Header' => 'value'))
       ).and_return(spy(:response, status: 200))
@@ -130,7 +121,6 @@ describe Kontena::Client do
     end
 
     it 'passes path to client' do
-      allow(subject).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:delete).with(
         hash_including(path: '/v1/foo')
       ).and_return(spy(:response, status: 200))
@@ -138,7 +128,6 @@ describe Kontena::Client do
     end
 
     it 'passes params to client' do
-      allow(subject).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:delete).with(
         hash_including(query: {bar: 'baz'})
       ).and_return(spy(:response, status: 200))
@@ -146,7 +135,6 @@ describe Kontena::Client do
     end
 
     it 'passes params to client' do
-      allow(subject).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:delete).with(
         hash_including(headers: hash_including(:'Some-Header' => 'value'))
       ).and_return(spy(:response, status: 200))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-13 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 description: Kontena command line tool
 email:
 - info@kontena.io