tomo 1.10.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05ddcb1e5cb7af61721270c94830cd0140881d4fd85ba97078994cafe8edb3ee
-  data.tar.gz: 6df6ad8b97fd3121b9becaa94682fd5e1c4fe8831903c0aafbfa5d1e91f9075b
+  metadata.gz: 9142456e11c3c6f0f98da45c6b25f72ffb9e3e1f82c17dff873e1c089e1a109e
+  data.tar.gz: a696e761b09568dd567fdbf02ed12cc135affe4fcf0bea27a28994a3133a9f5b
 SHA512:
-  metadata.gz: a618b9ba648758197a7f593b89594f24d75435ddebf624c5e9bacdc573966e41e9161c833e1897610da79d385881f3d8c0f7bad8ac0957c02accfe00d5f757a8
-  data.tar.gz: 0f007ba2ac69941daca0c619adcaba2b4d97af924781c6fc29cff7a368a2206572f4fc93f1bf2f103accdab694c7427ec2d5d1b87b05277f8853b0c39c75961c
+  metadata.gz: 949eb42bc30edb68b82e7f2a352f80eb19519faaef9935f9c910984cc2e915241ce85e9602e28e26fd9cbdae99b215094d2932a02462e379c7ea2674b591eb32
+  data.tar.gz: 7525b76d9ee72a93b511ff815167a5188fe818b17f004c4236f1620ddded762e08b0bb215af709c23ce96df8f4992239c34ec778a269f7685d45a663e67d141d

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Matt Brictson
+Copyright (c) 2022 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

@@ -240,6 +240,10 @@ host "app2@example.com"
 
 Next run `tomo setup` for _both_ apps; this will set everything up for both users on the remote host (environment variables, rbenv, etc.). You can now deploy both apps to the same host, with the confidence that their configurations will be kept cleanly separated.
 
