groundskeeper-bitcore 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1448cba896d4d2a4dd501ba945c66fb33ea2d61b039a931e3b2e281efbd2f8e6
-  data.tar.gz: 224187c49d02f02eadbbb85421579ece568c270307b3eff50dd044684f26b949
+  metadata.gz: 76a66b65c4de7ff36bc401d84e100417c577bd6fc79fa82a3a25e3068303afba
+  data.tar.gz: cbebbf63ed96160aacaf9df0d8b51a8064d747ec7a99f51f4b47e708dac74af3
 SHA512:
-  metadata.gz: a34d5b2fa7fc5ec78c14d7e2a7b56deedf02da8433d163993925cc31594ae07f570c2682ab2273424358afb5358a16bebeb070673dd1393c97877b3708e84b65
-  data.tar.gz: d8ca482356226b3786c69afab64e5a7e47f2233b29c2c39442111e705243c018ff6c84f64bba7ef1a5e26246afceb21ae0282328a351d7be3d20817636b7612d
+  metadata.gz: 668833b27cf2c40c28f8124db0ffc95d3452bf6d163408de22de3b0440b556c6276091260003e5d7d2fe7ddcfb40b7d2ad9fdf5a9911237c1bf0c933d9c6dac0
+  data.tar.gz: 025d383dd7bed00e1eaf0b64cbd8aead02392798d1051228eb977b1d15ae4f119e95d59eaaccd9165c9d6ad17170cc0c8a45c83928093e03b74451e474b1357f

data/.rubocop.yml

@@ -39,3 +39,6 @@ Style/SingleLineMethods:
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
+
+Style/IfUnlessModifier:
+  Enabled: false

data/config/git_config.rb

@@ -25,6 +25,7 @@ task :before_run do
   set :deploy_to, project.deploy_to
   set :forward_agent, true
   set :bundle_path, "bundle"
+  set :smtp_domain, project.smtp_domain
 
   set :rvm_ruby_version, project.rvm_ruby_version
   set :rvm_type, :system

data/config/rails_config.rb.erb

@@ -64,7 +64,7 @@ Rails.application.configure do
       authentication: :plain,
       address: 'smtp.mailgun.org',
       port: 587,
-      domain: 'cbits.northwestern.edu',
+      domain: '<%= fetch :smtp_domain %>',
       user_name: ENV['mailgun_db_username'],
       password: ENV['mailgun_db_password']
     }

data/lib/groundskeeper/commands.rb

@@ -5,6 +5,8 @@ require "mina"
 require "pp"
 require "open3"
 
+class VersionError < StandardError; end
+
 module Groundskeeper
   # Formulas for managing releases and deployments.
   # rubocop:disable Metrics/ClassLength
@@ -373,18 +375,26 @@ module Groundskeeper
       end
     end
 
-    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def update_deployed_issues
+      tries = 0
+
       announce_step(
         "Check deployed version at #{website.uri}/#{Website::VERSION_PATH}"
       )
-      deployed_version = website.version
 
-      if deployed_version == ENV[TAG]
+      begin
+        deployed_version = website.version
+
+        raise VersionError unless deployed_version == ENV[TAG]
+
         console.say("# deployment successful", :green)
         transition_remote_issues deployed_version
         announce_in_slack deployed_version
-      else
+      rescue VersionError
+        tries += 1
+        sleep 5
+        retry if tries < 3
         # :nocov:
         console.say(
           "something went wrong: expected version #{ENV[TAG]}, " \
@@ -394,7 +404,7 @@ module Groundskeeper
         # :nocov:
       end
     end
-    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     # :nocov:
     def release_version

data/lib/groundskeeper/project.rb

@@ -17,6 +17,7 @@ module Groundskeeper
     DB_ENV_VARIABLES_KEY = "db_env_variables"
     SENTRY_DSN_KEY = "sentry_dsn"
     SENTRY_PROJECT_KEY = "sentry_project"
+    SMTP_DOMAIN = "smtp_domain"
     SSL_CERTIFICATE_FILE_KEY = "SSLCertificateFile"
     SSL_CERTIFICATE_CHAIN_FILE_KEY = "SSLCertificateChainFile"
     SSL_CERTIFICATE_KEY_FILE_KEY = "SSLCertificateKeyFile"
@@ -65,6 +66,12 @@ module Groundskeeper
     end
     # :nocov:
 
+    # :nocov:
+    def smtp_domain
+      details[SMTP_DOMAIN] || ""
+    end
+    # :nocov:
+
     # :nocov:
     def rvm_ruby_version
       details[RVM_RUBY_VERSION_KEY] || ""

data/lib/groundskeeper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Groundskeeper
-  VERSION = "0.16.0"
+  VERSION = "0.17.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groundskeeper-bitcore
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - BIT Core
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - certs/ericcf.pem
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby