tomo 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2da243b8f639993407cdb09d1bd13a5fadfa783e05b341432769149e4121a9d4
-  data.tar.gz: c194f68b4700a9b1ed3883e20c75ea36c5353a2a19b3db92644af1fdbbba7860
+  metadata.gz: 70027859367ad910607a0d7329b50405c0a243e52ff650dc82d5c34ad5162990
+  data.tar.gz: 5dd2fe0c7b879d7cf6ef04301437e22fdd34412830fd4ecbd0958241643066a0
 SHA512:
-  metadata.gz: 9c547b318e37b40b47737a097a15b7bbacda5bfcb446c285f91045a87f234ab8a7a3033cf1433cb8a99ce564a4463b3445be298d721dd6c8734c1e2cd8a26c97
-  data.tar.gz: 7342081977edf2ae5f98fe9f0b1cd39b9451a5a4ce870f2f713541041427088c830ae1ed3d975dab1eeb688362540369b1d550958b50ab91a7d9f2b4a62e776f
+  metadata.gz: b336aeb0e8ccffdc3dbe5e4842a297a8e18527f37ea7c523ceb27f76191433448c85b0d71a937c135712cf71eff996822535a3f6257344315cb5805eb2c93a92
+  data.tar.gz: 2fdac86683f454707c033a5a93cf0f1cb1bc7e4cfdd2d3566088de39f54e9757cc6ab29bbf73f309832f3d733f440aefaf500139758039b2543500d485911ab1

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Matt Brictson
+Copyright (c) 2023 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,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/cli/rules.rb

@@ -12,9 +12,9 @@ module Tomo
       }.freeze
 
       OPTION_PATTERNS = {
-        /\A--\[no-\]([\-a-z]+)\z/               => :on_off_switch_rule,
-        /\A(-[a-z]), (--[\-a-z]+)\z/            => :basic_switch_rule,
-        /\A(-[a-z]), (--[\-a-z]+) [A-Z=_\-]+\z/ => :value_switch_rule
+        /\A--\[no-\]([-a-z]+)\z/              => :on_off_switch_rule,
+        /\A(-[a-z]), (--[-a-z]+)\z/           => :basic_switch_rule,
+        /\A(-[a-z]), (--[-a-z]+) [A-Z=_-]+\z/ => :value_switch_rule
       }.freeze
 
       private_constant :ARG_PATTERNS, :OPTION_PATTERNS

data/lib/tomo/commands/init.rb

@@ -29,7 +29,7 @@ module Tomo
         assert_no_tomo_project!
 
         app = args.first || current_dir_name || "default"
-        app = app.gsub(/([^\w\-]|_)+/, "_").downcase
+        app = app.gsub(/([^\w-]|_)+/, "_").downcase
         FileUtils.mkdir_p(".tomo/plugins")
 
         # TODO: use a template for this file

data/lib/tomo/console/menu.rb

@@ -86,7 +86,7 @@ module Tomo
       end
 
       def clear
-        height = 2 + visible_options.length
+        height = visible_options.length + 2
         esc_codes = Array.new(height) { "\e[2K\e[1G" }.join("\e[1A")
         print esc_codes
       end

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

@@ -34,17 +34,15 @@ 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
 
     def ruby_installed?(version)
       versions = remote.capture("rbenv versions", raise_on_error: false)
-      if versions.include?(version)
+      if versions.match?(/^\*?\s*#{Regexp.quote(version)}\s/)
         logger.info("Ruby #{version} is already installed.")
         return true
       end

data/lib/tomo/runtime/execution_plan.rb

@@ -70,7 +70,7 @@ module Tomo
         thread_pool.run_to_completion
         yield(remotes)
       ensure
-        (remotes || {}).values.each(&:close)
+        (remotes || {}).each_value(&:close)
       end
 
       def build_plan(tasks, task_filter)

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/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/ubuntu_setup.sh

@@ -17,7 +17,27 @@ touch /var/lib/systemd/linger/deployer
 
 # Packages needed for ruby, etc.
 apt-get -y update
-apt-get -y install build-essential zlib1g-dev libssl-dev libreadline-dev git-core curl locales libsqlite3-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.0".freeze
+  VERSION = "1.15.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-01 00:00:00.000000000 Z
+date: 2023-02-07 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.3.21
+rubygems_version: 3.4.3
 signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