tomo 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6202b071b5584a5fc5b2db693130e5160585b784822b2b220ff3685c4272f53c
-  data.tar.gz: 6c35312e003c7c00153a7ddf8d5c2761f19b9c16aa72d8f74b271f25b5f1d69c
+  metadata.gz: c340ddcd3ab2385834e3611bd577a7858cbd3f61136c19d8797d552eb15f6a4b
+  data.tar.gz: ab367d0bb86bd69f92255a4550f839f0bba0efbee83d67b9fd18e7117ca83973
 SHA512:
-  metadata.gz: 3c1a3a5edc2e67bd5d1aa77231534ca36d379214a9d4fade127d81ae810cfd75137d600f8018c44d171c41a6d0d6abacbc2986cef629de661747fd2199997f4d
-  data.tar.gz: efd002dc923b18b4aa48f98d2fa79069c1713fbc604614a68f0fe1b9bc0477de591b83a280edfe1ea2c8fcf398408394a095bd56d8fab27f58ddba7c5748d2d9
+  metadata.gz: 7659312aa674e8c3bdb26c18fc9dbbf5369a0530873eb07db16584b68dd2dd995af71bb0fe742532a4b16310554d77ff9c3a4a2c986e254c408f22834c6a6eeb
+  data.tar.gz: a4052c634e67510b0467b10d4f053e7993d593eb8a449abb8e660fdb8a39b794c473726f05d221515d24ba76b1d7fdf9b8baeb99dde7d8a00c6cecd0fff85f29

data/README.md

@@ -1,8 +1,9 @@
 # Tomo
 
