tomo 1.14.1 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f16c0351ed9e2f276d92b392f009490cf225c94adf318836a6556b6e92ff913b
-  data.tar.gz: b10e3f521efba3854ce8985680023d1e0fd79fb6e6be3acfe46e6a37a45cbd45
+  metadata.gz: e08c46b7da961cb96428f331a4d87af1fbf268c5a59b1dc129a55e469aca235d
+  data.tar.gz: 856bc5e3e24a905d464a50f8af236992aa85d5e8f024a0b17fbb59991db815f5
 SHA512:
-  metadata.gz: 880d8a3505f6f5435b2e2af09d967b5121b906f001caf71bb5cf10f43f13f0dc6802b6fb1f4a0335f3ca06ab855b8bf4995f7105b52ea6bf0a277f7f79ffef1c
-  data.tar.gz: 17fdc0e24d0b08f638bbeeddee49221d77dbd8c7767f3c0a79ce9378bc8c20ac86c997e52ce98267463e015a3559323ee0ff1551225772f53071623f99c29c26
+  metadata.gz: 050dfde517f1372eceaa32244e40f61dc689476ee2722b6b0e0cd3b52faa8a78df5c487a3c97753c6cb754696617b0ac4249b71218a7abbaa3f42ae270f902e2
+  data.tar.gz: '0589328cb0d63507ca917b69b298a50c0969b517e8eff3ccbab64b37bb18d81cd079f092a3c65b3993b1712a0e63b646a6b16514dd9ea1e12683106b3042f0d8'

data/README.md

@@ -1,7 +1,7 @@
 # Tomo
 
 [![Gem Version](https://badge.fury.io/rb/tomo.svg)](https://rubygems.org/gems/tomo)
-[![Circle](https://circleci.com/gh/mattbrictson/tomo/tree/main.svg?style=shield)](https://app.circleci.com/pipelines/github/mattbrictson/tomo?branch=main)
+[![Build Status](https://mattbrictson.semaphoreci.com/badges/tomo/branches/main.svg?style=shields)](https://mattbrictson.semaphoreci.com/projects/tomo)
 [![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.

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

@@ -62,6 +62,8 @@ module Tomo::Plugin::Nodenv
       version = remote.capture("cat", path, raise_on_error: false).strip
       return version unless version.empty?
 
+      return "DRY_RUN_PLACEHOLDER" if dry_run?
+
       die <<~REASON
         Could not guess node version from .node-version file.
         Use the :nodenv_node_version setting to specify the version of node to install.

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

@@ -34,10 +34,8 @@ module Tomo::Plugin::Rbenv
       ruby_version = version_setting || extract_ruby_ver_from_version_file
 
       unless ruby_installed?(ruby_version)
-        logger.info(
-          "Installing ruby #{ruby_version} -- this may take several minutes"
-        )
-        remote.run "CFLAGS=-O3 rbenv install #{ruby_version.shellescape}"
+        logger.info("Installing ruby #{ruby_version} -- this may take several minutes")
+        remote.run "CFLAGS=-O3 rbenv install #{ruby_version.shellescape} --verbose"
       end
       remote.run "rbenv global #{ruby_version.shellescape}"
     end

data/lib/tomo/ssh.rb

@@ -17,13 +17,17 @@ module Tomo
         options = Options.new(options) unless options.is_a?(Options)
 
         Tomo.logger.connect(host)
-        return Connection.dry_run(host, options) if Tomo.dry_run?
+        return build_dry_run_connection(host, options) if Tomo.dry_run?
 
         build_connection(host, options)
       end
 
       private
 
+      def build_dry_run_connection(host, options)
+        Connection.dry_run(host, options)
+      end
+
       def build_connection(host, options)
         conn = Connection.new(host, options)
         validator = ConnectionValidator.new(options.executable, conn)

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

@@ -33,6 +33,7 @@ set env_vars: {
   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

data/lib/tomo/testing/docker_image.rb

@@ -44,8 +44,6 @@ module Tomo
       end
 
       def puma_port
-        return 3000 if ENV["_TOMO_CONTAINER"]
-
         Local.capture("docker port #{container_id} 3000")[/:(\d+)/, 1].to_i
       end
 
@@ -88,13 +86,7 @@ module Tomo
       end
 
       def start_container
-        host_container = ENV["_TOMO_CONTAINER"]
-        args = "--detach --init #{image_id}"
-        if host_container
-          args.prepend("--network=container:#{host_container} ")
-        else
-          args.prepend("--publish-all ")
-        end
+        args = "--publish-all --detach --init #{image_id}"
         Local.capture("docker run #{args}")[/\S+/].tap do
           # Allow some time for the container to finish booting
           sleep 0.1
@@ -102,8 +94,6 @@ module Tomo
       end
 
       def find_ssh_port
-        return 22 if ENV["_TOMO_CONTAINER"]
-
         Local.capture("docker port #{container_id} 22")[/:(\d+)/, 1].to_i
       end
 

data/lib/tomo/testing/host_extensions.rb

@@ -20,6 +20,8 @@ module Tomo
 
       def result_for(script)
         match = mocks.find { |regexp, _| regexp.match?(script.to_s) }
+        raise "Scripts cannot be mocked during dry_run" if match && Tomo.dry_run?
+
         match&.last || Result.empty_success
       end
     end

data/lib/tomo/testing/local.rb

@@ -78,7 +78,7 @@ module Tomo
         end
 
         def interactive?
-          Tomo::Console.interactive? && !ENV["_TOMO_CONTAINER"]
+          Tomo::Console.interactive?
         end
 
         def wait_for_exit(thread, seconds=nil)

data/lib/tomo/testing/ssh_extensions.rb

@@ -3,6 +3,12 @@ module Tomo
     module SSHExtensions
       private
 
+      def build_dry_run_connection(host, options)
+        return super if Testing.ssh_enabled
+
+        Testing::Connection.new(host, options)
+      end
+
       def build_connection(host, options)
         return super if Testing.ssh_enabled
 

data/lib/tomo/testing/ubuntu_setup.sh

@@ -17,8 +17,27 @@ touch /var/lib/systemd/linger/deployer
 
 # Packages needed for ruby, etc.
 apt-get -y update
-apt-get -y install build-essential pkg-config git-core curl locales \
-                   libffi-dev libreadline-dev libsqlite3-dev libssl-dev libyaml-dev zlib1g-dev
+apt-get -y install autoconf \
+                   bison \
+                   build-essential \
+                   curl \
+                   git-core \
+                   libdb-dev \
+                   libffi-dev \
+                   libgdbm-dev \
+                   libgdbm6 \
+                   libgmp-dev \
+                   libncurses5-dev \
+                   libreadline6-dev \
+                   libsqlite3-dev \
+                   libssl-dev \
+                   libyaml-dev \
+                   locales \
+                   patch \
+                   pkg-config \
+                   rustc \
+                   uuid-dev \
+                   zlib1g-dev
 
 apt-get -y install tzdata \
         -o DPkg::options::="--force-confdef" \

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "1.14.1".freeze
+  VERSION = "1.15.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.1
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-01 00:00:00.000000000 Z
+date: 2023-04-11 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
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