ndr_dev_support 3.1.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 05ccb7deddac7cfb82fcffd1cc3d0d789f4638ef
-  data.tar.gz: 03a33b8084b9d0c1e3c59b1ab701dbe118d05380
+SHA256:
+  metadata.gz: a77c75ad60b45a91190083d470912db589015a7237713b510b9aa4b6cfc03284
+  data.tar.gz: 9ddefdc49d88b6d445586537284590fb656fb8a97425c77e7881660bfb8f467d
 SHA512:
-  metadata.gz: ad4b22eb5c5cc889aefb289a6b85fd5ad80acc38e37b6253b3e4da4d3ff8b64db5bbfd6fbbb5d3912e4a19f5ab2c58d007b4e5807a57e2f1e8a988165237936f
-  data.tar.gz: 24e39ab3c8830f74d6e297a9db9197d1d734efd17328a6de779820ef954d07723774784eb7157399a3316c1730bf76f9f4a7538c587a0a4c517658aa23bc9933
+  metadata.gz: dd8c7362ccb13351c211cb068a61fe660a2f4fa36b7bc93d98b5f2c395a93cfa23e503ddb07578382d631e617a1c06593c32d53c3cbfa40fffc29103f92880ba
+  data.tar.gz: 9534b04645eae6cae4d72902773f04809f8488c6a342e07e7fbf762da02372194c21f6ce0713a66856fb3034c04e341c861b939427c3205c5e37ae8d18f170a5

data/README.md

@@ -6,6 +6,7 @@ providing:
 1. rake tasks to manage code auditing of ruby based projects
 2. rake tasks to limit Rubocop's output to changed (and related) code
 3. integration testing support, which can be required from a project's `test_helper.rb`
+4. Deployment support, through Capistrano.
 
 ## Installation
 
@@ -127,6 +128,18 @@ Beyond standard Capybara testing DSL, ndr_dev_support bundles some additional fu
 
 When using a headless browser for integration tests, the test database must be consistent between the test runner and the application being tested. With transactional tests in operation, this means that both must share a connection. It is up to the individual project to provide this facility; as of Rails 5.1, it is built in to the framework directly.
 
+### Deployment support
+
+There are various capistrano plugins in the `ndr_dev_support/capistrano` directory - see each one for details.
+For new projects, you should likely add the following:
+
+```ruby
+# in config/deploy.rb
+require 'ndr_dev_support/capistrano/ndr_model'
+```
+
+This will pull in the majority of behaviour needed to deploy in our preferred style.
+
 ## Development
 
 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.

data/code_safety.yml

@@ -31,7 +31,7 @@ file safety:
   README.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: e0b3871607c649565330d6e62740ffd860930338
+    safe_revision: a2b7c20eb58572c213f77677b36aa2f7e6db747e
   Rakefile:
     comments: 
     reviewed_by: josh.pencheon
@@ -48,10 +48,42 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: c59a45986f8b6d087c8c21b1e889f31f7346da17
+  lib/ndr_dev_support/capistrano/assets.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: a2b7c20eb58572c213f77677b36aa2f7e6db747e
+  lib/ndr_dev_support/capistrano/ndr_model.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: bcecae9e1eeffa84687f1748abebc0c8505a228d
+  lib/ndr_dev_support/capistrano/restart.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: a2b7c20eb58572c213f77677b36aa2f7e6db747e
+  lib/ndr_dev_support/capistrano/revision_logger.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: a2b7c20eb58572c213f77677b36aa2f7e6db747e
+  lib/ndr_dev_support/capistrano/ruby_version.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: a2b7c20eb58572c213f77677b36aa2f7e6db747e
+  lib/ndr_dev_support/capistrano/standalone_gems.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: a2b7c20eb58572c213f77677b36aa2f7e6db747e
+  lib/ndr_dev_support/capistrano/svn_cache.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 123d0cd32bdf9e0940fac8945985aa9f467616c1
+  lib/ndr_dev_support/capistrano/sysadmin_scripts.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: a2b7c20eb58572c213f77677b36aa2f7e6db747e
   lib/ndr_dev_support/daemon/ci_server.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 3d81c21c0085acb44aedadeaa66313ac280eb326
+    safe_revision: ec3d1f3fa1d1f1f3d039587a2f31bda28062f731
   lib/ndr_dev_support/daemon/stoppable.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -63,11 +95,11 @@ file safety:
   lib/ndr_dev_support/integration_testing/drivers/chrome.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: e0b3871607c649565330d6e62740ffd860930338
+    safe_revision: 1c2b62f359b64c1cfb1754216533fbd4a86fd60e
   lib/ndr_dev_support/integration_testing/drivers/chrome_headless.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: e0b3871607c649565330d6e62740ffd860930338
+    safe_revision: 1c2b62f359b64c1cfb1754216533fbd4a86fd60e
   lib/ndr_dev_support/integration_testing/drivers/firefox.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -119,11 +151,11 @@ file safety:
   lib/ndr_dev_support/tasks.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 4dc952cb99ec6f4e416a5b668ceca7e8d7604eef
+    safe_revision: ec3d1f3fa1d1f1f3d039587a2f31bda28062f731
   lib/ndr_dev_support/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 35e322d31c8d44dac3daa3d6dead1d4b9dd6e1a6
+    safe_revision: 3efca19afad2f7dedc1d470cd8dd51e95ec77545
   lib/tasks/audit_code.rake:
     comments: Identical to the version reviewed by josh.pencheon when contained within
       ndr_support
@@ -137,10 +169,6 @@ file safety:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: ddcf7de0bf1f5fb17cc28e2460009e162ff8917c
-  lib/tasks/ci/bundle_install.rake:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: cf22c7ab8b2eb67b501b5ebd1309c832db4fdf6c
   lib/tasks/ci/dependencies.rake:
     comments: 
     reviewed_by: josh.pencheon
@@ -188,7 +216,7 @@ file safety:
   ndr_dev_support.gemspec:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 8faa3e5e7ba5ef29daa1a857c8c15702f57c5a3f
+    safe_revision: ec3d1f3fa1d1f1f3d039587a2f31bda28062f731
   test/daemon/ci_server_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/ndr_dev_support/capistrano/assets.rb

@@ -0,0 +1,23 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :ndr_dev_support do
+    desc 'Configure  / precompile assets'
+    task :configure_assets do
+      asset_script = fetch(:asset_script, <<~SHELL)
+        set -e
+        ruby -ryaml -e "puts YAML.dump('production' => { 'secret_key_base' => 'compile_me' })" > config/secrets.yml
+        RAILS_ENV=production bundle exec rake assets:precompile
+        rm config/secrets.yml
+      SHELL
+
+      if fetch(:webapp_deployment)
+        # Prepend the build script with asset compilation steps:
+        set :build_script, asset_script + fetch(:build_script, '')
+
+        # We'll have replaced all the assets if they're needed:
+        set :normalize_asset_timestamps, false
+      end
+    end
+  end
+
+  after 'ndr_dev_support:prepare', 'ndr_dev_support:configure_assets'
+end

data/lib/ndr_dev_support/capistrano/ndr_model.rb

