tomo 1.21.2 → 1.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b7ef495e4c77ac639e0322487357df44d5a31a503811231833f947851cb1086
-  data.tar.gz: 4c718faf4f997614b8baa3cafa8839d80f0e94cd270c906a3ce48d97b5413ffd
+  metadata.gz: 5ab6df6968dd42a95ca984a38b14a817c0d0a947454441d844515fdc0dae5f8b
+  data.tar.gz: 02acf3183ca8fd770437d67a33efa21fe32b56af223d6b0c281b89a549b3fc97
 SHA512:
-  metadata.gz: 2fe7b74a2bb78bcbbb4f9a954cf8ae38e76574f17649d40f1d047aab805c3948e199dd0203a4670133265336bbc51aeb6be5590180016608dbf9c1c9c881f3e0
-  data.tar.gz: 0adbee05ac60610a9141b854e5a5e20d04d2e0d5dd0e46c58fe7b2ca34b81d9d47429962dae1527d20f6b2fac518e479b629266a74df445ec71b60d803f6bb52
+  metadata.gz: 9328f7bcc5b49da0af09bec1a1cb03bbbef8a47b7fd31e2105005ab644ac4fcf93f17b432041a6ae158f45393adb881627ef0d8a4b218df818a6d945611bae0c
+  data.tar.gz: f9d299f3fca94e68d67e8a44e669a0e24ce84b9c8afcb1f9615ac272dfee1c9a93d53f352c3e1535ffb749a9cbca6f0b6786861b03a29a0f911544e62b8ae59d

data/lib/tomo/cli/common_options.rb

@@ -11,6 +11,9 @@ module Tomo
           option :debug, "--[no-]debug", "Enable/disable verbose debug logging" do |debug|
             Tomo.debug = debug
           end
+          option :quiet, "--[no-]quiet", "Silence all progress output" do |quiet|
+            Tomo.quiet = quiet
+          end
           option :trace, "--[no-]trace", "Display full backtrace on error" do |trace|
             CLI.show_backtrace = trace
           end

data/lib/tomo/error.rb

@@ -6,7 +6,7 @@ module Tomo
 
     include Colors
 
-    def self.raise_with(message=nil, attributes)
+    def self.raise_with(message=nil, attributes) # rubocop:disable Style/OptionalArguments
       err = new(message)
       attributes.each { |attr, value| err.public_send(:"#{attr}=", value) }
       raise err

data/lib/tomo/logger.rb

@@ -15,6 +15,7 @@ module Tomo
     end
 
     def script_start(script)
+      return if Tomo.quiet?
       return unless script.echo?
 
       puts yellow(script.echo_string)
@@ -27,6 +28,7 @@ module Tomo
     end
 
     def script_end(script, result)
+      return if Tomo.quiet?
       return unless result.failure?
       return unless script.silent?
       return unless script.raise_on_error?
@@ -35,14 +37,20 @@ module Tomo
     end
 
     def connect(host)
+      return if Tomo.quiet?
+
       puts gray("→ Connecting to #{host}")
     end
 
     def task_start(task)
+      return if Tomo.quiet?
+
       puts blue("• #{task}")
     end
 
     def info(message)
+      return if Tomo.quiet?
+
       puts message
     end
 

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

@@ -4,6 +4,9 @@ module Tomo::Plugin::Puma
   class Tasks < Tomo::TaskLibrary
     SystemdUnit = Struct.new(:name, :template, :path)
 
+    # Exposed to allow override during unit tests
+    def self.polling_delay = 1
+
     def setup_systemd # rubocop:disable Metrics/AbcSize
       linger_must_be_enabled!
 
@@ -90,7 +93,7 @@ module Tomo::Plugin::Puma
     def wait_until
       timeout = settings[:puma_check_timeout].to_i
       start = Time.now.to_i
-      delay = 1
+      delay = self.class.polling_delay
 
       loop do
         sleep delay
@@ -99,7 +102,7 @@ module Tomo::Plugin::Puma
         elapsed = Time.now.to_i - start
         return false if elapsed >= timeout
 
-        delay = [delay + 1, timeout - elapsed].min
+        delay = [delay + self.class.polling_delay, timeout - elapsed].min
       end
     end
 

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

@@ -10,6 +10,10 @@ module Tomo::Plugin::Rails
       remote.rails("console", settings[:run_args], attach: true)
     end
 
+    def query
+      remote.rails("query", settings[:run_args], attach: true)
+    end
+
     def db_console
       remote.rails("dbconsole", "--include-password", settings[:run_args], attach: true)
     end

data/lib/tomo/runtime/execution_plan.rb

@@ -26,7 +26,7 @@ module Tomo
 
         case applicable_hosts.length
         when 1 then applicable_hosts.first.to_s
-        when 2 then applicable_hosts.map(&:to_s).join(" and ")
+        when 2 then applicable_hosts.join(" and ")
         else
           "#{applicable_hosts.first} and #{applicable_hosts.length - 1} other hosts"
         end

data/lib/tomo/runtime/settings_interpolation.rb

@@ -23,11 +23,22 @@ module Tomo
 
       def fetch(name, stack=[])
         raise_circular_dependency_error(name, stack) if stack.include?(name)
+
+        stack += [name]
         value = settings.fetch(name)
-        return value unless value.is_a?(String)
 
+        if value.is_a?(String)
+          interpolate_string(value, stack)
+        elsif value.is_a?(Hash)
+          value.transform_values { |v| v.is_a?(String) ? interpolate_string(v, stack) : v }
+        else
+          value
+        end
+      end
+
+      def interpolate_string(value, stack)
         value.gsub(/%{(\w+)}/) do
-          fetch(Regexp.last_match[1].to_sym, stack + [name])
+          fetch(Regexp.last_match[1].to_sym, stack)
         end
       end
 

data/lib/tomo/task_api.rb

@@ -18,6 +18,10 @@ module Tomo
       Tomo.dry_run?
     end
 
+    def quiet?
+      Tomo.quiet?
+    end
+
     def logger
       Tomo.logger
     end

data/lib/tomo/testing/cli_tester.rb

@@ -37,6 +37,7 @@ module Tomo
       ensure
         Tomo.debug = false
         Tomo.dry_run = false
+        Tomo.quiet = false
         Tomo::CLI.show_backtrace = false
         Tomo::CLI::Completions.instance_variable_set(:@active, false)
       end

data/lib/tomo/testing/systemctl.rb

@@ -120,7 +120,7 @@ class Unit
   end
 end
 
-class Service < Unit
+class Service < Unit # rubocop:disable Style/OneClassPerFile
   def is_active # rubocop:disable Naming/PredicatePrefix
     exit(false) unless started?
     puts "active"
@@ -176,8 +176,8 @@ class Service < Unit
   end
 
   def with_detached_io
-    null_in = File.open(File::NULL, "r")
-    null_out = File.open(File::NULL, "w")
+    null_in = File.open(File::NULL, "r") # rubocop:disable Style/FileOpen
+    null_out = File.open(File::NULL, "w") # rubocop:disable Style/FileOpen
     $stdin.reopen(null_in)
     $stderr.reopen(null_out)
     $stdout.reopen(null_out)

data/lib/tomo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tomo
-  VERSION = "1.21.2"
+  VERSION = "1.22.1"
 end

data/lib/tomo.rb

@@ -27,7 +27,7 @@ module Tomo
 
   class << self
     attr_accessor :logger
-    attr_writer :debug, :dry_run
+    attr_writer :debug, :dry_run, :quiet
 
     def debug?
       !!@debug
@@ -37,6 +37,10 @@ module Tomo
       !!@dry_run
     end
 
+    def quiet?
+      !!@quiet
+    end
+
     def bundled?
       !!(defined?(Bundler) && ENV["BUNDLE_GEMFILE"])
     end
@@ -44,5 +48,6 @@ module Tomo
 
   self.debug = false
   self.dry_run = false
+  self.quiet = false
   self.logger = Logger.new
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.21.2
+  version: 1.22.1
 platform: ruby
 authors:
 - Matt Brictson
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.17
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨
 test_files: []