kontena-cli 1.2.0 → 1.2.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bc00d0ec3050b6dd80e0c193ee9a09499137c06
-  data.tar.gz: 51ba8dd82496286ec9751eb52a83a00d15cd99eb
+  metadata.gz: b18a8f9e16992007d8e29291e6205621b696c764
+  data.tar.gz: b48e57f00c487866a628536651900c9ac85abc16
 SHA512:
-  metadata.gz: e7b5f3297c6f8f7fddcfc10bea2c648f310588ed198ecac836ce1153178c76953d23be9b8e1950aa1d4d780f0d4f7cb5e3638a4044852420fc1a59227a01da78
-  data.tar.gz: a92ebc69b4e0eff2aadccaf1c1cefe54117ddca15dafd7d2a1196e6ede3dcbef0b836bb570e6227df9a3e9f6972be8a7ca644fc71c66ca9c2efe6fc3076a8d8c
+  metadata.gz: 791b963130649a9850ac5f953557a5c8334ec7b479106293180c9ad2383157709f1e3b82394d8c38fd819a3420d7c6f134fd8260d9f5ff1209d162975de41b0d
+  data.tar.gz: 861eeadeb19f458d1738c46f10dc8c8580f62958d419313f76d13c6be1c080a33c344fa178d8d21e14c2472c7edbd14d92217d6244e2726c6c805b28f3330a33

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1.rc1

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

@@ -97,7 +97,7 @@ module Kontena::Cli::Stacks
     end
 
     def stack_read_and_dump(filename, name: nil, values: nil, defaults: nil)
-      reader = reader_from_yaml(filename, name: name, values: values)
+      reader = reader_from_yaml(filename, name: name, values: values, defaults: defaults)
       stack = stack_from_reader(reader)
       dump_variables(reader) if values_to
       stack

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

@@ -73,7 +73,7 @@ module Kontena::Cli::Stacks
               warnings: false
             )
           )
-        )
+        ) || {}
       rescue Psych::SyntaxError => ex
         raise ex, "Error while parsing #{file} : #{ex.message}"
       end
@@ -92,13 +92,13 @@ module Kontena::Cli::Stacks
               raise_on_unknown: true
             )
           )
-        )
+        ) || {}
       rescue Psych::SyntaxError => ex
         raise ex, "Error while parsing #{file} : #{ex.message}"
       end
 
       def raw_yaml
-        @raw_yaml ||= ::YAML.safe_load(raw_content)
+        @raw_yaml ||= ::YAML.safe_load(raw_content) || {}
       end
 
       # @return [Opto::Group]

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

@@ -31,6 +31,24 @@ module Kontena::Cli::Stacks
         Validations::CustomValidators.load
       end
 
+      # borrowed from server/app/helpers/volumes_helpers.rb
+      def parse_volume(vol)
+        elements = vol.split(':')
+        if elements.size >= 2 # Bind mount or volume used
+          if elements[0].start_with?('/') && elements[1] && elements[1].start_with?('/') # Bind mount
+            {bind_mount: elements[0], path: elements[1], flags: elements[2..-1].join(',')}
+          elsif !elements[0].start_with?('/') && elements[1].start_with?('/') # Real volume
+            {volume: elements[0], path: elements[1], flags: elements[2..-1].join(',')}
+          else
+            {error: "volume definition not in right format: #{vol}" }
+          end
+        elsif elements.size == 1 && elements[0].start_with?('/') # anon volume
+          {bind_mount: nil, path: elements[0], flags: nil} # anon vols do not support flags
+        else
+          {error: "volume definition not in right format: #{vol}" }
+        end
+      end
+
       ##
       # @param [Hash] yaml
       # @param [TrueClass|FalseClass] strict
@@ -55,18 +73,14 @@ module Kontena::Cli::Stacks
               option_errors = validate_options(options)
               result[:errors] << { 'services' => { service => option_errors.errors } } unless option_errors.valid?
               if options['volumes']
-                mount_points = options['volumes'].inject(Hash.new(0)) { |hsh, vol| hsh[vol.split(':').last] += 1; hsh }
-                mount_points.each do |mount_point, occurences|
-                  next unless occurences > 1
-                  result[:errors] << { 'services' => { service => { 'volumes' => { mount_point => "mount point defined #{occurences} times" } } } }
-                end
-
+                mount_path_occurences = Hash.new(0)
                 options['volumes'].each do |volume|
-                  if volume.include?(':')
-                    volume_name, mount_point = volume.split(':', 2)
-                    unless mount_point
-                      result[:errors] << { 'services' => { service => { 'volumes' => { volume => 'mount point missing' } } } }
-                    end
+                  parsed = parse_volume(volume)
+                  if parsed[:error]
+                    result[:errors] << { 'services' => { service => { 'volumes' => { volume => parsed[:error] } } } }
+                  elsif parsed[:path]
+                    mount_path_occurences[parsed[:path]] += 1
+                    volume_name = parsed[:volume]
                     if volume_name && !volume_name.start_with?('/')
                       if yaml.key?('volumes')
                         unless yaml['volumes'][volume_name]
