tomo 1.4.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e70a81efc32a7a80b37b26edc668de8daa510e7954884a3711d71ced6ef1bf8
-  data.tar.gz: eef6788e4b36c1cdad66170b6b616af8a08f890bc089a6c70e6a12132a061911
+  metadata.gz: 431bd4cb252a935eb41e8b847e503ea681bc5dd633a3106f201758a2e45fffa1
+  data.tar.gz: 1e036f6ac85a2906cb3f7d8e6f39ea2edf434a6bf00d6124a7a9f8ca89d9d555
 SHA512:
-  metadata.gz: 4425384a896b364775994859d7ea4307cac1abcbd507514d6f7289d6a684f6263cd7b17d250d280f6f2ccd596ed47f5d8f0871337dd5b69895aa74a0ea9c718e
-  data.tar.gz: 57a0929d3e1be161c7830449226327ee1c4f0e20f4949658ec02287c436c4fbb12e8a7f819a4525266beb29a8abd6381285aae27e21b6e753ac27028783dca1f
+  metadata.gz: 8b11ac0a2cadff9fe301a56c2f3e9652f7ce4cc25ae9d59c8153ca342fb904510f1cd630cb6fd43565f198d9310e492689c9cb5c2a203b96ee253ea182b1a8f1
+  data.tar.gz: fcc17f36a7ae4555a31176607b3ae0a80e48842ae3473213ab511c25151c46d8b6458999468744d8a725c41ecc1585ad0b9f20b6651da68f31f5c6d4904bf5cb

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Matt Brictson
+Copyright (c) 2021 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,6 @@
 # Tomo
 
 [![Gem Version](https://badge.fury.io/rb/tomo.svg)](https://rubygems.org/gems/tomo)
-[![Travis](https://img.shields.io/travis/mattbrictson/tomo.svg?label=travis)](https://travis-ci.org/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

@@ -1,4 +1,5 @@
 require "erb"
+require "fileutils"
 
 module Tomo
   module Commands
@@ -94,25 +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")
 
-      def ruby_version_file?
-        File.exist?(".ruby-version")
+        IO.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
+        ERB.new(template, trim_mode: "-").result(binding)
       end
     end
   end

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

@@ -55,7 +55,7 @@ module Tomo
 
       def scan_for_plugins
         Gem.find_latest_files("#{PLUGIN_PREFIX}/*.rb").map do |file|
-          file[%r{#{PLUGIN_PREFIX}/(.+).rb$}, 1].tr("/", "-")
+          file[%r{#{PLUGIN_PREFIX}/(.+).rb$}o, 1].tr("/", "-")
         end.uniq.sort
       end
     end

data/lib/tomo/configuration/unknown_plugin_error.rb

@@ -17,11 +17,22 @@ module Tomo
       private
 
       def gem_suggestion
-        if Tomo.bundled?
-          "\nYou may need to add #{yellow(gem_name)} to your Gemfile."
-        else
-          "\nYou may need to install the #{yellow(gem_name)} gem."
+        return "\nYou may need to add #{yellow(gem_name)} to your Gemfile." if Tomo.bundled?
+
+        messages = ["\nYou may need to install the #{yellow(gem_name)} gem."]
+        if present_in_gemfile?
+          messages << "\nTry prefixing the tomo command with #{blue('bundle exec')} to fix this error."
         end
+
+        messages.join
+      end
+
+      def present_in_gemfile?
+        return false unless File.file?("Gemfile")
+
+        IO.read("Gemfile").match?(/^\s*gem ['"]#{Regexp.quote(gem_name)}['"]/)
+      rescue IOError
+        false
       end
     end
   end

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/plugin/bundler.rb

@@ -11,7 +11,7 @@ module Tomo::Plugin
     defaults bundler_config_path: ".bundle/config",
              bundler_deployment:  true,
              bundler_gemfile:     nil,
-             bundler_jobs:        "4",
+             bundler_jobs:        nil,
              bundler_path:        "%{shared_path}/bundle",
              bundler_retry:       "3",
              bundler_version:     nil,

data/lib/tomo/plugin/core.rb

@@ -21,7 +21,7 @@ module Tomo::Plugin
       releases_path:         "%{deploy_to}/releases",
       revision_log_path:     "%{deploy_to}/revisions.log",
       shared_path:           "%{deploy_to}/shared",
-      tmp_path:              "/tmp/tomo",
+      tmp_path:              "/tmp/tomo-#{SecureRandom.alphanumeric(8)}",
       tomo_config_file_path: nil, # determined at runtime
       run_args:              [] # determined at runtime
     )

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

@@ -41,7 +41,7 @@ module Tomo::Plugin::Core
       current = read_current_release
 
       remote.chdir(paths.releases) do
-        releases = remote.list_files.grep(/^#{RELEASE_REGEXP}$/).sort
+        releases = remote.list_files.grep(/^#{RELEASE_REGEXP}$/o).sort
         desired_count -= 1 if releases.delete(current)
         return if releases.length <= desired_count
 
@@ -122,7 +122,7 @@ module Tomo::Plugin::Core
       result = remote.run("readlink", paths.current, raise_on_error: false, silent: true)
       return nil if result.failure?
 
-      result.stdout.strip[%r{/(#{RELEASE_REGEXP})$}, 1]
+      result.stdout.strip[%r{/(#{RELEASE_REGEXP})$}o, 1]
     end
   end
 end

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

@@ -38,6 +38,10 @@ module Tomo::Plugin::Puma
       remote.attach "journalctl", "-q", raw("--user-unit=#{service.name.shellescape}"), *settings[:run_args]
     end
 
+    def tail_log
+      remote.attach "journalctl -q --user-unit=#{service.name.shellescape} -f"
+    end
+
     private
 
     def port

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

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

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

@@ -82,7 +82,7 @@ module Tomo
     end
 
     def export_env
-      exports = @env.reject { |_, value| value.nil? }
+      exports = @env.compact
       return if exports.empty?
 
       [

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

@@ -14,7 +14,7 @@ host "user@hostname.or.ip.address"
 
 set application: <%= app.inspect %>
 set deploy_to: "/var/www/%{application}"
-<% unless ruby_version_file? -%>
+<% unless using_ruby_version_file? -%>
 set rbenv_ruby_version: <%= RUBY_VERSION.inspect %>
 <% end -%>
 set nodenv_node_version: <%= node_version&.inspect || "nil # FIXME" %>

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

@@ -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.4.0".freeze
+  VERSION = "1.8.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2021-04-08 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.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