groundskeeper-bitcore 0.24.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8278cfd933803e54d5a6bf014110aa91a0b00d21ce9083fa71fc8b75045682e2
-  data.tar.gz: 7cbd2e2c351f82c7514acc9c64ffabf00a76f3a16b526c11474378bc7e4ea5c2
+  metadata.gz: 487deba234c2f61bd24c532e024f46ab91bf615ef629dd7bebe98e0af2c8e1ca
+  data.tar.gz: 051c6767dc1c7e3d55b53b7fb47ae049fb0aa55e6bf72f32949bc4a69befb583
 SHA512:
-  metadata.gz: b7d85b6a917b0d63015285e6df73b4ebe05e51bb5444c9a846e6c4dcfee36e87e2e7a60058bdea5b1c3aaf5a4c0b75423098576a2575a8823ed5115797eef960
-  data.tar.gz: 195c7b921fd5aae30ca88197571330261c8cee193483f14b3bfce45cdb73affb7a380d7af404e95fdf5c6271412c8399333524e7c1b53bf84fed5ffc5db9ffee
+  metadata.gz: 80f39b0dbeb4e1dcb1c83ad1ce380ab5338c14dc4283317f353e7b93ac83fb2328b160f86f53f4812d649e13f49e7fc13c9c014cb11fb0be92e1ae823ef533d3
+  data.tar.gz: dd611aebef24842096a6a8e365bc4bc379c29cbefdff40ceeb8214553a5ca447b0f58f43a5d7aaf9afc19b51cbd4933f4d45f4f7d3600950d294c0cb19fb955f

data/.rubocop.yml

@@ -1,4 +1,6 @@
-require: rubocop-performance
+require:
+  - rubocop-minitest
+  - rubocop-performance
 
 inherit_mode:
   merge:
@@ -8,6 +10,7 @@ AllCops:
   Exclude:
     - bin/**/*
   TargetRubyVersion: 3.0
+  NewCops: enable
 
 Metrics/AbcSize:
   Exclude:
@@ -42,3 +45,9 @@ Style/StringLiterals:
 
 Style/IfUnlessModifier:
   Enabled: false
+
+Style/OpenStructUse:
+  Enabled: false
+
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: "gemspec"

data/Rakefile

@@ -10,8 +10,11 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
+task :rubocop do
+  RuboCop::RakeTask.new
+end
+
 task :default do
   Rake::Task["test"].invoke
-  RuboCop::RakeTask.new
   Rake::Task["rubocop"].invoke
 end

data/config/deploy.rb

@@ -5,9 +5,9 @@ require "mina/git"
 require "mina/rvm" # for rvm support. (https://rvm.io)
 require "mina/whenever"
 
-require_relative "./git_config"
-require_relative "./predeploy"
-require_relative "./tasks"
+require_relative "git_config"
+require_relative "predeploy"
+require_relative "tasks"
 
 def load_project
   invoke :before_run unless fetch(:project)
