vidar 1.1.4 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8cc826680e276230381b1cb5158840c827e48d56ebb3598861ebb3aaa6baa2c
-  data.tar.gz: df2cbc9d2c82dddaf4219835905342f370e517a344c2bf2f46c8ebf5e27e18dd
+  metadata.gz: 5c3ae056c22e8845bf1ac3f1466ee039d734ced5310075fac57b8307e50cd8fd
+  data.tar.gz: 19d7a064152627fcef54561ff2097ca6302d5c95f5974271e019503c6b3bb945
 SHA512:
-  metadata.gz: 9c7dc902f40eb18d022bf95c4874886ad828aab6a7c6ff06f2507aa8cb9b2dc3680a78d4d651d85d7af69ca29810c1afc562794dd395eb2044ca3ffad3652603
-  data.tar.gz: b67b002b67712e37811d17dd2836e0a8b0bfe5de97f23c96c310cd8ae33cf57fd76b70ddc7e45e776503cb6f55576ac90fca6bfbee34468b35095c49d5ccb654
+  metadata.gz: 8aa88ec2442fb6082534094e9f0adeacab7c0580ffd3540ec84f12a1586431074c782a3b504233bdbb37efa7705b8eda2d0344e51c4d11a792d34db8377e0cda
+  data.tar.gz: 1168970bb83a07885619f13e3a5ec85d8731e1ae22207415d6791511dff63281814dfe670793cf09f5cd8f040996e5330d09f68e432f92b8a2194627180abdc6

data/.dependabot/config.yml

@@ -9,10 +9,3 @@ update_configs:
     allowed_updates:
       - match:
           update_type: "all"
-    automerged_updates:
-      - match:
-          dependency_type: "development"
-          update_type: "all"
-      - match:
-          dependency_type: "production"
-          update_type: "all"

data/.github/workflows/auto-approve.yml

@@ -1,7 +1,7 @@
-# automatically approve PRs submitted by Dependabot
+# automatically approve PRs submitted by Dependabot or Renofidev
 # this will allow Dependabot to automatically merge dependency update PRs where CI passes
 # from: https://github.com/hmarr/auto-approve-action
-name: Auto approve Dependabot PRs
+name: Auto approve dependency upgrades PRs
 
 on:
   pull_request
@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: hmarr/auto-approve-action@v2.0.0
-      if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+      if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev'
       with:
         github-token: "${{ secrets.GITHUB_TOKEN }}"

data/.github/workflows/auto-merge.yml

@@ -0,0 +1,19 @@
+name: automerge
+on:
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge
+        uses: "pascalgn/automerge-action@v0.11.0"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: squash
+          MERGE_DELETE_BRANCH: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (1.1.4)
+    vidar (1.3.2)
       colorize
       faraday
       thor (~> 1.0)
@@ -14,49 +14,53 @@ GEM
     coderay (1.1.3)
     colorize (0.8.1)
     diff-lcs (1.4.4)
