groundskeeper-bitcore 0.12.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dd59271068fce2a191e0d04f505184024ca82e372dc1abd8ac44ac5a41b2220
-  data.tar.gz: 3119cc55d3664dfbd7411a208f9c03104eb8cba9f3a3d0edb78fd49588b22bce
+  metadata.gz: 76a66b65c4de7ff36bc401d84e100417c577bd6fc79fa82a3a25e3068303afba
+  data.tar.gz: cbebbf63ed96160aacaf9df0d8b51a8064d747ec7a99f51f4b47e708dac74af3
 SHA512:
-  metadata.gz: 58ac93ac2c78209e47fe65b9d30728a7929acb84b0d1f927dfc9bc6525fbd007fe3506e4e8b8ccdba82d18d8cddaab96f0262454ad41c42801b2139b6eaa4a01
-  data.tar.gz: ba3c313d92a17492acadb94521ece6718842b2483d58db64c4679b214926abfb8b4d077dd547644438b45af90e6ca545bf9856f0d62927b52bf17b9cec4335e9
+  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/.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

@@ -21,9 +21,11 @@ task :before_run do
   set :domain, project.full_dns(fetch(:stage))
   set :user, "deploy"
   set :repository, project.repo_url
+  set :repo_name, project.repo_name
   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
@@ -39,6 +41,7 @@ task :before_run do
   end
 
   set :branch, "master"
-  set :tag, "tags/#{tag}"
+  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/tasks.rb

@@ -11,9 +11,7 @@ end
 desc "Checks out the selected release tag"
 task :checkout_release do
   comment "Checking out release \"#{fetch :tag}\""
-  command %(git clone -b "#{fetch :branch}" "#{fetch :repository}" .)
-  command "git fetch"
-  command %(git checkout "#{fetch :tag}")
+  command %(git clone -b "#{fetch :tag}" --depth 1 "#{fetch :repository}" .)
 end
 
 desc "Uses an RVM envionment"

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

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,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
@@ -191,6 +193,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
 
@@ -372,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]}, " \
@@ -393,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.12.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.12.0
+  version: 0.17.0
 platform: ruby
 authors:
 - BIT Core
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - certs/ericcf.pem
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-06-02 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
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   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
@@ -223,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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.