@@ -76,8 +90,13 @@ module Kontena::Cli::Stacks
                         result[:errors] << { 'services' => { service => { 'volumes' => { volume => 'defines volume name, but file does not contain volumes definitions' } } } }
                       end
                     end
+                  else
+                    result[:errors] << { 'services' => { service => { 'volumes' => { volume => 'mount point missing' } } } }
                   end
                 end
+                mount_path_occurences.select {|path, occurences| occurences > 1 }.each do |path, occurences|
+                  result[:errors] << { 'services' => { service => { 'volumes' => { path => "mount point defined #{occurences} times" } } } }
+                end
               end
             end
           else

data/lib/kontena/command.rb

@@ -210,6 +210,7 @@ class Kontena::Command < Clamp::Command
     if ex.message.include?('Unable to verify certificate')
       $stderr.puts " [#{Kontena.pastel.red('error')}] The server uses a certificate signed by an unknown authority."
       $stderr.puts "         You can trust this server by copying server CA pem file to: #{Kontena.pastel.yellow("~/.kontena/certs/<hostname>.pem")}"
+      $stderr.puts "         If kontena cannot find your system ca bundle, you can set #{Kontena.pastel.yellow('SSL_CERT_DIR=/etc/ssl/certs')} env variable to load them from another location."
       $stderr.puts "         Protip: you can bypass the certificate check by setting #{Kontena.pastel.yellow('SSL_IGNORE_ERRORS=true')} env variable, but any data you send to the server could be intercepted by others."
       abort
     else

data/omnibus/config/software/kontena.rb

@@ -7,6 +7,7 @@ dependency "libxml2"
 dependency "libxslt"
 whitelist_file "./wrappers/sh/kontena"
 build do
+  gem "install rb-readline -v 0.5.4 --no-ri --no-doc"
   gem "install nokogiri -v 1.6.8 --no-ri --no-doc"
   gem "install kontena-cli -v #{default_version} --no-ri --no-doc"
   copy "sh/kontena", "#{install_dir}/bin/kontena"

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

@@ -0,0 +1,102 @@
+require "kontena/cli/stacks/common"
+require "kontena/cli/stacks/yaml/reader"
+
+describe Kontena::Cli::Stacks::Common do
+
+  let(:klass) do
+    Class.new(Kontena::Command) do
+      include Kontena::Cli::Stacks::Common
+      include Kontena::Cli::Common
+      include Kontena::Cli::Stacks::Common::StackNameParam
+      include Kontena::Cli::Stacks::Common::StackFileOrNameParam
+      include Kontena::Cli::Stacks::Common::StackNameOption
+      include Kontena::Cli::Stacks::Common::StackValuesToOption
+      include Kontena::Cli::Stacks::Common::StackValuesFromOption
+    end
+  end
+
+  let(:subject) { klass.new('') }
+
+  context 'stack yaml reader methods' do
+    let(:reader) { double(:reader) }
+
+    before(:each) do
+      allow(reader).to receive(:execute).and_return({ errors: [], notifications: [] })
+      allow(reader).to receive(:raw_content).and_return("")
+      allow(reader).to receive(:stack_name).and_return('foo')
+      allow(subject).to receive(:set_env_variables).and_return(true)
+    end
+
+    describe '#stack_read_and_dump' do
+      it 'passes args to reader' do
+        expect(Kontena::Cli::Stacks::YAML::Reader).to receive(:new).with('foo', values: { 'value' => 'value' }, defaults: { 'default' => 'default' }).and_return(reader)
+        subject.stack_read_and_dump('foo', name: 'name', values: { 'value' => 'value' }, defaults: { 'default' => 'default' })
+      end
+
+      it 'returns a stack hash' do
+        expect(Kontena::Cli::Stacks::YAML::Reader).to receive(:new).and_return(reader)
+        expect(subject.stack_read_and_dump('foo')).to be_kind_of Hash
+      end
+    end
+
+    describe '#stack_from_yaml' do
+      it 'passes args to reader' do
+        expect(Kontena::Cli::Stacks::YAML::Reader).to receive(:new).with('foo', values: { 'value' => 'value' }, defaults: { 'default' => 'default' }).and_return(reader)
+        subject.stack_from_yaml('foo', name: 'name', values: { 'value' => 'value' }, defaults: { 'default' => 'default' })
+      end
+
+      it 'returns a stack hash' do
+        expect(Kontena::Cli::Stacks::YAML::Reader).to receive(:new).and_return(reader)
+        expect(subject.stack_from_yaml('foo')).to be_kind_of Hash
+      end
+    end
+
+    describe '#reader_from_yaml' do
+      it 'passes args to reader' do
+        expect(Kontena::Cli::Stacks::YAML::Reader).to receive(:new).with('foo', values: { 'value' => 'value' }, defaults: { 'default' => 'default' }).and_return(reader)
+        subject.reader_from_yaml('foo', name: 'name', values: { 'value' => 'value' }, defaults: { 'default' => 'default' })
+      end
+
+      it 'returns a reader' do
+        expect(Kontena::Cli::Stacks::YAML::Reader).to receive(:new).and_return(reader)
+        expect(subject.reader_from_yaml('foo')).to eq reader
+      end
+    end
+  end
+
+  describe '#stack_name' do
+  end
+
+  describe '#stack_from_reader' do
+  end
+
+  describe '#stack_from_yaml' do
+  end
+
+  describe '#require_config_file' do
+  end
+
+  describe '#generate_volumes' do
+  end
+
+  describe '#generate_services' do
+  end
+
+  describe '#set_env_variables' do
+  end
+
+  describe '#current_dir' do
+  end
+
+  describe '#display_notifications' do
+  end
+
+  describe '#hint_on_validation_notifications' do
+  end
+
+  describe '#abort_on_validation_errors' do
+  end
+
+  describe '#stacks_client' do
+  end
+end

