tomo 1.7.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e119875699293814b739fd1e11efef613df94aa2172c769180c83937f91ce384
-  data.tar.gz: 8674bc37cdede9eb970ce62c102f7f856cd74af5847a9f7563e653b59169be3b
+  metadata.gz: 05ddcb1e5cb7af61721270c94830cd0140881d4fd85ba97078994cafe8edb3ee
+  data.tar.gz: 6df6ad8b97fd3121b9becaa94682fd5e1c4fe8831903c0aafbfa5d1e91f9075b
 SHA512:
-  metadata.gz: 0722d662a66bcb60cf8e4dbacf6fccfc3640db1720b6673819637cb6f82b35ff3a4b2f09a4e122d0979bad5f29e5fde82aacdb06fd505bc20d3cfb2aec5d1ec7
-  data.tar.gz: 0d62e317b89ad43736dc6d6500f4377d108752c2e332e9d04f27aabec30136195b5042ac55a06ab4779fa6c5bbbe33473eb11a7e1b5e3f3f1beeb77d54eba98a
+  metadata.gz: a618b9ba648758197a7f593b89594f24d75435ddebf624c5e9bacdc573966e41e9161c833e1897610da79d385881f3d8c0f7bad8ac0957c02accfe00d5f757a8
+  data.tar.gz: 0f007ba2ac69941daca0c619adcaba2b4d97af924781c6fc29cff7a368a2206572f4fc93f1bf2f103accdab694c7427ec2d5d1b87b05277f8853b0c39c75961c

data/README.md

@@ -1,7 +1,6 @@
 # Tomo
 
 [![Gem Version](https://badge.fury.io/rb/tomo.svg)](https://rubygems.org/gems/tomo)
-[![Travis](https://img.shields.io/travis/com/mattbrictson/tomo.svg?label=travis)](https://travis-ci.com/github/mattbrictson/tomo)
 [![Circle](https://circleci.com/gh/mattbrictson/tomo/tree/main.svg?style=shield)](https://app.circleci.com/pipelines/github/mattbrictson/tomo?branch=main)
 [![Code Climate](https://codeclimate.com/github/mattbrictson/tomo/badges/gpa.svg)](https://codeclimate.com/github/mattbrictson/tomo)
 

data/lib/tomo/cli/parser.rb

@@ -78,7 +78,7 @@ module Tomo
         return [argv, []] if index == argv.length - 1 && Completions.active?
 
         before = argv[0...index]
-        after = argv[(index + 1)..-1]
+        after = argv[(index + 1)..]
 
         [before, after]
       end

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
@@ -95,30 +95,19 @@ module Tomo
         File.exist?(".rubocop.yml")
       end
 
-      def erb_2_2_or_later?
-        erb_version = Gem::Version.new(ERB.version[/\d[\d.]+/])
-        Gem::Requirement.new(">= 2.2").satisfied_by?(erb_version)
-      end
-
       # Does a .ruby-version file exist match the executing RUBY_VERSION?
       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)
-
-        # TODO: remove once we drop Ruby 2.5 support?
-        if erb_2_2_or_later?
-          ERB.new(template, trim_mode: "-").result(binding)
-        else
-          ERB.new(template, nil, "-").result(binding)
-        end
+        template = File.read(path)
+        ERB.new(template, trim_mode: "-").result(binding)
       end
     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/suggestions.rb

@@ -11,15 +11,13 @@ module Tomo
       end
 
       def to_a
-        @_suggestions ||= begin
-          if defined?(DidYouMean::SpellChecker)
-            checker = DidYouMean::SpellChecker.new(dictionary: dictionary)
-            suggestions = checker.correct(word)
-            suggestions || []
-          else
-            []
-          end
-        end
+        @_suggestions ||= if defined?(DidYouMean::SpellChecker)
+                            checker = DidYouMean::SpellChecker.new(dictionary: dictionary)
+                            suggestions = checker.correct(word)
+                            suggestions || []
+                          else
+                            []
+                          end
       end
 
       def to_console

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/nodenv/tasks.rb

@@ -12,7 +12,7 @@ module Tomo::Plugin::Nodenv
     private
 
     def run_installer
-      install_url = "https://github.com/nodenv/nodenv-installer/raw/master/bin/nodenv-installer"
+      install_url = "https://github.com/nodenv/nodenv-installer/raw/HEAD/bin/nodenv-installer"
       remote.env PATH: raw("$HOME/.nodenv/bin:$HOME/.nodenv/shims:$PATH") do
         remote.run("curl -fsSL #{install_url.shellescape} | bash")
       end
@@ -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/plugin/rbenv/tasks.rb

@@ -11,7 +11,7 @@ module Tomo::Plugin::Rbenv
     private
 
     def run_installer
-      install_url = "https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-installer"
+      install_url = "https://github.com/rbenv/rbenv-installer/raw/HEAD/bin/rbenv-installer"
       remote.env PATH: raw("$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH") do
         remote.run("curl -fsSL #{install_url.shellescape} | bash")
       end

data/lib/tomo/runtime/current.rb

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

data/lib/tomo/runtime/settings_interpolation.rb

@@ -10,7 +10,7 @@ module Tomo
       end
 
       def call
-        hash = Hash[settings.keys.map { |name| [name, fetch(name)] }]
+        hash = settings.keys.map { |name| [name, fetch(name)] }.to_h
         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

data/lib/tomo/testing/docker_image.rb

@@ -113,9 +113,7 @@ module Tomo
       end
 
       def build_dir
-        @_build_dir ||= begin
-          File.join(Dir.tmpdir, "tomo_docker_#{SecureRandom.hex(8)}")
-        end
+        @_build_dir ||= File.join(Dir.tmpdir, "tomo_docker_#{SecureRandom.hex(8)}")
       end
     end
   end

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)
@@ -165,7 +165,7 @@ class Service < Unit
   end
 
   def parse
-    config = Hash[spec.scan(/^([^\s=]+)=\s*(\S.*?)\s*$/)]
+    config = spec.scan(/^([^\s=]+)=\s*(\S.*?)\s*$/).to_h
     working_dir = config["WorkingDirectory"] || File.expand_path("~")
     executable = config.fetch("ExecStart") do
       raise "#{name} is missing ExecStart attribute"

data/lib/tomo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2021-10-13 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
@@ -181,14 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