vidar 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 550fa5fad13e11baf5d526d4f0bc9ec1355d1dba83b08ad6cda0a48907b770f0
-  data.tar.gz: e459ab46f1c3f0c68900af01d1a20f44506121b5da52d9305653748c458daa8e
+  metadata.gz: c3d537f85d8832eee399a795a023d6d1ec8d7c755742028bfebdc284faf1a73a
+  data.tar.gz: 9b9402f61125844939c73fdf1106a8e3b7b06d98a2445627bcc73ce3bed419bc
 SHA512:
-  metadata.gz: 15b9365745e2993d24a8121649ae9e86000b7e5a30615805fbb3b526824c3d5aed5e09ff33cf2f11a6a40c947b8921e5bd9fc018bd52f0a320d624926391be17
-  data.tar.gz: e559f868fb17e582f495796d9090ad770012f62e11006739732b464e0ecba94e544559397fa3d3651438b6f06639fdaf9feda1c50973baf3e39431ec15199c8e
+  metadata.gz: f52e9983f88d1158cf00e3f1343f1fe8b21947766dd81ad59d0853c5fc1393f2d8f849d0de66239a431ef58a799b323269706cb8f9af3887e630cd9fef21d4e5
+  data.tar.gz: ddc33975a9aebebc95b22096fda74a683faf3225517d27c1739a024d7eaa6f81fa77afceeba3b28c64b55aef285c38fda188c9b31bea256489ddaa1394405459

data/.bundler-version

@@ -0,0 +1 @@
+2.2.27

data/.dependabot/config.yml

@@ -3,9 +3,14 @@ version: 1
 update_configs:
   - package_manager: "ruby:bundler"
     directory: "/"
-    update_schedule: "monthly"
+    update_schedule: "daily"
     commit_message:
       prefix: "[dependabot]"
     allowed_updates:
       - match:
-          update_type: "all"
+          dependency_type: "all"
+          update_type: "security"
+    automerged_updates:
+      - match:
+          dependency_type: "all"
+          update_type: "security:patch"

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,18 +1,6 @@
-## Description
+## Description, motivation and context
 <!--- Describe your changes in detail -->
-
-## Related issue(s)
-<!--- GH issue number -->
-
-## Motivation and Context
 <!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
 
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-
-## Screenshots (if appropriate):
-<!--- Please add any screenshots of the feature. -->
-
-## Related PRs
-<!--- Please add links to any related PRs (backend, component packages, etc). -->
+## Related issue(s) or PR(s)
+<!--- GH issue number -->

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

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@v0.11.0"
+        uses: "pascalgn/automerge-action@v0.12.0"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_METHOD: squash

data/.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: Ruby CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+    - name: Run tests
+      run: bundle exec rake ci

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# CHANGELOG
+
+## 1.4.0 - 2020-12-14
+
+- make `default_branch` to be auto-detected
+from `main` and `master`, so it works with [the new github convention]) https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (1.3.0)
+    vidar (1.4.1)
       colorize
       faraday
       thor (~> 1.0)
@@ -9,63 +9,88 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
-    awesome_print (1.8.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
+    awesome_print (1.9.2)
     coderay (1.1.3)
     colorize (0.8.1)
+    crack (0.4.5)
+      rexml
     diff-lcs (1.4.4)
-    faraday (1.1.0)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    hashdiff (1.0.1)
     method_source (1.0.0)
     multipart-post (2.1.1)
-    parallel (1.19.2)
-    parser (2.7.2.0)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     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-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (0.93.1)
+    rspec-support (3.10.2)
+    rubocop (1.22.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.6.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.0)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.8.1)
-      rubocop (>= 0.87.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rspec (1.44.1)
-      rubocop (~> 0.87)
-      rubocop-ast (>= 0.7.1)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    thor (1.0.1)
-    unicode-display_width (1.7.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.12.0)
+      parser (>= 3.0.1.1)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.5.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    thor (1.1.0)
+    unicode-display_width (2.1.0)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   awesome_print
@@ -74,9 +99,10 @@ DEPENDENCIES
   rake
   rspec
   rubocop
-  rubocop-performance
+  rubocop-rake
   rubocop-rspec
   vidar!
+  webmock
 
 BUNDLED WITH
-   2.1.4
+   2.2.28

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,5 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
+task ci: %i[spec rubocop]
 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"
@@ -156,7 +158,7 @@ module Vidar
       else
         Log.info "Available containers:"
         containers.each(&:print)
-        container = containers.first
+        container = containers.detect { c.name == 'console' } || containers.last
 
         Log.info "Running #{options[:command]} in #{container.pod_name}"
         Run.kubectl("exec -it #{container.pod_name} -- #{options[:command]}")

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 },
@@ -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

@@ -1,6 +1,6 @@
 module Vidar
   class Interpolation
-    INTERPOLATION_PATTERN = /\{\{(\w+)\}\}/.freeze
+    INTERPOLATION_PATTERN = /\{\{(\w+)\}\}/
 
     class << self
       def call(string, getter)

data/lib/vidar/sentry_notification.rb

@@ -24,7 +24,7 @@ module Vidar
 
     def data
       {
-        "version": revision
+        version: revision
       }
     end
   end

data/lib/vidar/slack_notification.rb

@@ -1,6 +1,6 @@
 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
@@ -11,7 +11,7 @@ module Vidar
       @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?
@@ -57,13 +57,13 @@ module Vidar
     def data(message:, color:)
       text = [message].flatten.compact.join("\n")
       {
-        "attachments": [
+        attachments: [
           {
-            "title": github,
-            "title_link": github_url,
-            "color": color,
-            "text": text,
-            "fallback": text,
+            title: github,
+            title_link: github_url,
+            color: color,
+            text: text,
+            fallback: text,
           }
         ]
       }
@@ -78,6 +78,7 @@ module Vidar
     end
 
     def deploy_link
+      return deploy_name unless deploy_url
       "<#{deploy_url}|#{deploy_name}>"
     end
 

data/lib/vidar/version.rb

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.4.1'.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.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2021-09-30 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
@@ -174,6 +188,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundler-version"
 - ".dependabot/config.yml"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/config.yml"
@@ -181,9 +196,10 @@ files:
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/auto-approve.yml"
 - ".github/workflows/auto-merge.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -210,6 +226,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:
@@ -225,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.23
 signing_key:
 specification_version: 4
 summary: K8s deployment tools based on thor

data/.travis.yml

@@ -1,11 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6
-  - 2.7
-before_install: gem install bundler
-script:
-  - bundle exec rake spec
-  - bundle exec rake rubocop