tomo 1.1.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5b5ce43b616e968193b178c5bdcf299a066fff72803f7e5d08e5b2f3031da36
-  data.tar.gz: df6827b5fccc78461849a2aa226f5fc625bc8d5aa3dece49dcd029451e27bc27
+  metadata.gz: b4cb608a21d6ce3191225519a3b467a226f0e0b4d1675f08bbed82fd6379696b
+  data.tar.gz: 0cb9a00e0eb50501c727d4e58db8b0c5cc686b7e27714ec7bdc11b95387f977d
 SHA512:
-  metadata.gz: 71978c54069ac069386d7eac411fe85548492c8bc7f58dbbb48fed6791070c6abad2035d664111c93a827a1b8b03774cdfa1bf14fbd30c370066cee83d630bfb
-  data.tar.gz: f96b68f1c8f6457548c1d28276a3c599a99c02d4075cdb894d8ec16a9bc06b9f540758db3f7752ee3d5d964120db363145b8f2e0e1718c77610b36e0c386c02e
+  metadata.gz: 875563989d848c0dcec9d1b18110712d91603fa734d1aa6fbb5dad454a0911808543f0c0ae9da9510732625d36bc94a0ee5d64d136192e5b4df77b9e130b2292
+  data.tar.gz: 936d56fefb5c964b9e19d92ec328cf148de894da697e88d80146428abfefb307551820d9aaba1967d539a2ec22e8f465bf9296bdc364093de9e750e4734bbc05

data/README.md

