groundskeeper-bitcore 0.31.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f7d4a6ef906f8367078f634abf8e517d573e276039b7a8a5d800eca5e8ab010
-  data.tar.gz: 1341e7c739775b08b343dcbf8ed3ce36927cd219ffad29e81b1dcd4a98ae57b5
+  metadata.gz: 153df8ecf60a6641ad33e45fa3f3cb889a0ab59cdb7b52ce894b86df0713b645
+  data.tar.gz: d3223b8fd86b82f6288c73d1facce11d44d402dfe7cb17c2ec0e7dae26b5c9d4
 SHA512:
-  metadata.gz: 9f1cbf4bf33dab8ceb97393ae64a2228ebdbe12bf902a25132e708b5915caaba7b312ff6d567fe827b2965a201acb5a120112747d028e0b6ef6ee80ed1cf8044
-  data.tar.gz: 777dacc3fd9135cde4c4e0eaaa8ceb37ef76b23433352046db9a4b0cd20f21ecb83b26467628e462db48c2d7c407e9b559c34246a05e4bc05688d4950a0725a4
+  metadata.gz: 1f6847e707ff46d4e4306bae339f01985e4b20a1575319ffd7a5a8f04ef3af145c14eb552db74191f48acc2e602c9634232ec77f276bc3a6c06dbb7176cef2d4
+  data.tar.gz: 977946f4b403c6319bb914d39aac9abf73bd66438ebc6a96c23b579148fc87bb547073c24f26ffc44266be460e4c265d18d2ce066a37111d328b7dde337c9de0

data/.gitignore

@@ -10,3 +10,4 @@
 groundskeeper-*.gem
 .byebug_history
 .DS_Store
+.idea/

data/README.md

@@ -90,10 +90,15 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 `rake test` to run the tests. You can also run `bin/console` for an interactive
 prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To
-release a new version, update the version number in `version.rb`, and then run
-`bundle exec rake release`, which will create a git tag for the version, push
-git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
+
+To release a new version, update the version number in `version.rb`, and then run
+`bundle exec rake release`. You will then need to create a version branch `release/x.x.x` and push to version control.
+After merge checks pass merge the branch and pull changes into local master branch. Create and push the new tag
+ `git tag x.x.x` and `git push origin master --tags`. Then if you have permissions, 
+ push the `.gem` file to [rubygems.org](https://rubygems.org) with 
+ `gem push <name of .gem file that is generated`. The file will 
+ typically be in the format `groundskeeper-bitcore-x.x.x.gem`. 
 
 ## Contributing
 

data/config/predeploy.rb

@@ -109,28 +109,7 @@ 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 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
-
   desc "Configure Postgres."
   task :configure_pg do
     comment "Configuring Postgres with config #{PG_CONFIG}"
@@ -144,4 +123,3 @@ namespace :deploy_prepare do
     command "sudo chgrp -R #{owner} #{fetch :deploy_to}"
   end
 end
-# rubocop:enable Metrics/BlockLength

data/lib/groundskeeper/commands.rb

@@ -388,7 +388,7 @@ module Groundskeeper
       end
     end
 
-    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def update_deployed_issues
       tries = 0
 
@@ -397,13 +397,14 @@ module Groundskeeper
       )
 
       begin
-        deployed_version = website.version
+        deployed_version = SemanticVersion.new(website.version)
+        current_version = SemanticVersion.new(version_file.current_version)
 
-        raise VersionError unless deployed_version == ENV[TAG]
+        raise VersionError unless deployed_version.version == ENV[TAG]
 
         console.say("# deployment successful", :green)
-        transition_remote_issues deployed_version
-        announce_in_slack deployed_version
+        transition_remote_issues(deployed_version, current_version)
+        announce_in_slack deployed_version.version
       rescue VersionError
         tries += 1
         sleep 5
@@ -411,13 +412,13 @@ module Groundskeeper
         # :nocov:
         console.say(
           "something went wrong: expected version #{ENV.fetch(TAG, nil)}, " \
-          "found version #{deployed_version} instead",
+          "found version #{deployed_version.version} instead",
           :red
         )
         # :nocov:
       end
     end
-    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     # :nocov:
     def release_version
@@ -426,10 +427,16 @@ module Groundskeeper
     end
     # :nocov:
 
-    # rubocop:disable Metrics/MethodLength
-    def transition_remote_issues(version)
-      version_name = "#{repository.name} #{version}"
-      deployed_issues = jira.fetch_issues_by_fix_version(version_name)
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+    def transition_remote_issues(version, current_version)
+      version_int = version.minor.to_i
+      current_version_int = current_version.minor.to_i
+      deployed_issues = []
+      ((current_version_int + 1)..version_int).each do |version_to_deploy|
+        version_name = "#{repository.name} 0.#{version_to_deploy}.0"
+        deployed_issues.append(jira.fetch_issues_by_fix_version(version_name))
+      end
+
       action = if self.class.stage == PRODUCTION
                  Jira::DEPLOY_TO_PRODUCTION
                else