+#### Does tomo support git submodules?
+
+No, not out of the box. However, you can extend tomo with an additional task for submodules; see the solution in [PR #220](https://github.com/mattbrictson/tomo/pull/220#pullrequestreview-979249573) suggested by [@numbcoder](https://github.com/numbcoder).
+
 ## Support
 
 This project is a labor of love and I can only spend a few hours a week maintaining it, at most. If you'd like to help by submitting a pull request, or if you've discovered a bug that needs my attention, please let me know. Check out [CONTRIBUTING.md](https://github.com/mattbrictson/tomo/blob/main/CONTRIBUTING.md) to get started. Happy hacking! —Matt

data/lib/tomo/commands/init.rb

@@ -104,6 +104,16 @@ module Tomo
         false
       end
 
+      # Does a .node-version file exist match `node --version`?
+      def using_node_version_file?
+        return false unless File.exist?(".node-version")
+
+        version = File.read(".node-version").rstrip
+        !version.empty? && version == node_version
+      rescue IOError
+        false
+      end
+
       def config_rb_template(app)
         path = File.expand_path("../templates/config.rb.erb", __dir__)
         template = File.read(path)

data/lib/tomo/configuration/plugins_registry.rb

@@ -55,10 +55,7 @@ module Tomo
       end
 
       def register_task_library(namespace, library_class)
-        Tomo.logger.debug(
-          "Registering task library #{library_class}"\
-          " (#{namespace.inspect} namespace)"
-        )
+        Tomo.logger.debug("Registering task library #{library_class} (#{namespace.inspect} namespace)")
         namespaced_classes << [namespace, library_class]
       end
     end

data/lib/tomo/path.rb

@@ -1,4 +1,4 @@
-require "forwardable"
+require "delegate"
 require "pathname"
 
 module Tomo

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

@@ -3,6 +3,14 @@ require "time"
 
 module Tomo::Plugin::Git
   class Tasks < Tomo::TaskLibrary
+    def config
+      user_name = settings[:git_user_name] || remote.host.user
+      user_email = settings[:git_user_email] || "#{remote.host.user}@example.com"
+
+      remote.git("config", "--global", "user.name", user_name)
+      remote.git("config", "--global", "user.email", user_email)
+    end
+
     def clone
       require_setting :git_url
 
@@ -24,10 +32,7 @@ module Tomo::Plugin::Git
       remote.mkdir_p(paths.release)
 
       remote.chdir(paths.git_repo) do
-        remote.git(
-          "archive #{ref.shellescape} | "\
-          "tar -x -f - -C #{paths.release.shellescape}"
-        )
+        remote.git("archive #{ref.shellescape} | tar -x -f - -C #{paths.release.shellescape}")
       end
     end
 
@@ -45,8 +50,8 @@ module Tomo::Plugin::Git
       return unless settings[:git_ref] && settings[:git_branch]
 
       logger.warn(
-        ":git_ref (#{settings[:git_ref]}) and "\
-        ":git_branch (#{settings[:git_branch]}) are both specified. "\
+        ":git_ref (#{settings[:git_ref]}) and " \
+        ":git_branch (#{settings[:git_branch]}) are both specified. " \
         "Ignoring :git_branch."
       )
       @ref_override_warning = true

data/lib/tomo/plugin/git.rb

@@ -12,6 +12,8 @@ module Tomo::Plugin
              git_exclusions: [],
              git_env:        { GIT_SSH_COMMAND: "ssh -o PasswordAuthentication=no -o StrictHostKeyChecking=no" },
              git_ref:        nil,
-             git_url:        nil
+             git_url:        nil,
+             git_user_name:  nil,
+             git_user_email: nil
   end
 end

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

@@ -31,8 +31,7 @@ module Tomo::Plugin::Nodenv
     end
 
     def install_node
-      require_setting :nodenv_node_version
-      node_version = settings[:nodenv_node_version]
+      node_version = settings[:nodenv_node_version] || extract_node_ver_from_version_file
 
       remote.run "nodenv install #{node_version.shellescape}" unless node_installed?(node_version)
       remote.run "nodenv global #{node_version.shellescape}"
@@ -57,5 +56,16 @@ module Tomo::Plugin::Nodenv
       end
       false
     end
+
+    def extract_node_ver_from_version_file
+      path = paths.release.join(".node-version")
+      version = remote.capture("cat", path, raise_on_error: false).strip
+      return version unless version.empty?
+
+      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.
+      REASON
+    end
   end
 end

data/lib/tomo/runtime/current.rb

@@ -29,7 +29,7 @@ module Tomo
         private
 
         def slice(*keys)
-          keys.map { |key| [key, fiber_locals[key]] }.to_h
+          keys.to_h { |key| [key, fiber_locals[key]] }
         end
 
         def fiber_locals

data/lib/tomo/runtime/execution_plan.rb

@@ -26,8 +26,7 @@ module Tomo
         when 1 then applicable_hosts.first.to_s
         when 2 then applicable_hosts.map(&:to_s).join(" and ")
         else
-          "#{applicable_hosts.first} and "\
-          "#{applicable_hosts.length - 1} other hosts"
+          "#{applicable_hosts.first} and #{applicable_hosts.length - 1} other hosts"
         end
       end
 

data/lib/tomo/runtime/settings_interpolation.rb

@@ -10,7 +10,7 @@ module Tomo
       end
 
       def call
-        hash = settings.keys.map { |name| [name, fetch(name)] }.to_h
+        hash = settings.keys.to_h { |name| [name, fetch(name)] }
         dump_settings(hash) if Tomo.debug?
         hash
       end

data/lib/tomo/ssh/child_process.rb

@@ -1,5 +1,6 @@
 require "open3"
 require "shellwords"
+require "stringio"
 
 module Tomo
   module SSH

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

@@ -17,7 +17,9 @@ set deploy_to: "/var/www/%{application}"
 <% unless using_ruby_version_file? -%>
 set rbenv_ruby_version: <%= RUBY_VERSION.inspect %>
 <% end -%>
+<% unless using_node_version_file? -%>
 set nodenv_node_version: <%= node_version&.inspect || "nil # FIXME" %>
+<% end -%>
 set nodenv_install_yarn: <%= yarn_version ? "true" : "false" %>
 set git_url: <%= git_origin_url&.inspect || "nil # FIXME" %>
 set git_branch: <%= git_branch&.inspect || "nil # FIXME" %>
@@ -49,6 +51,7 @@ set linked_dirs: %w[
 setup do
   run "env:setup"
   run "core:setup_directories"
+  run "git:config"
   run "git:clone"
   run "git:create_release"
   run "core:symlink_shared"

data/lib/tomo/testing/Dockerfile

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

data/lib/tomo/testing/docker_image.rb

@@ -69,8 +69,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:20.04')
-        Local.capture("docker pull ubuntu:20.04") if images.strip.empty?
+        images = Local.capture('docker images --format "{{.ID}}" ubuntu:22.04')
+        Local.capture("docker pull ubuntu:22.04") if images.strip.empty?
       end
 
       def set_up_private_key

data/lib/tomo/testing/log_capturing.rb

@@ -1,3 +1,5 @@
+require "stringio"
+
 module Tomo
   module Testing
     module LogCapturing

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "1.10.0".freeze
+  VERSION = "1.12.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2022-07-29 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
@@ -173,6 +173,7 @@ metadata:
   source_code_uri: https://github.com/mattbrictson/tomo
   homepage_uri: https://github.com/mattbrictson/tomo
   documentation_uri: https://tomo-deploy.com/
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -181,14 +182,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.3.18
 signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