tomo 1.18.3 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7be159189aa32ca0143ab318466b1b0e8b8c9f16940eb410d9ca5119ac75dcc9
-  data.tar.gz: 5c6a16311a72ccc75b79ae06a62b3fd83a8d0b7f47382b167e9a2866efd1a5c2
+  metadata.gz: e0ab21d55aa30f611411e7184fea0b3456d0ffd8c1877ea74ad8394284286895
+  data.tar.gz: 38e0273b4304685c8515e8d150a2d140f9b9e64e7bac1eb73f3fc7881394d80b
 SHA512:
-  metadata.gz: 6cd5a644af7d6303051c6ae903ff3e35206005629e23df3211303d28136d0547bd094719ddb99ceb84f57470cfe8f6197b33ceeb416b323c20d202e97aca67ee
-  data.tar.gz: 508a44c49b78be4264bbb6d5b0ee011140f6cca91456a28b7e89786c98a9b4225a7099a7ad61667c8051b575a3a9484ceae4dd684eae3784e4cc5bf9a0b56629
+  metadata.gz: 837b9fe3ca56ddaa228d4e519b13e27efa06edbfbc2af71d3dfb3b387ab1d0c3ae6dfe03ea4093abb0fc1212ead742a810c425c46b10a9e534d1b897d1905057
+  data.tar.gz: 43d50fcc0e8b1c4ac385ad1e476b26351f1f364cf7ea52b6d29350c9bbd03179fffc898c9f3af1d2ca08cb9f40590624a37602e5c41a06aee9e0fa24cbc24da1

data/lib/tomo/cli/command.rb

@@ -3,11 +3,11 @@ module Tomo
     class Command
       class << self
         def arg(spec, values: [])
-          parser.arg(spec, values: values)
+          parser.arg(spec, values:)
         end
 
         def option(key, spec, desc=nil, values: [], &block)
-          parser.option(key, spec, desc, values: values, &block)
+          parser.option(key, spec, desc, values:, &block)
         end
 
         def after_parse(context_method_name)

data/lib/tomo/cli/completions.rb

@@ -35,7 +35,7 @@ module Tomo
 
       def all_candidates(rules, prefix_args, state)
         rules.flat_map do |rule|
-          rule.candidates(*prefix_args, literal: literal, state: state)
+          rule.candidates(*prefix_args, literal:, state:)
         end
       end
 

data/lib/tomo/cli/parser.rb

@@ -46,7 +46,7 @@ module Tomo
       attr_reader :rules, :usage, :after_parse_methods
 
       def evaluate(argv, state, literal:)
-        RulesEvaluator.evaluate(rules: rules.to_a, argv: argv, state: state, literal: literal)
+        RulesEvaluator.evaluate(rules: rules.to_a, argv:, state:, literal:)
       end
 
       def check_required_rules(state)

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

@@ -3,7 +3,7 @@ class Tomo::CLI::Rules
     include Tomo::Colors
 
     def initialize(key, *switches, values_proc:, callback_proc:)
-      super(key, *switches, callback_proc: callback_proc)
+      super(key, *switches, callback_proc:)
 
       @values_proc = values_proc
     end

data/lib/tomo/cli/rules.rb

@@ -51,29 +51,29 @@ module Tomo
       attr_reader :rules
 
       def optional_arg_rule(spec, values_proc)
-        Rules::Argument.new(spec, values_proc: values_proc, required: false, multiple: false)
+        Rules::Argument.new(spec, values_proc:, required: false, multiple: false)
       end
 
       def required_arg_rule(spec, values_proc)
-        Rules::Argument.new(spec, values_proc: values_proc, required: true, multiple: false)
+        Rules::Argument.new(spec, values_proc:, required: true, multiple: false)
       end
 
       def mutiple_optional_args_rule(spec, values_proc)