@@ -441,7 +448,7 @@ module Groundskeeper
       )
       jira.transition_remote_issues(action, deployed_issues)
     end
-    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     def announce_in_slack(deployed_version)
       slack.send_message(

data/lib/groundskeeper/jira.rb

@@ -3,6 +3,7 @@
 require "cgi"
 require "date"
 require "jira-ruby"
+require "active_support/core_ext/object"
 
 class IssueNotFoundError < StandardError; end
 

data/lib/groundskeeper/project.rb

@@ -17,9 +17,6 @@ module Groundskeeper
     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"
     WHENEVER_KEY = "uses_whenever"
 
     def self.build(repository_name)
@@ -81,24 +78,6 @@ module Groundskeeper
       details[SENTRY_PROJECT_KEY] || ""
     end
 
-    # :nocov:
-    def ssl_certificate_file(stage)
-      details.dig(SSL_CERTIFICATE_FILE_KEY, stage.to_s) || ""
-    end
-    # :nocov:
-
-    # :nocov:
-    def ssl_certificate_chain_file(stage)
-      details.dig(SSL_CERTIFICATE_CHAIN_FILE_KEY, stage.to_s) || ""
-    end
-    # :nocov:
-
-    # :nocov:
-    def ssl_certificate_key_file(stage)
-      details.dig(SSL_CERTIFICATE_KEY_FILE_KEY, stage.to_s) || ""
-    end
-    # :nocov:
-
     # :nocov:
     def uses_whenever?
       details[WHENEVER_KEY] == true

data/lib/groundskeeper/semantic_version.rb

@@ -47,5 +47,9 @@ module Groundskeeper
 
       minor == other_minor && patch > other_version.patch
     end
+
+    def version
+      "#{major}.#{minor}.#{patch}"
+    end
   end
 end

data/lib/groundskeeper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groundskeeper-bitcore
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.33.0
 platform: ruby
 authors:
 - RADD
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-16 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby
@@ -207,8 +207,6 @@ files:
 - config/rails_config.rb.erb
 - 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

data/config/vhost_config.conf.erb

@@ -1,49 +0,0 @@
-<% project = fetch :project -%>
-<VirtualHost *:80>
-    ServerName <%= fetch :domain %>
-    Redirect permanent / https://<%= fetch :domain -%>/
-  </VirtualHost>
-
-  <VirtualHost *:443>
-    PassengerFriendlyErrorPages off
-    PassengerAppEnv <%= fetch :stage %>
-    PassengerRuby /usr/local/rvm/wrappers/ruby-<%= fetch :rvm_ruby_version -%>/ruby
-    # Always have at least 1 process in existence for the application
-    PassengerMinInstances 1
-
-    ServerName <%= fetch :domain %>
-
-    SSLEngine On
-    SSLCertificateFile <%= project.ssl_certificate_file(fetch(:stage).to_sym) %>
-    SSLCertificateChainFile <%= project.ssl_certificate_chain_file(fetch(:stage).to_sym) %>
-    SSLCertificateKeyFile <%= project.ssl_certificate_key_file(fetch(:stage).to_sym) %>
-
-    DocumentRoot <%= fetch :deploy_to -%>/current/public
-    RailsBaseURI /
-    PassengerDebugLogFile /var/log/httpd/passenger.log
-
-    <Directory <%= fetch :deploy_to -%>/current/public >
-      Allow from all
-      Options -MultiViews
-    </Directory>
-
-    AddOutputFilterByType DEFLATE text/html text/css application/javascript
-
-    RewriteEngine On
-
-    # Show maintenance page if it exists
-    ErrorDocument 503 /system/maintenance.html
-    RewriteCond %{REQUEST_URI} !\.(css|gif|jpg|png)$
-    RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
-    RewriteCond %{SCRIPT_FILENAME} !maintenance.html
-    RewriteRule ^.*$  -  [redirect=503,last]
-
-    <Location /assets/>
-      # RFC says only cache for 1 year
-      ExpiresActive On
-      ExpiresDefault \"access plus 1 year\"
-    </Location>
-  </VirtualHost>
-
-# Start the application before the first access
-PassengerPreStart https://<%= fetch :domain -%>:443/

data/config/vhost_config_nginx.conf.erb

@@ -1,26 +0,0 @@
-<% 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;
-}