groundskeeper-bitcore 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c42acd881127bee131fdf1527a0d2bfc514d63fb664f26302c3716d2cba974c0
-  data.tar.gz: bc2927f60462a8b649de263a5ecc575afaf13d41424560a1963e7b28dbc2b980
+  metadata.gz: a313973fae89b7f987fe0b7b066866b60e4e0ec54bb0d2e8d31cbf008868bfb9
+  data.tar.gz: a6d2f72b2e810b91f7e1ba0b6121afc5ff3795601b428e5819c970e48931561f
 SHA512:
-  metadata.gz: f45c5e3555520d9f9212a99145c8b568c119312c18dee4eadfd08d1837338cea7f459de29bfd4d9391af407889006313ce81203a2721bb628ad0001b6097ff7c
-  data.tar.gz: ee6eeaf2d42a1fb2d02b703e621ede7a68d1679344bb3dceb38a1a44c7ef8957d0c84ec80ddc8da62328d528f24bac7ad2cbdd707f223bbb184ab9c6b25e1f9c
+  metadata.gz: e5b84247121dfe9e4383ec835f8396508983da48afdc454792c64a8df5837dbad9d69f9a23f5f30b88cd9d04042c722d7afefe900beb64773a7ccfd6942e7575
+  data.tar.gz: 349a4fb05d2be8b770f68f9e0e4f5ef31e666b03776615b16bd03134e326af9e1d8668b2442667e1a9074485b53c0db5a7e526defcf0990a4890b756d3a04c9c

data/.rubocop.yml

@@ -9,33 +9,33 @@ AllCops:
     - bin/**/*
   TargetRubyVersion: 2.4
 
-AbcSize:
+Metrics/AbcSize:
   Exclude:
     - test/**/*
 
-BlockLength:
+Metrics/BlockLength:
   Exclude:
     - groundskeeper.gemspec
 
-ClassLength:
+Metrics/ClassLength:
   Exclude:
     - test/**/*
 
-EmptyLineBetweenDefs:
+Layout/EmptyLineBetweenDefs:
   Exclude:
     - test/**/*
 
-MethodLength:
+Metrics/MethodLength:
   Exclude:
     - test/**/*
 
-NestedMethodDefinition:
+Lint/NestedMethodDefinition:
   Exclude:
     - test/**/*
 
-SingleLineMethods:
+Style/SingleLineMethods:
   Exclude:
     - test/**/*
 
-StringLiterals:
+Style/StringLiterals:
   EnforcedStyle: double_quotes

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.6.2

data/bitbucket-pipelines.yml

@@ -1,4 +1,4 @@
-image: 'isgmhradd/rails-ruby24:2019-04-02'
+image: 'isgmhradd/rails-ruby26:2019-10-07'
 
 pipelines:
   default:

data/config/deploy.rb

@@ -13,23 +13,6 @@ def load_project
   invoke :before_run unless fetch(:project)
 end
 
-# Basic settings:
-#   domain       - The hostname to SSH to.
-#   deploy_to    - Path to deploy into.
-#   repository   - Git repo to clone from. (needed by mina/git)
-#   branch       - Branch name to deploy. (needed by mina/git)
-
-# set :application_name, 'foobar'
-# set :domain, 'foobar.com'
-# set :deploy_to, '/var/www/foobar.com'
-# set :repository, 'git://...'
-# set :branch, 'master'
-
-# Optional settings:
-#   set :user, 'foobar'          # Username in the server to SSH to.
-#   set :port, '30000'           # SSH port number.
-#   set :forward_agent, true     # SSH forward_agent.
-
 # Shared dirs and files will be symlinked into the app-folder by the
 # 'deploy:link_shared_paths' step. Some plugins already add folders to
 # shared_dirs like `mina/rails` add `public/assets`, `vendor/bundle` and many
@@ -41,6 +24,7 @@ set :shared_dirs, fetch(:shared_dirs, []).push(
   "tmp/cache",
   "tmp/sockets",
   "bundle",
+  "public/packs",
   "public/system",
   "storage"
 )
@@ -51,6 +35,10 @@ set :shared_files, fetch(:shared_files, []).push(
   "config/master.key"
 )
 
