vidar 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c3ae056c22e8845bf1ac3f1466ee039d734ced5310075fac57b8307e50cd8fd
-  data.tar.gz: 19d7a064152627fcef54561ff2097ca6302d5c95f5974271e019503c6b3bb945
+  metadata.gz: b09b655bc0059808f6e0373ebcf7e2e70b99d0cb9935e1e882cb63f609e2550d
+  data.tar.gz: 1fc818361e0ac1d324bc0077bce17036999264657f50f1a3274b366dd16b6ce5
 SHA512:
-  metadata.gz: 8aa88ec2442fb6082534094e9f0adeacab7c0580ffd3540ec84f12a1586431074c782a3b504233bdbb37efa7705b8eda2d0344e51c4d11a792d34db8377e0cda
-  data.tar.gz: 1168970bb83a07885619f13e3a5ec85d8731e1ae22207415d6791511dff63281814dfe670793cf09f5cd8f040996e5330d09f68e432f92b8a2194627180abdc6
+  metadata.gz: 7bdf349a69e3d83d1baa584bcd648adfb3cd2de1e34382577514f0436ef08fdd2e8884956ab77df450ba6af441e91a12b0a70dd3f3baaa20919e2d97cbfec3e8
+  data.tar.gz: 43bb2ff9ed08d64344412cb8e06a43c2ef61445e109fdcf09412472339110073071b30516ebfc3c8bb8a0535f7bfc2d802465b59fd034206dadc7e5de46bc15b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (1.3.2)
+    vidar (1.4.0)
       colorize
       faraday
       thor (~> 1.0)
@@ -9,25 +9,30 @@ 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.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.20.0)
+    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.8.2)
+    regexp_parser (2.0.0)
     rexml (3.2.4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -42,27 +47,30 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (1.2.0)
+    rubocop (1.6.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.0.1)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.1)
+    rubocop-ast (1.3.0)
       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-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
@@ -74,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/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/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?

data/lib/vidar/version.rb

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '1.3.2'.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.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-10 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
@@ -210,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: