groundskeeper-bitcore 0.19.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7dcfaed6f571874111c1ad58ae2bbbd584ae2d55f65310ac6440b77488f066b
-  data.tar.gz: 48117df263a168b70c69923bed84fd3253528c799c3115f4ef951c5822ded61a
+  metadata.gz: 19eb74448b9f6577cfa1acd88557d0bed18e2d7df2c5d2d1da927ea37f0a4489
+  data.tar.gz: f5369d34ac67395554e718f7099ce5c422589dd0b5e51378b3dc0931dcccae37
 SHA512:
-  metadata.gz: aca1a48ad5c22b23d123d39a4d24c840100d9e31ea16c0694cae3cf983261526fae1157e9bcb198cd52c092466f8360e6d12337f2201d08356366a0055bbcf21
-  data.tar.gz: b2cd407005039a60bf1b034c94f85f3b53dcd624d44a47ad5682634339a2b6dace1432091bdae3a6fd9c94586bb9af624a0628f904c90d66f54974fb97616c04
+  metadata.gz: 9882832af630e4d5b53ada93e59778fe3be20256f9104010b42c7123cc6ca3791cc8fbe0608553b49e51f19a20da66161cef2df314413720f4feba8456dc8beb
+  data.tar.gz: 79b51a0e962a8de4fef32cfcd623c88b23783207ddc7dcc719df09d1c9257cefe55a771fa1b3c2474adafcb57d1f2d4c62844937cadbbcf28dbec20654ec1ea9

data/.rubocop.yml

@@ -7,7 +7,7 @@ inherit_mode:
 AllCops:
   Exclude:
     - bin/**/*
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 3.0
 
 Metrics/AbcSize:
   Exclude:

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+3.0.0

data/bitbucket-pipelines.yml

@@ -1,4 +1,7 @@
-image: 'isgmhradd/rails-ruby27:2020-04-01'
+image: 'isgmhradd/rails-ruby30:2021-01-22'
+
+clone:
+  depth: 1
 
 pipelines:
   default:

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.rb"
-require_relative "./predeploy.rb"
-require_relative "./tasks.rb"
+require_relative "./git_config"
+require_relative "./predeploy"
+require_relative "./tasks"
 
 def load_project
   invoke :before_run unless fetch(:project)