@@ -24,6 +24,7 @@ set :shared_dirs, fetch(:shared_dirs, []).push(
   "tmp/cache",
   "tmp/sockets",
   "bundle",
+  "node_modules",
   "public/packs",
   "public/system",
   "storage"
@@ -47,11 +48,6 @@ task :environment do
   # invoke :'rvm:use', 'ruby-1.9.3-p125@default'
 end
 
-# Put any custom commands you need to run at setup
-# All paths in `shared_dirs` and `shared_paths` will be created on their own.
-task :setup do
-end
-
 task :staging do
   set :stage, :staging
   set :rails_env, "staging"
@@ -74,10 +70,10 @@ task predeploy: :remote_environment do
   run :remote do
     invoke :setup
   end
-  invoke :'deploy_configure:create_configs'
-  invoke :'deploy_prepare:create_vhost'
-  invoke :'deploy_prepare:configure_pg'
-  invoke :'deploy_prepare:set_owner'
+  invoke :"deploy_configure:create_configs"
+  invoke :"deploy_prepare:create_vhost"
+  invoke :"deploy_prepare:configure_pg"
+  invoke :"deploy_prepare:set_owner"
 end
 
 desc "Deploys the current version to the server."
@@ -89,13 +85,14 @@ task deploy: :remote_environment do
     invoke :rvm_use
     invoke :checkout_release
     invoke :link_shared_dirs
-    invoke :'bundle:install'
-    invoke :'rails:db_migrate'
-    invoke :'rails:assets_precompile'
-    invoke :'deploy:cleanup'
+    invoke :"bundle:install"
+    invoke :"rails:db_migrate"
+    invoke :rails, "yarn:install"
+    invoke :rails, "assets:precompile"
+    invoke :"deploy:cleanup"
 
     on :launch do
-      invoke(:'whenever:update') if ENV["whenever"]
+      invoke(:"whenever:update") if ENV["whenever"]
       invoke :restart
     end
   end

data/config/git_config.rb

@@ -38,7 +38,7 @@ task :before_run do
   tags = project.tags
   raise "There must be a tagged release prior to deploying." if tags.count.zero?
 
-  tag = ENV["tag"]
+  tag = ENV.fetch("tag", nil)
   unless tags.include? tag
     raise "Tag \"#{tag}\" not found. Available tags:\n #{tags.join("\n")}"
   end

data/config/predeploy.rb

@@ -44,7 +44,7 @@ def active_storage_dir
   "#{fetch :deploy_to}/shared/storage"
 end
 
-FORCE_OVERWRITE = ENV["force_overwrite"]
+FORCE_OVERWRITE = ENV.fetch("force_overwrite", nil)
 
 # rubocop:disable Metrics/BlockLength
 namespace :deploy_configure do
@@ -62,7 +62,7 @@ namespace :deploy_configure do
     end
 
     if File.exist? "./config/secrets.yml"
-      invoke :'deploy_configure:copy_secrets'
+      invoke :"deploy_configure:copy_secrets"
     end
 
     comment "Writing staging secrets to #{secrets_config_file}"

data/config/tasks.rb

@@ -27,7 +27,7 @@ task :link_shared_dirs do
   )
 
   comment "Shared directories: #{(fetch :shared_dirs).join("\n")}"
-  invoke :'deploy:link_shared_paths'
+  invoke :"deploy:link_shared_paths"
 end
 
 desc "Open the newly deployed server in the browser (for macOS)."

data/groundskeeper.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
     spec.metadata["allowed_push_host"] = "https://rubygems.org"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+          "public gem pushes."
   end
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
@@ -40,6 +40,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "byebug", "~> 11.1"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rubocop", "~> 1.23"
+  spec.add_development_dependency "rubocop-minitest"
   spec.add_development_dependency "rubocop-performance", "~> 1.12"
   spec.add_development_dependency "simplecov", "~> 0.14"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/groundskeeper/bitbucket.rb

@@ -12,7 +12,7 @@ module Groundskeeper
     COMMAND = "curl"
     BITBUCKET_USERNAME = "BITBUCKET_USERNAME"
     BITBUCKET_APP_PASSWORD = "BITBUCKET_APP_PASSWORD"
-    URL = "https://api.bitbucket.org/2.0/repositories/"\
+    URL = "https://api.bitbucket.org/2.0/repositories/" \
           "isgmh-radd/%<repository>s/pullrequests"
     CREATE_PR = <<~REQUEST.split.join(" ")
       #{URL} -u %<username>s:%<password>s
@@ -36,8 +36,8 @@ module Groundskeeper
     # rubocop:disable Metrics/MethodLength
     def create_pr(repository:, branch_name:)
       response = bitbucket.execute(format(CREATE_PR,
-                                          username: ENV[BITBUCKET_USERNAME],
-                                          password: ENV[BITBUCKET_APP_PASSWORD],
+                                          username: ENV.fetch(BITBUCKET_USERNAME, nil),
+                                          password: ENV.fetch(BITBUCKET_APP_PASSWORD, nil),
                                           repository: repository,
                                           branch_name: branch_name))
 

data/lib/groundskeeper/changelog.rb

@@ -24,7 +24,7 @@ module Groundskeeper
 
     # rubocop:disable Performance/RedundantMatch,Performance/RegexpMatch
     def update_file(version, changes)