-    faraday (1.0.1)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     method_source (1.0.0)
     multipart-post (2.1.1)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.20.0)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.2)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.88.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    rubocop (1.2.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
+      rubocop-ast (>= 1.0.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.2.0)
-      parser (>= 2.7.0.1)
-    rubocop-performance (1.7.1)
-      rubocop (>= 0.82.0)
-    rubocop-rspec (1.42.0)
+    rubocop-ast (1.1.1)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.8.1)
       rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rspec (2.0.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     thor (1.0.1)
     unicode-display_width (1.7.0)
 

data/Rakefile

@@ -5,4 +5,4 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
-task default: %i[rubocop:auto_correct spec]
+task default: %i[spec rubocop:auto_correct]

data/lib/vidar/cli.rb

@@ -65,9 +65,11 @@ module Vidar
 
     desc "deploy", "Perform k8s deployment with deploy hook"
     method_option :revision, required: false
+    method_option :kubectl_context, required: false
     def deploy
       revision = options[:revision] || Config.get!(:revision)
-      Log.info "Current kubectl context: #{Config.get!(:kubectl_context)}"
+      kubectl_context = options[:kubectl_context] || Config.get!(:kubectl_context)
+      Log.info "Current kubectl context: #{kubectl_context}"
 
       Log.info "Looking for deploy hook..."
       template_name, error, status = Open3.capture3 "kubectl get cronjob deploy-hook-template -n #{Config.get!(:namespace)} -o name --ignore-not-found=true"

data/lib/vidar/config.rb

@@ -53,7 +53,7 @@ module Vidar
       end
 
       def build_url
-        value = ENV[get(:build_env).to_s]
+        value = ENV[get(:build_env).to_s] || get(:build_url)
         value&.empty? ? nil : value
       end
 

data/lib/vidar/deploy_config.rb

@@ -10,7 +10,7 @@ module Vidar
 
     def initialize(options)
       @name = options.fetch(:name)
-      @url = options.fetch(:url)
+      @url = options.fetch(:url, nil)
 
       @default_color = options.fetch(:default_color, DEFAULT_COLOR)
       @success_color = options.fetch(:success_color, SUCCESS_COLOR)

data/lib/vidar/interpolation.rb

@@ -8,7 +8,7 @@ module Vidar
         fail ArgumentError, "getter must respond_to get." unless getter.respond_to?(:get)
 
         string.gsub(INTERPOLATION_PATTERN) do |match|
-          getter.get($1) || match # rubocop:disable Style/PerlBackrefs
+          getter.get($1) || ENV[$1] || match # rubocop:disable Style/PerlBackrefs
         end
       end
     end

data/lib/vidar/log.rb

@@ -2,7 +2,7 @@ module Vidar
   class Log
     class << self
       def line
-        puts "|" + "-" * 142 + "|"
+        puts "|#{'-' * 142}|"
       end
 
       def info(text, fill_with = "#")

data/lib/vidar/slack_notification.rb

@@ -5,7 +5,6 @@ module Vidar
       @revision = revision
       @revision_name = revision_name
       @build_url = build_url
-      @build_hostname = ::URI.parse(build_url || '').hostname
       @deploy_name = deploy_config.name
       @deploy_url = deploy_config.url
       @default_color = deploy_config.default_color
@@ -20,12 +19,19 @@ module Vidar
     end
 
     def failure
-      message = "Failed deploy of #{github_link} to #{deploy_link} :fire: <!channel> #{build_link}"
+      message = [
+        "Failed deploy of #{github_link} to #{deploy_link}.",
+        ":fire: <!channel>",
+        build_link
+      ]
       perform_with data(message: message, color: failure_color)
     end
 
     def success
-      message = "Successful deploy of #{github_link} to #{deploy_link}. #{build_link}"
+      message = [
+        "Successful deploy of #{github_link} to #{deploy_link}.",
+        build_link
+      ]
       perform_with data(message: message, color: success_color)
     end
 
@@ -46,17 +52,18 @@ module Vidar
     attr_reader :github, :revision, :revision_name,
       :deploy_name, :deploy_url, :webhook_url,
       :default_color, :success_color, :failure_color,
-      :connection, :build_url, :build_hostname
+      :connection, :build_url
 
     def data(message:, color:)
+      text = [message].flatten.compact.join("\n")
       {
         "attachments": [
           {
             "title": github,
             "title_link": github_url,
             "color": color,
-            "text": message,
-            "fallback": message
+            "text": text,
+            "fallback": text,
           }
         ]
       }
@@ -71,11 +78,12 @@ module Vidar
     end
 
     def deploy_link
+      return deploy_name unless deploy_url
       "<#{deploy_url}|#{deploy_name}>"
     end
 
     def build_link
-      build_url && "<#{build_url}|View the build on #{build_hostname}>"
+      build_url && "<#{build_url}|View the build.>"
     end
   end
 end

data/lib/vidar/version.rb

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '1.1.4'.freeze
+  VERSION = '1.3.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.3.2
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -180,6 +180,7 @@ files:
 - ".github/ISSUE_TEMPLATE/story.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/auto-approve.yml"
+- ".github/workflows/auto-merge.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -224,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: K8s deployment tools based on thor