@@ -37,7 +37,7 @@ set :shared_files, fetch(:shared_files, []).push(
 
 # Each deploy, these directories will be checked for changes. If changes are
 # detected, assets will be precompiled. Otherwise that step will be skipped.
-set :asset_dirs, ["app/javascript/"]
+set :asset_dirs, ["app/javascript/", "app/packs/"]
 
 # This task is the environment that is loaded for all remote run commands, such
 # as `mina deploy` or `mina rake`.

data/config/git_config.rb

@@ -2,7 +2,10 @@
 
 require "yaml"
 require "json"
-require "groundskeeper"
+require "groundskeeper/project"
+require "groundskeeper/document"
+require "groundskeeper/git"
+require "groundskeeper/executable"
 
 desc "Sets up project details."
 # rubocop:disable Metrics/BlockLength

data/config/predeploy.rb

@@ -4,7 +4,7 @@ PG_CONFIG = "/usr/pgsql-9.3/bin/pg_config"
 
 def load_template(name)
   template_str = File.binread(File.join(File.dirname(__FILE__), name))
-  template = ERB.new(template_str, nil, "-")
+  template = ERB.new(template_str, trim_mode: "-")
   template.result
 end
 

data/groundskeeper.gemspec

@@ -7,13 +7,12 @@ require "groundskeeper/version"
 Gem::Specification.new do |spec|
   spec.name          = "groundskeeper-bitcore"
   spec.version       = Groundskeeper::VERSION
-  spec.authors       = ["BIT Core"]
-  spec.email         = ["ericcf@northwestern.edu"]
+  spec.authors       = ["RADD"]
+  spec.email         = ["radd@northwestern.edu"]
 
   spec.summary       = "A gem for managing releases and deployments."
-  spec.homepage      = "https://github.com/NU-CBITS/groundskeeper.git"
+  spec.homepage      = "https://bitbucket.org/isgmh-radd/groundskeeper/src/master/"
   spec.license       = "MIT"
-  spec.cert_chain    = ["certs/ericcf.pem"]
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the
   # 'allowed_push_host' to allow pushing to a single host or delete this
   # section to allow pushing to any host.
@@ -31,16 +30,16 @@ Gem::Specification.new do |spec|
   spec.executables   = "ground"
   spec.require_paths = %w[lib config]
 
-  spec.required_ruby_version = ">= 2.4"
+  spec.required_ruby_version = ">= 3.0"
   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", "~> 1.0"
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "byebug", "~> 11.1"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "rubocop", "~> 0.63"
-  spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "rubocop", "~> 1.23"
+  spec.add_development_dependency "rubocop-performance", "~> 1.12"
   spec.add_development_dependency "simplecov", "~> 0.14"
 end

data/lib/groundskeeper/application.rb

@@ -5,6 +5,7 @@ require "thor"
 module Groundskeeper
   # Bootstrap this as a Thor application.
   class Application < Thor
+    include Thor::Actions
     attr_reader :commands
 
     class_option :simulate, desc: "Simulate mina"

data/lib/groundskeeper/bitbucket.rb

@@ -7,9 +7,6 @@ module Groundskeeper
   class Bitbucket
     # Bitbucket API Error
     class UnableToCreatePR < StandardError
-      def initialize(response)
-        super
-      end
     end
 
     COMMAND = "curl"

data/lib/groundskeeper/commands.rb

@@ -60,8 +60,7 @@ module Groundskeeper
 
     # rubocop:disable Metrics/MethodLength,Metrics/ParameterLists
     def initialize(
-      changelog: nil,
-      console:,
+      console:, version_file:, changelog: nil,
       bitbucket: nil,
       git: nil,
       jira: nil,
@@ -71,8 +70,7 @@ module Groundskeeper
       sentry: nil,
       slack: nil,
       ssh: nil,
-      website: nil,
-      version_file:
+      website: nil
     )
       @changelog = changelog
       @console = console
@@ -95,15 +93,14 @@ module Groundskeeper
     # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
     def info(options = {})
       return unrecognized_version unless version_file.exists?
-      return unless check_groundskeeper_version
+      return groundskeeper_outdated unless check_groundskeeper_version
 
       Executable.verbose = options[:verbose]
       pull_project_details
 
       announce_latest_tag
       console.say(
-        "version in current branch: " +
-        version_file.current_version,
+        "version in current branch: #{version_file.current_version}",
         :yellow
       )
       console.say(
@@ -119,7 +116,7 @@ module Groundskeeper
 
       return missing_jira_credentials unless jira.credentials?
       return missing_bitbucket_credentials unless bitbucket.credentials?
-      return unless check_groundskeeper_version
+      return groundskeeper_outdated unless check_groundskeeper_version
       return unrecognized_version unless version_file.rails?
 
       version_file.create_initial_version! unless version_file.exists?
@@ -143,7 +140,7 @@ module Groundskeeper
     # :nocov:
     def predeploy(options = {})
       return unrecognized_version unless version_file.exists?
-      return unless check_groundskeeper_version
+      return groundskeeper_outdated unless check_groundskeeper_version
 
       Executable.verbose = options[:verbose]
       pull_project_details
@@ -160,7 +157,7 @@ module Groundskeeper
       return missing_jira_credentials unless jira.credentials?
       return missing_sentry_credentials unless sentry.credentials?
       return missing_slack_credentials unless slack.credentials?
-      return unless check_groundskeeper_version
+      return groundskeeper_outdated unless check_groundskeeper_version
       return unable_to_ssh unless ssh.can_connect?
 
       Executable.verbose = options[:verbose]
@@ -204,7 +201,6 @@ module Groundskeeper
       end
     end
 
-    # rubocop:disable Metrics/MethodLength
     def check_groundskeeper_version
       @check_groundskeeper_version ||= begin
         console.say("Groundskeeper version #{Groundskeeper::VERSION}\n\n",
@@ -213,24 +209,28 @@ module Groundskeeper
 
         return true unless SemanticVersion.new(latest_version) > VERSION
 
-        question = <<~TEXT.squish
-          Groundskeeper is outdated,
-          would you like the latest version installed?
-        TEXT
-
-        response = console.ask(question, :red, limited_to: %w[yes no])
-
-        return true if response == "no"
+        return false unless install_latest_groundskeeper?
 
         console.run("gem install groundskeeper-bitcore")
+
+        true
       end
     end
-    # rubocop:enable Metrics/MethodLength
+
+    # :nocov:
+    def install_latest_groundskeeper?
+      question = <<~TEXT.squish
+        Groundskeeper is outdated,
+        would you like the latest version installed?
+      TEXT
+
+      console.ask(question, :red, limited_to: %w[yes no]) == "yes"
+    end
+    # :nocov:
 
     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_across_branches}",
         :yellow
       )
     end
@@ -334,6 +334,10 @@ module Groundskeeper
       )
     end
 
