kontena-mortar 0.2.0.pre5 → 0.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c6641d230a974893218c9c7cf7c72804a450d4a8faaafb2785f7660d034de0b
-  data.tar.gz: 9f5b2f3a5b5ea42f5c99d9fff2dfa7856e2cba3b119a140f76d09114616f78ec
+  metadata.gz: cff0530a854b482030dadc4223cac97233b85b1a4e15625a0ec5483c641446b2
+  data.tar.gz: 5204676edc234f73e953068d2392ef8390898adcde8642c79579a182cd10efc2
 SHA512:
-  metadata.gz: 7eb162fd4cb67521319721b4deeb5a7337e6771a3e6a1b17fd728369d2398c5b4f17477eaa0ba6e5618ebdc41ea7ec4bbf0723efedd46f24b90c223006062f1f
-  data.tar.gz: 850d89b358166d680c09a6d5e1943dd5ef16c8ad52678ce85c140b2156c1d1db6814b20d720b5df101c24ab0484519841e0b8e3c521b849377c1047cb0982e0f
+  metadata.gz: 3ce686d74349ecdb2229e42d9effc248ceb72902ceaa71b3dbe570ae2789729e194c44336969a86429b34251b50bca07a617362b7eb730d89375b7364bcde3b6
+  data.tar.gz: 0bba3e81223eca4342f5e601b4ae82229cf14e44b0b18fe7acba17ca7ac9887a0e469e73afb7d58d5eaaec9f866d130519067dac84eec0c99763692b17acf630

data/.drone.yml

@@ -4,6 +4,7 @@ pipeline:
     commands:
       - bundle install --path bundler
       - bundle exec rspec spec/ # && bundle exec rubocop --fail-level A -S --format c --parallel
+      - bundle exec rubocop lib/
   docker_latest:
     registry: quay.io
     image: plugins/docker

data/.rubocop.relaxed.yml

@@ -0,0 +1,166 @@
+# Relaxed.Ruby.Style
+## Version 2.2
+
+Style/Alias:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylealias
+
+Style/AsciiComments:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleasciicomments
+
+Style/BeginBlock:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylebeginblock
+
+Style/BlockDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleblockdelimiters
+
+Style/CommentAnnotation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylecommentannotation
+
+Style/Documentation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledocumentation
+
+Layout/DotPosition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#layoutdotposition
+
+Style/DoubleNegation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledoublenegation
+
+Style/EndBlock:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleendblock
+
+Style/FormatString:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleformatstring
+
+Style/IfUnlessModifier:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleifunlessmodifier
+
+Style/Lambda:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylelambda
+
+Style/ModuleFunction:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylemodulefunction
+
+Style/MultilineBlockChain:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylemultilineblockchain
+
+Style/NegatedIf:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedif
+
+Style/NegatedWhile:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
+
+Style/ParallelAssignment:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylepercentliteraldelimiters
+
+Style/PerlBackrefs:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleperlbackrefs
+
+Style/Semicolon:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesemicolon
+
+Style/SignalException:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesignalexception
+
+Style/SingleLineBlockParams:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesinglelineblockparams
+
+Style/SingleLineMethods:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
+
+Layout/SpaceBeforeBlockBraces:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#layoutspacebeforeblockbraces
+
+Layout/SpaceInsideParens:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#layoutspaceinsideparens
+
+Style/SpecialGlobalVars:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespecialglobalvars
+
+Style/StringLiterals:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylestringliterals
+
+  # Style/TrailingCommaInArguments:
+  #   Enabled: false
+  #   StyleGuide: http://relaxed.ruby.style/#styletrailingcommainarguments
+  #
+  # Style/TrailingCommaInArrayLiteral:
+  #   Enabled: false
+  #   StyleGuide: http://relaxed.ruby.style/#styletrailingcommainarrayliteral
+  #
+  # Style/TrailingCommaInHashLiteral:
+  #   Enabled: false
+  #   StyleGuide: http://relaxed.ruby.style/#styletrailingcommainhashliteral
+
+Style/WhileUntilModifier:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylewhileuntilmodifier
+
+Style/WordArray:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylewordarray
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
+
+Lint/AssignmentInCondition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+

