groundskeeper-bitcore 0.14.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f3abfedd064f6693fca5e7662bbbd9e9d86ad809745eb6447dae93b0f65836d
-  data.tar.gz: 06b0d10e2ee271169399a386c13cd9da2baf5b23caaa11b9838a67635dbf68a5
+  metadata.gz: e7dcfaed6f571874111c1ad58ae2bbbd584ae2d55f65310ac6440b77488f066b
+  data.tar.gz: 48117df263a168b70c69923bed84fd3253528c799c3115f4ef951c5822ded61a
 SHA512:
-  metadata.gz: a6b169b9c74ae1efafe33c5a9fd47f990f4d14247c505fd790da3c679c713819187782688d6b7689d3572b16438bfae93e38e7128765faa0ddc0c9b189910aec
-  data.tar.gz: f0b0d7874d08b8900ddde2e23150c7851d05329c8f5b34c372c70d0008dc1698c7a500159906c8ae19a1dcbb5e0d44640894c93819a6b480f17c782d8ced5d4f
+  metadata.gz: aca1a48ad5c22b23d123d39a4d24c840100d9e31ea16c0694cae3cf983261526fae1157e9bcb198cd52c092466f8360e6d12337f2201d08356366a0055bbcf21
+  data.tar.gz: b2cd407005039a60bf1b034c94f85f3b53dcd624d44a47ad5682634339a2b6dace1432091bdae3a6fd9c94586bb9af624a0628f904c90d66f54974fb97616c04

data/.rubocop.yml

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

data/.ruby-version

@@ -1 +1 @@
-2.6.2
+2.7.1

data/README.md

@@ -70,10 +70,11 @@ application directory:
 ground release
 ```
 
-To prepare the server (only required the first time) for deployment:
+To prepare the server (only required the first time) for deployment, add nginx
+flag if deploying to nginx server:
 
 ```bash
