kontena-cli 1.0.0.pre1 → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 449b75212c33f152d3b6d1179301ad0da967b5a2
-  data.tar.gz: a4190acf5dbd76ddd258afd7aafd7aa186d3e606
+  metadata.gz: bb909be3c98e6f195a842ad6291f01a061f5a99e
+  data.tar.gz: e19fbfaeb34ae9b1f980bdcd9daf1f5a946a4339
 SHA512:
-  metadata.gz: 5689de9e2585507122dde4432c24c3d58bcaec6acf8ff93748f1611449e2c337a52ae608ecf4abf853fdfdee039b990baa7cab7bff870853cb4f5afe603cdbd4
-  data.tar.gz: 5531cc8ff20f5477c1912f06fabf78c73cbe44531141fc60db08430857191605d59fff266122cba3d4c733cb2338498944abe117b0decacb9ebdbe6963dcfe87
+  metadata.gz: 35adfcc4263f86a37f5d87c2ccc487c1db64e831092f1eeb9538575d7f01f11053001c52925d89f401806a8e7767cd5907893809bd497efa798a6acaa30b4705
+  data.tar.gz: b32a33ee26a54ba74db995a020a95ca7f310f43da9bc144ab6147fdeafeec3d927765f82df3defb98e27854a8b240c6864eae1979608dd5160b0aab1aff47292

data/VERSION

@@ -1 +1 @@
-1.0.0.pre1
+1.0.0.pre2

data/kontena-cli.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "launchy", "~> 2.4.3"
   spec.add_runtime_dependency "hash_validator", "~> 0.7.0"
   spec.add_runtime_dependency "retriable", "~> 2.1.0"
+  spec.add_runtime_dependency "opto", "~> 1.5"
 end

data/lib/kontena/callbacks/master/deploy/50_authenticate_after_deploy.rb

@@ -16,6 +16,11 @@ module Kontena
         return unless command.result.has_key?(:code)
         return unless command.result.has_key?(:name)
 
+        # If plugins generate self-signed cert, most of the upcoming callbacks will
+        # fail without this. This can be made bit more clever once all the plugins
+        # return the generated self-signed certificate.
+        ENV['SSL_IGNORE_ERRORS'] = 'true'
+
         # In case there already is a server with the same name add random characters to name
         if config.find_server(command.result[:name])
           command.result[:name] = "#{command.result[:name]}-#{SecureRandom.hex(2)}"
@@ -33,7 +38,7 @@ module Kontena
           ENV["DEBUG"] && puts("Trying to request / from #{new_master.url}")
           client = Kontena::Client.new(new_master.url, nil, ignore_ssl_errors: true)
           client.get('/')
-        rescue 
+        rescue
           ENV["DEBUG"] && puts("HTTPS test failed: #{$!} #{$!.message}")
           unless retried
             new_master.url = "http://#{command.result[:public_ip]}"

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

@@ -37,8 +37,8 @@ module Kontena::Cli::Apps
           ports = service['ports'].map{|p|
             "#{p['ip']}:#{p['node_port']}->#{p['container_port']}/#{p['protocol']}"
           }.join(", ")
-          running = service['instances']['running']
-          desired = service['container_count']
+          running = service['instance_counts']['running']
+          desired = service['instances']
           instances = "#{running} / #{desired}"
           vars = [name, service['image'], instances, state, service['state'], ports]
         else

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

@@ -19,7 +19,7 @@ module Kontena::Cli::Apps
       yml_service = services_from_yaml(filename, [service], service_prefix, true)
       if yml_service[service]
         options = yml_service[service]
-        exit_with_error("Service has already instances defined in #{filename}. Please update #{filename} and deploy service instead") if options['container_count']
+        exit_with_error("Service has already instances defined in #{filename}. Please update #{filename} and deploy service instead") if options['instances']
         spinner "Scaling #{service.colorize(:cyan)} " do
           deployment = scale_service(require_token, prefixed_name(service), instances)
           wait_for_deploy_to_finish(token, deployment)

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