@@ -1,26 +1,26 @@
 # Tomo
 
 [![Gem Version](https://badge.fury.io/rb/tomo.svg)](https://rubygems.org/gems/tomo)
-[![Travis](https://img.shields.io/travis/mattbrictson/tomo.svg?label=travis)](https://travis-ci.org/mattbrictson/tomo)
-[![Circle](https://circleci.com/gh/mattbrictson/tomo.svg?style=shield)](https://app.circleci.com/pipelines/github/mattbrictson/tomo?branch=master)
+[![Travis](https://img.shields.io/travis/com/mattbrictson/tomo.svg?label=travis)](https://travis-ci.com/github/mattbrictson/tomo)
+[![Circle](https://circleci.com/gh/mattbrictson/tomo/tree/main.svg?style=shield)](https://app.circleci.com/pipelines/github/mattbrictson/tomo?branch=main)
 [![Code Climate](https://codeclimate.com/github/mattbrictson/tomo/badges/gpa.svg)](https://codeclimate.com/github/mattbrictson/tomo)
 
-Tomo is a friendly command-line tool for deploying Rails apps. It is a new alternative to Capistrano, Mina, and Shipit that aims for simplicity and developer happiness.
+Tomo is a friendly command-line tool for deploying Rails apps.
 
 💻 Rich command-line interface with built-in bash completions<br/>
 ☁️ Multi-environment and role-based multi-host support<br/>
 💎 Everything you need to deploy a basic Rails app out of the box<br/>
 🔌 Easily extensible for polyglot projects (not just Rails!)<br/>
-💡 Concise, helpful error messages<br/>
 📚 Quality documentation<br/>
 🔬 Minimal dependencies<br/>
 
-See [how tomo compares](https://tomo-deploy.com/comparisons/) to other Ruby deployment tools.
+[→ See how tomo compares to other Ruby deployment tools like Capistrano and Mina.](https://tomo-deploy.com/comparisons/)
 
 ---
 
 - [Quick start](#quick-start)
 - [Usage](#usage)
+- [Extending tomo](#extending-tomo)
 - [Tutorials](#tutorials)
 - [Reference documentation](#reference-documentation)
 - [FAQ](#faq)
@@ -31,21 +31,19 @@ See [how tomo compares](https://tomo-deploy.com/comparisons/) to other Ruby depl
 
 ## Quick start
 
+#### Installation
+
 Tomo is distributed as a ruby gem. To install:
 
 ```
 $ gem install tomo
 ```
 
-For instructions on setting up bash completions, run:
-
-```
-$ tomo completion-script
-```
+> 💡 **Protip:** run `tomo completion-script` for instructions on setting up bash completions.
 
 #### Configuring a project
 
-Tomo is configured via a `.tomo/config.rb` file in your project. To get started, you can use `tomo init` to generate a configuration that works for a basic Rails app.
+Tomo is configured via a `.tomo/config.rb` file in your project. To get started, run `tomo init` to generate a configuration that works for a basic Rails app.
 
 ![$ tomo init](./readme_images/tomo-init.png)
 
@@ -64,7 +62,7 @@ host "user@hostname.or.ip.address"
 set application: "my-rails-app"
 set deploy_to: "/var/www/%{application}"
 set git_url: "git@github.com:my-username/my-rails-app.git"
-set git_branch: "master"
+set git_branch: "main"
 # ...
 
 setup do
@@ -87,20 +85,25 @@ deploy do
 end
 ```
 
-Check out the [configuration docs](https://tomo-deploy.com/configuration/) for a complete reference.
+#### Next steps
+
+[→ The reference docs have a complete guide to tomo configuration.](https://tomo-deploy.com/configuration/)<br>
+[→ Check out the **Deploying Rails From Scratch** tutorial for a step-by-step guide to using tomo with a real app.](https://tomo-deploy.com/tutorials/deploying-rails-from-scratch/)
 
 ## Usage
 
-Tomo gives you easy-to-use commands for three common use cases:
+Once your project is configured, you can:
+
+1. Run `tomo setup` to prepare the remote host for its first deploy.
+2. Run `tomo deploy` to deploy your app.
+3. Use `tomo run` to invoke one-off tasks, like launching a Rails console.
 
-1. `tomo setup` prepares a remote host for its first deploy
-2. `tomo deploy` performs a deployment
-3. `tomo run` lets you invoke one-off tasks
+> 💡 **Protip:** add `-h` or `--help` when running any of these commands to see detailed docs and examples.
 
-### Setup
+### `tomo setup`
 
 `tomo setup` prepares the remote host for its first deploy by sequentially running the
-[setup](https://tomo-deploy.com/configuration#setupblock) list of tasks specified in `.tomo/config.rb`. These tasks typically create directories, initialize data stores, install prerequisite tools, and perform other one-time actions that are necessary before a deploy can take place.
+`setup` list of tasks specified in `.tomo/config.rb`. These tasks typically create directories, initialize data stores, install prerequisite tools, and perform other one-time actions that are necessary before a deploy can take place.
 
 Out of the box, tomo will:
 
@@ -109,9 +112,12 @@ Out of the box, tomo will:
 - Create all necessary deployment directories
 - Create the Rails database, load the schema, and insert seed data
 
-### Deploy
+[→ Here is the default list of tasks invoked by the setup command.](https://tomo-deploy.com/configuration#setupblock)<br>
+[→ The `tomo setup` section of the reference docs explains supported command-line options.](https://tomo-deploy.com/commands/setup/)
 
-Whereas `tomo setup` is typically run once, you can use `tomo deploy` every time you want to deploy a new version of your app. The deploy command will sequentially run the [deploy](https://tomo-deploy.com/configuration#deployblock) list of tasks specified in `.tomo/config.rb`. You can customize this list to meet the needs of your app. By default, tomo runs these tasks:
+### `tomo deploy`
+
+Whereas `tomo setup` is typically run once, you can use `tomo deploy` every time you want to deploy a new version of your app. The deploy command will sequentially run the `deploy` list of tasks specified in `.tomo/config.rb`. You can customize this list to meet the needs of your app. By default, tomo runs these tasks:
 
 1. Create a release (using the [git:create_release](https://tomo-deploy.com/plugins/git#gitcreate_release) task)
 2. Build the project (e.g. [bundler:install](https://tomo-deploy.com/plugins/bundler#bundlerinstall), [rails:assets_precompile](https://tomo-deploy.com/plugins/rails#railsassets_precompile))
@@ -120,7 +126,13 @@ Whereas `tomo setup` is typically run once, you can use `tomo deploy` every time
 5. Restart the app to use the new current release (e.g. [puma:restart](https://tomo-deploy.com/plugins/puma#pumarestart))
 6. Perform any cleanup (e.g. [bundler:clean](https://tomo-deploy.com/plugins/bundler#bundlerclean))
 
-### Run
+> 💡 **Protip:** you can abbreviate tomo commands, like `tomo d` for `tomo deploy` or `tomo s` for `tomo setup`.
+
+[→ Here is the default list of tasks invoked by the deploy command.](https://tomo-deploy.com/configuration#deployblock)<br>
+[→ The `tomo deploy` section of the reference docs explains supported command-line options, like `--dry-run`.](https://tomo-deploy.com/commands/deploy/)
+
+
+### `tomo run [TASK]`
 
 Tomo can also `run` individual remote tasks on demand. You can use the `tasks` command to see the list of tasks tomo knows about.
 
@@ -130,9 +142,15 @@ One of the built-in Rails tasks is `rails:console`, which brings up a fully-inte
 
 ![$ tomo run rails:console](./readme_images/tomo-run-rails-console.png)
 
-### Extending tomo
+> 💡 **Protip:** you can shorten this as `tomo rails:console` (the `run` command is implied).
+
+[→ The `tomo run` section of the reference docs explains supported command-line options and has more examples.](https://tomo-deploy.com/commands/run/)
+
 
-Tomo has many plugins built-in, but you can easily add your own to extend tomo with custom tasks. By convention, custom plugins are stored in `.tomo/plugins/`. These plugins can define tasks as plain ruby methods. For example:
+
+## Extending tomo
+
+Tomo has a powerful plugin system that lets you extend tomo by installing Ruby gems (e.g. [tomo-plugin-sidekiq](https://github.com/mattbrictson/tomo-plugin-sidekiq)). You can also define plugins on the fly within your project by adding simple `.rb` files to `.tomo/plugins/`. These plugins can define tasks as plain ruby methods. For example:
 
 ```ruby
 # .tomo/plugins/my-plugin.rb
@@ -142,8 +160,6 @@ def hello
 end
 ```
 
-Use `remote.run` to execute shell scripts on the remote host, similar to how you would use Ruby's `system`. Project settings are accessible via `settings`, which is a plain Ruby hash.
-
 Load your plugin in `config.rb` like this:
 
 ```ruby
@@ -156,7 +172,9 @@ And run it!
 
 ![$ tomo run my-plugin:hello](./readme_images/tomo-run-hello.png)
 
-Read the [Writing Custom Tasks](https://tomo-deploy.com/tutorials/writing-custom-tasks/) tutorial for an in-depth guide to extending tomo.
+[→ The **Writing Custom Tasks** tutorial has an in-depth explanation of how plugins work.](https://tomo-deploy.com/tutorials/writing-custom-tasks/)<br>
+[→ The **TaskLibrary** API is tomo's DSL for building tasks.](https://tomo-deploy.com/api/TaskLibrary/)<br>
+[→ The **Publishing a Plugin** tutorial explains how to package your plugin as a Ruby gem to share it with the community.](https://tomo-deploy.com/tutorials/publishing-a-plugin/)
 
 ## Tutorials
 
@@ -225,7 +243,7 @@ Next run `tomo setup` for _both_ apps; this will set everything up for both user
 
 ## Support
 
-This project is a labor of love and I can only spend a few hours a week maintaining it, at most. If you'd like to help by submitting a pull request, or if you've discovered a bug that needs my attention, please let me know. Check out [CONTRIBUTING.md](https://github.com/mattbrictson/tomo/blob/master/CONTRIBUTING.md) to get started. Happy hacking! —Matt
+This project is a labor of love and I can only spend a few hours a week maintaining it, at most. If you'd like to help by submitting a pull request, or if you've discovered a bug that needs my attention, please let me know. Check out [CONTRIBUTING.md](https://github.com/mattbrictson/tomo/blob/main/CONTRIBUTING.md) to get started. Happy hacking! —Matt
 
 ## License
 
@@ -233,8 +251,8 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of conduct
 
-Everyone interacting in the Tomo project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/mattbrictson/tomo/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Tomo project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/mattbrictson/tomo/blob/main/CODE_OF_CONDUCT.md).
 
 ## Contribution guide
 
-Interested in filing a bug report, feature request, or opening a PR? Excellent! Please read the short [CONTRIBUTING.md](https://github.com/mattbrictson/tomo/blob/master/CONTRIBUTING.md) guidelines before you dive in.
+Interested in filing a bug report, feature request, or opening a PR? Excellent! Please read the short [CONTRIBUTING.md](https://github.com/mattbrictson/tomo/blob/main/CONTRIBUTING.md) guidelines before you dive in.

data/lib/tomo/cli.rb

@@ -20,7 +20,7 @@ module Tomo
     class << self
       attr_accessor :show_backtrace
 
-      def exit(status=true)
+      def exit(status=true) # rubocop:disable Style/OptionalBooleanParameter
         Process.exit(status)
       end
     end
@@ -55,7 +55,7 @@ module Tomo
       argv << "" if argv.shift == "--complete"
     end
 
-    def lookup_command(argv) # rubocop:disable Metrics/CyclomaticComplexity
+    def lookup_command(argv)
       command_name = argv.first unless Completions.active? && argv.length == 1
       command_name = Abbrev.abbrev(COMMANDS.keys)[command_name]
       argv.shift if command_name

data/lib/tomo/cli/rules/argument.rb

@@ -1,6 +1,6 @@
 class Tomo::CLI::Rules
   class Argument
-    def initialize(label, multiple: false, required: false, values_proc:)
+    def initialize(label, values_proc:, multiple: false, required: false)
       @label = label
       @multiple = multiple
       @required = required
@@ -15,7 +15,7 @@ class Tomo::CLI::Rules
       state.parsed_arg(arg)
     end
 
-    def candidates(literal: false, state:)
+    def candidates(state:, literal: false)
       values(state).reject { |val| literal && val.start_with?("-") }
     end
 

data/lib/tomo/cli/rules/switch.rb

@@ -1,6 +1,6 @@
 class Tomo::CLI::Rules
   class Switch
-    def initialize(key, *switches, required: false, callback_proc:, &convert_proc)
+    def initialize(key, *switches, callback_proc:, required: false, &convert_proc)
       @key = key
       @switches = switches
       @callback_proc = callback_proc

data/lib/tomo/cli/rules/value_switch.rb

@@ -28,7 +28,7 @@ class Tomo::CLI::Rules
       state.parsed_option(key, value)
     end
 
-    def candidates(switch=nil, literal: false, state:)
+    def candidates(switch=nil, state:, literal: false)
       return [] if literal
 
       vals = values(state)

data/lib/tomo/commands/init.rb

@@ -70,6 +70,14 @@ module Tomo
         nil
       end
 
+      def git_branch
+        return unless File.file?(".git/config")
+
+        `git rev-parse --abbrev-ref HEAD`.chomp
+      rescue SystemCallError
+        nil
+      end
+
       def node_version
         `node --version`.chomp.sub(/^v/i, "")
       rescue SystemCallError
@@ -82,10 +90,29 @@ module Tomo
         nil
       end
 
+      def rubocop?
+        File.exist?(".rubocop.yml")
+      end
+
+      def erb_2_2_or_later?
+        erb_version = Gem::Version.new(ERB.version[/\d[\d.]+/])
+        Gem::Requirement.new(">= 2.2").satisfied_by?(erb_version)
+      end
+
+      def ruby_version_file?
+        File.exist?(".ruby-version")
+      end
+
       def config_rb_template(app)
         path = File.expand_path("../templates/config.rb.erb", __dir__)
         template = IO.read(path)
-        ERB.new(template).result(binding)
+
+        # TODO: remove once we drop Ruby 2.5 support?
+        if erb_2_2_or_later?
+          ERB.new(template, trim_mode: "-").result(binding)
+        else
+          ERB.new(template, nil, "-").result(binding)
+        end
       end
     end
   end

data/lib/tomo/configuration.rb

@@ -90,7 +90,7 @@ module Tomo
       plugins_registry = PluginsRegistry.new
 
       (["core"] + plugins.uniq).each do |plug|
-        if %w[. /].include?(plug[0])
+        if plug.start_with?(".", "/")
           plug = File.expand_path(plug, File.dirname(path)) unless path.nil?
           plugins_registry.load_plugin_from_path(plug)
         else

data/lib/tomo/configuration/dsl/error_formatter.rb

@@ -50,7 +50,7 @@ module Tomo
           HINT
         end
 
-        def highlighted_lines
+        def highlighted_lines # rubocop:disable Metrics/AbcSize
           first = [1, error_line_no - 1].max
           last = [dsl_lines.length, error_line_no + 1].min
           width = last.to_s.length

data/lib/tomo/configuration/plugins_registry/gem_resolver.rb

@@ -39,7 +39,7 @@ module Tomo
       def constantize(path)
         parts = path.split("/")
         parts.reduce(Object) do |parent, part|
-          child = part.gsub(/^[a-z]|_[a-z]/) { |str| str.chars.last.upcase }
+          child = part.gsub(/^[a-z]|_[a-z]/) { |str| str[-1].upcase }
           parent.const_get(child, false)
         end
       end
@@ -55,7 +55,7 @@ module Tomo
 
       def scan_for_plugins
         Gem.find_latest_files("#{PLUGIN_PREFIX}/*.rb").map do |file|
-          file[%r{#{PLUGIN_PREFIX}/(.+).rb$}, 1].tr("/", "-")
+          file[%r{#{PLUGIN_PREFIX}/(.+).rb$}o, 1].tr("/", "-")
         end.uniq.sort
       end
     end

data/lib/tomo/console.rb

@@ -12,9 +12,10 @@ module Tomo
       def_delegators :@instance, :interactive?, :prompt, :menu
     end
 
-    def initialize(env=ENV, input=$stdin)
+    def initialize(env=ENV, input=$stdin, output=$stdout)
       @env = env
       @input = input
+      @output = output
     end
 
     def interactive?
@@ -24,7 +25,7 @@ module Tomo
     def prompt(question)
       assert_interactive
 
-      print question
+      output.print question
       line = input.gets
       raise_non_interactive if line.nil?
 
@@ -39,7 +40,7 @@ module Tomo
 
     private
 
-    attr_reader :env, :input
+    attr_reader :env, :input, :output
 
     CI_VARS = %w[
       JENKINS_HOME

data/lib/tomo/paths.rb

@@ -20,7 +20,7 @@ module Tomo
       path(:"#{method}_path")
     end
 
-    def respond_to_missing?(method, include_private=false)
+    def respond_to_missing?(method, include_private)
       setting?(method) || super
     end
 

data/lib/tomo/plugin/bundler/tasks.rb

@@ -56,7 +56,7 @@ module Tomo::Plugin::Bundler
         raise_on_error: false
       )
       version = lockfile_tail[/BUNDLED WITH\n   (\S+)$/, 1]
-      return version if version
+      return version if version || dry_run?
 
       die <<~REASON
         Could not guess bundler version from Gemfile.lock.

data/lib/tomo/plugin/core/helpers.rb

@@ -12,7 +12,7 @@ module Tomo::Plugin::Core
       result.success?
     end
 
-    def write(text: nil, template: nil, to:, append: false, **run_opts)
+    def write(to:, text: nil, template: nil, append: false, **run_opts)
       assert_text_or_template_required!(text, template)
       text = merge_template(template) unless template.nil?
       message = "Writing #{text.bytesize} bytes to #{to}"

data/lib/tomo/plugin/core/tasks.rb

@@ -41,7 +41,7 @@ module Tomo::Plugin::Core
       current = read_current_release
 
       remote.chdir(paths.releases) do
-        releases = remote.list_files.grep(/^#{RELEASE_REGEXP}$/).sort
+        releases = remote.list_files.grep(/^#{RELEASE_REGEXP}$/o).sort
         desired_count -= 1 if releases.delete(current)
         return if releases.length <= desired_count
 
@@ -122,7 +122,7 @@ module Tomo::Plugin::Core
       result = remote.run("readlink", paths.current, raise_on_error: false, silent: true)
       return nil if result.failure?
 
-      result.stdout.strip[%r{/(#{RELEASE_REGEXP})$}, 1]
+      result.stdout.strip[%r{/(#{RELEASE_REGEXP})$}o, 1]
     end
   end
 end

data/lib/tomo/plugin/env/tasks.rb

@@ -1,7 +1,7 @@
 require "monitor"
 
 module Tomo::Plugin::Env
-  class Tasks < Tomo::TaskLibrary
+  class Tasks < Tomo::TaskLibrary # rubocop:disable Metrics/ClassLength
     include MonitorMixin
 
     def show
@@ -10,8 +10,8 @@ module Tomo::Plugin::Env
     end
 
     def setup
-      update
       modify_bashrc
+      update
     end
 
     def update
@@ -103,12 +103,37 @@ module Tomo::Plugin::Env
       existing_rc = remote.capture("cat", paths.bashrc, raise_on_error: false)
       return if existing_rc.include?(". #{env_path}")
 
+      fail_if_different_app_already_configured!(existing_rc)
+
       remote.write(text: <<~BASHRC + existing_rc, to: paths.bashrc)
-        if [ -f #{env_path} ]; then
-          . #{env_path}
-        fi
+        if [ -f #{env_path} ]; then  # DO NOT MODIFY THESE LINES
+          . #{env_path}              # ENV MAINTAINED BY TOMO
+        fi                #{' ' * env_path.to_s.length}# END TOMO ENV
 
       BASHRC
     end
+
+    def fail_if_different_app_already_configured!(bashrc)
+      existing_env_path = bashrc[/\s*\.\s+(.+)\s+# ENV MAINTAINED BY TOMO/, 1]
+      return if existing_env_path.nil?
+
+      die <<~REASON
+        Based on the contents of #{paths.bashrc}, it looks like another application
+        is already being deployed via tomo to this host, using the following envrc
+        path:
+
+          #{existing_env_path}
+
+        Tomo is designed such that only one application can be deployed to a given
+        user@host. To deploy multiple applications to the same host, use a separate
+        deployer user per app. Refer to the tomo FAQ for details:
+
+          https://tomo-deploy.com/#faq
+
+        You may be receiving this message in error if you recently renamed or
+        reconfigured your application. In this case, remove the references to the
+        old envrc path in the host's #{paths.bashrc} and re-run env:setup.
+      REASON
+    end
   end
 end

data/lib/tomo/plugin/git.rb

@@ -7,7 +7,7 @@ module Tomo::Plugin
 
     helpers Tomo::Plugin::Git::Helpers
     tasks Tomo::Plugin::Git::Tasks
-    defaults git_branch:     "master",
+    defaults git_branch:     nil,
              git_repo_path:  "%{deploy_to}/git_repo",
              git_exclusions: [],
              git_env:        { GIT_SSH_COMMAND: "ssh -o PasswordAuthentication=no -o StrictHostKeyChecking=no" },

data/lib/tomo/plugin/rails/tasks.rb

@@ -8,6 +8,10 @@ module Tomo::Plugin::Rails
       remote.rails("console", settings[:run_args], attach: true)
     end
 
+    def db_console
+      remote.rails("dbconsole", "--include-password", settings[:run_args], attach: true)
+    end
+
     def db_migrate
       remote.rake("db:migrate")
     end

data/lib/tomo/plugin/rbenv/tasks.rb

@@ -31,8 +31,7 @@ module Tomo::Plugin::Rbenv
     end
 
     def compile_ruby
-      require_setting :rbenv_ruby_version
-      ruby_version = settings[:rbenv_ruby_version]
+      ruby_version = version_setting || extract_ruby_ver_from_version_file
 
       unless ruby_installed?(ruby_version)
         logger.info(
@@ -51,5 +50,22 @@ module Tomo::Plugin::Rbenv
       end
       false
     end
+
+    def version_setting
+      settings[:rbenv_ruby_version]
+    end
+
+    def extract_ruby_ver_from_version_file
+      path = paths.release.join(".ruby-version")
+      version = remote.capture("cat", path, raise_on_error: false).strip
+      return version unless version.empty?
+
+      return RUBY_VERSION if dry_run?
+
+      die <<~REASON
+        Could not guess ruby version from .ruby-version file.
+        Use the :rbenv_ruby_version setting to specify the version of ruby to install.
+      REASON
+    end
   end
 end

data/lib/tomo/runtime/explanation.rb

@@ -7,7 +7,7 @@ module Tomo
         @concurrency = concurrency
       end
 
-      def to_s # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
+      def to_s # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         desc = []
         threads = [applicable_hosts.length, concurrency].min
         desc << "CONCURRENTLY (#{threads} THREADS):" if threads > 1

data/lib/tomo/shell_builder.rb

@@ -82,7 +82,7 @@ module Tomo
     end
 
     def export_env
-      exports = @env.reject { |_, value| value.nil? }
+      exports = @env.compact
       return if exports.empty?
 
       [

data/lib/tomo/ssh/connection.rb

@@ -26,7 +26,7 @@ module Tomo
       end
 
       def ssh_subprocess(script, verbose: false)
-        ssh_args = build_args(script, verbose)
+        ssh_args = build_args(script, verbose: verbose)
         handle_data = ->(data) { logger.script_output(script, data) }
 
         logger.script_start(script)
@@ -50,7 +50,7 @@ module Tomo
         Tomo.logger
       end
 
-      def build_args(script, verbose=false)
+      def build_args(script, verbose: false)
         options.build_args(host, script, control_path, verbose)
       end
 

data/lib/tomo/ssh/connection_validator.rb

@@ -15,10 +15,10 @@ module Tomo
 
       def assert_valid_executable!
         result = begin
-                   ChildProcess.execute(executable, "-V")
-                 rescue StandardError => e
-                   handle_bad_executable(e)
-                 end
+          ChildProcess.execute(executable, "-V")
+        rescue StandardError => e
+          handle_bad_executable(e)
+        end
 
         Tomo.logger.debug(result.output)
         return if result.success? && supported?(result.output)

data/lib/tomo/templates/config.rb.erb

@@ -1,3 +1,6 @@
+<% if rubocop? -%>
+# rubocop:disable Style/FormatStringToken
+<% end -%>
 plugin "git"
 plugin "env"
 plugin "bundler"
@@ -11,11 +14,13 @@ host "user@hostname.or.ip.address"
 
 set application: <%= app.inspect %>
 set deploy_to: "/var/www/%{application}"
+<% unless ruby_version_file? -%>
 set rbenv_ruby_version: <%= RUBY_VERSION.inspect %>
+<% end -%>
 set nodenv_node_version: <%= node_version&.inspect || "nil # FIXME" %>
 set nodenv_yarn_version: <%= yarn_version.inspect %>
 set git_url: <%= git_origin_url&.inspect || "nil # FIXME" %>
-set git_branch: "master"
+set git_branch: <%= git_branch&.inspect || "nil # FIXME" %>
 set git_exclusions: %w[
   .tomo/
   spec/
@@ -72,3 +77,6 @@ deploy do
   run "bundler:clean"
   run "core:log_revision"
 end
+<% if rubocop? -%>
+# rubocop:enable Style/FormatStringToken
+<% end -%>

data/lib/tomo/testing/cli_extensions.rb

@@ -1,7 +1,7 @@
 module Tomo
   module Testing
     module CLIExtensions
-      def exit(status=true)
+      def exit(status=true) # rubocop:disable Style/OptionalBooleanParameter
         raise MockedExitError, status
       end
     end

data/lib/tomo/testing/docker_image.rb

@@ -80,9 +80,9 @@ module Tomo
       end
 
       def build_image
-        Local.capture(
-          "docker build #{build_dir}"
-        )[/Successfully built (\S+)$/i, 1]
+        tag = "tomo_testing:latest"
+        Local.capture("docker build --tag #{tag} #{build_dir}")
+        tag
       end
 
       def start_container

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "1.1.2".freeze
+  VERSION = "1.4.1".freeze
 end

metadata

@@ -1,141 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.4.1
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.11'
-- !ruby/object:Gem::Dependency
-  name: minitest-ci
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.85.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.85.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.1
+date: 2020-11-26 00:00:00.000000000 Z
+dependencies: []
 description: Tomo is a feature-rich deployment tool that contains everything you need
   to deploy a basic Rails app out of the box. It has an opinionated, production-tested
   set of defaults, but is easily extensible via a well-documented plugin system. Unlike
@@ -191,7 +65,6 @@ files:
 - lib/tomo/configuration/environment.rb
 - lib/tomo/configuration/glob.rb
 - lib/tomo/configuration/plugin_file_not_found_error.rb
-- lib/tomo/configuration/plugin_resolver.rb
 - lib/tomo/configuration/plugins_registry.rb
 - lib/tomo/configuration/plugins_registry/file_resolver.rb
 - lib/tomo/configuration/plugins_registry/gem_resolver.rb
@@ -298,7 +171,7 @@ metadata:
   bug_tracker_uri: https://github.com/mattbrictson/tomo/issues
   changelog_uri: https://github.com/mattbrictson/tomo/releases
   source_code_uri: https://github.com/mattbrictson/tomo
-  homepage_uri: https://tomo-deploy.com/
+  homepage_uri: https://github.com/mattbrictson/tomo
   documentation_uri: https://tomo-deploy.com/
 post_install_message:
 rdoc_options: []

data/lib/tomo/configuration/plugin_resolver.rb

@@ -1,63 +0,0 @@
-module Tomo
-  class Configuration
-    class PluginResolver
-      PLUGIN_PREFIX = "tomo/plugin".freeze
-      private_constant :PLUGIN_PREFIX
-
-      def self.resolve(name)
-        new(name).plugin_module
-      end
-
-      def initialize(name)
-        @name = name
-      end
-
-      def plugin_module
-        plugin_path = [PLUGIN_PREFIX, name.tr("-", "/")].join("/")
-        require plugin_path
-
-        plugin = constantize(plugin_path)
-        assert_compatible_api(plugin)
-
-        plugin
-      rescue LoadError => e
-        raise unless e.message.match?(/\s#{Regexp.quote(plugin_path)}$/)
-
-        raise_unknown_plugin_error(e)
-      end
-
-      private
-
-      attr_reader :name
-
-      def assert_compatible_api(plugin)
-        return if plugin.is_a?(::Tomo::PluginDSL)
-
-        raise "#{plugin} does not extend Tomo::PluginDSL"
-      end
-
-      def constantize(path)
-        parts = path.split("/")
-        parts.reduce(Object) do |parent, part|
-          child = part.gsub(/^[a-z]|_[a-z]/) { |str| str.chars.last.upcase }
-          parent.const_get(child, false)
-        end
-      end
-
-      def raise_unknown_plugin_error(error)
-        UnknownPluginError.raise_with(
-          error.message,
-          name: name,
-          gem_name: "#{PLUGIN_PREFIX}/#{name}".tr("/", "-"),
-          known_plugins: scan_for_plugins
-        )
-      end
-
-      def scan_for_plugins
-        Gem.find_latest_files("#{PLUGIN_PREFIX}/*.rb").map do |file|
-          file[%r{#{PLUGIN_PREFIX}/(.+).rb$}, 1].tr("/", "-")
-        end.uniq.sort
-      end
-    end
-  end
-end