-tag=0.0.0 stage=production ground predeploy
+tag=0.0.0 stage=production ground predeploy [--nginx]
 ```
 
 To deploy the release (note that `stage` is optional and will be set to staging

data/bitbucket-pipelines.yml

@@ -1,4 +1,4 @@
-image: 'isgmhradd/rails-ruby26:2019-10-07'
+image: 'isgmhradd/rails-ruby27:2020-04-01'
 
 pipelines:
   default:

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
@@ -41,5 +42,6 @@ task :before_run do
 
   set :branch, "master"
   set :tag, tag
+  set :nginx, fetch(:nginx)
 end
 # rubocop:enable Metrics/BlockLength

data/config/predeploy.rb

@@ -28,6 +28,14 @@ def vhost_config_file
   "/etc/httpd/conf.d/#{fetch :application_name}.conf"
 end
 
+def vhost_nginx_config_file
+  "/etc/nginx/sites-available/#{fetch :application_name}.conf"
+end
+
+def vhost_nginx_linked_file
+  "/etc/nginx/sites-enabled/#{fetch :application_name}.conf"
+end
+
 def remote_shared_path(path)
   "#{fetch(:user)}@#{fetch(:domain)}:#{fetch(:shared_path)}/#{path}"
 end
@@ -101,14 +109,25 @@ namespace :deploy_configure do
 end
 # rubocop:enable Metrics/BlockLength
 
+# rubocop:disable Metrics/BlockLength
 namespace :deploy_prepare do
   desc "Write the virtual host config file. May require an Apache restart."
   task :create_vhost do
     load_project
+    vhost_file = vhost_config_file
     vhost_config = load_template("vhost_config.conf.erb")
-    if !(File.exist? vhost_config_file) || FORCE_OVERWRITE
-      comment "Writing virtual host config to #{vhost_config_file}"
-      command "echo \"#{vhost_config}\" > #{vhost_config_file}"
+
+    if fetch(:nginx)
+      vhost_file = vhost_nginx_config_file
+      vhost_config = load_template("vhost_config_nginx.conf.erb")
+      command "sudo chown -R deploy:nginx /etc/nginx/sites-available"
+      command "sudo chown -R deploy:nginx /etc/nginx/sites-enabled"
+    end
+
+    if !(File.exist? vhost_file) || FORCE_OVERWRITE
+      comment "Writing virtual host config to #{vhost_file}"
+      command "echo \"#{vhost_config}\" > #{vhost_file}"
+      command "ln -s #{vhost_file} #{vhost_nginx_linked_file}" if fetch(:nginx)
     end
   end
 
@@ -120,7 +139,9 @@ namespace :deploy_prepare do
 
   desc "Set owner."
   task :set_owner do
-    comment "Setting owner of #{fetch :deploy_to} apache"
-    command "sudo chgrp -R apache #{fetch :deploy_to}"
+    owner = fetch(:nginx) ? "nginx" : "apache"
+    comment "Setting owner of #{fetch :deploy_to} #{owner}"
+    command "sudo chgrp -R #{owner} #{fetch :deploy_to}"
   end
 end
+# rubocop:enable Metrics/BlockLength

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/config/vhost_config_nginx.conf.erb

@@ -0,0 +1,26 @@
+<% project = fetch :project -%>
+server {
+    listen 80;
+
+    server_name <%= fetch :domain %>;
+    return 301 https://<%= fetch :domain -%>/;
+}
+
+server {
+    listen              443 ssl;
+    server_name         <%= fetch :domain %>;
+
+    passenger_enabled on;
+    passenger_friendly_error_pages off;
+    passenger_app_env <%= fetch :stage %>;
+    passenger_ruby /usr/local/rvm/gems/ruby-<%= fetch :rvm_ruby_version -%>/wrappers/ruby;
+    passenger_min_instances 1;
+    passenger_base_uri /;
+
+    root <%= fetch :deploy_to -%>/current/public;
+
+    ssl_certificate     <%= project.ssl_certificate_file(fetch(:stage).to_sym) %>;
+    ssl_certificate_key <%= project.ssl_certificate_key_file(fetch(:stage).to_sym) %>;
+    ssl_protocols       TLSv1.2;
+    ssl_ciphers         HIGH:!aNULL:!MD5;
+}

data/groundskeeper.gemspec

@@ -31,7 +31,8 @@ Gem::Specification.new do |spec|
   spec.executables   = "ground"
   spec.require_paths = %w[lib config]
 
-  spec.add_dependency "jira-ruby", "~> 1.6"
+  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"
   spec.add_dependency "thor", "~> 1.0"

data/lib/groundskeeper/application.rb

@@ -29,6 +29,7 @@ module Groundskeeper
 
     # :nocov:
     desc "predeploy", "create configuration files for the project"
+    option :nginx, type: :boolean
     def predeploy
       commands.info options
       commands.predeploy options

data/lib/groundskeeper/commands.rb

@@ -5,9 +5,11 @@ require "mina"
 require "pp"
 require "open3"
 
+class VersionError < StandardError; end
+
 module Groundskeeper
   # Formulas for managing releases and deployments.
-  # rubocop:disable Lint/Debugger,Metrics/ClassLength
+  # rubocop:disable Metrics/ClassLength
   class Commands
     RAKEFILE = File.join(
       File.dirname(__FILE__), "..", "..", "config", "deploy.rb"
@@ -112,7 +114,6 @@ 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?
 
@@ -137,7 +138,7 @@ 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 = {})
@@ -191,6 +192,7 @@ module Groundskeeper
       cmd << " -s" if options[:simulate]
       cmd << " -v" if options[:verbose]
       cmd << " force_asset_precompile=true" if options[:force_asset_precompile]
+      cmd << " nginx=true" if options[:nginx]
       run_mina cmd
     end
 
@@ -209,16 +211,18 @@ module Groundskeeper
                     :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
+        question = <<~TEXT.squish
+          Groundskeeper is outdated,
+          would you like the latest version installed?
+        TEXT
+
+        response = console.ask(question, :red, limited_to: %w[yes no])
+
+        return true if response == "no"
+
+        console.run("gem install groundskeeper-bitcore")
       end
     end
     # rubocop:enable Metrics/MethodLength
@@ -280,8 +284,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
@@ -306,6 +316,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.",
@@ -374,16 +388,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]}, " \
@@ -434,5 +456,5 @@ module Groundskeeper
       @current_step += 1
     end
   end
-  # rubocop:enable Lint/Debugger,Metrics/ClassLength
+  # rubocop:enable Metrics/ClassLength
 end

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.14.0"
+  VERSION = "0.19.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groundskeeper-bitcore
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.19.0
 platform: ruby
 authors:
 - BIT Core
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - certs/ericcf.pem
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mina
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +181,7 @@ files:
 - config/secrets_config.yml.erb
 - config/tasks.rb
 - config/vhost_config.conf.erb
+- config/vhost_config_nginx.conf.erb
 - groundskeeper.gemspec
 - lib/groundskeeper.rb
 - lib/groundskeeper/application.rb
@@ -216,14 +217,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A gem for managing releases and deployments.