data/spec/kontena/cli/stacks/yaml/validator_v3_spec.rb

@@ -324,6 +324,7 @@ describe Kontena::Cli::Stacks::YAML::ValidatorV3 do
 
         }
       end
+
       it 'fails validation if volumes are not declared' do
         result = subject.validate(stack)
         expect(result[:errors]).not_to be_empty
@@ -361,6 +362,24 @@ describe Kontena::Cli::Stacks::YAML::ValidatorV3 do
         expect(result[:errors]).to be_empty
       end
 
+      it 'validation passes when mount points are defined with :ro' do
+        stack['services']['foo']['volumes'] = ['/var/foo:/foo:ro', '/tmp/foo:/bar:ro']
+        result = subject.validate(stack)
+        expect(result[:errors]).to be_empty
+      end
+
+      it 'validation fails when same mount point is defined multiple times' do
+        stack['services']['foo']['volumes'] = ['/var/foo:/foo', '/tmp/foo:/foo']
+        result = subject.validate(stack)
+        expect(result[:errors]).to include({"services"=>{"foo"=>{"volumes"=>{"/foo"=>"mount point defined 2 times"}}}})
+      end
+
+      it 'validation fails when same mount point is defined multiple times mixing :ro' do
+        stack['services']['foo']['volumes'] = ['/var/foo:/foo', '/tmp/foo:/foo:ro']
+        result = subject.validate(stack)
+        expect(result[:errors]).to include({"services"=>{"foo"=>{"volumes"=>{"/foo"=>"mount point defined 2 times"}}}})
+      end
+
       it 'bind mount do not need ext volumes' do
         stack['services']['foo']['volumes'] = ['/var/run/docker.sock:/var/run/docker.sock']
         result = subject.validate(stack)

data/spec/kontena/kontena_cli_spec.rb

@@ -12,10 +12,16 @@ describe Kontena do
       Kontena.reset_prompt
     end
 
-    it 'uses light prompt on windows' do
-      allow(ENV).to receive(:[]).with('OS').and_return('Windows_NT')
+    it 'uses light prompt on simple terminals' do
+      expect(ENV).to receive(:[]).with('KONTENA_SIMPLE_TERM').and_return('true')
       expect(Kontena.prompt).to be_kind_of(Kontena::LightPrompt)
     end
+
+    it 'uses fancy prompt on fancy terminals' do
+      expect($stdout).to receive(:tty?).at_least(:once).and_return(true)
+      expect(ENV).to receive(:[]).with('KONTENA_SIMPLE_TERM').and_return(nil)
+      expect(Kontena.prompt).to be_kind_of(TTY::Prompt)
+    end
   end
 
   describe '#minor_version' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -611,6 +611,7 @@ files:
 - spec/kontena/cli/services/unlink_command_spec.rb
 - spec/kontena/cli/services/update_command_spec.rb
 - spec/kontena/cli/stacks/build_command_spec.rb
+- spec/kontena/cli/stacks/common_spec.rb
 - spec/kontena/cli/stacks/deploy_command_spec.rb
 - spec/kontena/cli/stacks/events_command_spec.rb
 - spec/kontena/cli/stacks/install_command_spec.rb
@@ -661,9 +662,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8
@@ -756,6 +757,7 @@ test_files:
 - spec/kontena/cli/services/unlink_command_spec.rb
 - spec/kontena/cli/services/update_command_spec.rb
 - spec/kontena/cli/stacks/build_command_spec.rb
+- spec/kontena/cli/stacks/common_spec.rb
 - spec/kontena/cli/stacks/deploy_command_spec.rb
 - spec/kontena/cli/stacks/events_command_spec.rb
 - spec/kontena/cli/stacks/install_command_spec.rb