+# 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/"]
+
 # This task is the environment that is loaded for all remote run commands, such
 # as `mina deploy` or `mina rake`.
 task :environment do

data/lib/groundskeeper.rb

@@ -13,6 +13,7 @@ require "groundskeeper/repository"
 require "groundskeeper/rubygems"
 require "groundskeeper/semantic_version"
 require "groundskeeper/sentry"
+require "groundskeeper/ssh"
 require "groundskeeper/string_utils"
 require "groundskeeper/version"
 require "groundskeeper/website"

data/lib/groundskeeper/changelog.rb

@@ -22,7 +22,7 @@ module Groundskeeper
       @date = date
     end
 
-    # rubocop:disable Performance/RedundantMatch
+    # rubocop:disable Performance/RedundantMatch,Performance/RegexpMatch
     def update_file(version, changes)
       unless document.match(/(#{TITLE_EXPRESSION})/)
         document.prepend_file("#{TITLE_EXPRESSION}\n\n")
@@ -31,7 +31,7 @@ module Groundskeeper
       document
         .append_to_file(TITLE_EXPRESSION, version_template(version, changes))
     end
-    # rubocop:enable Performance/RedundantMatch
+    # rubocop:enable Performance/RedundantMatch,Performance/RegexpMatch
 
     private
 

data/lib/groundskeeper/commands.rb

@@ -18,6 +18,7 @@ module Groundskeeper
     DEFAULT_STAGE = STAGING
     TAG = "tag"
     INITIAL_VERSION = "0.0.1"
+    SSH_USERNAME = "deploy"
 
     # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
     def self.build(console)
@@ -29,6 +30,7 @@ module Groundskeeper
         project_name: project.sentry_project,
         version_prefix: repository.name
       )
+      ssh = Ssh.build(SSH_USERNAME, project.full_dns(stage))
 
       new(
         changelog: Changelog.build,
@@ -39,6 +41,7 @@ module Groundskeeper
         repository: repository,
         rubygems: Rubygems,
         sentry: sentry,
+        ssh: ssh,
         version_file: RailsVersion.build,
         website: website
       )
@@ -59,6 +62,7 @@ module Groundskeeper
       repository: nil,
       rubygems: nil,
       sentry: nil,
+      ssh: nil,
       website: nil,
       version_file:
     )
@@ -70,6 +74,7 @@ module Groundskeeper
       @repository = repository
       @rubygems = rubygems
       @sentry = sentry
+      @ssh = ssh
       @website = website
       @version_file = version_file
       @did_push_to_remote = false
@@ -111,14 +116,14 @@ module Groundskeeper
       pull_project_details
 
       summarize_recent_commits unless is_initial_release
-      ask_next_version(is_initial_release)
+      say_next_version(is_initial_release)
       checkout_new_branch
       update_version_file
       update_changelog
       commit_changes_and_tag(is_initial_release)
-      ask_create_jira_version
-      ask_push
-      ask_add_version_to_jira_issues unless is_initial_release
+      create_jira_version
+      push
+      add_version_to_jira_issues unless is_initial_release
     end
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/MethodLength
@@ -143,6 +148,7 @@ module Groundskeeper
       return missing_jira_credentials unless jira.credentials?
       return missing_sentry_credentials unless sentry.credentials?
       return unless check_groundskeeper_version
+      return unable_to_ssh unless ssh.can_connect?
 
       Executable.verbose = options[:verbose]
       pull_project_details
@@ -161,7 +167,7 @@ module Groundskeeper
 
     # collaborators
     attr_reader :changelog, :console, :git, :jira, :project,
-                :repository, :rubygems, :sentry, :version_file, :website
+                :repository, :rubygems, :sentry, :ssh, :version_file, :website
     # state
     attr_reader :current_step, :did_push_to_remote, :next_version,
                 :recent_commits
@@ -219,13 +225,11 @@ module Groundskeeper
       console.say("")
     end
 
-    def ask_next_version(is_initial_release)
+    def say_next_version(is_initial_release)
       if is_initial_release
         @next_version = INITIAL_VERSION
       else
-        type = console.ask("Major, minor, or patch release?",
-                           :cyan,
-                           limited_to: %w[M m p])
+        type = "m"
         @next_version = repository.bumped_semantic_version(type)
       end
 
@@ -252,33 +256,19 @@ module Groundskeeper
       console.say("# committed changes", :green)
     end
 
-    def ask_create_jira_version
-      create_jira_version =
-        console.yes?("Create version #{next_version} in Jira? [y, n]", :cyan)
-      jira.create_remote_version(next_jira_version_name) if create_jira_version
+    def create_jira_version
+      jira.create_remote_version(next_jira_version_name)
     end
 
-    def ask_push
-      @did_push_to_remote = console.yes?(
-        "Push to remote with tags? [y, n]",
-        :cyan
-      )
-      git.push && console.say("# pushed") if @did_push_to_remote
+    def push
+      @did_push_to_remote = true
+      git.push && console.say("# pushed to version control")
     end
 
-    def ask_add_version_to_jira_issues
+    def add_version_to_jira_issues
       issue_ids = jira.included_issues(recent_commits)
-      add_version_to_jira_issues = console.yes?(
-        "Add #{next_jira_version_name} to #{issue_ids}? [y, n]",
-        :cyan
-      )
-
-      return unless add_version_to_jira_issues
-
-      # :nocov:
       jira.add_version_to_remote_issues(next_jira_version_name, issue_ids)
-      console.say("# added version to Jira issues", :green)
-      # :nocov:
+      console.say("# added version to Jira issues #{issue_ids}", :green)
     end
 
     def next_jira_version_name
@@ -325,6 +315,13 @@ module Groundskeeper
       )
     end
 
+    def unable_to_ssh
+      console.say(
+        "Unable to SSH to the server, are you signed into VPN?",
+        :red
+      )
+    end
+
     def new_branch_name
       "release/#{next_version}"
     end
@@ -342,6 +339,7 @@ module Groundskeeper
       end
     end
 
+    # rubocop:disable Metrics/MethodLength
     def update_deployed_issues
       announce_step(
         "Check deployed version at #{website.uri}/#{Website::VERSION_PATH}"
@@ -353,10 +351,15 @@ module Groundskeeper
         transition_remote_issues deployed_version
       else
         # :nocov:
-        console.say("something went wrong", :red)
+        console.say(
+          "something went wrong: expected version #{ENV[TAG]}, " \
+          "found version #{deployed_version} instead",
+          :red
+        )
         # :nocov:
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     # :nocov:
     def release_version

data/lib/groundskeeper/ssh.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Groundskeeper
+  # Wraps ssh executable.
+  class Ssh
+    COMMAND = "ssh"
+    DEFAULT_CONNECT_TIMEOUT_IN_S = 5
+    # ssh arguments
+    CONNECT_WITH_TIMEOUT = "-o ConnectTimeout=#{DEFAULT_CONNECT_TIMEOUT_IN_S}"
+    REMOTE_ECHO =
+      "%<options>s %<username>s@%<domain_name>s \"echo 'groundskeeper'\""
+
+    attr_reader :domain_name, :ssh, :username
+
+    def self.build(username, domain_name)
+      new Executable.new(COMMAND), username, domain_name
+    end
+
+    def initialize(ssh, username, domain_name)
+      @ssh = ssh
+      @username = username
+      @domain_name = domain_name
+    end
+
+    def can_connect?
+      ssh.execute(format(REMOTE_ECHO,
+                         options: CONNECT_WITH_TIMEOUT,
+                         username: username,
+                         domain_name: domain_name)).strip == "groundskeeper"
+    end
+  end
+end

data/lib/groundskeeper/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groundskeeper-bitcore
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - BIT Core
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - certs/ericcf.pem
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby
@@ -196,6 +196,7 @@ files:
 - lib/groundskeeper/rubygems.rb
 - lib/groundskeeper/semantic_version.rb
 - lib/groundskeeper/sentry.rb
+- lib/groundskeeper/ssh.rb
 - lib/groundskeeper/string_utils.rb
 - lib/groundskeeper/version.rb
 - lib/groundskeeper/website.rb
@@ -220,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A gem for managing releases and deployments.