groundskeeper-bitcore 0.34.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c85ed53bac61c994b0e4e1ee83781a57ca26046128412199c0824fd93a95774
-  data.tar.gz: 3a61a6eccc60d1b40a3508b28d10cc888dde680b35e59f074f221d7f53d31aae
+  metadata.gz: bcbe30ae86e759cb40905efad8cc3149fd1743bd6794a1d739b25e498b8f0999
+  data.tar.gz: 02d8b2f6fe6efd0f2108aa305a8eb020b99835440e90d787571bb5a0d7880ee2
 SHA512:
-  metadata.gz: 6d980eba26b5dc7fd0376aa291074de4196ae75576a3460019774d6711672797541abf1d0e0943fc869bc80720c7561bbdb2c8c6ae4baac83a36d76344500b9f
-  data.tar.gz: df07fc3671092395b4797d9a6cd3d4facaa438108841b162e773f693a01dea69bb324c183cd0ddb03d10c80ed0ae24e16ab4f7bb637babe325ac2c6eb26ae08a
+  metadata.gz: f05104d2de2c06a4c469b9664f998dfdf3db235d638c3f8b828b85dd27739e319921ac0ef5a4cb13ddff655f3fc65131bee779fe26dd94b035c6142968c8738e
+  data.tar.gz: cb50c3c6b02fdb369c386ca03fada47a6a5bae33ea13f35089848fbcbe549f649b7b556c50ac8bae3799c71974c0858bdebf1922412539bf148f07d8adad3c52

data/bitbucket-pipelines.yml

@@ -1,4 +1,4 @@
-image: 'isgmhradd/rails-ruby30:2021-01-22'
+image: 'isgmhradd/rails-ruby312:2023-05-15'
 
 clone:
   depth: 1

data/config/git_config.rb

@@ -28,7 +28,6 @@ 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/lib/groundskeeper/commands.rb

@@ -107,7 +107,7 @@ module Groundskeeper
     end
     # rubocop:enable Metrics/AbcSize
 
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity,
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
     def release(options = {})
       is_initial_release = !version_file.exists?
 
@@ -232,7 +232,7 @@ module Groundskeeper
 
     def announce_latest_tag
       console.say(
-        "latest tag on this repository: #{git.latest_tag_name_across_branches}",
+        "latest tag on this repository: #{git.latest_tag_name_in_primary_branch}",
         :yellow
       )
     end

data/lib/groundskeeper/git.rb

@@ -11,8 +11,7 @@ module Groundskeeper
     TAGS_ASC = "tag -l --sort=v:refname"
     TAGS_DESC = "tag -l --sort=-v:refname"
     LATEST_TAG_COMMIT = "#{COMMAND} rev-list --tags --max-count=1".freeze
-    LATEST_TAG_NAME =
-      format("describe --tags $(%<commit>s)", commit: LATEST_TAG_COMMIT)
+    LATEST_TAG_NAME = "tag --merged $(git branch --show-current) --sort=-creatordate | head -n 1"
     LATEST_TAG_BRANCHES =
       format("branch --contains $(%<commit>s)", commit: LATEST_TAG_COMMIT)
     LATEST_CHANGES = "log %s..HEAD --oneline"
@@ -58,7 +57,7 @@ module Groundskeeper
       git.execute(TAGS_DESC).split("\n")
     end
 
-    def latest_tag_name_across_branches
+    def latest_tag_name_in_primary_branch
       git.execute(LATEST_TAG_NAME).chop
     end
 
@@ -67,7 +66,7 @@ module Groundskeeper
     end
 
     def raw_changes_since_latest_tag
-      latest_changes = format(LATEST_CHANGES, latest_tag_name_across_branches)
+      latest_changes = format(LATEST_CHANGES, latest_tag_name_in_primary_branch)
 
       git.execute(latest_changes).split("\n")
     end

data/lib/groundskeeper/project.rb

@@ -16,7 +16,6 @@ module Groundskeeper
     RVM_RUBY_VERSION_KEY = "ruby_version"
     SENTRY_DSN_KEY = "sentry_dsn"
     SENTRY_PROJECT_KEY = "sentry_project"
-    SMTP_DOMAIN = "smtp_domain"
     WHENEVER_KEY = "uses_whenever"
 
     def self.build(repository_name)
@@ -56,12 +55,6 @@ module Groundskeeper
       details.dig(FULL_DNS_KEY, stage.to_s) || ""
     end
 
-    # :nocov:
-    def smtp_domain
-      details[SMTP_DOMAIN] || ""
-    end
-    # :nocov:
-
     # :nocov:
     def rvm_ruby_version
       details[RVM_RUBY_VERSION_KEY] || ""

data/lib/groundskeeper/repository.rb

@@ -51,7 +51,7 @@ module Groundskeeper
     end
 
     def bumped_semantic_version(type)
-      SemanticVersion.new(git.latest_tag_name_across_branches).bump(type)
+      SemanticVersion.new(git.latest_tag_name_in_primary_branch).bump(type)
     end
 
     def name

data/lib/groundskeeper/semantic_version.rb

