tomo 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f17c4f644a912a79bac63de1bf2bd3d27d87e3bbe58ffdb63e1ee1ffaea160c
-  data.tar.gz: cc22d62f9bd02f647197a7d691c005a5ddf095141f40c12a8af3ea211fd41c04
+  metadata.gz: 92b79ae23f462d987b150fe0537a743f087e150b6947780baa77ea4046e7d9b9
+  data.tar.gz: 77f301ef039cc4b8e8ed65f4009f0f1e0f3b0edaba7420f7b9994797b78bd53f
 SHA512:
-  metadata.gz: 52e06ed4c55e3d1630108802847c04235b1d48ee26225c1e78207931311333c00003c50e5a204aeb2a6752f9013bd3e2610436f2cc65222ea46bdb08513fbeea
-  data.tar.gz: f898fbf717712c309d5c30431fe6a30c71263c1139a4426ad573e8354506cc69dbfba3b443ff100dd1ce35b67c7c837b17d468698ba12a25762e6455cba07859
+  metadata.gz: 312cc7f96ebe0fa19c369fe1bb3ad3c8ea654abfbc8f6d35ec8253f03f8694f4300d6b113d9c17a20ab0473d649b1c0404611f746ffbf563a0c15b8eb35b29e4
+  data.tar.gz: 737e7aa7cbffe6a048164a6798fc63847ec32478ea81fe63b78fe62b95970f602c6c888b5087a7c03ffe281807182284e1d46ce8e25eff189bc48591a7c598b4

data/README.md

@@ -199,6 +199,20 @@ By default, tomo uses the ["accept-new"](https://www.openssh.com/txt/release-7.6
 set ssh_strict_host_key_checking: true # or false
 ```
 
+#### Why does my deploy hang after starting puma?
+
+Puma 4.1.0 [has a bug](https://github.com/puma/puma/issues/1906) where its output isn't properly detached prior to daemonzing. This causes tomo to hang waiting for output. You may see something like this prior to the deploy freezing:
+
+```
+Puma starting in single mode...
+* Version 4.1.0 (ruby 2.6.4-p104), codename: Fourth and One
+* Min threads: 5, max threads: 5
+* Environment: production
+* Daemonizing...
+```
+
+To fix, upgrade to puma 4.1.1 or newer.
+
 ## Support
 
 This project is a labor of love and I can only spend a few hours a week maintaining it, at most. If you'd like to help by submitting a pull request, or if you've discovered a bug that needs my attention, please let me know. Check out [CONTRIBUTING.md](https://github.com/mattbrictson/tomo/blob/master/CONTRIBUTING.md) to get started. Happy hacking! —Matt

data/lib/tomo/cli.rb

@@ -42,7 +42,7 @@ module Tomo
       command.parse(argv)
     rescue Interrupt
       handle_error(InterruptedError.new, command_name)
-    rescue StandardError => e
+    rescue StandardError, SyntaxError => e
       handle_error(e, command_name)
     end
 

data/lib/tomo/configuration/dsl/error_formatter.rb

@@ -2,20 +2,31 @@ module Tomo
   class Configuration
     module DSL
       module ErrorFormatter
-        def self.decorate(error, path, lines)
-          if error.backtrace[0..1].grep(/^#{Regexp.quote(path)}:/).empty?
-            return error
+        class << self
+          def decorate(error, path, lines)
+            line_no = find_line_no(path, error.message, *error.backtrace[0..1])
+            return error if line_no.nil?
+
+            error.extend(self)
+            error.dsl_lines = lines || []
+            error.dsl_path = path
+            error.error_line_no = line_no
+            error
           end
 
-          error.extend(self)
-          error.dsl_lines = lines || []
-          error.dsl_path = path
-          error
+          private
+
+          def find_line_no(path, *lines)
+            lines.find do |line|
+              line_no = line[/^#{Regexp.quote(path)}:(\d+):/, 1]
+              break line_no.to_i if line_no
+            end
+          end
         end
 
         include Colors
 
-        attr_accessor :dsl_lines, :dsl_path
+        attr_accessor :dsl_lines, :dsl_path, :error_line_no
 
         def to_console
           <<~ERROR
@@ -39,16 +50,6 @@ module Tomo
           HINT
         end
 
-        def error_line_no
-          @_error_line_no ||= begin
-            pattern = /^#{Regexp.quote(dsl_path)}:(\d+):/
-            backtrace.each do |entry|
-              match = pattern.match(entry)
-              break match[1].to_i if match
-            end
-          end
-        end
-
         # rubocop:disable Metrics/AbcSize
         # rubocop:disable Metrics/MethodLength
         def highlighted_lines

data/lib/tomo/configuration.rb

@@ -23,7 +23,7 @@ module Tomo
         config.working_dir = File.dirname(path)
         DSL::ConfigFile.new(config).instance_eval(config_rb, path.to_s, 1)
       end
-    rescue StandardError => e
+    rescue StandardError, SyntaxError => e
       raise DSL::ErrorFormatter.decorate(e, path, config_rb&.lines)
     end
 

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

@@ -31,9 +31,7 @@ module Tomo::Plugin::Puma
 
       remote.chdir(paths.current) do
         remote.bundle(
-          "exec", "puma", "--daemon", *control_options,
-          raw(">"), paths.puma_stdout,
-          raw("2>"), paths.puma_stderr
+          "exec", "puma", "--daemon", *control_options, *output_options
         )
       end
     end
@@ -51,5 +49,12 @@ module Tomo::Plugin::Puma
         "--control-token", settings[:puma_control_token]
       ]
     end
+
+    def output_options
+      options = []
+      options << ["--redirect-stdout", paths.puma_stdout] if paths.puma_stdout
+      options << ["--redirect-stderr", paths.puma_stderr] if paths.puma_stderr
+      options.flatten
+    end
   end
 end

data/lib/tomo/testing/cli_tester.rb

@@ -10,8 +10,12 @@ module Tomo
         @token = SecureRandom.hex(8)
       end
 
+      def in_temp_dir(&block)
+        super(token, &block)
+      end
+
       def run(*args, raise_on_error: true)
-        in_temp_dir(token) do
+        in_temp_dir do
           restoring_defaults do
             capturing_logger_output do
               handling_exit(raise_on_error) do

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "0.6.0".freeze
+  VERSION = "0.7.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-02 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler