kontena-cli 0.15.0.rc1 → 0.15.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2097ac9b19a1b3ffe77759d51f750de06bab2af
-  data.tar.gz: 0484b872ce20c995506cba6cc651716b7a4ffec3
+  metadata.gz: de5064548c891f2a1dc2b8382efcd81ef47a4e3b
+  data.tar.gz: 0d1262bfcc83048a591ab04b1040c94cbbb0ca02
 SHA512:
-  metadata.gz: 6fce1e0c1cac772357d580e0c05284130ad1632a234c47e48f722028d37bc5ec6c025628e343fe5cc6567e9703775c64bd04a34e46ee71d072c52525d1ace02e
-  data.tar.gz: 929389765338d0c8db3dbc56973052f4cb5b7c384ea37f6ba2125a393436b83260161c1ff9aa0111aa1f6446e1afe8d9fe3cd5a7f6ccb2928e7369ef03938421
+  metadata.gz: 3c540225c876e38452bcf9308fa2ae356464b17e7f0433c65e078afaaf20b9cfeedee96fb76e77a921f2f0d2269a3fbbac127cad33abb81a8b5d4af49829ca06
+  data.tar.gz: 2c723b83ee5fe5a81e853f45e22cb44be1decb8dee9e4f8b83defa1ef2c0a3c03af8afc750ac38d3f90d1a6c7c6abd92dda7d921e83a8ac311891a487b23e8af

data/VERSION

@@ -1 +1 @@
-0.15.0.rc1
+0.15.0.rc2

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

@@ -26,7 +26,7 @@ module Kontena::Cli::Apps
       data = {}
       data['container_count'] = options['instances']
       data['image'] = parse_image(options['image'])
-      data['env'] = merge_env_vars(options)
+      data['env'] = options['environment'] if options['environment']
       data['container_count'] = options['instances']
       data['links'] = parse_links(options['links'] || [])
       data['external_links'] = parse_links(options['external_links'] || [])
@@ -73,24 +73,6 @@ module Kontena::Cli::Apps
       data
     end
 
-    # @param [Hash] options
-    def merge_env_vars(options)
-      return options['environment'] 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
-
-
-    # @param [String] path
-    def read_env_file(path)
-      File.readlines(path).delete_if { |line| line.start_with?('#') || line.strip.empty? }
-    end
-
     # @param [Array<String>] port_options
     # @return [Array<Hash>]
     def parse_stringified_ports(port_options)

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

@@ -89,6 +89,8 @@ module Kontena::Cli::Apps
       # @param [Hash] service_config
       def process_config(service_config)
         normalize_env_vars(service_config)
+        merge_env_vars(service_config)
+        expand_build_context(service_config)
         normalize_build_args(service_config)
         service_config = extend_config(service_config) if service_config.key?('extends')
         service_config
@@ -146,7 +148,33 @@ module Kontena::Cli::Apps
           options['environment'] = options['environment'].map { |k, v| "#{k}=#{v}" }
         end
       end
-      
+
+      # @param [Hash] options
+      def merge_env_vars(options)
+        return options['environment'] 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.delete('env_file')
+        options['environment'].uniq! { |s| s.split('=').first }
+      end
+
+      # @param [String] path
+      def read_env_file(path)
+        File.readlines(path).map { |line| line.strip }.delete_if { |line| line.start_with?('#') || line.empty? }
+      end
+
+      def expand_build_context(options)
+        if options['build'].is_a?(String)
+          options['build'] = File.expand_path(options['build'])
+        elsif context = options.dig('build', 'context')
+          options['build']['context'] = File.expand_path(context)
+        end
+      end
+
       # @param [Hash] options - service config
       def normalize_build_args(options)
         if v2? && options.dig('build', 'args')

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

@@ -4,8 +4,9 @@ module Kontena::Cli::Grids
     ##
     # @param [Hash] grid
     def print_grid(grid)
+      host = ENV['KONTENA_URL'] || self.current_master['url']
       puts "#{grid['name']}:"
-      puts "  uri: #{self.current_master['url'].sub('http', 'ws')}"
+      puts "  uri: #{host.sub('http', 'ws')}"
       puts "  token: #{grid['token']}"
       root_dir = grid['engine_root_dir']
       nodes = client(require_token).get("grids/#{grid['name']}/nodes")

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

@@ -12,8 +12,8 @@ module Kontena::Cli::Services
 
       grids = client(token).get("grids/#{current_grid}/services")
       services = grids['services'].sort_by{|s| s['updated_at'] }.reverse
-      titles = ['NAME', 'INSTANCES', 'STATEFUL', 'STATE', 'HEALTH', 'EXPOSED PORTS']
-      puts "%-60s %-10s %-8s %-10s %-10s %-50s" % titles
+      titles = ['NAME', 'INSTANCES', 'STATEFUL', 'STATE', 'EXPOSED PORTS']
+      puts "%-60s %-10s %-8s %-10s %-50s" % titles
       services.each do |service|
         stateful = service['stateful'] ? 'yes' : 'no'
         running = service['instances']['running']
@@ -22,28 +22,15 @@ module Kontena::Cli::Services
         ports = service['ports'].map{|p|
           "#{p['ip']}:#{p['node_port']}->#{p['container_port']}/#{p['protocol']}"
         }.join(", ")
-        health = 'unknown'
-        if service['health_status']
-          icon = "■"
-          healthy = service.dig('health_status', 'healthy')
-          total = service.dig('health_status', 'total')
-          color = :green
-          if healthy == 0
-            color = :red
-          elsif healthy > 0 && healthy < total
-            color = :yellow
-          end
-          health = "■".colorize(color)
-        end 
+        health = health_status(service)
         vars = [
-          service['name'],
+          "#{health_status_icon(health)} #{service['name']}",
           instances,
           stateful,
           service['state'],
-          health,
           ports
         ]
-        puts "%-60.60s %-10.10s %-8s %-10s %-10s %-50s" % vars
+        puts "%-74s %-10.10s %-8s %-10s %-50s" % vars
       end
     end
   end

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

@@ -180,7 +180,7 @@ module Kontena
             puts "    interval: #{service['health_check']['interval']}"
             puts "    initial_delay: #{service['health_check']['initial_delay']}"
           end
-          
+
           if service['health_status']
             puts "  health status:"
             puts "    healthy: #{service['health_status']['healthy']}"
@@ -282,7 +282,7 @@ module Kontena
               ip: ip,
               container_port: container_port,
               node_port: node_port,
-              protocol: protocol 
+              protocol: protocol
             }
           }
         end
@@ -399,6 +399,42 @@ module Kontena
 
           build_args
         end
+
+        # @param [Symbol] health
+        # @return [String]
+        def health_status_icon(health)
+          if health == :unhealthy
+            icon = '⊗'.freeze
+            icon.colorize(:red)
+          elsif health == :partial
+            icon = '⊙'.freeze
+            icon.colorize(:yellow)
+          elsif health == :healthy
+            icon = '⊛'.freeze
+            icon.colorize(:green)
+          else
+            icon = '⊝'.freeze
+            icon.colorize(:default)
+          end
+        end
+
+        # @param [Hash] service
+        # @return [Symbol]
+        def health_status(service)
+          if service['health_status']
+            healthy = service.dig('health_status', 'healthy')
+            total = service.dig('health_status', 'total')
+            if healthy == 0
+              :unhealthy
+            elsif healthy > 0 && healthy < total
+              :partial
+            else
+              :healthy
+            end
+          else
+            :unknown
+          end
+        end
       end
     end
   end

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

@@ -10,10 +10,10 @@ module Kontena::Cli::Vault
       token = require_token
       result = client(token).get("grids/#{current_grid}/secrets")
 
-      column_width_paddings = '%-54s %-25.25s'
-      puts column_width_paddings % ['NAME', 'CREATED AT']
+      column_width_paddings = '%-54s %-25.25s %-25.25s'
+      puts column_width_paddings % ['NAME', 'CREATED AT', 'UPDATED AT']
       result['secrets'].sort_by { |s| s['name'] }.each do |secret|