-        Rules::Argument.new(spec, multiple: true, values_proc: values_proc)
+        Rules::Argument.new(spec, multiple: true, values_proc:)
       end
 
       def on_off_switch_rule(key, name, _values_proc, callback_proc)
-        Rules::Switch.new(key, "--#{name}", "--no-#{name}", callback_proc: callback_proc) do |arg|
+        Rules::Switch.new(key, "--#{name}", "--no-#{name}", callback_proc:) do |arg|
           arg == "--#{name}"
         end
       end
 
       def basic_switch_rule(key, *switches, _values_proc, callback_proc)
-        Rules::Switch.new(key, *switches, callback_proc: callback_proc)
+        Rules::Switch.new(key, *switches, callback_proc:)
       end
 
       def value_switch_rule(key, *switches, values_proc, callback_proc)
-        Rules::ValueSwitch.new(key, *switches, values_proc: values_proc, callback_proc: callback_proc)
+        Rules::ValueSwitch.new(key, *switches, values_proc:, callback_proc:)
       end
     end
   end

data/lib/tomo/cli/rules_evaluator.rb

@@ -10,7 +10,7 @@ module Tomo
         @argv = argv.dup
         @state = state
         @literal = literal
-        @completions = completions || Completions.new(literal: literal)
+        @completions = completions || Completions.new(literal:)
       end
 
       def call
@@ -18,7 +18,7 @@ module Tomo
           complete_if_needed(remaining_rules, *argv) if argv.length == 1
           rule, matched_args = match_next_rule
           complete_if_needed([rule], *matched_args) if argv.empty?
-          rule.process(*matched_args, state: state)
+          rule.process(*matched_args, state:)
           state.processed_rule(rule)
         end
       end
@@ -29,7 +29,7 @@ module Tomo
 
       def match_next_rule
         matched_rule, length = remaining_rules.find do |rule|
-          matching_length = rule.match(argv.first, literal: literal)
+          matching_length = rule.match(argv.first, literal:)
           break [rule, matching_length] if matching_length
         end
         raise_unrecognized_args if matched_rule.nil?
@@ -41,7 +41,7 @@ module Tomo
       def complete_if_needed(matched_rules, *matched_args)
         return unless Completions.active?
 
-        completions.print_completions_and_exit(matched_rules, *matched_args, state: state)
+        completions.print_completions_and_exit(matched_rules, *matched_args, state:)
       end
 
       def remaining_rules

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

@@ -7,7 +7,7 @@ module Tomo
         end
 
         def run(task, privileged: false)
-          task.extend(Runtime::PrivilegedTask) if privileged
+          task = String.new(task).extend(Runtime::PrivilegedTask) if privileged
           @batch << task
           self
         end

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

@@ -18,19 +18,19 @@ module Tomo
           self
         end
 
-        def environment(name, &block)
+        def environment(name, &)
           environment = @config.environments[name.to_s] ||= Environment.new
-          EnvironmentBlock.new(environment).instance_eval(&block)
+          EnvironmentBlock.new(environment).instance_eval(&)
           self
         end
 
-        def deploy(&block)
-          TasksBlock.new(@config.deploy_tasks).instance_eval(&block)
+        def deploy(&)
+          TasksBlock.new(@config.deploy_tasks).instance_eval(&)
           self
         end
 
-        def setup(&block)
-          TasksBlock.new(@config.setup_tasks).instance_eval(&block)
+        def setup(&)
+          TasksBlock.new(@config.setup_tasks).instance_eval(&)
           self
         end
       end

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

@@ -10,10 +10,10 @@ module Tomo
         def host(address, port: 22, roles: [], log_prefix: nil, privileged_user: "root")
           @config.hosts << Host.parse(
             address,
-            privileged_user: privileged_user,
-            port: port,
-            roles: roles,
-            log_prefix: log_prefix
+            privileged_user:,
+            port:,
+            roles:,
+            log_prefix:
           )
           self
         end

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

@@ -6,15 +6,15 @@ module Tomo
           @tasks = tasks
         end
 