-[![Gem Version](https://badge.fury.io/rb/tomo.svg)](https://rubygems.org/gems/tomo)
-[![Build Status](https://mattbrictson.semaphoreci.com/badges/tomo/branches/main.svg?style=shields)](https://mattbrictson.semaphoreci.com/projects/tomo)
-[![Code Climate](https://codeclimate.com/github/mattbrictson/tomo/badges/gpa.svg)](https://codeclimate.com/github/mattbrictson/tomo)
+[![Gem Version](https://img.shields.io/gem/v/tomo)](https://rubygems.org/gems/tomo)
+[![Gem Downloads](https://img.shields.io/gem/dt/tomo)](https://www.ruby-toolbox.com/projects/tomo)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/mattbrictson/tomo/ci.yml)](https://github.com/mattbrictson/tomo/actions/workflows/ci.yml)
+[![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability/mattbrictson/tomo)](https://codeclimate.com/github/mattbrictson/tomo)
 
 Tomo is a friendly command-line tool for deploying Rails apps.
 

data/lib/tomo/cli/completions.rb

@@ -45,7 +45,7 @@ module Tomo
 
         # Don't complete the =value part of long switch unless the user has
         # already typed at least up to the = sign.
-        return true if cand.match?(/\A--.*=/) && !word.match?(/\A--.*=/)
+        true if cand.match?(/\A--.*=/) && !word.match?(/\A--.*=/)
       end
 
       # bash tokenizes the user's input prior to completion, and expects the

data/lib/tomo/cli/usage.rb

@@ -26,7 +26,7 @@ module Tomo
       attr_reader :banner_proc, :options
 
       def options_help
-        width = options.map(&:first).map(&:length).max
+        width = options.map { |opt| opt.first.length }.max
         options.each_with_object([]) do |(spec, desc), help|
           help << "#{Colors.yellow(spec.ljust(width))}    #{desc}"
         end.join("\n")

data/lib/tomo/commands/init.rb

@@ -30,11 +30,9 @@ module Tomo
 
         app = args.first || current_dir_name || "default"
         app = app.gsub(/([^\w-]|_)+/, "_").downcase
-        FileUtils.mkdir_p(".tomo/plugins")
-
-        # TODO: use a template for this file
-        FileUtils.touch(".tomo/plugins/#{app}.rb")
 
+        FileUtils.mkdir_p(".tomo/plugins")
+        File.write(".tomo/plugins/#{app}.rb", plugin_rb_template)
         File.write(DEFAULT_CONFIG_PATH, config_rb_template(app))
 
         logger.info(green("✔ Created #{DEFAULT_CONFIG_PATH}"))
@@ -71,10 +69,22 @@ module Tomo
         nil
       end
 
-      def git_branch
+      def git_main_branch
         return unless File.file?(".git/config")
 
-        `git rev-parse --abbrev-ref HEAD`.chomp
+        # If "main" or "master" is in the list of branch names, use that
+        branch = (%w[main master] & `git branch`.scan(/^\W*(.+)$/).flatten).first
+
+        # If not, use the current branch
+        if branch.nil?
+          branch = if `git --version`[/\d+\.\d+/].to_f >= 2.22
+                     `git branch --show-current`.chomp
+                   else
+                     `git rev-parse --abbrev-ref HEAD`.chomp
+                   end
+        end
+
+        branch.empty? ? nil : branch
       rescue SystemCallError
         nil
       end
@@ -119,6 +129,12 @@ module Tomo
         template = File.read(path)
         ERB.new(template, trim_mode: "-").result(binding)
       end
+
+      def plugin_rb_template
+        path = File.expand_path("../templates/plugin.rb.erb", __dir__)
+        template = File.read(path)
+        ERB.new(template, trim_mode: "-").result(binding)
+      end
     end
   end
 end

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

@@ -5,6 +5,7 @@ module Tomo::Plugin::Bundler
     CONFIG_SETTINGS = %i[
       bundler_deployment
       bundler_gemfile
+      bundler_ignore_messages
       bundler_jobs
       bundler_path
       bundler_retry

data/lib/tomo/plugin/bundler.rb

@@ -8,13 +8,14 @@ module Tomo::Plugin
     tasks Tomo::Plugin::Bundler::Tasks
     helpers Tomo::Plugin::Bundler::Helpers
 
-    defaults bundler_config_path: ".bundle/config",
-             bundler_deployment:  true,
-             bundler_gemfile:     nil,
-             bundler_jobs:        nil,
-             bundler_path:        "%{shared_path}/bundle",
-             bundler_retry:       "3",
-             bundler_version:     nil,
-             bundler_without:     %w[development test]
+    defaults bundler_config_path:     ".bundle/config",
+             bundler_deployment:      true,
+             bundler_gemfile:         nil,
+             bundler_ignore_messages: true,
+             bundler_jobs:            nil,
+             bundler_path:            "%{shared_path}/bundle",
+             bundler_retry:           "3",
+             bundler_version:         nil,
+             bundler_without:         %w[development test]
   end
 end

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

@@ -81,7 +81,7 @@ module Tomo::Plugin::Puma
 
     def setup_directories
       files = [service.path, socket.path].compact
-      dirs = files.map(&:dirname).map(&:to_s)
+      dirs = files.map { |f| f.dirname.to_s }
       remote.mkdir_p dirs.uniq
     end
 

data/lib/tomo/runtime/concurrent_ruby_thread_pool.rb

@@ -17,10 +17,10 @@ module Tomo
         @promises = []
       end
 
-      def post(*args, &block)
+      def post(...)
         return if failure?
 
-        promises << future_on(executor, *args, &block)
+        promises << future_on(executor, ...)
           .on_rejection_using(executor) do |reason|
             self.failure = reason
           end

data/lib/tomo/runtime/explanation.rb

@@ -22,7 +22,7 @@ module Tomo
             indent = threads > 1 ? "  = " : ""
             if threads > 1 && step.applicable_tasks.length > 1
               desc << "#{indent}IN SEQUENCE:"
-              indent.sub!(/=/, "   ")
+              indent.sub!("=", "   ")
             end
             desc << step.explain.gsub(/^/, indent)
           end

data/lib/tomo/runtime/settings_interpolation.rb

@@ -39,7 +39,7 @@ module Tomo
       end
 
       def dump_settings(hash)
-        key_len = hash.keys.map(&:to_s).map(&:length).max
+        key_len = hash.keys.map { |k| k.to_s.length }.max
         dump = "Settings: {\n"
         hash.to_a.sort_by(&:first).each do |key, value|
           justified_key = "#{key}:".ljust(key_len + 1)

data/lib/tomo/shell_builder.rb

@@ -67,7 +67,7 @@ module Tomo
     def shell_join(*command)
       return command.first.to_s if command.length == 1
 
-      command.flatten.compact.map(&:to_s).map(&:shellescape).join(" ")
+      command.flatten.compact.map { |arg| arg.to_s.shellescape }.join(" ")
     end
 
     def cd_chdir

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

@@ -22,7 +22,7 @@ set nodenv_node_version: <%= node_version&.inspect || "nil # FIXME" %>
 <% end -%>
 set nodenv_install_yarn: <%= yarn_version ? "true" : "false" %>
 set git_url: <%= git_origin_url&.inspect || "nil # FIXME" %>
-set git_branch: <%= git_branch&.inspect || "nil # FIXME" %>
+set git_branch: <%= git_main_branch&.inspect || "nil # FIXME" %>
 set git_exclusions: %w[
   .tomo/
   spec/

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

@@ -0,0 +1 @@
+# https://tomo-deploy.com/tutorials/writing-custom-tasks/

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "1.17.0".freeze
+  VERSION = "1.18.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-13 00:00:00.000000000 Z
+date: 2023-08-15 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
@@ -145,6 +145,7 @@ files:
 - lib/tomo/task_api.rb
 - lib/tomo/task_library.rb
 - lib/tomo/templates/config.rb.erb
+- lib/tomo/templates/plugin.rb.erb
 - lib/tomo/testing.rb
 - lib/tomo/testing/Dockerfile
 - lib/tomo/testing/cli_extensions.rb
@@ -189,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