groundskeeper-bitcore 0.32.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc1ab08b2e8620a96de42eee267d2274a9fa752f9e33d6bd1238eb4fa9ec1b89
-  data.tar.gz: 053b37c294e199247e93baddae4cd8f43e5886a753004288f821322ea82e23d1
+  metadata.gz: 7c85ed53bac61c994b0e4e1ee83781a57ca26046128412199c0824fd93a95774
+  data.tar.gz: 3a61a6eccc60d1b40a3508b28d10cc888dde680b35e59f074f221d7f53d31aae
 SHA512:
-  metadata.gz: cb13a970df10e139a70b86240cf1ab955c8e8ad6108a9599435117caf7f29b7b5f45d535268171f72a5ea3f599774551b27456fa81ef69d31e97798be07ffa2e
-  data.tar.gz: 4b0ce99c72b6283c403bf2658a935804559ae8c43ff08535799c689050ec2d52c53c2acac7cb3a3fe81f02679e14957f9f3e26ce9d9ed1bb8b729bcd1b531428
+  metadata.gz: 6d980eba26b5dc7fd0376aa291074de4196ae75576a3460019774d6711672797541abf1d0e0943fc869bc80720c7561bbdb2c8c6ae4baac83a36d76344500b9f
+  data.tar.gz: df07fc3671092395b4797d9a6cd3d4facaa438108841b162e773f693a01dea69bb324c183cd0ddb03d10c80ed0ae24e16ab4f7bb637babe325ac2c6eb26ae08a

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

@@ -432,10 +432,11 @@ module Groundskeeper
       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))
+      ((current_version_int)..version_int).each do |version_to_deploy|
+        version_name = "0.#{version_to_deploy}.0"
+        deployed_issues.append(jira.fetch_issues_by_fix_version(project: project, version: version_name))
       end
+      deployed_issues.uniq!
 
       action = if self.class.stage == PRODUCTION
                  Jira::DEPLOY_TO_PRODUCTION

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
 
@@ -67,9 +68,9 @@ module Groundskeeper
       # :nocov:
 
       # :nocov:
-      def fetch_issues_by_fix_version(version:)
+      def fetch_issues_by_fix_version(project:, version:)
         search_path = "/rest/api/2/search"
-        query = "fixVersion=\"#{version}\""
+        query = "fixVersion=\"#{project.repo_name} #{version}\""
         request_url = "#{search_path}?fields=key&jql=#{CGI.escape(query)}"
         response = client.get(request_url).body
 
@@ -140,15 +141,15 @@ module Groundskeeper
     def transition_remote_issues(transition_type, issue_ids)
       issue_ids.each do |issue_id|
         client.transition_issue(
-          issue_id: issue_id,
+          issue_id: issue_id[0],
           transition_id: TRANSITION_IDS[transition_type]
         )
       end
     end
 
     # :nocov:
-    def fetch_issues_by_fix_version(version)
-      client.fetch_issues_by_fix_version(version: version)
+    def fetch_issues_by_fix_version(project:, version:)
+      client.fetch_issues_by_fix_version(project: project, version: version)
     end
     # :nocov:
 

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groundskeeper-bitcore
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.34.0
 platform: ruby
 authors:
 - RADD
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-01 00:00:00.000000000 Z
+date: 2024-09-24 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;
-}