tomo 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6e4c4920127adec0015456e7b666ecf2f58f7459c347d62b04ad337cdf8818c
-  data.tar.gz: e153c6374dcd288ce08125c70c973fb60f4f9d389020f19261d63dba97b1e925
+  metadata.gz: e119875699293814b739fd1e11efef613df94aa2172c769180c83937f91ce384
+  data.tar.gz: 8674bc37cdede9eb970ce62c102f7f856cd74af5847a9f7563e653b59169be3b
 SHA512:
-  metadata.gz: eb670d2ab71b34098caee98bf44d47cc6a6a7c2e857541d33b9394588b4b294375ab91dbd1c071080fc5f70d893acf80acca09b1a863e99ad7c7994f6e7c6991
-  data.tar.gz: 14082e3582721a2816cfee25b8a613a8fc267e97e4b317b1cc87833f7150dd9ecee3af751ba123d4da06ea515d9d1913bda80cd9187311a9e9ab636a31b0b48e
+  metadata.gz: 0722d662a66bcb60cf8e4dbacf6fccfc3640db1720b6673819637cb6f82b35ff3a4b2f09a4e122d0979bad5f29e5fde82aacdb06fd505bc20d3cfb2aec5d1ec7
+  data.tar.gz: 0d62e317b89ad43736dc6d6500f4377d108752c2e332e9d04f27aabec30136195b5042ac55a06ab4779fa6c5bbbe33473eb11a7e1b5e3f3f1beeb77d54eba98a

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

@@ -100,8 +100,13 @@ module Tomo
         Gem::Requirement.new(">= 2.2").satisfied_by?(erb_version)
       end
 
-      def ruby_version_file?
-        File.exist?(".ruby-version")
+      # 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
+      rescue IOError
+        false
       end
 
       def config_rb_template(app)

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

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

metadata

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