-        puts column_width_paddings % [secret['name'], secret['created_at']]
+        puts column_width_paddings % [secret['name'], secret['created_at'], secret['updated_at']]
       end
     end
   end

data/lib/kontena/cli/whoami_command.rb

@@ -10,27 +10,26 @@ class Kontena::Cli::WhoamiCommand < Clamp::Command
     end
 
     require_api_url
-    puts "Master: #{self.current_master['name']}"
-    puts "URL: #{api_url}"
-    puts "Grid: #{current_grid}"
-    if current_master['email']
-      puts "User: #{current_master['email']}"
-    else # In case local storage doesn't have the user email yet
-      token = require_token
-      user = client(token).get('user')
-      puts "User: #{user['email']}"
-      master = {
-          'name' => current_master['name'],
-          'url' => current_master['url'],
-          'token' => current_master['token'],
-          'email' => user['email'],
-          'grid' => current_master['grid']
-      }
+    puts "Master: #{ENV['KONTENA_URL'] || self.current_master['name']}"
+    puts "URL: #{ENV['KONTENA_URL'] || api_url}"
+    puts "Grid: #{ENV['KONTENA_GRID'] || current_grid}"
+    unless ENV['KONTENA_URL']
+      if current_master['email']
+        puts "User: #{current_master['email']}"
+      else # In case local storage doesn't have the user email yet
+        token = require_token
+        user = client(token).get('user')
+        puts "User: #{user['email']}"
+        master = {
+            'name' => current_master['name'],
+            'url' => current_master['url'],
+            'token' => current_master['token'],
+            'email' => user['email'],
+            'grid' => current_master['grid']
+        }
 
-      self.add_master(current_master['name'], master)
+        self.add_master(current_master['name'], master)
+      end
     end
-
-
   end
-
 end

data/lib/kontena/main_command.rb

@@ -27,10 +27,11 @@ require_relative 'cli/stack_command'
 require_relative 'cli/certificate_command'
 
 class Kontena::MainCommand < Kontena::Command
+  include Kontena::Util
 
   subcommand "grid", "Grid specific commands", Kontena::Cli::GridCommand
   subcommand "app", "App specific commands", Kontena::Cli::AppCommand
-  subcommand "stack", "Stack specific commands", Kontena::Cli::StackCommand
+  subcommand "stack", "Stack specific commands", Kontena::Cli::StackCommand if experimental?
   subcommand "service", "Service specific commands", Kontena::Cli::ServiceCommand
   subcommand "vault", "Vault specific commands", Kontena::Cli::VaultCommand
   subcommand "certificate", "LE Certificate specific commands", Kontena::Cli::CertificateCommand

data/lib/kontena/util.rb

@@ -1,6 +1,10 @@
 module Kontena
   module Util
     
+    def self.included(base)
+        base.extend(ClassMethods)
+    end
+
     # @param [String] cmd
     def which(cmd)
       exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
@@ -13,5 +17,12 @@ module Kontena
       return nil
     end
     module_function(:which)
+
+    module ClassMethods
+      def experimental?
+        ENV.has_key?('KONTENA_EXPERIMENTAL')
+      end   
+    end
+    
   end
 end

data/spec/fixtures/kontena-with-env-file.yml

@@ -0,0 +1,18 @@
+wordpress:
+  extends:
+    file: docker-compose.yml
+    service: wordpress
+  stateful: true
+  env_file: .env
+  environment:
+    WORDPRESS_DB_PASSWORD: %{project}_secret
+  instances: 2
+  deploy:
+    strategy: ha
+mysql:
+  extends:
+    file: docker-compose.yml
+    service: mysql
+  stateful: true
+  environment:
+    - MYSQL_ROOT_PASSWORD=%{project}_secret

data/spec/kontena/cli/app/service_generator_spec.rb

@@ -6,12 +6,6 @@ describe Kontena::Cli::Apps::ServiceGenerator do
     described_class.new({})
   end
 
-  let(:env_file) do
-    'APIKEY=12345
-MYSQL_ROOT_PASSWORD=secret
-WP_ADMIN_PASSWORD=verysecret'.split(/\r?\n/)
-  end
-
   describe '#parse_data' do
     context 'volumes' do
       it 'returns volumes if set' do
@@ -387,50 +381,5 @@ WP_ADMIN_PASSWORD=verysecret'.split(/\r?\n/)
         expect(result['secrets']).to be_nil
       end
     end
-  end
-
-  describe '#read_env_file' do
-    before(:each) do
-      allow(File).to receive(:readlines).with('.env').and_return(env_file)
-    end
-    it 'reads given file' do
-      expect(File).to receive(:readlines).with('.env').and_return(env_file)
-      subject.send(:read_env_file, '.env')
-    end
-
-    it 'returns array' do
-      variables = subject.send(:read_env_file, '.env')
-      expect(variables).to eq([
-        'APIKEY=12345',
-        'MYSQL_ROOT_PASSWORD=secret',
-        'WP_ADMIN_PASSWORD=verysecret'
-        ])
-    end
-
-    it 'discards comment lines' do
-      result = env_file
-      result << "#COMMENTLINE"
-      allow(File).to receive(:readlines).with('.env').and_return(result)
-
-      variables = subject.send(:read_env_file, '.env')
-      expect(variables).to eq([
-        'APIKEY=12345',
-        'MYSQL_ROOT_PASSWORD=secret',
-        'WP_ADMIN_PASSWORD=verysecret'
-        ])
-    end
-
-    it 'discards empty lines' do
-      result = env_file
-      result << '
-'
-      allow(File).to receive(:readlines).with('.env').and_return(result)
-      variables = subject.send(:read_env_file, '.env')
-      expect(variables).to eq([
-        'APIKEY=12345',
-        'MYSQL_ROOT_PASSWORD=secret',
-        'WP_ADMIN_PASSWORD=verysecret'
-        ])
-    end
-  end
+  end  
 end

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

@@ -16,6 +16,12 @@ describe Kontena::Cli::Apps::YAML::Reader do
     spy
   end
 
+  let(:env_file) do
+    ['APIKEY=12345
+', 'MYSQL_ROOT_PASSWORD=secret
+', 'WP_ADMIN_PASSWORD=verysecret']
+  end
+
   let(:valid_result) do
     {
       'wordpress' => {
@@ -232,6 +238,57 @@ describe Kontena::Cli::Apps::YAML::Reader do
         result = subject.execute[:services]
         expect(result['mysql']['environment']).to eq(['MYSQL_ROOT_PASSWORD=test_secret'])
       end
+
+      context 'when introduced env_file' do
+        before(:each) do
+          allow(File).to receive(:read)
+            .with(absolute_yaml_path('kontena.yml'))
+            .and_return(fixture('kontena-with-env-file.yml'))
+          allow(File).to receive(:readlines).with('.env').and_return(env_file)
+        end
+
+        it 'reads given file' do
+          expect(File).to receive(:readlines).with('.env').and_return(env_file)
+          subject.send(:read_env_file, '.env')
+        end
+
+        it 'discards comment lines' do
+          result = env_file
+          result << "#COMMENTLINE"
+          allow(File).to receive(:readlines).with('.env').and_return(result)
+
+          variables = subject.send(:read_env_file, '.env')
+          expect(variables).to eq([
+            'APIKEY=12345',
+            'MYSQL_ROOT_PASSWORD=secret',
+            'WP_ADMIN_PASSWORD=verysecret'
+            ])
+        end
+
+        it 'discards empty lines' do
+          result = env_file
+          result << '
+    '
+          allow(File).to receive(:readlines).with('.env').and_return(result)
+          variables = subject.send(:read_env_file, '.env')
+          expect(variables).to eq([
+            'APIKEY=12345',
+            'MYSQL_ROOT_PASSWORD=secret',
+            'WP_ADMIN_PASSWORD=verysecret'
+            ])
+        end
+
+        it 'merges variables' do
+          result = subject.execute[:services]
+          expect(result['wordpress']['environment']).to eq([
+            'WORDPRESS_DB_PASSWORD=test_secret',
+            'APIKEY=12345',
+            'MYSQL_ROOT_PASSWORD=secret',
+            'WP_ADMIN_PASSWORD=verysecret'
+            ])
+        end
+
+      end
     end
     it 'returns result hash' do
       outcome = subject.execute
@@ -246,4 +303,31 @@ describe Kontena::Cli::Apps::YAML::Reader do
       expect(outcome[:errors].size).to eq(1)
     end
   end
+
+  context 'when build option is string' do
+    it 'expands build option to absolute path' do
+      allow(File).to receive(:read)
+        .with(absolute_yaml_path('docker-compose.yml'))
+        .and_return(fixture('docker-compose.yml'))
+      allow(File).to receive(:read)
+        .with(absolute_yaml_path('kontena.yml'))
+        .and_return(fixture('kontena-build.yml'))
+      outcome = subject.execute
+
+      expect(outcome[:services]['wordpress']['build']).to eq(File.expand_path('.'))
+    end
+  end
+
+  context 'when build option is Hash' do
+    it 'expands build context to absolute path' do
+      allow(File).to receive(:read)
+        .with(absolute_yaml_path('docker-compose.yml'))
+        .and_return(fixture('docker-compose.yml'))
+      allow(File).to receive(:read)
+        .with(absolute_yaml_path('kontena.yml'))
+        .and_return(fixture('kontena_build_v2.yml'))
+      outcome = subject.execute
+      expect(outcome[:services]['webapp']['build']['context']).to eq(File.expand_path('.'))
+    end
+  end
 end

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

@@ -223,5 +223,41 @@ module Kontena::Cli::Services
         expect(subject.parse_build_args({'foo' => 'bar', 'baz' => nil})).to eq({'foo' => 'bar', 'baz' => 'baf'})
       end
     end
+
+    describe '#health_status' do
+      it 'returns :unknown by default' do
+        expect(subject.health_status({})).to eq(:unknown)
+      end
+
+      it 'returns :healthy if all instances are healthy' do
+        data = {
+          'health_status' => {
+            'healthy' => 3,
+            'total' => 3
+          }
+        }
+        expect(subject.health_status(data)).to eq(:healthy)
+      end
+
+      it 'returns :partial if not all instances are healthy' do
+        data = {
+          'health_status' => {
+            'healthy' => 2,
+            'total' => 3
+          }
+        }
+        expect(subject.health_status(data)).to eq(:partial)
+      end
+
+      it 'returns :unhealthy if all instances are down' do
+        data = {
+          'health_status' => {
+            'healthy' => 0,
+            'total' => 3
+          }
+        }
+        expect(subject.health_status(data)).to eq(:unhealthy)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.15.0.rc1
+  version: 0.15.0.rc2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -339,9 +339,10 @@ files:
 - spec/fixtures/health.yml
 - spec/fixtures/kontena-build.yml
 - spec/fixtures/kontena-invalid.yml
+- spec/fixtures/kontena-with-env-file.yml
 - spec/fixtures/kontena-with-variables.yml
 - spec/fixtures/kontena.yml
-- spec/fixtures/kontena_build_v2.yaml
+- spec/fixtures/kontena_build_v2.yml
 - spec/fixtures/kontena_v2.yml
 - spec/fixtures/mysql.yml
 - spec/fixtures/wordpress-scaled.yml
@@ -419,9 +420,10 @@ test_files:
 - spec/fixtures/health.yml
 - spec/fixtures/kontena-build.yml
 - spec/fixtures/kontena-invalid.yml
+- spec/fixtures/kontena-with-env-file.yml
 - spec/fixtures/kontena-with-variables.yml
 - spec/fixtures/kontena.yml
-- spec/fixtures/kontena_build_v2.yaml
+- spec/fixtures/kontena_build_v2.yml
 - spec/fixtures/kontena_v2.yml
 - spec/fixtures/mysql.yml
 - spec/fixtures/wordpress-scaled.yml