tomo 1.8.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f097a0641bd9a692351f6ab9fa10b2b2a7b4d6a5df809b19821c644ad1491044
-  data.tar.gz: 31706e6cec01be45c4e4eb71b1ba6666ce9ec63b197b78af69e1b4b08611eff7
+  metadata.gz: 2f646a8ad8b9a55a908ead2765b2b48461f279328424ffae5ddd71adbf525099
+  data.tar.gz: 07b17c07811315a55e49e8b8e0e5d30f56ff88a618fc8ba8053c147f53fa0289
 SHA512:
-  metadata.gz: 3b53ec01d9d61a5e2238ad82ea786f8ff9a4747dd87459f8ed05a57c400ebd5694b68c5e1bc50e52dedbf0318a58d2f44805eb6a2dd905349330bd1dd6148ae1
-  data.tar.gz: 1ddf5313df3b5226d311c32f828405242d431e3a5869d61ac091563a1ee06ff844f533afa07d4b78ba03ac24cb7d093625ec6ef833dd3755456016832bb51320
+  metadata.gz: 1a28e6dcdf0ae942ade3eccad7d3c4cf2b8bc8ae1b843fb342d6bb15b35dacda4e07447a9d68cc7ccbe401bb3665fc48ac3ad82a1c0cf21c3d38b20151d52581
+  data.tar.gz: 7ed26ba43d56e602c8aebc59c29900ac53174c8dbf781cc357a16ad5cf5d7581caadd706d5efb4fc6befc30830dba6c322fb9e1910b3cfbfca5573d9bf962c0c

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/lib/tomo/commands/init.rb

@@ -35,7 +35,7 @@ module Tomo
         # TODO: use a template for this file
         FileUtils.touch(".tomo/plugins/#{app}.rb")
 
-        IO.write(DEFAULT_CONFIG_PATH, config_rb_template(app))
+        File.write(DEFAULT_CONFIG_PATH, config_rb_template(app))
 
         logger.info(green("✔ Created #{DEFAULT_CONFIG_PATH}"))
       end
@@ -99,14 +99,14 @@ module Tomo
       def using_ruby_version_file?
         return false unless File.exist?(".ruby-version")
 
-        IO.read(".ruby-version").rstrip == RUBY_VERSION
+        File.read(".ruby-version").rstrip == RUBY_VERSION
       rescue IOError
         false
       end
 
       def config_rb_template(app)
         path = File.expand_path("../templates/config.rb.erb", __dir__)
-        template = IO.read(path)
+        template = File.read(path)
         ERB.new(template, trim_mode: "-").result(binding)
       end
     end

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

@@ -13,7 +13,7 @@ module Tomo
         raise_file_not_found(path) unless File.file?(path)
 
         Tomo.logger.debug("Loading plugin from #{path.inspect}")
-        script = IO.read(path)
+        script = File.read(path)
         plugin = define_anonymous_plugin_class
         plugin.class_eval(script, path.to_s, 1)
 

data/lib/tomo/configuration/role_based_task_filter.rb

@@ -20,7 +20,7 @@ module Tomo
 
       def filter(tasks, host:)
         roles = host.roles
-        roles = roles.empty? ? [""] : roles
+        roles = [""] if roles.empty?
         tasks.select do |task|
           roles.any? { |role| match?(task, role) }
         end
@@ -31,7 +31,7 @@ module Tomo
       attr_reader :globs
 
       def match?(task, role)
-        task_globs = globs.keys.select { |glob| glob.match?(task) }
+        task_globs = globs.keys.select { |glob| glob.match?(task) } # rubocop:disable Style/SelectByRegexp
         return true if task_globs.empty?
 
         roles = globs.values_at(*task_globs).flatten

data/lib/tomo/configuration/unknown_plugin_error.rb

@@ -30,7 +30,7 @@ module Tomo
       def present_in_gemfile?
         return false unless File.file?("Gemfile")
 