-      unless document.match(/(#{TITLE_EXPRESSION})/)
+      unless document.match(/(#{TITLE_EXPRESSION})/o)
         document.prepend_file("#{TITLE_EXPRESSION}\n\n")
       end
 

data/lib/groundskeeper/commands.rb

@@ -2,7 +2,6 @@
 
 require "rake"
 require "mina"
-require "pp"
 require "open3"
 
 class VersionError < StandardError; end
@@ -195,27 +194,33 @@ module Groundskeeper
 
     def pull_project_details
       @pull_project_details ||= begin
-        announce_step("Updating ~/.project_details from "\
+        announce_step("Updating ~/.project_details from " \
                       "#{git.remote_url('.project_details')}")
         git.pull(".project_details")
       end
     end
 
+    # rubocop:disable Metrics/MethodLength
     def check_groundskeeper_version
       @check_groundskeeper_version ||= begin
         console.say("Groundskeeper version #{Groundskeeper::VERSION}\n\n",
                     :bold)
         latest_version = rubygems.latest_groundskeeper_version
 
-        return true unless SemanticVersion.new(latest_version) > VERSION
-
-        return false unless install_latest_groundskeeper?
-
-        console.run("gem install groundskeeper-bitcore")
+        # rubocop:disable Style/InverseMethods
+        if !(SemanticVersion.new(latest_version) > VERSION)
+          true
+        elsif !install_latest_groundskeeper?
+          false
+        else
+          console.run("gem install groundskeeper-bitcore")
 
-        true
+          true
+        end
+        # rubocop:enable Style/InverseMethods
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     # :nocov:
     def install_latest_groundskeeper?
@@ -306,9 +311,9 @@ module Groundskeeper
 
     def add_version_to_sentry
       announce_step "Add release to Sentry and mark deployed"
-      sentry.create_release(ENV[TAG])
-      sentry.associate_commits(ENV[TAG])
-      sentry.deploy(ENV[TAG], self.class.stage)
+      sentry.create_release(ENV.fetch(TAG, nil))
+      sentry.associate_commits(ENV.fetch(TAG, nil))
+      sentry.deploy(ENV.fetch(TAG, nil), self.class.stage)
       console.say("# added version to Sentry", :green)
     end
 
@@ -412,7 +417,7 @@ module Groundskeeper
         retry if tries < 3
         # :nocov:
         console.say(
-          "something went wrong: expected version #{ENV[TAG]}, " \
+          "something went wrong: expected version #{ENV.fetch(TAG, nil)}, " \
           "found version #{deployed_version} instead",
           :red
         )

data/lib/groundskeeper/document.rb

@@ -51,7 +51,7 @@ module Groundskeeper
     end
 
     def write_file(content)
-      File.open(path, "wb") { |file| file.write(content) }
+      File.binwrite(path, content)
     end
 
     def read

data/lib/groundskeeper/jira.rb

@@ -29,9 +29,9 @@ module Groundskeeper
 
       def initialize
         @client = JIRA::Client.new(
-          username: ENV[JIRA_USERNAME_KEY],
-          password: ENV[JIRA_API_TOKEN_KEY],
-          site: ENV[JIRA_SITE_KEY],
+          username: ENV.fetch(JIRA_USERNAME_KEY, nil),
+          password: ENV.fetch(JIRA_API_TOKEN_KEY, nil),
+          site: ENV.fetch(JIRA_SITE_KEY, nil),
           context_path: "",
           auth_type: :basic,
           read_timeout: 120

data/lib/groundskeeper/repository.rb

@@ -47,7 +47,7 @@ module Groundskeeper
       git
         .raw_changes_since_latest_tag
         .map { |c| c.gsub(COMMIT_HASH, "") }
-        .reject { |c| c.match(/#{format(RELEASE_MESSAGE, "")}/) }
+        .reject { |c| c.match(/#{format(RELEASE_MESSAGE, '')}/) }
     end
 
     def bumped_semantic_version(type)

data/lib/groundskeeper/slack.rb

@@ -25,9 +25,9 @@ module Groundskeeper
     def send_message(message)
       slack.execute(format(SEND_MESSAGE,
                            message: message,
-                           workspace: ENV[SLACK_WORKSPACE_KEY],
-                           channel: ENV[SLACK_CHANNEL_KEY],
-                           token: ENV[SLACK_TOKEN_KEY]))
+                           workspace: ENV.fetch(SLACK_WORKSPACE_KEY, nil),
+                           channel: ENV.fetch(SLACK_CHANNEL_KEY, nil),
+                           token: ENV.fetch(SLACK_TOKEN_KEY, nil)))
     end
 
     def credentials?

data/lib/groundskeeper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groundskeeper-bitcore
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.26.0
 platform: ruby
 authors:
 - RADD
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.23'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +221,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: