vidar 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3d537f85d8832eee399a795a023d6d1ec8d7c755742028bfebdc284faf1a73a
-  data.tar.gz: 9b9402f61125844939c73fdf1106a8e3b7b06d98a2445627bcc73ce3bed419bc
+  metadata.gz: 67ea48d5694ee975aac8c0122b35891a07663da7f6ed897b5da4af401fec0b25
+  data.tar.gz: 7d3e3876268d1a1b455dbf3e126cb41b5ecb54beaa2ae72adb8aa8e803d4e713
 SHA512:
-  metadata.gz: f52e9983f88d1158cf00e3f1343f1fe8b21947766dd81ad59d0853c5fc1393f2d8f849d0de66239a431ef58a799b323269706cb8f9af3887e630cd9fef21d4e5
-  data.tar.gz: ddc33975a9aebebc95b22096fda74a683faf3225517d27c1739a024d7eaa6f81fa77afceeba3b28c64b55aef285c38fda188c9b31bea256489ddaa1394405459
+  metadata.gz: df9143590421ea15f86ea20e783178b018f9c8a7c6abffc5bfa7b91223c270ed519bbd29caf0be154776d03eb2de6b9caa6c409d55bcf803b07138de4e139133
+  data.tar.gz: 8754dae3249c781998ed949c3d13243938aa2845aba2c117aceb9f951b7af76867c593ea7e09d8558cf9536a45921bce7355204bd8d1aea93c18099a1dfade72

data/.bundler-version

@@ -1 +1 @@
-2.2.27
+2.3.11

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

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

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0']
+        ruby-version: ['3.0', 3.1]
 
     steps:
     - uses: actions/checkout@v2
@@ -19,7 +19,7 @@ jobs:
     # 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
+      uses: ruby/setup-ruby@bd94d6a504586da892a5753afdd1480096ed30df
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/CHANGELOG.md

@@ -1,6 +1,5 @@
 # CHANGELOG
 
-## 1.4.0 - 2020-12-14
+## 1.5.0 - 2022-04-20
 
-- 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)
+- Drop ruby 2.7 support and test against ruby 3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (1.4.1)
+    vidar (1.5.0)
       colorize
       faraday
       thor (~> 1.0)
@@ -17,71 +17,55 @@ GEM
     colorize (0.8.1)
     crack (0.4.5)
       rexml
-    diff-lcs (1.4.4)
-    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)
+    diff-lcs (1.5.0)
+    faraday (2.2.0)
+      faraday-net_http (~> 2.0)
       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)
+    faraday-net_http (2.0.2)
     hashdiff (1.0.1)
     method_source (1.0.0)
-    multipart-post (2.1.1)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
-    rainbow (3.0.0)
+    public_suffix (4.0.7)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.3.0)
     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.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.22.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.27.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.5.0)
+    rubocop-rspec (2.10.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    thor (1.1.0)
+    thor (1.2.1)
     unicode-display_width (2.1.0)
     webmock (3.14.0)
       addressable (>= 2.8.0)
@@ -89,7 +73,11 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
+  aarch64-linux-musl
+  x86_64-darwin-18
+  x86_64-darwin-19
   x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -105,4 +93,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.28
+   2.3.11

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/vidar.svg)](https://rubygems.org/gems/vidar)
-[![Build Status](https://travis-ci.org/RenoFi/vidar.svg?branch=master)](https://travis-ci.org/RenoFi/vidar)
+[![Build Status](https://github.com/RenoFi/vidar/actions/workflows/ci.yml/badge.svg)](https://github.com/RenoFi/vidar/actions/workflows/ci.yml?query=branch%3Amain)
 
 # vidar
 

data/lib/vidar/cli.rb

@@ -84,6 +84,7 @@ module Vidar
           Run.kubectl "create job deploy-hook --from=#{template_name}"
 
           deploy_status = Vidar::DeployStatus.new(namespace: Config.get!(:namespace), filter: "deploy-hook")
+          deploy_status.wait_until_up
           deploy_status.wait_until_completed
 
           unless deploy_status.success?
@@ -158,7 +159,7 @@ module Vidar
       else
         Log.info "Available containers:"
         containers.each(&:print)
-        container = containers.detect { c.name == 'console' } || containers.last
+        container = containers.detect { |c| 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/deploy_status.rb

@@ -12,6 +12,20 @@ module Vidar
       @max_tries = max_tries
     end
 
+    def wait_until_up
+      tries = 0
+
+      sleep(INITIAL_SLEEP)
+
+      until pod_set.any?
+        tries += 1
+        sleep(SLEEP)
+        if tries > max_tries
+          break
+        end
+      end
+    end
+
     def wait_until_completed
       tries = 0
 
@@ -28,6 +42,7 @@ module Vidar
 
     def success?
       return false unless last_pod_set
+
       last_pod_set.success?
     end
 
@@ -36,7 +51,7 @@ module Vidar
     end
 
     def pod_set
-      @pod_set = K8s::PodSet.new(namespace: namespace, filter: filter)
+      @pod_set = K8s::PodSet.new(namespace:, filter:)
     end
   end
 end

data/lib/vidar/k8s/pod_set.rb

@@ -6,6 +6,10 @@ module Vidar
         @filter = filter
       end
 
+      def any?
+        containers.any?
+      end
+
       def deployed?
         if items.empty?
           Log.error "Could not fetch pod list"

data/lib/vidar/slack_notification.rb

@@ -24,7 +24,7 @@ module Vidar
         ":fire: <!channel>",
         build_link
       ]
-      perform_with data(message: message, color: failure_color)
+      perform_with data(message:, color: failure_color)
     end
 
     def success
@@ -32,11 +32,11 @@ module Vidar
         "Successful deploy of #{github_link} to #{deploy_link}.",
         build_link
       ]
-      perform_with data(message: message, color: success_color)
+      perform_with data(message:, color: success_color)
     end
 
     def deliver(message:, color: default_color)
-      perform_with data(message: message, color: color)
+      perform_with data(message:, color:)
     end
 
     def perform_with(data)
@@ -61,8 +61,8 @@ module Vidar
           {
             title: github,
             title_link: github_url,
-            color: color,
-            text: text,
+            color:,
+            text:,
             fallback: text,
           }
         ]
@@ -79,6 +79,7 @@ module Vidar
 
     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.4.1'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/vidar.gemspec

@@ -15,6 +15,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.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin/|spec/|\.rub)}) }
@@ -23,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 3.0'
 
   spec.add_dependency 'colorize'
   spec.add_dependency 'faraday'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -227,6 +227,7 @@ 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
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -235,14 +236,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.23
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: K8s deployment tools based on thor