data/.rubocop.yml

@@ -0,0 +1,57 @@
+inherit_from: .rubocop.relaxed.yml
+
+AllCops:
+  Exclude:
+    - spec/**/*
+    - Gemfile
+    - "*.gemspec"
+    - bundler/**/*
+  TargetRubyVersion: 2.4
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    default: ()
+    '%i': '()'
+    '%I': '()'
+    '%r': '{}'
+    '%w': '()'
+    '%W': '()'
+
+Style/FormatString:
+  EnforcedStyle: percent
+
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: always
+
+Style/WordArray:
+  Enabled: true
+  MinSize: 3
+
+Style/SymbolArray:
+  Enabled: true
+  MinSize: 3
+
+Gemspec/OrderedDependencies:
+  Enabled: false
+
+Style/PerlBackrefs:
+  Enabled: true
+
+Layout/SpaceInsideParens:
+  Enabled: true
+
+Style/SpecialGlobalVars:
+  Enabled: true
+
+Style/Alias:
+  Enabled: true
+
+Style/BeginBlock:
+  Enabled: true
+
+Naming/UncommunicativeMethodParamName:
+  AllowedNames:
+    - cn
+
+Metrics/BlockLength:
+  Enabled: false

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    kontena-mortar (0.2.0.pre5)
+    kontena-mortar (0.2.0.rc1)
       clamp (~> 1.3)
       deep_merge (~> 1.2)
-      k8s-client (~> 0.4.1)
+      k8s-client (~> 0.4.2)
       pastel (~> 0.7.2)
       rouge (~> 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.0)
     clamp (1.3.0)
     concurrent-ruby (1.0.5)
     deep_merge (1.2.1)
@@ -44,15 +45,21 @@ GEM
     excon (0.62.0)
     hashdiff (0.3.7)
     ice_nine (0.11.2)
-    k8s-client (0.4.1)
+    jaro_winkler (1.5.1)
+    k8s-client (0.4.2)
       deep_merge (~> 1.2.1)
       dry-struct (~> 0.5.0)
       excon (~> 0.62.0)
       hashdiff (~> 0.3.7)
       recursive-open-struct (~> 1.1.0)
+    parallel (1.12.1)
+    parser (2.5.1.2)
+      ast (~> 2.4.0)
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)
+    powerpack (0.1.2)
+    rainbow (3.0.0)
     rake (10.5.0)
     recursive-open-struct (1.1.0)
     rouge (3.2.1)
@@ -69,7 +76,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    rubocop (0.59.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.10.0)
     tty-color (0.4.3)
+    unicode-display_width (1.4.0)
 
 PLATFORMS
   ruby
@@ -79,6 +96,7 @@ DEPENDENCIES
   kontena-mortar!
   rake (~> 10.0)
   rspec (~> 3.0)
+  rubocop (~> 0.57)
 
 BUNDLED WITH
-   1.16.3
+   1.16.1

data/README.md

