vidar 1.1.5 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed660da4b231ed9dfd128c739f85bbcd5635007a907016e8d5f5b981ffa98372
-  data.tar.gz: 926998278a721071e8232acbaafd3daf742693d219a26e8db59551072770dc3e
+  metadata.gz: b09b655bc0059808f6e0373ebcf7e2e70b99d0cb9935e1e882cb63f609e2550d
+  data.tar.gz: 1fc818361e0ac1d324bc0077bce17036999264657f50f1a3274b366dd16b6ce5
 SHA512:
-  metadata.gz: a17be0f3854b58d0f9a040ca7314bc877a4cc697e9ae92b7f60291795a833259318cb5f59b99c324f8b88d70de27a0e55f6ef6480d32eb5e46f316337718a538
-  data.tar.gz: '083c14b658ab0eff7425086b6736461198b84af6de2be568a9767e8c0b6aa2db09fa5ecc245162610bc3808d96d6a2b08056e2dc9c1455d4d33cf9010272bad3'
+  metadata.gz: 7bdf349a69e3d83d1baa584bcd648adfb3cd2de1e34382577514f0436ef08fdd2e8884956ab77df450ba6af441e91a12b0a70dd3f3baaa20919e2d97cbfec3e8
+  data.tar.gz: 43bb2ff9ed08d64344412cb8e06a43c2ef61445e109fdcf09412472339110073071b30516ebfc3c8bb8a0535f7bfc2d802465b59fd034206dadc7e5de46bc15b

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.5)
+    vidar (1.4.0)
       colorize
       faraday
       thor (~> 1.0)
@@ -9,56 +9,68 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.1)
     awesome_print (1.8.0)
     coderay (1.1.3)
     colorize (0.8.1)
+    crack (0.4.4)
     diff-lcs (1.4.4)
-    faraday (1.0.1)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    hashdiff (1.0.1)
     method_source (1.0.0)
     multipart-post (2.1.1)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.20.1)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.7.1)
+    regexp_parser (2.0.0)
     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.90.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    rubocop (1.6.1)
       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, < 3.0)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    rubocop-performance (1.7.1)
-      rubocop (>= 0.82.0)
-    rubocop-rspec (1.43.2)
-      rubocop (~> 0.87)
+    rubocop-ast (1.3.0)
+      parser (>= 2.7.1.5)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.0.1)
+      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)
+    webmock (3.10.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -70,9 +82,10 @@ DEPENDENCIES
   rake
   rspec
   rubocop
-  rubocop-performance
+  rubocop-rake
   rubocop-rspec
   vidar!
+  webmock
 
 BUNDLED WITH
    2.1.4

data/README.md

@@ -90,7 +90,7 @@ deployments:
     slack_webhook_url: https://hooks.slack.com/services/ASCKNZ0vug2R3Ydo/ASCKNZ0vug2R3Ydo/ASCKNZ0vug2R3Ydo
 # docker-compose file, optional, default value: docker-compose.ci.yml
 compose_file: docker-compose.ci.yml
-# default_branch, optional, default value: master
+# default_branch, optional, default value: main or master (auto-detected from local branches)
 default_branch: dev
 # console_command, optional, default value: bin/console
 console_command: rake console

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

@@ -1,10 +1,11 @@
 module Vidar
   class Config
     DEFAULT_MANIFEST_FILE = "vidar.yml".freeze
+    DEFAULT_BRANCHES = %w[main master].freeze
 
     DEFAULT_OPTIONS = {
       compose_file:       -> { "docker-compose.ci.yml" },
-      default_branch:     -> { "master" },
+      default_branch:     -> { (DEFAULT_BRANCHES & branches).first || DEFAULT_BRANCHES.first },
       current_branch:     -> { `git rev-parse --abbrev-ref HEAD`.strip.tr("/", "-") },
       revision:           -> { `git rev-parse HEAD`.strip },
       revision_name:      -> { `git show --pretty=format:"%s (%h)" -s HEAD`.strip },
@@ -53,7 +54,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
 
@@ -73,6 +74,10 @@ module Vidar
         DeployConfig.new(deployment)
       end
 
+      def branches
+        `git for-each-ref --format='%(refname:short)' refs/heads/*`.split("\n")
+      end
+
       def default_branch?
         get!(:current_branch) == get!(:default_branch)
       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/slack_notification.rb

@@ -1,18 +1,17 @@
 module Vidar
   class SlackNotification
-    def initialize(github:, revision:, revision_name:, deploy_config:, build_url: nil)
+    def initialize(github:, revision:, revision_name:, deploy_config:, build_url: nil, connection: Faraday.new)
       @github = github
       @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
       @success_color = deploy_config.success_color
       @failure_color = deploy_config.failure_color
       @webhook_url = deploy_config.slack_webhook_url
-      @connection = Faraday.new
+      @connection = connection
     end
 
     def configured?
@@ -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.5'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/vidar.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata['homepage_uri'] = 'https://github.com/RenoFi/vidar'
   spec.metadata['source_code_uri'] = 'https://github.com/RenoFi/vidar'
+  spec.metadata['changelog_uri'] = 'https://github.com/RenoFi/vidar/blob/master/CHANGELOG.md'
 
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin/|spec/|\.rub)}) }
@@ -34,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'webmock'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -138,7 +138,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,6 +165,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - knapo@knapo.net
@@ -180,6 +194,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"
@@ -209,6 +224,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/RenoFi/vidar
   source_code_uri: https://github.com/RenoFi/vidar
+  changelog_uri: https://github.com/RenoFi/vidar/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -224,7 +240,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