tomo 1.4.1 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4cb608a21d6ce3191225519a3b467a226f0e0b4d1675f08bbed82fd6379696b
-  data.tar.gz: 0cb9a00e0eb50501c727d4e58db8b0c5cc686b7e27714ec7bdc11b95387f977d
+  metadata.gz: f097a0641bd9a692351f6ab9fa10b2b2a7b4d6a5df809b19821c644ad1491044
+  data.tar.gz: 31706e6cec01be45c4e4eb71b1ba6666ce9ec63b197b78af69e1b4b08611eff7
 SHA512:
-  metadata.gz: 875563989d848c0dcec9d1b18110712d91603fa734d1aa6fbb5dad454a0911808543f0c0ae9da9510732625d36bc94a0ee5d64d136192e5b4df77b9e130b2292
-  data.tar.gz: 936d56fefb5c964b9e19d92ec328cf148de894da697e88d80146428abfefb307551820d9aaba1967d539a2ec22e8f465bf9296bdc364093de9e750e4734bbc05
+  metadata.gz: 3b53ec01d9d61a5e2238ad82ea786f8ff9a4747dd87459f8ed05a57c400ebd5694b68c5e1bc50e52dedbf0318a58d2f44805eb6a2dd905349330bd1dd6148ae1
+  data.tar.gz: 1ddf5313df3b5226d311c32f828405242d431e3a5869d61ac091563a1ee06ff844f533afa07d4b78ba03ac24cb7d093625ec6ef833dd3755456016832bb51320

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/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

@@ -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/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/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

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

@@ -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/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.1".freeze
+  VERSION = "1.8.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.8.1
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-26 00:00:00.000000000 Z
+date: 2021-05-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.16
 signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