@@ -7,6 +7,7 @@ module Groundskeeper
     MINOR = "minor"
     PATCH = "patch"
     SEMANTIC_RELEASE_TYPE = { M: MAJOR, m: MINOR, p: PATCH }.freeze
+    WORD_NUMBER_PATTERN = /^([a-zA-Z]+)-(\d+)$/
 
     attr_reader :major, :minor, :patch
 
@@ -19,19 +20,30 @@ module Groundskeeper
     # :nocov:
 
     def initialize(version)
-      @major, @minor, @patch = version.split(".").map(&:to_i)
+      if version.match(WORD_NUMBER_PATTERN)
+        @word = ::Regexp.last_match(1)
+        @number = ::Regexp.last_match(2).to_i
+      else
+        @major, @minor, @patch = version.split(".").map(&:to_i)
+      end
     end
 
+    # rubocop:disable Metrics/MethodLength
     def bump(release_type)
-      case SEMANTIC_RELEASE_TYPE[release_type.to_sym]
-      when MAJOR
-        "#{major + 1}.0.0"
-      when MINOR
-        "#{major}.#{minor + 1}.0"
-      when PATCH
-        "#{major}.#{minor}.#{patch + 1}"
+      if @major.nil? && @minor.nil? && @patch.nil?
+        "#{@word}-#{@number + 1}"
+      else
+        case SEMANTIC_RELEASE_TYPE[release_type.to_sym]
+        when MAJOR
+          "#{major + 1}.0.0"
+        when MINOR
+          "#{major}.#{minor + 1}.0"
+        when PATCH
+          "#{major}.#{minor}.#{patch + 1}"
+        end
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def >(other)
       other_version = SemanticVersion.build(other)

data/lib/groundskeeper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groundskeeper-bitcore
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.36.0
 platform: ruby
 authors:
 - RADD
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-24 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby
@@ -204,7 +204,6 @@ files:
 - config/deploy.rb
 - config/git_config.rb
 - config/predeploy.rb
-- config/rails_config.rb.erb
 - config/secrets_config.yml.erb
 - config/tasks.rb
 - groundskeeper.gemspec

data/config/rails_config.rb.erb

@@ -1,87 +0,0 @@
-<% project = fetch :project %>
-Rails.application.configure do
-    # For catching exceptions
-    config.sentry_dsn = '<%= project.sentry_dsn %>'
-
-    # Settings specified here will take precedence over those in config/application.rb.
-
-    # Code is not reloaded between requests.
-    config.cache_classes = true
-
-    # Eager load code on boot. This eager loads most of Rails and
-    # your application in memory, allowing both thread web servers
-    # and those relying on copy on write to perform better.
-    # Rake tasks automatically ignore this option for performance.
-    config.eager_load = true
-
-    # Full error reports are disabled and caching is turned on.
-    config.consider_all_requests_local       = false
-    config.action_controller.perform_caching = true
-
-    # Disable serving static files from the `/public` folder by default since
-    # Apache or NGINX already handles this.
-    config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
-
-    # Compress JavaScripts and CSS.
-    config.assets.js_compressor = :uglifier
-    # config.assets.css_compressor = :sass
-
-    # Do not fallback to assets pipeline if a precompiled asset is missed.
-    config.assets.compile = false
-
-    # Specifies the header that your server uses for sending files.
-    config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for apache
-    # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
-    # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-    config.force_ssl = true
-
-    # Set to :debug to see everything in the log.
-    config.log_level = :info
-
-    # Prepend all log lines with the following tags.
-    config.log_tags = [ :request_id ]
-
-    # Use a different logger for distributed setups.
-    # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-
-    # Use a different cache store in production.
-    # config.cache_store = :mem_cache_store
-
-    config.action_mailer.perform_caching = false
-
-    # Precompile additional assets.
-    # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-    # config.assets.precompile += %w( search.js )
-
-    # Ignore bad email addresses and do not raise email delivery errors.
-    # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-    config.action_mailer.default_url_options = { host: '<%= fetch :domain %>' }
-    config.action_mailer.delivery_method = :smtp
-    config.action_mailer.raise_delivery_errors = false
-    config.action_mailer.perform_deliveries = true
-    config.action_mailer.smtp_settings = {
-      authentication: :plain,
-      address: 'smtp.mailgun.org',
-      port: 587,
-      domain: '<%= fetch :smtp_domain %>',
-      user_name: ENV['mailgun_db_username'],
-      password: ENV['mailgun_db_password']
-    }
-
-    Rails.application.routes.default_url_options[:host] = '<%= fetch :domain %>'
-    Rails.application.routes.default_url_options[:protocol] = 'https'
-
-    # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-    # the I18n.default_locale when a translation can not be found).
-    config.i18n.fallbacks = true
-
-    # Send deprecation notices to registered listeners.
-    config.active_support.deprecation = :notify
-
-    # Disable automatic flushing of the log to improve performance.
-    # config.autoflush_log = false
-
-    # Use default logging formatter so that PID and timestamp are not suppressed.
-    config.log_formatter = ::Logger::Formatter.new
-end