-        def batch(&block)
+        def batch(&)
           batch = []
-          BatchBlock.new(batch).instance_eval(&block)
+          BatchBlock.new(batch).instance_eval(&)
           @tasks << batch unless batch.empty?
           self
         end
 
         def run(task, privileged: false)
-          task.extend(Runtime::PrivilegedTask) if privileged
+          task = String.new(task).extend(Runtime::PrivilegedTask) if privileged
           @tasks << task
           self
         end

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

@@ -25,7 +25,7 @@ module Tomo
       attr_reader :path
 
       def raise_file_not_found(path)
-        PluginFileNotFoundError.raise_with(path: path)
+        PluginFileNotFoundError.raise_with(path:)
       end
 
       def define_anonymous_plugin_class

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

@@ -47,7 +47,7 @@ module Tomo
       def raise_unknown_plugin_error(error)
         UnknownPluginError.raise_with(
           error.message,
-          name: name,
+          name:,
           gem_name: "#{PLUGIN_PREFIX}/#{name}".tr("/", "-"),
           known_plugins: scan_for_plugins
         )

data/lib/tomo/configuration.rb

@@ -12,7 +12,7 @@ module Tomo
     autoload :UnspecifiedEnvironmentError, "tomo/configuration/unspecified_environment_error"
 
     def self.from_config_rb(path=DEFAULT_CONFIG_PATH)
-      ProjectNotFoundError.raise_with(path: path) unless File.file?(path)
+      ProjectNotFoundError.raise_with(path:) unless File.file?(path)
       Tomo.logger.debug("Loading configuration from #{path.inspect}")
       config_rb = File.read(path)
 
@@ -51,12 +51,12 @@ module Tomo
       plugins_registry = register_plugins
 
       Runtime.new(
-        deploy_tasks: deploy_tasks,
-        setup_tasks: setup_tasks,
-        plugins_registry: plugins_registry,
+        deploy_tasks:,
+        setup_tasks:,
+        plugins_registry:,
         hosts: add_log_prefixes(hosts),
         settings: { tomo_config_file_path: path }.merge(settings),
-        task_filter: task_filter
+        task_filter:
       )
     end
 

data/lib/tomo/console.rb

@@ -56,7 +56,7 @@ module Tomo
     private_constant :CI_VARS
 
     def ci?
-      (env.keys & CI_VARS).any?
+      env.keys.intersect?(CI_VARS)
     end
 
     def assert_interactive

data/lib/tomo/error/suggestions.rb

@@ -12,7 +12,7 @@ module Tomo
 
       def to_a
         @_suggestions ||= if defined?(DidYouMean::SpellChecker)
-                            checker = DidYouMean::SpellChecker.new(dictionary: dictionary)
+                            checker = DidYouMean::SpellChecker.new(dictionary:)
                             suggestions = checker.correct(word)
                             suggestions || []
                           else

data/lib/tomo/host.rb

@@ -10,7 +10,7 @@ module Tomo
       user, address = host.match(PATTERN).captures
       raise ArgumentError, "host cannot be blank" if address.empty?
 
-      new(user: user, address: address, **kwargs)
+      new(user:, address:, **kwargs)
     end
 
     def initialize(address:, port: nil, log_prefix: nil, roles: nil, user: nil, privileged_user: "root")
@@ -31,7 +31,7 @@ module Tomo
 
     def to_s
       str = user ? "#{user}@#{address}" : address
-      str << ":#{port}" unless port == 22
+      str += ":#{port}" unless port == 22
       str
     end
 

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

@@ -1,4 +1,5 @@
 require "monitor"
+require "securerandom"
 
 module Tomo::Plugin::Env
   class Tasks < Tomo::TaskLibrary # rubocop:disable Metrics/ClassLength
@@ -14,17 +15,25 @@ module Tomo::Plugin::Env
       update
     end
 
