tomo 1.18.3 → 1.20.0

data/lib/tomo/ssh/connection_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "forwardable"
 
 module Tomo
@@ -49,13 +51,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 +66,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/ssh/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module SSH
     class Error < Tomo::Error

data/lib/tomo/ssh/executable_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module SSH
     class ExecutableError < Error

data/lib/tomo/ssh/options.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module Tomo
   module SSH
     class Options
       DEFAULTS = {
         ssh_connect_timeout: 5,
-        ssh_executable: "ssh".freeze,
+        ssh_executable: "ssh",
         ssh_extra_opts: %w[-o PasswordAuthentication=no].map(&:freeze),
         ssh_forward_agent: true,
         ssh_reuse_connections: true,
-        ssh_strict_host_key_checking: "accept-new".freeze
+        ssh_strict_host_key_checking: "accept-new"
       }.freeze
 
       attr_reader :executable

data/lib/tomo/ssh/permission_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module SSH
     class PermissionError < Error

data/lib/tomo/ssh/script_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "shellwords"
 
 module Tomo

data/lib/tomo/ssh/unknown_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module SSH
     class UnknownError < Error

data/lib/tomo/ssh/unsupported_version_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module SSH
     class UnsupportedVersionError < Error

data/lib/tomo/ssh.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module SSH
     autoload :ChildProcess, "tomo/ssh/child_process"

data/lib/tomo/task_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "erb"
 
 module Tomo
@@ -24,7 +26,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/task_library.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   class TaskLibrary
     include TaskAPI

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

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 WORKDIR /provision
 COPY ./tomo_test_ed25519.pub /root/.ssh/authorized_keys
 COPY ./ubuntu_setup.sh ./

data/lib/tomo/testing/cli_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module Testing
     module CLIExtensions

data/lib/tomo/testing/cli_tester.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "securerandom"
 
 module Tomo
@@ -10,8 +12,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/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module Testing
     class Connection < Tomo::SSH::Connection

data/lib/tomo/testing/docker_image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "fileutils"
 require "open3"
 require "securerandom"
@@ -69,8 +71,8 @@ module Tomo
       attr_reader :container_id, :image_id, :private_key_path
 
       def pull_base_image_if_needed
-        images = Local.capture('docker images --format "{{.ID}}" ubuntu:22.04')
-        Local.capture("docker pull ubuntu:22.04") if images.strip.empty?
+        images = Local.capture('docker images --format "{{.ID}}" ubuntu:24.04')
+        Local.capture("docker pull ubuntu:24.04") if images.strip.empty?
       end
 
       def set_up_private_key

data/lib/tomo/testing/host_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module Testing
     module HostExtensions
@@ -14,7 +16,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: String.new(stdout), stderr: String.new(stderr), exit_status:)
         ]
       end
 

data/lib/tomo/testing/local.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler"
 require "fileutils"
 require "open3"
@@ -8,16 +10,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 +31,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 +51,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 +64,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/testing/log_capturing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "stringio"
 
 module Tomo

data/lib/tomo/testing/mock_plugin_tester.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module Testing
     class MockPluginTester

data/lib/tomo/testing/mocked_exec_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module Testing
     class MockedExecError < Exception # rubocop:disable Lint/InheritException

data/lib/tomo/testing/mocked_exit_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module Testing
     class MockedExitError < Exception # rubocop:disable Lint/InheritException

data/lib/tomo/testing/remote_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module Testing
     module RemoteExtensions

data/lib/tomo/testing/ssh_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   module Testing
     module SSHExtensions

data/lib/tomo/testing/systemctl.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # THIS SCRIPT IS FOR TESTING PURPOSES ONLY.
 #

data/lib/tomo/testing/ubuntu_setup.sh

@@ -4,6 +4,9 @@ set -e
 
 export DEBIAN_FRONTEND=noninteractive
 
+apt-get -y update
+apt-get -y install adduser
+
 # Create `deployer` user
 adduser --disabled-password deployer < /dev/null
 mkdir -p /home/deployer/.ssh
@@ -16,7 +19,6 @@ mkdir -p /var/lib/systemd/linger
 touch /var/lib/systemd/linger/deployer
 
 # Packages needed for ruby, etc.
-apt-get -y update
 apt-get -y install autoconf \
                    bison \
                    build-essential \

data/lib/tomo/testing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "tomo"
 
 module Tomo

data/lib/tomo/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
-  VERSION = "1.18.3".freeze
+  VERSION = "1.20.0"
 end

data/lib/tomo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tomo
   autoload :CLI, "tomo/cli"
   autoload :Colors, "tomo/colors"
@@ -21,7 +23,7 @@ module Tomo
   autoload :TaskLibrary, "tomo/task_library"
   autoload :VERSION, "tomo/version"
 
-  DEFAULT_CONFIG_PATH = ".tomo/config.rb".freeze
+  DEFAULT_CONFIG_PATH = ".tomo/config.rb"
 
   class << self
     attr_accessor :logger

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.18.3
+  version: 1.20.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-09-01 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.18
 signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