@@ -25,10 +25,9 @@ module Kontena::Cli::Apps
     # @return [Hash]
     def parse_data(options)
       data = {}
-      data['container_count'] = options['instances']
+      data['instances'] = options['instances']
       data['image'] = parse_image(options['image'])
       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'] || [])
       data['ports'] = parse_stringified_ports(options['ports'] || [])

data/lib/kontena/cli/apps/yaml/custom_validators/extends_validator.rb

@@ -10,10 +10,9 @@ module Kontena::Cli::Apps::YAML::Validations::CustomValidators
         return
       end
       if value.is_a?(Hash)
-        extends_validation = {
-          'service' => 'string',
-          'file' => HashValidator.optional('string')
-        }
+        extends_validation = { 'service' => 'string' }
+        extends_validation['file']  = HashValidator.optional('string') if value['file']
+        extends_validation['stack'] = HashValidator.optional('string') if value['stack']
         HashValidator.validator_for(extends_validation).validate(key, value, extends_validation, errors)
       end
     end

data/lib/kontena/cli/config.rb

@@ -122,6 +122,7 @@ module Kontena
         {
           name: 'kontena',
           url: 'https://cloud-api.kontena.io',
+          stacks_url: 'https://stacks.kontena.io',
           token_endpoint: 'https://cloud-api.kontena.io/oauth2/token',
           authorization_endpoint: 'https://cloud.kontena.io/login/oauth/authorize',
           userinfo_endpoint: 'https://cloud-api.kontena.io/user',

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

@@ -30,8 +30,8 @@ module Kontena::Cli::Services
 
     def print_service_row(service)
       stateful = service['stateful'] ? 'yes' : 'no'
-      running = service['instances']['running']
-      desired = service['container_count']
+      running = service['instance_counts']['running']
+      desired = service['instances']
       instances = "#{running} / #{desired}"
       ports = service['ports'].map{|p|
         "#{p['ip']}:#{p['node_port']}->#{p['container_port']}/#{p['protocol']}"

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

@@ -22,7 +22,7 @@ module Kontena::Cli::Services
           nodes[container['node']['name']] << container
         end
         clear_terminal
-        puts "service: #{name} (#{result['containers'].size}/#{service['container_count']} instances)"
+        puts "service: #{name} (#{result['containers'].size}/#{service['instances']} instances)"
         puts "strategy: #{service['strategy']}"
         puts "status: #{service['state']}"
         puts "stateful: #{service['stateful'] == true ? 'yes' : 'no' }"

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

@@ -48,7 +48,7 @@ module Kontena
           puts "  image: #{service['image']}"
           puts "  revision: #{service['revision']}"
           puts "  stateful: #{service['stateful'] == true ? 'yes' : 'no' }"
-          puts "  scaling: #{service['container_count'] }"
+          puts "  scaling: #{service['instances'] }"
           puts "  strategy: #{service['strategy']}"
           puts "  deploy_opts:"
           puts "    min_health: #{service['deploy_opts']['min_health']}"

data/lib/kontena/cli/stack_command.rb

@@ -7,6 +7,10 @@ require_relative 'stacks/show_command'
 require_relative 'stacks/build_command'
 require_relative 'stacks/monitor_command'
 require_relative 'stacks/logs_command'
+require_relative 'stacks/push_command'
+require_relative 'stacks/pull_command'
+require_relative 'stacks/search_command'
+require_relative 'stacks/install_command'
 
 class Kontena::Cli::StackCommand < Kontena::Command
 
@@ -16,11 +20,14 @@ class Kontena::Cli::StackCommand < Kontena::Command
   subcommand "show", "Show stack details", Kontena::Cli::Stacks::ShowCommand
   subcommand "upgrade", "Upgrade installed stack", Kontena::Cli::Stacks::UpgradeCommand
   subcommand "deploy", "Deploy stack", Kontena::Cli::Stacks::DeployCommand
-  subcommand "logs", "Show stack logs from stack services", Kontena::Cli::Stacks::LogsCommand
-  subcommand "monitor", "Monitor stack", Kontena::Cli::Stacks::MonitorCommand
-  subcommand ["remove","rm"], "Remove stack", Kontena::Cli::Stacks::RemoveCommand
-
+  subcommand "logs", "Show logs from stack services", Kontena::Cli::Stacks::LogsCommand
+  subcommand "monitor", "Monitor stack services", Kontena::Cli::Stacks::MonitorCommand
+  subcommand ["remove","rm"], "Remove a deployed stack", Kontena::Cli::Stacks::RemoveCommand
+  subcommand "push", "Push a stack to stacks registry", Kontena::Cli::Stacks::PushCommand
+  subcommand ["pull", "get"], "Pull a stack from stacks registry", Kontena::Cli::Stacks::PullCommand
+  subcommand "install", "Deploy a stack to Kontena Master", Kontena::Cli::Stacks::InstallCommand
+  subcommand "search", "Search for stacks in stacks repository", Kontena::Cli::Stacks::SearchCommand
+  
   def execute
-
   end
 end

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

@@ -1,19 +1,19 @@
-require 'yaml'
 require_relative 'yaml/reader'
 require_relative '../services/services_helper'
 require_relative 'service_generator_v2'
+require_relative '../../stacks_client'
 
 module Kontena::Cli::Stacks
   module Common
     include Kontena::Cli::Services::ServicesHelper
 
-    def stack_from_yaml(filename, skip_validation = false)
-      reader = Kontena::Cli::Stacks::YAML::Reader.new(filename, skip_validation)
+    def stack_from_yaml(filename)
+      reader = Kontena::Cli::Stacks::YAML::Reader.new(filename)
       if reader.stack_name.nil?
-        exit_with_error "Stack MUST have name in YAML! Aborting."
+        exit_with_error "Stack MUST have stack name in YAML top level field 'stack'! Aborting."
       end
       set_env_variables(self.name || reader.stack_name, current_grid)
-      reader.reload
+      #reader.reload
       outcome = reader.execute
 
       hint_on_validation_notifications(outcome[:notifications]) if outcome[:notifications].size > 0
@@ -24,7 +24,7 @@ module Kontena::Cli::Stacks
         'stack' => outcome[:stack],
         'expose' => outcome[:expose],
         'version' => outcome[:version],
-        'source' => reader.raw,
+        'source' => reader.raw_content,
         'registry' => 'file://',
         'services' => kontena_services
       }
@@ -52,12 +52,6 @@ module Kontena::Cli::Stacks
       services
     end
 
-    def read_yaml(filename, skip_validation = false)
-      reader = Kontena::Cli::Stacks::YAML::Reader.new(filename)
-      outcome = reader.execute
-      outcome
-    end
-
     def set_env_variables(stack, grid)
       ENV['STACK'] = stack
       ENV['GRID'] = grid
@@ -98,5 +92,12 @@ module Kontena::Cli::Stacks
       display_notifications(errors, :red)
       abort
     end
+
+    def stacks_client
+      return @stacks_client if @stacks_client
+      Kontena.run('cloud login') unless cloud_auth?
+      config.reset_instance
+      @stacks_client = Kontena::StacksClient.new(kontena_account.stacks_url, kontena_account.token)
+    end
   end
 end

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

@@ -6,15 +6,14 @@ module Kontena::Cli::Stacks
     include Kontena::Cli::GridOptions
     include Common
 
-    def execute
-      require_api_url
-      token = require_token
+    requires_current_master
 
-      list_stacks(token)
+    def execute
+      list_stacks
     end
 
-    def list_stacks(token)
-      response = client(token).get("grids/#{current_grid}/stacks")
+    def list_stacks
+      response = client.get("grids/#{current_grid}/stacks")
 
       titles = ['NAME', 'VERSION', 'SERVICES', 'STATE', 'EXPOSED PORTS']
       puts "%-60s %-10s %-10s %-10s %-50s" % titles

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

@@ -15,7 +15,7 @@ module Kontena::Cli::Stacks
 
       response = client(token).get("grids/#{current_grid}/services?stack=#{name}")
       services = response['services']
-      if selected_services
+      if selected_services.size > 0
         services.delete_if{ |s| !selected_services.include?(s['name'])}
       end
       show_monitor(token, services)

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

@@ -0,0 +1,12 @@
+require_relative 'common'
+
+module Kontena::Cli::Stacks
+  class PullCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Common
+
+    def execute
+    end
+  end
+end
+

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

@@ -0,0 +1,17 @@
+require_relative 'common'
+
+module Kontena::Cli::Stacks
+  class PushCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Common
+
+    parameter "FILENAME", "Stack file path"
+
+    requires_current_account_token
+
+    def execute
+      file = YAML::Reader.new(self.filename, skip_variables: true, replace_missing: "filler")
+      stacks_client.push(file.yaml['stack'], file.yaml['version'], file.raw_content)
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require_relative 'common'
+
+module Kontena::Cli::Stacks
+  class SearchCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Common
+
+    parameter '[QUERY]', "Query string"
+
+    requires_current_account_token
+
+    def execute
+      puts stacks_client.search(query).inspect
+    end
+  end
+end
+

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

@@ -25,10 +25,9 @@ module Kontena::Cli::Stacks
     # @return [Hash]
     def parse_data(options)
       data = {}
-      data['container_count'] = options['instances']
+      data['instances'] = options['instances']
       data['image'] = parse_image(options['image'])
       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'] || [])
       data['ports'] = parse_stringified_ports(options['ports'] || [])

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

@@ -45,7 +45,7 @@ module Kontena::Cli::Stacks
       end
       puts "#{pad}  revision: #{service['revision']}"
       puts "#{pad}  stateful: #{service['stateful'] == true ? 'yes' : 'no' }"
-      puts "#{pad}  scaling: #{service['container_count'] }"
+      puts "#{pad}  scaling: #{service['instances'] }"
       puts "#{pad}  strategy: #{service['strategy']}"
       puts "#{pad}  deploy_opts:"
       puts "#{pad}    min_health: #{service['deploy_opts']['min_health']}"

data/lib/kontena/cli/stacks/yaml/opto/prompt_resolver.rb

@@ -0,0 +1,76 @@
+if RUBY_VERSION < '2.1'
+  require 'opto/extensions/hash_string_or_symbol_key'
+  using Opto::Extension::HashStringOrSymbolKey
+end
+
+module Kontena::Cli::Stacks
+  module YAML
+    class Prompt < Opto::Resolver
+      include Kontena::Cli::Common
+
+      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+
+      def enum?
+        option.type == 'enum'
+      end
+
+      def boolean?
+        option.type == 'boolean'
+      end
+
+      def prompt_word
+        return "Select" if enum?
+        return "Enable" if boolean?
+        "Enter"
+      end
+
+      def question_text
+        (!hint.nil? && hint != option.name) ? "#{hint} :" : "#{prompt_word} #{option.label || option.name} :"
+      end
+
+      def enum_can_be_other?
+        enum? && option.handler.options[:can_be_other] ? true : false
+      end
+
+      def enum
+        opts = option.handler.options[:options]
+        opts << { label: '(Other)', value: nil, description: '(Other)' } if enum_can_be_other?
+
+        answer = prompt.select(question_text) do |menu|
+          menu.enum ':' # makes it show numbers before values, you can press the number to select.
+          menu.default(opts.index {|opt| opt[:value] == option.default }.to_i + 1) if option.default
+          opts.each do |opt|
+            menu.choice opt[:label], opt[:value]
+          end
+        end
+
+        if answer.nil? && enum_can_be_other?
+          ask
+        else
+          answer
+        end
+      end
+
+      def bool
+        prompt.yes?(question_text, default: option.default == false ? false : true)
+      end
+
+      def ask
+        prompt.ask(question_text, default: option.default)
+      end
+
+
+      def resolve
+        return nil if option.skip?
+        if enum?
+          enum
+        elsif boolean?
+          bool
+        else
+          ask
+        end
+      end
+    end
+  end
+end
+

data/lib/kontena/cli/stacks/yaml/opto/vault_resolver.rb

@@ -0,0 +1,10 @@
+module Kontena::Cli::Stacks
+  module YAML
+    class Opto::Resolvers::Vault < Opto::Resolver
+      def resolve
+        require 'shellwords'
+        Kontena.run("vault read --return #{hint.shellescape}", returning: :result)
+      end
+    end
+  end
+end

data/lib/kontena/cli/stacks/yaml/opto/vault_setter.rb

@@ -0,0 +1,12 @@
+module Kontena::Cli::Stacks
+  module YAML
+    class Opto::Setters::Vault < Opto::Setter
+      def set(value)
+        require 'shellwords'
+        ENV["DEBUG"] && puts("Setting to vault: #{hint}")
+        Kontena.run("vault write --silent #{hint} #{value.to_s.shellescape}")
+      end
+    end
+  end
+end
+

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

@@ -1,35 +1,63 @@
-require 'yaml'
-require_relative 'service_extender'
-require_relative 'validator_v3'
 require_relative '../../../util'
 
 module Kontena::Cli::Stacks
   module YAML
     class Reader
       include Kontena::Util
-      attr_reader :yaml, :file, :errors, :notifications
 
-      def initialize(file, skip_validation = false)
+      attr_reader :file, :raw_content, :result, :errors, :notifications, :variables, :yaml
+
+      def initialize(file, skip_validation: false, skip_variables: false, replace_missing: nil)
+        require 'yaml'
+        require_relative 'service_extender'
+        require_relative 'validator_v3'
+        require 'opto'
+        require_relative 'opto/vault_setter'
+        require_relative 'opto/vault_resolver'
+        require_relative 'opto/prompt_resolver'
+
         @file = file
+        @raw_content = File.read(File.expand_path(file))
         @errors = []
         @notifications = []
-        @skip_validation = skip_validation
+        @skip_validation  = skip_validation
+        @skip_variables   = skip_variables
+        @replace_missing  = replace_missing
+        parse_variables unless skip_variables
         parse_yaml
       end
 
+      # @return [Opto::Group]
+      def variables
+        return @variables if @variables
+        yaml = ::YAML.load(interpolate(raw_content, 'filler'))
+        if yaml && yaml.has_key?('variables')
+          @variables = Opto::Group.new(yaml['variables'], defaults: { from: :env, to: :env })
+        else
+          @variables = Opto::Group.new(defaults: { from: :env, to: :env })
+        end
+        @variables
+      end
+
+      def parse_variables
+        raise RuntimeError, "Variable validation failed: #{variables.errors.inspect}" unless variables.valid?
+        variables.run
+      end
+
       ##
       # @param [String] service_name
       # @return [Hash]
       def execute(service_name = nil)
         result = {}
         Dir.chdir(File.dirname(File.expand_path(file))) do
-          result[:version] = yaml['version'] || '1'
-          result[:stack] = yaml['stack']
-          result[:name] = self.stack_name
-          result[:expose] = yaml['expose']
-          result[:errors] = errors
+          result[:stack]         = yaml['stack']
+          result[:version]       = self.stack_version
+          result[:name]          = self.stack_name
+          result[:expose]        = yaml['expose']
+          result[:errors]        = errors unless skip_validation?
           result[:notifications] = notifications
-          result[:services] = parse_services(service_name) unless errors.count > 0
+          result[:services]      = parse_services(service_name) unless errors.count > 0
+          result[:variables]     = variables.to_h(values_only: true).reject { |k,_| variables.option(k).to.has_key?(:vault) } unless skip_variables?
         end
         result
       end
@@ -37,38 +65,37 @@ module Kontena::Cli::Stacks
       def reload
         @errors = []
         @notifications = []
+        @variables = nil
+        parse_variables unless skip_variables?
         parse_yaml
       end
 
       def stack_name
-        yaml['stack'].split('/').last if yaml['stack']
+        yaml['stack'].split('/').last.split(':').first if yaml['stack']
       end
 
-      # @return [String]
-      def raw
-        read_content
+      def stack_version
+        yaml['version'] || yaml['stack'].to_s[/:(.*)/, 1] || '1'
       end
 
       private
 
+      # A hash such as { "${MYSQL_IMAGE}" => "MYSQL_IMAGE } where the key is the
+      # string to be substituted and value is the pure name part
+      # @return [Hash]
+      def yaml_substitutables
+        @content_variables ||= raw_content.scan(/((?<!\$)\$(?!\$)\{?(\w+)\}?)/m)
+      end
+
       def parse_yaml
         load_yaml
         validate unless skip_validation?
       end
 
-      def read_content
-        @content ||= File.read(File.expand_path(file))
-      end
-
       def load_yaml
-        content = read_content.dup
-        interpolate(content)
-        replace_dollar_dollars(content)
-        begin
-          @yaml = ::YAML.load(content)
-        rescue Psych::SyntaxError => e
-          raise "Error while parsing #{file}".colorize(:red)+ " "+e.message
-        end
+        @yaml = ::YAML.load(replace_dollar_dollars(interpolate(raw_content)))
+      rescue Psych::SyntaxError => e
+        raise "Error while parsing #{file}".colorize(:red)+ " "+e.message
       end
 
       # @return [Array] array of validation errors
@@ -82,6 +109,10 @@ module Kontena::Cli::Stacks
         @skip_validation == true
       end
 
+      def skip_variables?
+        @skip_variables == true
+      end
+
       def store_failures(data)
         errors << { file => data[:errors] } unless data[:errors].empty?
         notifications << { file => data[:notifications] } unless data[:notifications].empty?
@@ -99,21 +130,75 @@ module Kontena::Cli::Stacks
         if service_name.nil?
           services.each do |name, config|
             services[name] = process_config(config)
+            if process_service?(config)
+              services[name].delete('only_if')
+              services[name].delete('skip_if')
+            else
+              services.delete(name)
+            end
           end
           services
         else
-          raise ("Service '#{service_name}' not found in #{file}") unless services.key?(service_name)
+          raise ("Service '#{service_name}' not found in #{file}") unless services.has_key?(service_name)
           process_config(services[service_name])
         end
       end
 
+      def process_service?(config)
+        return true unless config['skip_if'] || config['only_if']
+        return true if skip_variables? || variables.empty?
+
+        skip_lambdas = normalize_ifs(config['skip_if'])
+        only_lambdas = normalize_ifs(config['only_if'])
+
+        if skip_lambdas
+          return false if skip_lambdas.any? { |s| s.call }
+        end
+
+        if only_lambdas
+          return false unless only_lambdas.all? { |s| s.call }
+        end
+
+        true
+      end
+
+      # Generates an array of lambdas that return true if a condition is true
+      # Possible syntaxes:
+      # @example
+      #   normalize_ifs( 'wp' )        # lambdas return true if variable wp is not null or false or 'false'
+      #   normalize_ifs( wp: 1 )       # lambdas return true if value of wp is 1
+      #   normalize_ifs( [:wp, :ws] )  # lambdas return true if wp and ws are not not null or false or 'false'
+      #   normalize_ifs( wp: 1, ws: 1) # lambdas return true if wp and ws are 1
+      #   normalize_ifs(nil)           # returns nil
+      def normalize_ifs(ifs)
+        case ifs
+        when NilClass
+          nil
+        when Array
+          ifs.map do |iff|
+            lambda { val = variables.value_of(iff.to_s); !val.nil? && !val.kind_of?(FalseClass) && val != 'false' }
+          end
+        when Hash
+          ifs.each_with_object([]) do |(k, v), arr|
+            arr << lambda { variables.value_of(k.to_s) == v }
+          end
+        when String, Symbol
+          [lambda { val = variables.value_of(ifs.to_s); !val.nil? && !val.kind_of?(FalseClass) && val != 'false' }]
+        else
+          raise TypeError, "Invalid syntax for if: #{ifs.inspect}"
+        end
+      end
+
       # @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')
+        if service_config.has_key?('extends')
+          service_config = extend_config(service_config)
+          service_config.delete('extends')
+        end
         service_config
       end
 
@@ -124,18 +209,29 @@ module Kontena::Cli::Stacks
 
       ##
       # @param [String] text - content of YAML file
-      def interpolate(text)
-        text.gsub!(/(?<!\$)\$(?!\$)\{?\w+\}?/) do |v| # searches $VAR and ${VAR} and not $$VAR
-          var = v.tr('${}', '')
-          puts "The #{var} is not set. Substituting an empty string." if !ENV.key?(var) && !skip_validation?
-          ENV[var] # replace with equivalent ENV variables
+      def interpolate(text, filler = nil)
+        text.gsub(/(?<!\$)\$(?!\$)\{?\w+\}?/) do |v| # searches $VAR and ${VAR} and not $$VAR
+          if filler
+            filler
+          elsif @replace_missing
+            @replace_missing
+          else
+            var = v.tr('${}', '')
+            val = ENV[var]
+            if val
+              val
+            else
+              puts "Value for #{var} is not set. Substituting with an empty string." unless skip_validation?
+              ''
+            end
+          end
         end
       end
 
       ##
       # @param [String] text - content of yaml file
       def replace_dollar_dollars(text)
-        text.gsub!('$$', '$')
+        text.gsub('$$', '$')
       end
 
       # @param [Hash] service_config
@@ -147,16 +243,16 @@ module Kontena::Cli::Stacks
         if filename
           parent_config = from_external_file(filename, extended_service)
         else
-          raise ("Service '#{extended_service}' not found in #{file}") unless services.key?(extended_service)
+          raise ("Service '#{extended_service}' not found in #{file}") unless services.has_key?(extended_service)
           parent_config = process_config(services[extended_service])
         end
         ServiceExtender.new(service_config).extend_from(parent_config)
       end
 
       def extended_service(extend_config)
-        if extend_config.is_a?(Hash)
+        if extend_config.kind_of?(Hash)
           extend_config['service']
-        elsif extend_config.is_a?(String)
+        elsif extend_config.kind_of?(String)
           extend_config
         else
           nil
@@ -164,15 +260,15 @@ module Kontena::Cli::Stacks
       end
 
       def from_external_file(filename, service_name)
-        outcome = Reader.new(filename, @skip_validation).execute(service_name)
-        errors.concat outcome[:errors] unless errors.any? { |item| item.key?(filename) }
-        notifications.concat outcome[:notifications] unless notifications.any? { |item| item.key?(filename) }
+        outcome = Reader.new(filename, skip_validation: @skip_validation, skip_variables: true, replace_missing: @replace_missing).execute(service_name)
+        errors.concat outcome[:errors] unless errors.any? { |item| item.has_key?(filename) }
+        notifications.concat outcome[:notifications] unless notifications.any? { |item| item.has_key?(filename) }
         outcome[:services]
       end
 
       # @param [Hash] options - service config
       def normalize_env_vars(options)
-        if options['environment'].is_a?(Hash)
+        if options['environment'].kind_of?(Hash)
           options['environment'] = options['environment'].map { |k, v| "#{k}=#{v}" }
         end
       end
@@ -181,7 +277,7 @@ module Kontena::Cli::Stacks
       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['env_file'] = [options['env_file']] if options['env_file'].kind_of?(String)
         options['environment'] = [] unless options['environment']
         options['env_file'].each do |env_file|
           options['environment'].concat(read_env_file(env_file))
@@ -196,16 +292,16 @@ module Kontena::Cli::Stacks
       end
 
       def expand_build_context(options)
-        if options['build'].is_a?(String)
+        if options['build'].kind_of?(String)
           options['build'] = File.expand_path(options['build'])
-        elsif context = options.dig('build', 'context')
+        elsif context = safe_dig(options, 'build', 'context')
           options['build']['context'] = File.expand_path(context)
         end
       end
 
       # @param [Hash] options - service config
       def normalize_build_args(options)
-        if safe_dig(options, 'build', 'args').is_a?(Array)
+        if safe_dig(options, 'build', 'args').kind_of?(Array)
           args = options['build']['args'].dup
           options['build']['args'] = {}
           args.each do |arg|