-    def update
+    def update # rubocop:disable Metrics/MethodLength
       return if settings[:env_vars].empty?
 
       modify_env_file do |env|
         settings[:env_vars].each do |name, value|
-          next if value == :prompt && contains_entry?(env, name)
+          case value
+          when :prompt
+            next if contains_entry?(env, name)
+
+            value = prompt_for(name, message: <<~MSG)
+              The remote host needs a value for the $#{name} environment variable.
+              Please provide a value at the prompt.
+            MSG
+          when :generate_secret
+            next if contains_entry?(env, name)
+
+            value = SecureRandom.hex(64)
+          end
 
-          value = prompt_for(name, message: <<~MSG) if value == :prompt
-            The remote host needs a value for the $#{name} environment variable.
-            Please provide a value at the prompt.
-          MSG
           replace_entry(env, name, value)
         end
       end

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

@@ -19,7 +19,7 @@ module Tomo::Plugin::Rbenv
 
     def modify_bashrc
       existing_rc = remote.capture("cat", paths.bashrc, raise_on_error: false)
-      return if existing_rc.include?("rbenv init")
+      return if existing_rc.include?("rbenv init") && existing_rc.include?("$HOME/.rbenv/bin")
 
       remote.write(text: <<~BASHRC + existing_rc, to: paths.bashrc)
         if [ -d $HOME/.rbenv ]; then

data/lib/tomo/remote.rb

@@ -20,14 +20,14 @@ module Tomo
     end
 
     def attach(*command, default_chdir: nil, **command_opts)
-      full_command = shell_builder.build(*command, default_chdir: default_chdir)
+      full_command = shell_builder.build(*command, default_chdir:)
       ssh.ssh_exec(Script.new(full_command, pty: true, **command_opts))
     end
 
     def run(*command, attach: false, default_chdir: nil, **command_opts)
-      attach(*command, default_chdir: default_chdir, **command_opts) if attach
+      attach(*command, default_chdir:, **command_opts) if attach
 
-      full_command = shell_builder.build(*command, default_chdir: default_chdir)
+      full_command = shell_builder.build(*command, default_chdir:)
       ssh.ssh_subprocess(Script.new(full_command, **command_opts))
     end
 

data/lib/tomo/runtime/execution_plan.rb

@@ -35,7 +35,7 @@ module Tomo
         open_connections do |remotes|
           plan.each do |steps|
             steps.each do |step|
-              step.execute(thread_pool: thread_pool, remotes: remotes)
+              step.execute(thread_pool:, remotes:)
             end
             thread_pool.run_to_completion
           end
@@ -76,7 +76,7 @@ module Tomo
       def build_plan(tasks, task_filter)
         tasks.each_with_object([]) do |task, result|
           steps = hosts.map do |host|
-            HostExecutionStep.new(tasks: task, host: host, task_filter: task_filter, task_runner: task_runner)
+            HostExecutionStep.new(tasks: task, host:, task_filter:, task_runner:)
           end
           steps.reject!(&:empty?)
           result << steps unless steps.empty?

data/lib/tomo/runtime/host_execution_step.rb

@@ -25,7 +25,7 @@ module Tomo
 
             task_host = task.is_a?(PrivilegedTask) ? host.as_privileged : host
             remote = remotes[task_host]
-            task_runner.run(task: task, remote: remote)
+            task_runner.run(task:, remote:)
           end
         end
       end

data/lib/tomo/runtime/task_runner.rb

@@ -24,15 +24,15 @@ module Tomo
 
       def run(task:, remote:)
         validate_task!(task)
-        Current.with(task: task, remote: remote) do
+        Current.with(task:, remote:) do
           Tomo.logger.task_start(task)
           tasks_by_name[task].call
         end
       end
 
       def connect(host)
-        Current.with(host: host) do
-          conn = SSH.connect(host: host, options: ssh_options)
+        Current.with(host:) do
+          conn = SSH.connect(host:, options: ssh_options)
           remote = Remote.new(conn, context, helper_modules)
           return remote unless block_given?
 

data/lib/tomo/runtime.rb

@@ -51,15 +51,15 @@ module Tomo
     end
 
     def run!(task, *args, privileged: false)
-      task = task.dup.extend(PrivilegedTask) if privileged
-      execution_plan_for([task], release: :current, args: args).execute
+      task = String.new(task).extend(PrivilegedTask) if privileged
+      execution_plan_for([task], release: :current, args:).execute
     end
 
     def execution_plan_for(tasks, release: :current, args: [])
       ExecutionPlan.new(
-        tasks: tasks,
-        hosts: hosts,
-        task_filter: task_filter,
+        tasks:,
+        hosts:,
+        task_filter:,
         task_runner: new_task_runner(release, args)
       )
     end
@@ -74,7 +74,7 @@ module Tomo
         .merge(settings)
         .merge(run_args: args)
 
-      TaskRunner.new(plugins_registry: plugins_registry, settings: run_settings)
+      TaskRunner.new(plugins_registry:, settings: run_settings)
     end
 
     def release_path_for(type)

data/lib/tomo/ssh/child_process.rb

@@ -6,7 +6,7 @@ module Tomo
   module SSH
     class ChildProcess
       def self.execute(*command, on_data: ->(data) {})
-        process = new(*command, on_data: on_data)
+        process = new(*command, on_data:)
         process.wait_for_exit
         process.result
       end
@@ -31,7 +31,7 @@ module Tomo
       end
 
       def result
-        Result.new(exit_status: exit_status, stdout: stdout_buffer.string, stderr: stderr_buffer.string)
+        Result.new(exit_status:, stdout: stdout_buffer.string, stderr: stderr_buffer.string)
       end
 
       private

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: verbose)
+        ssh_args = build_args(script, verbose:)
         handle_data = ->(data) { logger.script_output(script, data) }
 
         logger.script_start(script)
@@ -62,7 +62,7 @@ module Tomo
       end
 
       def raise_run_error(script, ssh_args, result)
-        ScriptError.raise_with(result.output, host: host, result: result, script: script, ssh_args: ssh_args)
+        ScriptError.raise_with(result.output, host:, result:, script:, ssh_args:)
       end
     end
   end

data/lib/tomo/ssh/connection_validator.rb

@@ -49,13 +49,13 @@ module Tomo
       end
 
       def handle_bad_executable(error)
-        ExecutableError.raise_with(error, executable: executable)
+        ExecutableError.raise_with(error, executable:)
       end
 
       def raise_unsupported_version(ver)
         UnsupportedVersionError.raise_with(
           ver,
-          host: host,
+          host:,
           command: "#{executable} -V",
           expected_version: "OpenSSH_#{MINIMUM_OPENSSH_VERSION}"
         )
@@ -64,16 +64,16 @@ module Tomo
       def raise_connection_failure(result)
         case result.output
         when /Permission denied/i
-          PermissionError.raise_with(result.output, host: host)
+          PermissionError.raise_with(result.output, host:)
         when /(Could not resolve|Operation timed out|Connection refused)/i
-          ConnectionError.raise_with(result.output, host: host)
+          ConnectionError.raise_with(result.output, host:)
         else
-          UnknownError.raise_with(result.output, host: host)
+          UnknownError.raise_with(result.output, host:)
         end
       end
 
       def raise_unknown_error(result)
-        UnknownError.raise_with(<<~ERROR.strip, host: host)
+        UnknownError.raise_with(<<~ERROR.strip, host:)
           Unexpected output from `ssh`. Expected `echo hi` to return "hi" but got:
           #{result.output}
           (exited with code #{result.exit_status})

data/lib/tomo/task_api.rb

@@ -24,7 +24,7 @@ module Tomo
       working_path = paths.tomo_config_file&.dirname
       path = File.expand_path(path, working_path) if working_path && path.start_with?(".")
 
-      Runtime::TemplateNotFoundError.raise_with(path: path) unless File.file?(path)
+      Runtime::TemplateNotFoundError.raise_with(path:) unless File.file?(path)
       template = File.read(path)
       ERB.new(template).result(binding)
     end

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

@@ -29,14 +29,11 @@ set git_exclusions: %w[
   test/
 ]
 set env_vars: {
-  RACK_ENV: "production",
   RAILS_ENV: "production",
-  RAILS_LOG_TO_STDOUT: "1",
-  RAILS_SERVE_STATIC_FILES: "1",
   RUBY_YJIT_ENABLE: "1",
   BOOTSNAP_CACHE_DIR: "tmp/bootsnap-cache",
   DATABASE_URL: :prompt,
-  SECRET_KEY_BASE: :prompt
+  SECRET_KEY_BASE: :generate_secret
 }
 set linked_dirs: %w[
   .yarn/cache

data/lib/tomo/testing/cli_tester.rb

@@ -10,8 +10,8 @@ module Tomo
         @token = SecureRandom.hex(8)
       end
 
-      def in_temp_dir(&block)
-        super(token, &block)
+      def in_temp_dir(&)
+        super(token, &)
       end
 
       def run(*args, raise_on_error: true)

data/lib/tomo/testing/host_extensions.rb

@@ -14,7 +14,7 @@ module Tomo
       def mock(script, stdout: "", stderr: "", exit_status: 0)
         mocks << [
           script.is_a?(Regexp) ? script : /\A#{Regexp.quote(script)}\z/,
-          Result.new(stdout: stdout, stderr: stderr, exit_status: exit_status)
+          Result.new(stdout:, stderr:, exit_status:)
         ]
       end
 

data/lib/tomo/testing/local.rb

@@ -8,16 +8,16 @@ require "tmpdir"
 module Tomo
   module Testing
     module Local
-      def with_tomo_gemfile(&block)
-        Local.with_tomo_gemfile(&block)
+      def with_tomo_gemfile(&)
+        Local.with_tomo_gemfile(&)
       end
 
-      def in_temp_dir(token=nil, &block)
-        Local.in_temp_dir(token, &block)
+      def in_temp_dir(token=nil, &)
+        Local.in_temp_dir(token, &)
       end
 
       def capture(*command, raise_on_error: true)
-        Local.capture(*command, raise_on_error: raise_on_error)
+        Local.capture(*command, raise_on_error:)
       end
 
       class << self
@@ -29,11 +29,11 @@ module Tomo
           end
         end
 
-        def in_temp_dir(token=nil, &block)
+        def in_temp_dir(token=nil, &)
           token ||= SecureRandom.hex(8)
           dir = File.join(Dir.tmpdir, "tomo_test_#{token}")
           FileUtils.mkdir_p(dir)
-          Dir.chdir(dir, &block)
+          Dir.chdir(dir, &)
         end
 
         def capture(*command, raise_on_error: true)
@@ -49,10 +49,10 @@ module Tomo
 
         private
 
-        def progress(message, &block)
-          return with_progress(message, &block) if interactive?
+        def progress(message, &)
+          return with_progress(message, &) if interactive?
 
-          thread = Thread.new(&block)
+          thread = Thread.new(&)
           return thread.value if wait_for_exit(thread, 4)
 
           puts "#{message} ..."
@@ -62,9 +62,9 @@ module Tomo
           thread.value
         end
 
-        def with_progress(message, &block)
+        def with_progress(message, &)
           spinner = %w[⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏].cycle
-          thread = Thread.new(&block)
+          thread = Thread.new(&)
           return thread.value if wait_for_exit(thread, 4)
 
           print "#{spinner.next} #{message}..."

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "1.18.3".freeze
+  VERSION = "1.19.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.18.3
+  version: 1.19.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-05-25 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
@@ -183,14 +183,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