groundskeeper-bitcore 0.16.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1448cba896d4d2a4dd501ba945c66fb33ea2d61b039a931e3b2e281efbd2f8e6
-  data.tar.gz: 224187c49d02f02eadbbb85421579ece568c270307b3eff50dd044684f26b949
+  metadata.gz: 1eac58f6bfc760b50d34890dd5a828d289a6e04670b7fa8b373038a6ba7464e7
+  data.tar.gz: bfe6d170c239314941b713d84411853e810f9d78675fc5c5137f3f0833bdb852
 SHA512:
-  metadata.gz: a34d5b2fa7fc5ec78c14d7e2a7b56deedf02da8433d163993925cc31594ae07f570c2682ab2273424358afb5358a16bebeb070673dd1393c97877b3708e84b65
-  data.tar.gz: d8ca482356226b3786c69afab64e5a7e47f2233b29c2c39442111e705243c018ff6c84f64bba7ef1a5e26246afceb21ae0282328a351d7be3d20817636b7612d
+  metadata.gz: 5be5c57f082ebcd53a599b9bd261454c9353425fb84bf2d38a4f73fc52e53b371db2454489a095c3a7141654a7968d997bbfc726d47e8cc76861e406b8da2ba5
+  data.tar.gz: 9e238b3b3deaa46383a6440b23f5ba8c25f3a327776307c08ddeac62b62f4153cdfb460fcf68639980bbfffaca0a144db09b9401f7f0234f8de4ad0d711df621

data/.rubocop.yml

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

data/config/git_config.rb

@@ -2,7 +2,10 @@
 
 require "yaml"
 require "json"
-require "groundskeeper"
+require "groundskeeper/project"
+require "groundskeeper/document"
+require "groundskeeper/git"
+require "groundskeeper/executable"
 
 desc "Sets up project details."
 # rubocop:disable Metrics/BlockLength
@@ -25,6 +28,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/groundskeeper.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.executables   = "ground"
   spec.require_paths = %w[lib config]
 
+  spec.required_ruby_version = ">= 2.4"
   spec.add_dependency "jira-ruby", "~> 2.0"
   spec.add_dependency "mina", "~> 1.2"
   spec.add_dependency "mina-whenever", "~> 1.0.1"

data/lib/groundskeeper/application.rb

@@ -5,6 +5,7 @@ require "thor"
 module Groundskeeper
   # Bootstrap this as a Thor application.
   class Application < Thor
+    include Thor::Actions
     attr_reader :commands
 
     class_option :simulate, desc: "Simulate mina"

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
@@ -93,7 +95,7 @@ module Groundskeeper
     # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
     def info(options = {})
       return unrecognized_version unless version_file.exists?
-      return unless check_groundskeeper_version
+      return groundskeeper_outdated unless check_groundskeeper_version
 
       Executable.verbose = options[:verbose]
       pull_project_details
@@ -112,13 +114,12 @@ module Groundskeeper
     # rubocop:enable Metrics/AbcSize
 
     # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity,
-    # rubocop:disable Metrics/PerceivedComplexity
     def release(options = {})
       is_initial_release = !version_file.exists?
 
       return missing_jira_credentials unless jira.credentials?
       return missing_bitbucket_credentials unless bitbucket.credentials?
-      return unless check_groundskeeper_version
+      return groundskeeper_outdated unless check_groundskeeper_version
       return unrecognized_version unless version_file.rails?
 
       version_file.create_initial_version! unless version_file.exists?
@@ -137,12 +138,12 @@ module Groundskeeper
       create_pr
     end
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
-    # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/MethodLength
 
     # :nocov:
     def predeploy(options = {})
       return unrecognized_version unless version_file.exists?
-      return unless check_groundskeeper_version
+      return groundskeeper_outdated unless check_groundskeeper_version
 
       Executable.verbose = options[:verbose]
       pull_project_details
@@ -159,7 +160,7 @@ module Groundskeeper
       return missing_jira_credentials unless jira.credentials?
       return missing_sentry_credentials unless sentry.credentials?
       return missing_slack_credentials unless slack.credentials?
-      return unless check_groundskeeper_version
+      return groundskeeper_outdated unless check_groundskeeper_version
       return unable_to_ssh unless ssh.can_connect?
 
       Executable.verbose = options[:verbose]