@@ -0,0 +1,175 @@
+require 'rainbow'
+
+# Discrete bits of functionality we use automatically:
+require_relative 'assets'
+require_relative 'restart'
+require_relative 'revision_logger'
+require_relative 'ruby_version'
+# require_relative 'standalone_gems' # This doesn't work with the permissions model
+require_relative 'svn_cache'
+require_relative 'sysadmin_scripts'
+
+# This file contains logic for managing deployments structured in our preferred "NDRv2" style.
+# More details on the structure can be found on plan.io issue #6565.
+#
+# == Configuration
+#
+#   The following variables are used:
+#     * :application
+#     * :application_user
+#     * :explicitly_writeable_shared_paths
+#     * :repository_branches
+#     * :ruby
+#     * :shared_paths
+#
+#   You'll want to use the `add_target` helper method to register individual deployment targets,
+#   by supplying "env" (beta/live etc), "name", "host", "port", "app_user" (e.g. "blog_live"),
+#   and "is_web_server" (e.g. should it get assets compiled).
+#
+#   A configuration file (config/deployments.yml) can be used to set per-environment ruby versions
+#   and SVN branches. To use the latter, be sure to set the `:repository_branches` variable
+#   to point at the root of the branches. Otherwise, just set `:repository` directly as normal.
+#
+Capistrano::Configuration.instance(:must_exist).load do
+  # Paths that are symlinked for each release to the "shared" directory:
+  set :shared_paths, %w[config/database.yml config/secrets.yml log tmp]
+
+  # Paths in shared/ that the application can write to:
+  set :explicitly_writeable_shared_paths, %w[log tmp tmp/pids]
+
+  # This flag gets set only when running `ndr_dev_support:prepare`, which means it can be used
+  # to toggle behaviour in environments where some targets are using the NDR model of deployment,
+  # and others aren't.
+  set :ndr_model_deployment, false
+
+  namespace :ndr_dev_support do
+    desc 'Custom tasks to be run once, immediately before the initial `cap setup`'
+    task :pre_setup do
+      # Ensure that the deployment area is owned by the deployer group, and that this is
+      # sticky; all deployments made within it should be owned by the deployer group too. This
+      # means that e.g. a deployment by "bob.smith" can then be rolled back by "tom.jones".
+      run "mkdir -p #{deploy_to}"
+      run "chgrp -R deployer #{deploy_to}"
+
+      # The sticky group will apply automatically to new subdirectories, but
+      # any existing subdirectories will need it manually applying via `-R`.
+      run "chmod -R g+s #{deploy_to}"
+    end
+
+    desc 'Custom tasks to be run once, after the initial `cap setup`'
+    task :post_setup do
+      fetch(:explicitly_writeable_shared_paths, []).each do |path|
+        full_path = File.join(shared_path, path)
+        run "mkdir -p #{full_path}"
+
+        # Allow the application to write into here:
+        run "chgrp -R #{application_group} #{full_path}"
+        run "chmod -R g+s #{full_path}"
+      end
+
+      fetch(:shared_paths, []).each do |path|
+        full_path = File.join(shared_path, path)
+
+        if /^n$/ =~ capture("test -e #{full_path} && echo 'y' || echo 'n'")
+          warn Rainbow("Warning: shared '#{path}' is not yet present!").red
+        end
+      end
+    end
+
+    before 'deploy:setup', 'ndr_dev_support:pre_setup'
+    after  'deploy:setup', 'ndr_dev_support:post_setup'
+
+    desc 'More generic configuration, built on top of target-specific config.'
+    task :prepare do
+      warn Rainbow('                                                                        ').red.underline
+      warn Rainbow('')
+      warn Rainbow("Target: #{Rainbow(fetch(:name)).bright.green}")
+      warn Rainbow("Branch: #{Rainbow(fetch(:branch)).bright.green} (see config/deployments.yml)")
+      warn Rainbow("Ruby:   #{Rainbow(fetch(:ruby)).bright.green}")
+      warn Rainbow('')
+      warn Rainbow("DBs:    Migrations are not run automatically by capistrano;")
+      warn Rainbow("        #{Rainbow('please run any necessary manually before proceeding').underline.bright}.")
+      warn Rainbow('                                                                        ').red.underline
+      warn Rainbow('')
+
+      # Gather SSH credentials: (password is asked for by Net::SSH, if needed)
+      set :use_sudo, false
+      set :user, Capistrano::CLI.ui.ask('Deploy as: ')
+
+      # If no alternate user is specified, deploy to the crediental-holding user.
+      set :application_user, fetch(:user) unless fetch(:application_user)
+
+      # The home folder of the application user:
+      set :application_home, File.join('/home', fetch(:application_user))
+
+      # The deploying user will need to be a member of the application user's group,
+      # as well as being a member of the "deployer" group:
+      set :application_group, fetch(:application_user)
+
+      # Where we'll be deploying to:
+      set :deploy_to, File.join(application_home, fetch(:application))
+
+      # Use the application user's ruby:
+      set(:default_environment) do
+        { 'PATH' => "#{application_home}/.rbenv/shims:#{application_home}/.rbenv/bin:$PATH" }
+      end
+
+      # Set a flag so behaviour can toggle in mixed use cases
+      set(:ndr_model_deployment, true)
+    end
+
+    after 'deploy:update', 'deploy:cleanup' # Keep only 5 deployments
+
+    desc 'Symlink to the release any :shared_paths, ensure private/ is writeable'
+    task :filesystem_tweaks do
+      fetch(:shared_paths, []).each do |path|
+        # Symlink `path` from the shared space to the release being prepared, replacing anything
+        # already there:
+        run "rm -rf #{File.join(release_path, path)} && ln -s #{File.join(shared_path, path)} #{File.join(release_path, path)}"
+      end
+
+      # Make the private/ directory in the release writeable to the application user:
+      private_directory = File.join(release_path, 'private')
+      run "mkdir -p #{private_directory} && chgrp #{fetch(:application_group)} #{private_directory} && chmod g+s #{private_directory}"
+    end
+
+    after 'deploy:finalize_update', 'ndr_dev_support:filesystem_tweaks'
+  end
+end
+
+def release_config_for(env)
+  branches = YAML.load_file('config/deployments.yml')
+  branches.fetch(env.to_s) { raise 'Unknown release branch!' }
+end
+
+def target_ruby_version_for(env)
+  raw   = release_config_for(env).fetch('ruby')
+  match = raw.match(/\A(?<version>\d+\.\d+\.\d+)\z/)
+
+  match ? match[:version] : raise('Unrecognized Ruby version!')
+end
+
+def add_target(env, name, app, port, app_user, is_web_server)
+  desc "Deploy to #{env} service #{app_user || 'you'}@#{app}:#{port}"
+  task(name) do
+    set :name, name
+
+    set :application_user, app_user
+
+    role :app, app
+    set :port, port
+
+    set :webapp_deployment, is_web_server
+    set :daemon_deployment, !is_web_server
+
+    set :branch, release_config_for(env).fetch('branch')
+    if exists?(:repository_branches)
+      set :repository, fetch(:repository_branches) + fetch(:branch)
+    end
+
+    # Extract Ruby configuration if available:
+    ruby_version = target_ruby_version_for(env)
+    set :ruby, ruby_version if ruby_version
+  end
+  after name, 'ndr_dev_support:prepare'
+end