+    def groundskeeper_outdated
+      console.say("Groundskeeper outdated. Install the latest version.", :red)
+    end
+
     def missing_bitbucket_credentials
       console.say(
         "Please configure your Bitbucket environment variables.",

data/lib/groundskeeper/git.rb

@@ -10,7 +10,7 @@ module Groundskeeper
     VERSION = "--version"
     TAGS_ASC = "tag -l --sort=v:refname"
     TAGS_DESC = "tag -l --sort=-v:refname"
-    LATEST_TAG_COMMIT = "#{COMMAND} rev-list --tags --max-count=1"
+    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_BRANCHES =
@@ -21,8 +21,8 @@ module Groundskeeper
     ADD_ALL = "add ."
     COMMIT = "commit -m \"%s\""
     PUSH_HEAD = "push origin head"
-    PULL = "-C #{Dir.home}/%s pull"
-    REMOTE_URL = "-C #{Dir.home}/%s config --get remote.origin.url"
+    PULL = "-C #{Dir.home}/%s pull".freeze
+    REMOTE_URL = "-C #{Dir.home}/%s config --get remote.origin.url".freeze
     ORIGIN_URL = "config --get remote.origin.url"
 
     attr_reader :git

data/lib/groundskeeper/jira.rb

@@ -124,22 +124,18 @@ module Groundskeeper
       client.create_version(name: name, prefix: prefix)
     end
 
-    # rubocop:disable Metrics/MethodLength
     def add_version_to_remote_issues(name, issue_ids)
       failed_issues = []
       issue_ids.each do |issue_id|
-        begin
-          client.add_version_to_issue(issue_id: issue_id, version_name: name)
-        rescue IssueNotFoundError
-          failed_issues << issue_id
-          next
-        end
+        client.add_version_to_issue(issue_id: issue_id, version_name: name)
+      rescue IssueNotFoundError
+        failed_issues << issue_id
+        next
       end
       return "" unless failed_issues.count.positive?
 
       "Jira issue(s) not found, is #{failed_issues.join(', ')} correct?"
     end
-    # rubocop:enable Metrics/MethodLength
 
     def transition_remote_issues(transition_type, issue_ids)
       issue_ids.each do |issue_id|

data/lib/groundskeeper/rails_version.rb

@@ -5,11 +5,11 @@ module Groundskeeper
   class RailsVersion
     APPLICATION_CONFIG_FILE = "%sconfig/application.rb"
     INITIAL_VERSION = "0.0.0"
-    MODULE_NAME_EXPRESSION = /module (\w+)/.freeze
+    MODULE_NAME_EXPRESSION = /module (\w+)/
     NAMESPACE_FILE = "%slib/%s.rb"
     MODULE_DIRECTORY = "%slib/%s"
-    VERSION_FILE = "#{MODULE_DIRECTORY}/version.rb"
-    VERSION_EXPRESSION = /(?<=VERSION = ")([^"]+)(?=")/.freeze
+    VERSION_FILE = "#{MODULE_DIRECTORY}/version.rb".freeze
+    VERSION_EXPRESSION = /(?<=VERSION = ")([^"]+)(?=")/
 
     attr_reader :config_file, :namespace_file, :project_name, :relative_path,
                 :version_file
@@ -36,9 +36,8 @@ module Groundskeeper
 
     def initialize(
       relative_path = "",
-      project_name: "",
+      namespace_file:, project_name: "",
       config_file: nil,
-      namespace_file:,
       version_file: nil
     )
       @relative_path = relative_path

data/lib/groundskeeper/repository.rb

@@ -8,7 +8,7 @@ module Groundskeeper
     UP_TO_DATE = "Your branch is up-to-date with 'origin/master'"
     UNSTAGED_CHANGES = "Changes not staged for commit"
     # git comment matching
-    COMMIT_HASH = /^[^ ]+ /.freeze
+    COMMIT_HASH = /^[^ ]+ /
     RELEASE_MESSAGE = "release version %s"
 
     attr_reader :git

data/lib/groundskeeper/slack.rb

@@ -10,7 +10,7 @@ module Groundskeeper
     URL = "https://hooks.slack.com/services/" \
           "%<workspace>s/%<channel>s/%<token>s"
     SEND_MESSAGE = "-X POST -H 'Content-type: application/json' " \
-                   "--data '{\"text\":\"%<message>s\"}' #{URL}"
+                   "--data '{\"text\":\"%<message>s\"}' #{URL}".freeze
 
     attr_reader :slack
 

data/lib/groundskeeper/ssh.rb

@@ -6,7 +6,7 @@ module Groundskeeper
     COMMAND = "ssh"
     DEFAULT_CONNECT_TIMEOUT_IN_S = 5
     # ssh arguments
-    CONNECT_WITH_TIMEOUT = "-o ConnectTimeout=#{DEFAULT_CONNECT_TIMEOUT_IN_S}"
+    CONNECT_WITH_TIMEOUT = "-o ConnectTimeout=#{DEFAULT_CONNECT_TIMEOUT_IN_S}".freeze
     REMOTE_ECHO =
       "%<options>s %<username>s@%<domain_name>s \"echo 'groundskeeper'\""
 

data/lib/groundskeeper/version.rb

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groundskeeper-bitcore
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.23.0
 platform: ruby
 authors:
-- BIT Core
-autorequire: 
+- RADD
+autorequire:
 bindir: bin
-cert_chain:
-- certs/ericcf.pem
-date: 2020-10-09 00:00:00.000000000 Z
+cert_chain: []
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby
@@ -85,16 +84,16 @@ dependencies:
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -115,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.63'
+        version: '1.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.63'
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -151,9 +150,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-description: 
+description:
 email:
-- ericcf@northwestern.edu
+- radd@northwestern.edu
 executables:
 - ground
 extensions: []
@@ -203,12 +202,12 @@ files:
 - lib/groundskeeper/string_utils.rb
 - lib/groundskeeper/version.rb
 - lib/groundskeeper/website.rb
-homepage: https://github.com/NU-CBITS/groundskeeper.git
+homepage: https://bitbucket.org/isgmh-radd/groundskeeper/src/master/
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -217,15 +216,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A gem for managing releases and deployments.
 test_files: []