@@ -203,26 +204,32 @@ module Groundskeeper
       end
     end
 
-    # rubocop:disable Metrics/MethodLength
     def check_groundskeeper_version
       @check_groundskeeper_version ||= begin
         console.say("Groundskeeper version #{Groundskeeper::VERSION}\n\n",
                     :bold)
         latest_version = rubygems.latest_groundskeeper_version
 
-        if SemanticVersion.new(latest_version) > SemanticVersion.new(VERSION)
-          console.say(
-            "Groundskeeper is outdated, please install #{latest_version}",
-            :red
-          )
+        return true unless SemanticVersion.new(latest_version) > VERSION
 
-          false
-        else
-          true
-        end
+        return false unless install_latest_groundskeeper?
+
+        console.run("gem install groundskeeper-bitcore")
+
+        true
       end
     end
-    # rubocop:enable Metrics/MethodLength
+
+    # :nocov:
+    def install_latest_groundskeeper?
+      question = <<~TEXT.squish
+        Groundskeeper is outdated,
+        would you like the latest version installed?
+      TEXT
+
+      console.ask(question, :red, limited_to: %w[yes no]) == "yes"
+    end
+    # :nocov:
 
     def announce_latest_tag
       console.say(
@@ -281,8 +288,14 @@ module Groundskeeper
 
     def add_version_to_jira_issues
       issue_ids = jira.included_issues(recent_commits)
-      jira.add_version_to_remote_issues(next_jira_version_name, issue_ids)
-      console.say("# added version to Jira issues #{issue_ids}", :green)
+      message = jira.add_version_to_remote_issues(
+        next_jira_version_name, issue_ids
+      )
+      if message.blank?
+        console.say("# added version to Jira issues #{issue_ids}", :green)
+      else
+        announce_error(message)
+      end
     end
 
     def create_pr
@@ -307,6 +320,10 @@ module Groundskeeper
       tag.nil? ? false : git.list_tags.include?(tag)
     end
 
+    def announce_error(message)
+      console.say("# #{message}", :red)
+    end
+
     def unrecognized_tag
       console.say(
         "Tag not found, try again with an existing tag.",
@@ -321,6 +338,10 @@ module Groundskeeper
       )
     end
 
+    def groundskeeper_outdated
+      console.say("Groundskeeper outdated. Install the latest version.", :red)
+    end
+
     def missing_bitbucket_credentials
       console.say(
         "Please configure your Bitbucket environment variables.",
@@ -375,16 +396,24 @@ module Groundskeeper
 
     # rubocop:disable Metrics/MethodLength
     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]}, " \

data/lib/groundskeeper/jira.rb

@@ -4,6 +4,8 @@ require "cgi"
 require "date"
 require "jira-ruby"
 
+class IssueNotFoundError < StandardError; end
+
 module Groundskeeper
   # Wraps an interface to Jira.
   class Jira
@@ -46,6 +48,8 @@ module Groundskeeper
 
       # :nocov:
       def add_version_to_issue(issue_id:, version_name:)
+        raise IssueNotFoundError if client.Issue.find(issue_id).nil?
+
         client.Issue
               .find(issue_id)
               .save(update: { fixVersions: [{ add: { name: version_name } }] })
@@ -120,11 +124,22 @@ module Groundskeeper
       client.create_version(name: name, prefix: prefix)
     end
 
+    # rubocop:disable Metrics/MethodLength
     def add_version_to_remote_issues(name, issue_ids)
+      failed_issues = []
       issue_ids.each do |issue_id|
-        client.add_version_to_issue(issue_id: issue_id, version_name: name)
+        begin
+          client.add_version_to_issue(issue_id: issue_id, version_name: name)
+        rescue IssueNotFoundError
+          failed_issues << issue_id
+          next
+        end
       end
+      return "" unless failed_issues.count.positive?
+
+      "Jira issue(s) not found, is #{failed_issues.join(', ')} correct?"
     end
+    # rubocop:enable Metrics/MethodLength
 
     def transition_remote_issues(transition_type, issue_ids)
       issue_ids.each do |issue_id|

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.21.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.21.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: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby
@@ -217,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="