data/lib/ndr_dev_support/capistrano/restart.rb

@@ -0,0 +1,9 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :deploy do
+    desc 'Trigger application to restart'
+    task :restart do
+      # The tmp/ directory should be shared, so this affects all prior deployments
+      run "touch #{shared_path}/tmp/restart.txt"
+    end
+  end
+end

data/lib/ndr_dev_support/capistrano/revision_logger.rb

@@ -0,0 +1,14 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :ndr_dev_support do
+    desc 'Append to the log of deployments the user and revision.'
+    task :log_deployment, except: { no_release: true } do
+      name = fetch(:deployer_name, capture('id -un'))
+      log  = File.join(shared_path, 'revisions.log')
+      msg  = "[#{Time.now}] #{name} deployed #{latest_revision}"
+
+      run "(test -e #{log} || (touch #{log} && chmod 664 #{log})) && echo #{msg} >> #{log};"
+    end
+  end
+
+  after 'deploy:update_code', 'ndr_dev_support:log_deployment'
+end

data/lib/ndr_dev_support/capistrano/ruby_version.rb

@@ -0,0 +1,10 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :ndr_dev_support do
+    desc 'Creates a .ruby-version file for this release'
+    task :set_ruby_version, except: { no_release: true } do
+      run "cd #{release_path} && echo #{fetch(:ruby)} > .ruby-version"
+    end
+  end
+
+  before 'bundle:install', 'ndr_dev_support:set_ruby_version'
+end

data/lib/ndr_dev_support/capistrano/standalone_gems.rb

@@ -0,0 +1,30 @@
+require_relative 'ruby_version'
+
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :ndr_dev_support do
+    desc 'Ensure gems outside the bundle are up to date'
+    task :update_out_of_bundle_gems, except: { no_release: true } do
+      # You can seed this list in your configuration with something like:
+      #
+      #   before 'ndr_dev_support:update_out_of_bundle_gems' do
+      #     set :out_of_bundle_gems, webapp_deployment ? %w[puma] : %[god]
+      #   end
+      #
+      gem_list = Array(fetch(:out_of_bundle_gems, []))
+
+      # Extract the current version requirements for each of the gems from the lockfile,
+      # and then check they're installed. If not, install them from the vendored cache.
+      run <<~CMD if gem_list.any?
+        export RBENV_VERSION=`cat "#{latest_release}/.ruby-version"`;
+        cat "#{latest_release}/Gemfile.lock" | egrep "^    (#{gem_list.join('|')}) " | tr -d '()' | \
+        while read gem ver; do
+          gem list -i "$gem" --version "$ver" > /dev/null || \
+          gem install "#{latest_release}/vendor/cache/$gem-$ver.gem" --ignore-dependencies \
+                      --conservative --no-document;
+        done
+      CMD
+    end
+  end
+
+  after 'bundle:install', 'ndr_dev_support:update_out_of_bundle_gems'
+end

data/lib/ndr_dev_support/capistrano/svn_cache.rb

@@ -0,0 +1,23 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  # Maintains a second checkout SVN locally, then uses sftp to push.
+  # This avoids the deployment target needing to have any direct
+  # access to the source code repository.
+  set :scm, :subversion
+  set :deploy_via, :copy
+  set :copy_strategy, :export
+  set :copy_cache, 'tmp/deployment'
+  set :copy_dir, 'tmp/staging'
+
+  namespace :ndr_dev_support do
+    desc 'Remove the SVN cache (it may be pointing at the wrong branch)'
+    task :remove_svn_cache_if_needed do
+      cache = fetch(:copy_cache)
+      unless Dir.exist?(cache) && `svn info #{cache}`.include?(fetch(:repository))
+        logger.debug "Cache is stale for #{fetch(:branch)}, wiping..."
+        system("rm -rf #{cache}")
+      end
+    end
+  end
+
+  before 'deploy:update_code', 'ndr_dev_support:remove_svn_cache_if_needed'
+end

data/lib/ndr_dev_support/capistrano/sysadmin_scripts.rb

@@ -0,0 +1,25 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :ndr_dev_support do
+    desc "Refresh the start/stop scripts in the app user's $HOME directory"
+    task :refresh_sysadmin_scripts, except: { no_release: true } do
+      # This is desirable, but opt-in, behaviour:
+      if fetch(:synchronise_sysadmin_scripts, false)
+        type    = fetch(:daemon_deployment) ? 'god' : 'server'
+        scripts = %W(start_#{type}.sh stop_#{type}_gracefully.sh)
+
+        scripts.each do |script|
+          source  = File.join(release_path, 'script', "#{script}.sample")
+          dest    = File.join(fetch(:application_home), script)
+
+          # Ensure the script is pre-existing, with the correct permissions (should be writeable
+          # by deployers, but only runnable by the application user, to prevent the wrong user
+          # attempting to start the processes.)
+          run "test -w #{dest}"                              # Should exist and be writeable
+          run "test -e #{source} && cat #{source} > #{dest}" # Replace without changing permissions
+        end
+      end
+    end
+  end
+
+  after 'deploy:update_code', 'ndr_dev_support:refresh_sysadmin_scripts'
+end

data/lib/ndr_dev_support/daemon/ci_server.rb

@@ -1,5 +1,7 @@
+require 'English'
 require_relative 'stoppable'
 require 'rugged'
+require 'with_clean_rbenv'
 
 module NdrDevSupport
   module Daemon
@@ -46,7 +48,12 @@ module NdrDevSupport
         objectids_between_master_and_remote.each do |oid|
           `git rebase #{oid}`
 
-          Rake::Task['ci:all'].invoke
+          WithCleanRbenv.with_clean_rbenv do
+            # TODO: rbenv_install
+            bundle_install
+            `rbenv exec bundle exec rake ci:all`
+            git_discard_changes
+          end
         end
       end
 
@@ -58,6 +65,13 @@ module NdrDevSupport
         `git checkout #{oid}`
       end
 
+      def git_discard_changes
+        # git clean would remove all unstaged files
+        stash_output = `git stash`
+        return if stash_output.start_with?('No local changes to save')
+        `git stash drop stash@{0}`
+      end
+
       def svn_remote?
         GIT_SVN_REMOTE_BRANCH_NAME == remote_branch
       end
@@ -89,6 +103,28 @@ module NdrDevSupport
 
         revisions.reverse
       end
+
+      def bundle_install
+        return unless File.file?('Gemfile')
+        return if system('bundle check')
+
+        `rbenv exec bundle install --local --jobs=3`
+        return if $CHILD_STATUS.exitstatus.zero? || ENV['SLACK_WEBHOOK_URL'].nil?
+
+        slack_publisher = NdrDevSupport::SlackMessagePublisher.new(ENV['SLACK_WEBHOOK_URL'],
+                                                                   username: 'Rake CI',
+                                                                   icon_emoji: ':robot_face:',
+                                                                   channel: ENV['SLACK_CHANNEL'])
+
+        attachment = {
+          color: 'danger',
+          fallback: 'Failure running bundle install --local',
+          text: 'Failure running `bundle install --local`',
+          footer: 'bundle exec rake ci:bundle_install'
+        }
+
+        slack_publisher.post(attachments: [attachment])
+      end
     end
   end
 end

data/lib/ndr_dev_support/integration_testing/drivers/chrome.rb

@@ -1,3 +1,4 @@
+require 'chromedriver-helper'
 require 'selenium-webdriver'
 
 Capybara.register_driver(:chrome) do |app|

data/lib/ndr_dev_support/integration_testing/drivers/chrome_headless.rb

@@ -1,3 +1,4 @@
+require 'chromedriver-helper'
 require 'selenium-webdriver'
 
 Capybara.register_driver(:chrome_headless) do |app|

data/lib/ndr_dev_support/tasks.rb

@@ -1,7 +1,6 @@
 load 'tasks/audit_code.rake'
 load 'tasks/ci/brakeman.rake'
 load 'tasks/ci/bundle_audit.rake'
-load 'tasks/ci/bundle_install.rake'
 load 'tasks/ci/dependencies.rake'
 load 'tasks/ci/housekeep.rake'
 load 'tasks/ci/linguist.rake'

data/lib/ndr_dev_support/version.rb

@@ -2,5 +2,5 @@
 # This defines the NdrDevSupport version. If you change it, rebuild and commit the gem.
 # Use "rake build" to build the gem, see rake -T for all bundler rake tasks (and our own).
 module NdrDevSupport
-  VERSION = '3.1.3'.freeze
+  VERSION = '4.0.0'.freeze
 end

data/ndr_dev_support.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   # Integration test dependencies:
   spec.add_dependency 'capybara'
   spec.add_dependency 'capybara-screenshot'
-  spec.add_dependency 'chromedriver-helper'
+  spec.add_dependency 'chromedriver-helper', '~> 2.0'
   spec.add_dependency 'poltergeist', '>= 1.8.0'
   spec.add_dependency 'selenium-webdriver'
 
@@ -45,6 +45,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'github-linguist'
   spec.add_dependency 'prometheus-client'
   spec.add_dependency 'rugged'
+  spec.add_dependency 'with_clean_rbenv'
+
+  # Deployment dependencies:
+  spec.add_dependency 'capistrano', '~> 2.15'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'minitest', '~> 5.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 4.0.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -112,16 +112,16 @@ dependencies:
   name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: with_clean_rbenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -308,6 +336,14 @@ files:
 - bin/setup
 - code_safety.yml
 - lib/ndr_dev_support.rb
+- lib/ndr_dev_support/capistrano/assets.rb
+- lib/ndr_dev_support/capistrano/ndr_model.rb
+- lib/ndr_dev_support/capistrano/restart.rb
+- lib/ndr_dev_support/capistrano/revision_logger.rb
+- lib/ndr_dev_support/capistrano/ruby_version.rb
+- lib/ndr_dev_support/capistrano/standalone_gems.rb
+- lib/ndr_dev_support/capistrano/svn_cache.rb
+- lib/ndr_dev_support/capistrano/sysadmin_scripts.rb
 - lib/ndr_dev_support/daemon/ci_server.rb
 - lib/ndr_dev_support/daemon/stoppable.rb
 - lib/ndr_dev_support/integration_testing.rb
@@ -330,7 +366,6 @@ files:
 - lib/tasks/audit_code.rake
 - lib/tasks/ci/brakeman.rake
 - lib/tasks/ci/bundle_audit.rake
-- lib/tasks/ci/bundle_install.rake
 - lib/tasks/ci/dependencies.rake
 - lib/tasks/ci/housekeep.rake
 - lib/tasks/ci/linguist.rake
@@ -363,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: NDR Developer Support library

data/lib/tasks/ci/bundle_install.rake

@@ -1,21 +0,0 @@
-namespace :ci do
-  desc 'Install bundled gems'
-  task :bundle_install do
-    require 'English'
-
-    # `gem install bundler`
-    `bundle install --local`
-    next if $CHILD_STATUS.exitstatus.zero?
-
-    attachment = {
-      color: 'danger',
-      fallback: 'Failure running bundle install --local',
-      text: 'Failure running `bundle install --local`',
-      footer: 'bundle exec rake ci:bundle_install'
-    }
-
-    @attachments ||= []
-    @attachments << attachment
-    puts attachment.inspect
-  end
-end