-        IO.read("Gemfile").match?(/^\s*gem ['"]#{Regexp.quote(gem_name)}['"]/)
+        File.read("Gemfile").match?(/^\s*gem ['"]#{Regexp.quote(gem_name)}['"]/)
       rescue IOError
         false
       end

data/lib/tomo/configuration.rb

@@ -14,7 +14,7 @@ module Tomo
     def self.from_config_rb(path=DEFAULT_CONFIG_PATH)
       ProjectNotFoundError.raise_with(path: path) unless File.file?(path)
       Tomo.logger.debug("Loading configuration from #{path.inspect}")
-      config_rb = IO.read(path)
+      config_rb = File.read(path)
 
       new.tap do |config|
         config.path = File.expand_path(path)

data/lib/tomo/console/menu.rb

@@ -98,7 +98,7 @@ module Tomo
       def visible_range
         max_visible = [8, options.length].min
 
-        offset = [0, position - max_visible / 2].max
+        offset = [0, position - (max_visible / 2)].max
         adjusted_offset = [offset, options.length - max_visible].min
 
         adjusted_offset...(adjusted_offset + max_visible)

data/lib/tomo/error.rb

@@ -15,8 +15,7 @@ module Tomo
     def debug_suggestion
       return if Tomo.debug?
 
-      "For more troubleshooting info, run tomo again using the "\
-      "#{blue('--debug')} option."
+      "For more troubleshooting info, run tomo again using the #{blue('--debug')} option."
     end
   end
 end

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
 

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

@@ -39,11 +39,14 @@ module Tomo::Plugin::Nodenv
     end
 
     def install_yarn
-      version = settings[:nodenv_yarn_version]
-      return remote.run "npm i -g yarn@#{version.shellescape}" if version
+      unless settings[:nodenv_install_yarn]
+        logger.info ":nodenv_install_yarn is false; skipping yarn installation."
+        return
+      end
 
-      logger.info "No :nodenv_yarn_version specified; "\
-      "skipping yarn installation."
+      version = settings[:nodenv_yarn_version]
+      yarn_spec = version ? "yarn@#{version.shellescape}" : "yarn"
+      remote.run "npm i -g #{yarn_spec}"
     end
 
     def node_installed?(version)

data/lib/tomo/plugin/nodenv.rb

@@ -5,6 +5,7 @@ module Tomo::Plugin
     extend Tomo::PluginDSL
 
     defaults bashrc_path: ".bashrc",
+             nodenv_install_yarn: true,
              nodenv_node_version: nil,
              nodenv_yarn_version: nil
 

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/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/task_api.rb

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

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

@@ -18,7 +18,7 @@ set deploy_to: "/var/www/%{application}"
 set rbenv_ruby_version: <%= RUBY_VERSION.inspect %>
 <% end -%>
 set nodenv_node_version: <%= node_version&.inspect || "nil # FIXME" %>
-set nodenv_yarn_version: <%= yarn_version.inspect %>
+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" %>
 set git_exclusions: %w[
@@ -31,10 +31,12 @@ set env_vars: {
   RAILS_ENV: "production",
   RAILS_LOG_TO_STDOUT: "1",
   RAILS_SERVE_STATIC_FILES: "1",
+  BOOTSNAP_CACHE_DIR: "tmp/bootsnap-cache",
   DATABASE_URL: :prompt,
   SECRET_KEY_BASE: :prompt
 }
 set linked_dirs: %w[
+  .yarn/cache
   log
   node_modules
   public/assets
@@ -47,6 +49,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/systemctl.rb

@@ -63,9 +63,9 @@ class Unit
   def self.find(name)
     path = File.join(File.expand_path("~/.config/systemd/user/"), name)
     raise "Unknown unit: #{name}" unless File.file?(path)
-    return Service.new(name, IO.read(path)) if name.end_with?(".service")
+    return Service.new(name, File.read(path)) if name.end_with?(".service")
 
-    new(name, IO.read(path))
+    new(name, File.read(path))
   end
 
   def initialize(name, spec)

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "1.8.1".freeze
+  VERSION = "1.11.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.11.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-08 00:00:00.000000000 Z
+date: 2022-02-26 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:
@@ -188,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