@@ -14,11 +14,13 @@ While we were developing [Kontena Pharos](https://kontena.io/pharos) Kubernetes
 
 ## Installation
 
-Rubygems:
+### Rubygems:
 
 `$ gem install kontena-mortar`
 
-Docker:
+To install bash/zsh auto-completions, use `mortar install-completions` after Mortar has been installed.
+
+### Docker:
 
 `$ docker pull quay.io/kontena/mortar:latest`
 
@@ -60,10 +62,16 @@ pipeline:
     image: quay.io/kontena/mortar:latest
     secrets: [ kube_token, kube_ca, kube_server ]
     commands:
-      - mortar my-app k8s/
+      - mortar fire k8s/ my-app
 
 ```
 
+## Namespaces
+
+**Namespace is mandatory to be set on the resources**
+
+Currently Mortar will not add any default namespaces into the resources it shoots. Therefore it is mandatory for the user to set the namespaces in all namespaced resources shot with Mortar. See [this](https://github.com/kontena/mortar/issues/10) issue for details and track the fix.
+
 ## Shots
 
 Mortar manages a set of resources as a single unit, we call them *shots*. A shot can have as many resources as your application needs, there's no limit to that. Much like you'd do with `kubectl apply -f my_dir/`, but Mortar actually injects information into the resources it shoots into your Kubernetes cluster. This added information, labels and annotations, will be used later on by Mortar itself or can be used with `kubectl` too. This allows the management of many resources as a single application.
@@ -103,13 +111,15 @@ See example of overlays [here](/examples/overlays).
 
 Mortar also support templating for the resource definitons. The templating language used is [ERB](https://en.wikipedia.org/wiki/ERuby). It's pretty simple templating language but yet powerful enough for Kubernetes resource templating.
 
-Mortar automatically processes the resource definition as a template if the filename is either `.yml.erb` or `.yaml.erb`.
+**Note:** Mortar will process the resource definitions as ERB even if the filename does not have the `.erb` extension. This means that Ruby code in an innocent looking `.yml` file will be evaluated using the current user's access privileges on the local machine. Running untrusted code is dangerous and so is deploying untrusted manifests, make sure you know what you're deploying.
+
+### Variables
 
 There are two ways to introduce variables into the templating.
 
 See examples at [examples/templates](examples/templates).
 
-### Environment variables
+#### Environment variables
 
 As for any process, environment variables are also available for Mortar during template processing.
 
@@ -129,7 +139,7 @@ spec:
       - containerPort: 80
 ```
 
-### Variables via options
+#### Variables via options
 
 Another option to use variables is via command-line options. Use `mortar --var foo=bar my-app resources/`.
 

data/Rakefile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/kontena-mortar.gemspec

@@ -23,12 +23,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.post_install_message = "To install shell auto-completions, use:\n  mortar install-completions"
+
   spec.add_runtime_dependency "clamp", "~> 1.3"
-  spec.add_runtime_dependency "k8s-client", "~> 0.4.1"
+  spec.add_runtime_dependency "k8s-client", "~> 0.4.2"
   spec.add_runtime_dependency "rouge", "~> 3.2"
   spec.add_runtime_dependency "deep_merge", "~> 1.2"
   spec.add_runtime_dependency "pastel", "~> 0.7.2"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rubocop", "~> 0.57"
 end
+

data/lib/extensions/recursive_open_struct/each.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Extensions
   module RecursiveOpenStruct
     module Each
-      def each(&block)
-        self.to_h.each { |k,v| yield k.to_s,v }
+      def each
+        to_h.each { |k, v| yield k.to_s, v }
       end
     end
   end
 end
 
 # Monkey-patch the above module into RecursiveOpenStruct
-RecursiveOpenStruct.include Extensions::RecursiveOpenStruct::Each
+RecursiveOpenStruct.include Extensions::RecursiveOpenStruct::Each

data/lib/mortar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "clamp"
 require "deep_merge"
 require "mortar/version"
@@ -9,8 +11,10 @@ autoload :ERB, "erb"
 autoload :Rouge, "rouge"
 autoload :RecursiveOpenStruct, "recursive-open-struct"
 autoload :Pastel, "pastel"
+autoload :Pathname, "pathname"
+autoload :FileUtils, "fileutils"
 
 require "extensions/recursive_open_struct/each"
 
 module Mortar
-end
+end

data/lib/mortar/command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "clamp"
 
 module Mortar
@@ -7,4 +9,4 @@ module Mortar
 
     option ["-d", "--debug"], :flag, "debug"
   end
-end
+end

data/lib/mortar/fire_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "base64"
 require_relative "command"
 require_relative "yaml_file"
@@ -94,7 +96,7 @@ module Mortar
     def dotted_path_to_hash(hash)
       hash.map do |pkey, pvalue|
         pkey.to_s.split(".").reverse.inject(pvalue) do |value, key|
-          {key.to_sym => value}
+          { key.to_sym => value }
         end
       end.inject(&:deep_merge)
     end
@@ -102,7 +104,7 @@ module Mortar
     # Stringifies all hash keys
     # @return [Hash]
     def stringify_hash(hash)
-      JSON.load(JSON.dump(hash))
+      JSON.parse(JSON.dump(hash))
     end
   end
-end
+end

data/lib/mortar/install_completions_command.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module Mortar
+  class InstallCompletionsCommand < Mortar::Command
+    include Mortar::TTYHelper
+
+    DEFAULT_PATHS = [
+      '/etc/bash_completion.d/mortar.bash',
+      '/usr/local/etc/bash_completion.d/mortar.bash',
+      '/usr/share/zsh/site-functions/_mortar',
+      '/usr/local/share/zsh/site-functions/_mortar',
+      '/usr/local/share/zsh-completions/_mortar',
+      File.join(Dir.home, '.bash_completion.d', 'mortar.bash')
+    ].freeze
+
+    COMPLETION_FILE_PATH = File.expand_path(
+      '../../opt/bash-completion.sh',
+      Pathname.new(__dir__).realpath
+    ).freeze
+
+    banner 'Installs bash/zsh auto completion script'
+
+    option '--remove', :flag, 'Remove completion script from known locations'
+
+    def execute
+      return uninstall if remove?
+
+      installed = []
+
+      DEFAULT_PATHS.each do |path|
+        next unless File.directory?(File.dirname(path))
+
+        begin
+          FileUtils.ln_sf(COMPLETION_FILE_PATH, path)
+          installed << path
+        rescue Errno::EACCES, Errno::EPERM
+          nil # To keep Mr. Rubocop happy
+        end
+      end
+
+      if installed.empty?
+        warn "Installation failed"
+        warn "Try with sudo or set up user bash completions in ~/.bash_completion to include files from ~/.bash_completion.d"
+        exit 1
+      else
+        puts "Completions installed to:"
+        installed.each do |path|
+          puts "  - #{path}"
+        end
+        puts
+        puts "The completions will be reloaded when you start a new shell."
+        puts "To load now, use:"
+        puts pastel.cyan("  source \"#{COMPLETION_FILE_PATH}\"")
+        exit 0
+      end
+    end
+
+    def uninstall
+      failures = false
+      DEFAULT_PATHS.each do |path|
+        begin
+          if File.exist?(path)
+            File.unlink(path)
+            puts "Removed #{path}"
+          end
+        rescue Errno::EACCESS, Errno::EPERM
+          failures = true
+          warn "Failed to remove #{path} : permission denied"
+        end
+      end
+      exit 1 unless failures
+    end
+  end
+end

data/lib/mortar/mixins/client_helper.rb

@@ -1,17 +1,21 @@
+# frozen_string_literal: true
+
 module Mortar
   module ClientHelper
     # @return [K8s::Client]
     def client
-      return @client if @client
+      @client ||= create_client
+    end
 
+    def create_client
       if ENV['KUBE_TOKEN'] && ENV['KUBE_CA'] && ENV['KUBE_SERVER']
-        @client = K8s::Client.new(K8s::Transport.config(build_kubeconfig_from_env))
+        K8s::Client.new(K8s::Transport.config(build_kubeconfig_from_env))
       elsif ENV['KUBECONFIG']
-        @client = K8s::Client.config(K8s::Config.load_file(ENV['KUBECONFIG']))
+        K8s::Client.config(K8s::Config.load_file(ENV['KUBECONFIG']))
       elsif File.exist?(File.join(Dir.home, '.kube', 'config'))
-        @client = K8s::Client.config(K8s::Config.load_file(File.join(Dir.home, '.kube', 'config')))
+        K8s::Client.config(K8s::Config.load_file(File.join(Dir.home, '.kube', 'config')))
       else
-        @client = K8s::Client.in_cluster_config
+        K8s::Client.in_cluster_config
       end
     end
 
@@ -54,4 +58,4 @@ module Mortar
       signal_usage_error "KUBE_TOKEN env doesn't seem to be base64 encoded!"
     end
   end
-end
+end

data/lib/mortar/mixins/resource_helper.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Mortar
   module ResourceHelper
     # @param filename [String] file path
     # @return [Array<K8s::Resource>]
     def from_files(path)
       Dir.glob("#{path}/*.{yml,yaml,yml.erb,yaml.erb}").sort.map { |file|
-          self.from_file(file)
+        from_file(file)
       }.flatten
     end
 
@@ -19,14 +21,7 @@ module Mortar
     end
 
     def load_resources(src)
-      stat = File.stat(src)
-      if stat.directory?
-        resources = from_files(src)
-      else
-        resources = from_file(src)
-      end
-
-      resources
+      File.directory?(src) ? from_files(src) : from_file(src)
     end
 
     # Checks if the two resource refer to the same resource. Two resources refer to same only if following match:
@@ -37,10 +32,11 @@ module Mortar
     # @param a [K8s::Resource]
     # @param b [K8s::Resource]
     # @return [TrueClass]
-    def same_resource?(a, b)
-      return true if a.namespace == b.namespace && a.apiVersion == b.apiVersion && a.kind == b.kind && a.metadata[:name] == b.metadata[:name]
-
-      false
+    def same_resource?(resource_a, resource_b)
+      resource_a.namespace == resource_b.namespace &&
+        resource_a.apiVersion == resource_b.apiVersion &&
+        resource_a.kind == resource_b.kind &&
+        resource_a.metadata[:name] == resource_b.metadata[:name]
     end
   end
-end
+end

data/lib/mortar/mixins/tty_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mortar
   module TTYHelper
     # @return [Pastel]
@@ -5,4 +7,4 @@ module Mortar
       @pastel ||= Pastel.new
     end
   end
-end
+end

data/lib/mortar/root_command.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require "clamp"
 require_relative "fire_command"
 require_relative "yank_command"
+require_relative "install_completions_command"
 
 Clamp.allow_options_after_parameters = true
 
 module Mortar
   class RootCommand < Clamp::Command
-
     banner "mortar - Kubernetes manifest shooter"
 
     option ['-v', '--version'], :flag, "print mortar version" do
@@ -16,5 +18,7 @@ module Mortar
 
     subcommand "fire", "Fire a shot (of k8s manifests)", FireCommand
     subcommand "yank", "Yank a shot (of k8s manifests)", YankCommand
+
+    subcommand "install-completions", "Install shell autocompletions", InstallCompletionsCommand
   end
-end
+end

data/lib/mortar/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mortar
-  VERSION = "0.2.0.pre5"
+  VERSION = "0.2.0.rc1"
 end

data/lib/mortar/yaml_file.rb

@@ -21,8 +21,7 @@ module Mortar
 
     # @param input [String,IO] A IO/File object, a path to a file or string content
     # @param override_filename [String] use string as the filename for parse errors
-    # @param force_erb [Boolean] force erb processing even if filename does not end in .yml or is unknown
-    def initialize(input, override_filename: nil, force_erb: false)
+    def initialize(input, override_filename: nil)
       @filename = override_filename
       if input.respond_to?(:read)
         @content = input.read
@@ -31,7 +30,6 @@ module Mortar
         @filename ||= input.to_s
         @content = File.read(input)
       end
-      @force_erb = force_erb
     end
 
     # @return [Array<Hash>]
@@ -40,6 +38,7 @@ module Mortar
       if result.is_a?(String)
         raise ParseError, "File #{"#{@filename} " if @filename}does not appear to be in YAML format"
       end
+
       result
     rescue Psych::SyntaxError => ex
       raise ParseError, ex.message
@@ -54,25 +53,11 @@ module Mortar
     end
 
     def read(variables = {})
-      erb? ? erb_result(variables) : @content
-    end
-
-    def erb_result(variables = {})
       Namespace.new(variables).with_binding do |ns_binding|
         ERB.new(@content, nil, '%<>-').tap { |e| e.location = [@filename, nil] }.result(ns_binding)
       end
     rescue StandardError, ScriptError => ex
       raise ParseError, "#{ex.class.name} : #{ex.message} (#{ex.backtrace.first.gsub(/:in `with_binding'/, '')})"
     end
-
-    private
-
-    def erb?
-      force_erb? || @filename&.end_with?('.erb')
-    end
-
-    def force_erb?
-      @force_erb
-    end
   end
 end

data/lib/mortar/yank_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "command"
 require_relative "mixins/client_helper"
 require_relative "mixins/tty_helper"
@@ -19,8 +21,7 @@ module Mortar
             signal_error("confirmation did not match #{pastel.cyan(name)}.") unless $stdin.gets.chomp == name
           rescue Interrupt
             puts
-            puts "Canceled"
-            return
+            abort 'Canceled'
           end
         else
           signal_usage_error '--force required when running in a non-interactive mode'
@@ -37,4 +38,4 @@ module Mortar
       puts "yanked #{pastel.cyan(name)} successfully!" if $stdout.tty?
     end
   end
-end
+end

data/opt/bash-completion.sh

@@ -0,0 +1,41 @@
+if [[ -n ${ZSH_VERSION-} ]]; then
+  autoload -U +X bashcompinit && bashcompinit
+fi
+
+_mortar () {
+  local cur prev ret
+  COMPREPLY=()
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+  if [ "$COMP_CWORD" = "1" ]; then
+    if [[ ${cur} == -* ]] ; then
+      COMPREPLY=( $(compgen -W "--help --version" -- ${cur}) )
+      return
+    fi
+
+    COMPREPLY=( $(compgen -W "fire yank" -- ${cur}) )
+    return
+  else
+    case "${COMP_WORDS[1]}" in
+      fire)
+        if [[ ${cur} == -* ]] ; then
+          COMPREPLY=( $(compgen -W "--var --output --prune --overlay --force --debug --help" -- ${cur}) )
+        elif [ "$prev" = "--overlay" ]; then
+          if command -v compopt &> /dev/null; then
+            COMPREPLY=( $(compgen -d -S "/" -- "${COMP_WORDS[COMP_CWORD]}") )
+            compopt -o nospace
+          fi
+        fi
+        ;;
+      yank)
+        if [[ ${cur} == -* ]] ; then
+          COMPREPLY=( $(compgen -W "--force --debug --help" -- ${cur}) )
+        fi
+        ;;
+    esac
+  fi
+}
+
+complete -o default -F _mortar mortar
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-mortar
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre5
+  version: 0.2.0.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.57'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.57'
 description: Kubernetes manifest shooter
 email:
 - info@kontena.io
@@ -133,6 +147,8 @@ files:
 - ".drone.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.relaxed.yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - Dockerfile
 - Gemfile
@@ -161,6 +177,7 @@ files:
 - lib/mortar.rb
 - lib/mortar/command.rb
 - lib/mortar/fire_command.rb
+- lib/mortar/install_completions_command.rb
 - lib/mortar/mixins/client_helper.rb
 - lib/mortar/mixins/resource_helper.rb
 - lib/mortar/mixins/tty_helper.rb
@@ -168,11 +185,14 @@ files:
 - lib/mortar/version.rb
 - lib/mortar/yaml_file.rb
 - lib/mortar/yank_command.rb
+- opt/bash-completion.sh
 homepage: https://github.com/kontena/mortar
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message: |-
+  To install shell auto-completions, use:
+    mortar install-completions
 rdoc_options: []
 require_paths:
 - lib