tomo 1.3.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f92e6f11a186cd036164b26a2fad74f9afe3d9eec791c46c75c6aaf3040eabe7
-  data.tar.gz: 528ad7dcf0c63df6b887d29bd396475c02df4aef06fb2bae74ea1830a6818127
+  metadata.gz: e119875699293814b739fd1e11efef613df94aa2172c769180c83937f91ce384
+  data.tar.gz: 8674bc37cdede9eb970ce62c102f7f856cd74af5847a9f7563e653b59169be3b
 SHA512:
-  metadata.gz: 0f751e1f2bf4684b886016d67e22fd909219e4e1787585614daa1b323562940c0042d56fa16ea99c602e70cbede58d3828dcfd51e0618e790175fd500567e4a6
-  data.tar.gz: 4e6b438a4b13ccc464591b2d43e980f2f0dd5b221e48106c335aa27c17729ba02f36553ac72f1170e0dcc22ad6aea5663faeb82dae70ce437a7f09af08cb4630
+  metadata.gz: 0722d662a66bcb60cf8e4dbacf6fccfc3640db1720b6673819637cb6f82b35ff3a4b2f09a4e122d0979bad5f29e5fde82aacdb06fd505bc20d3cfb2aec5d1ec7
+  data.tar.gz: 0d62e317b89ad43736dc6d6500f4377d108752c2e332e9d04f27aabec30136195b5042ac55a06ab4779fa6c5bbbe33473eb11a7e1b5e3f3f1beeb77d54eba98a

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Matt Brictson
+Copyright (c) 2021 Matt Brictson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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)
+[![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)
 
@@ -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
 

data/lib/tomo/commands/init.rb

@@ -1,4 +1,5 @@
 require "erb"
+require "fileutils"
 
 module Tomo
   module Commands
@@ -99,6 +100,15 @@ module Tomo
         Gem::Requirement.new(">= 2.2").satisfied_by?(erb_version)
       end
 
+      # Does a .ruby-version file exist match the executing RUBY_VERSION?
+      def using_ruby_version_file?
+        return false unless File.exist?(".ruby-version")
+
+        IO.read(".ruby-version").rstrip == RUBY_VERSION
+      rescue IOError
+        false
+      end
+
       def config_rb_template(app)
         path = File.expand_path("../templates/config.rb.erb", __dir__)
         template = IO.read(path)

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

@@ -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/configuration/unknown_plugin_error.rb

@@ -17,11 +17,22 @@ module Tomo
       private
 
       def gem_suggestion
-        if Tomo.bundled?
-          "\nYou may need to add #{yellow(gem_name)} to your Gemfile."
-        else
-          "\nYou may need to install the #{yellow(gem_name)} gem."
+        return "\nYou may need to add #{yellow(gem_name)} to your Gemfile." if Tomo.bundled?
+
+        messages = ["\nYou may need to install the #{yellow(gem_name)} gem."]
+        if present_in_gemfile?
+          messages << "\nTry prefixing the tomo command with #{blue('bundle exec')} to fix this error."
         end
+
+        messages.join
+      end
+
+      def present_in_gemfile?
+        return false unless File.file?("Gemfile")
+
+        IO.read("Gemfile").match?(/^\s*gem ['"]#{Regexp.quote(gem_name)}['"]/)
+      rescue IOError
+        false
       end
     end
   end

data/lib/tomo/plugin/bundler.rb

@@ -11,7 +11,7 @@ module Tomo::Plugin
     defaults bundler_config_path: ".bundle/config",
              bundler_deployment:  true,
              bundler_gemfile:     nil,
-             bundler_jobs:        "4",
+             bundler_jobs:        nil,
              bundler_path:        "%{shared_path}/bundle",
              bundler_retry:       "3",
              bundler_version:     nil,

data/lib/tomo/plugin/core.rb

@@ -21,7 +21,7 @@ module Tomo::Plugin
       releases_path:         "%{deploy_to}/releases",
       revision_log_path:     "%{deploy_to}/revisions.log",
       shared_path:           "%{deploy_to}/shared",
-      tmp_path:              "/tmp/tomo",
+      tmp_path:              "/tmp/tomo-#{SecureRandom.alphanumeric(8)}",
       tomo_config_file_path: nil, # determined at runtime
       run_args:              [] # determined at runtime
     )

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/puma/tasks.rb

@@ -38,6 +38,10 @@ module Tomo::Plugin::Puma
       remote.attach "journalctl", "-q", raw("--user-unit=#{service.name.shellescape}"), *settings[:run_args]
     end
 
+    def tail_log
+      remote.attach "journalctl -q --user-unit=#{service.name.shellescape} -f"
+    end
+
     private
 
     def port

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/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_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

@@ -14,7 +14,9 @@ host "user@hostname.or.ip.address"
 
 set application: <%= app.inspect %>
 set deploy_to: "/var/www/%{application}"
+<% unless using_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" %>

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.3.1".freeze
+  VERSION = "1.7.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2021-01-31 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
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.7
 signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