Release 0.4.5 (#112)

* Release 0.4.5

* Build on a more recent ruby

* Bundler business getting out of hand

* Part 2

* And now I need to fix rubocop errors?

* 0.4.5.rc2

* 0.4.5.rc3

* Release 0.4.5

.drone.yml

@@ -6,10 +6,11 @@ platform:
   arch: amd64
 steps:
   - name: test
-    image: ruby:2.4
+    image: ruby:2.6
     commands:
+      - gem install bundler -v 2.0.2
       - bundle install --path bundler
-      - bundle exec rspec spec/ # && bundle exec rubocop --fail-level A -S --format c --parallel
+      - bundle exec rspec spec/
       - bundle exec rubocop lib/
   - name: docker_latest
     image: plugins/docker

.travis.yml

@@ -2,6 +2,8 @@ language: ruby
 sudo: required
 cache: bundler
 bundler_args: --without development
+before_install:
+  - gem install bundler -v 2.0.2
 env:
   global:
     - secure: "ODwK1K2gm4yBWSTgQ9SVyIMTheUnT55JtMKb8i8wQiKC3g74HHmiJGOMSqkCGenwF7Fc8e0BQEGHiyFDcCnuUVhU5oTDgOEEcCHiFAwDCv+tekBqCAjmccqRE5MamSZsN7myGULClaljFDKdRc5b/MN1f26bViYUq3H7m06jnW/JYn+32VenGFq1Py7QyTD1IqG2x6sC4zG7jqiIXqcM24sKO6Q49fb5KneqF+A4C2wHPpjuVmgqRcwrQKcNixPtiXs4Nn5UZEkH3ceAyXjBvElI2Bt6/sJLfB2C2/IdEob+MrKsBfGAcgSXPKGEQvMyzAkcWg7aXa65H09ta/sUe0OdgczAxeFIV26RmsHJN+/vW5b46+cgcIEnyTq0whsrKPiailEWfns7xgfY+Q4MazUJ6mbxhmRixaNSn6y1GIKqSYv5FpU/+KVfu0tdM/joOkHcNxnyIDWAnTegN0sEwMCnHEt9tkdXtMZe83B9BY2cbWM36BdW1zRHeTZj8kfHpifT34cuoiQrg2P19BLpqzIgrCMbznbXNEy/m9TisMplvY6SdpujqYhCdLd4srbzcxq2UDplWsL0QtRy+aiaPKFy24yDnKo45aBjDFI4787lxmlW96KMoXNISK2F050IxDJ5yQ0qeRY1GvTy2GWy/sSRvrr8gb+ZY9+/m2MbLqw="
@@ -12,5 +14,5 @@ jobs:
   include:
     - stage: publish binary
       script: ./build/travis/macos.sh
-      rvm: 2.4
-      os: osx
+      rvm: 2.6
+      os: osx

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kontena-mortar (0.4.3)
+    kontena-mortar (0.4.5.rc2)
       clamp (~> 1.3)
       deep_merge (~> 1.2)
       k8s-client (~> 0.10.4)
@@ -47,7 +47,7 @@ GEM
     excon (0.67.0)
     hashdiff (1.0.0)
     ice_nine (0.11.2)
-    jaro_winkler (1.5.2)
+    jaro_winkler (1.5.3)
     jsonpath (0.9.9)
       multi_json
       to_regexp (~> 0.2.1)
@@ -62,13 +62,12 @@ GEM
       yaml-safe_load_stream (~> 0.1)
     multi_json (1.13.1)
     necromancer (0.4.0)
-    parallel (1.13.0)
-    parser (2.6.0.0)
+    parallel (1.17.0)
+    parser (2.6.4.1)
       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)
@@ -77,28 +76,27 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.64.0)
+    rspec-support (3.8.2)
+    rubocop (0.74.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    ruby-progressbar (1.10.0)
-    strings (0.1.4)
-      strings-ansi (~> 0.1.0)
-      unicode-display_width (~> 1.4.0)
-      unicode_utils (~> 1.4.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
+    strings (0.1.6)
+      strings-ansi (~> 0.1)
+      unicode-display_width (~> 1.5)
+      unicode_utils (~> 1.4)
     strings-ansi (0.1.0)
     to_regexp (0.2.1)
     tty-color (0.4.3)
@@ -109,7 +107,7 @@ GEM
       pastel (~> 0.7.2)
       strings (~> 0.1.0)
       tty-screen (~> 0.6.4)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.6.0)
     unicode_utils (1.4.0)
     yajl-ruby (1.4.1)
     yaml-safe_load_stream (0.1.1)
@@ -118,11 +116,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.0.0)
   kontena-mortar!
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop (~> 0.57)
 
 BUNDLED WITH
-   1.17.2
+   2.0.2

build/drone/ubuntu_xenial.sh

@@ -5,7 +5,7 @@ set -ue
 # build binary
 apt-get update -y
 apt-get install -y -q squashfs-tools build-essential ruby bison ruby-dev git-core texinfo curl
-curl -sL https://dl.bintray.com/kontena/ruby-packer/0.5.0-dev/rubyc-linux-amd64.gz | gunzip > /usr/local/bin/rubyc
+curl -sL https://github.com/kontena/ruby-packer/releases/download/0.5.0%2Bextra7/rubyc-0.5.0+extra7-linux-amd64.gz | gunzip > /usr/local/bin/rubyc
 chmod +x /usr/local/bin/rubyc
 gem install bundler
 version=${DRONE_TAG#"v"}

build/travis/macos.sh

@@ -3,7 +3,7 @@
 set -ue
 
 brew install squashfs
-curl -sL https://dl.bintray.com/kontena/ruby-packer/0.5.0-dev/rubyc-darwin-amd64.gz | gunzip > /usr/local/bin/rubyc
+curl -sL https://github.com/kontena/ruby-packer/releases/download/0.5.0%2Bextra7/rubyc-0.5.0+extra7-osx-amd64.gz | gunzip > /usr/local/bin/rubyc
 chmod +x /usr/local/bin/rubyc
 version=${TRAVIS_TAG#"v"}
 package="mortar-darwin-amd64-${version}"
@@ -21,4 +21,4 @@ chmod +x /usr/local/bin/github-release
     --file ./$package
 
 mkdir -p upload
-mv $package upload/
+mv $package upload/

kontena-mortar.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "deep_merge", "~> 1.2"
   spec.add_runtime_dependency "pastel", "~> 0.7.2"
   spec.add_runtime_dependency "tty-table", "~> 0.10.0"
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.0.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "~> 0.57"

lib/mortar/mixins/resource_helper.rb

@@ -16,8 +16,8 @@ def from_file(filename)
       variables = { name: name, var: variables_struct }
       resources = YamlFile.new(filename).load(variables)
       resources.map { |r| K8s::Resource.new(r) }
-    rescue Mortar::YamlFile::ParseError => exc
-      signal_usage_error exc.message
+    rescue Mortar::YamlFile::ParseError => e
+      signal_usage_error e.message
     end
 
     def load_resources(src)

lib/mortar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mortar
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

lib/mortar/yaml_file.rb

@@ -40,8 +40,8 @@ def load(variables = {})
       end
 
       result
-    rescue Psych::SyntaxError => ex
-      raise ParseError, ex.message
+    rescue Psych::SyntaxError => e
+      raise ParseError, e.message
     end
 
     def dirname
@@ -56,8 +56,8 @@ def read(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'/, '')})"
+    rescue StandardError, ScriptError => e
+      raise ParseError, "#{e.class.name} : #{e.message} (#{e.backtrace.first.gsub(/:in `with_binding'/, '')})"
     end
   end
 end