tomo 1.13.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40ab6286952126707fe78f7d1168a02d2cc07593efdb9a62fb52dbd39ea7e816
-  data.tar.gz: 6cd99a5981d14a4a1ea0e520533f87ff7e941293bb9f5a63fbe9f9718afe13db
+  metadata.gz: f16c0351ed9e2f276d92b392f009490cf225c94adf318836a6556b6e92ff913b
+  data.tar.gz: b10e3f521efba3854ce8985680023d1e0fd79fb6e6be3acfe46e6a37a45cbd45
 SHA512:
-  metadata.gz: d23f6506248bbb3fb112ccd2a8225d670adee6ddeca7ef2906d15c16e367da065612d8f0a2087090eb96db9cafd79a5ced35bf0a9cfa137dceb020da09422180
-  data.tar.gz: 02be70059d804b3184fbb4898f0bc50c74c4a216034271a888a4bf68fc81dbedb5c42617226c0ed9cd99e3bf7de285e9830712cbf989fcb5b4146473a0f6a54d
+  metadata.gz: 880d8a3505f6f5435b2e2af09d967b5121b906f001caf71bb5cf10f43f13f0dc6802b6fb1f4a0335f3ca06ab855b8bf4995f7105b52ea6bf0a277f7f79ffef1c
+  data.tar.gz: 17fdc0e24d0b08f638bbeeddee49221d77dbd8c7767f3c0a79ce9378bc8c20ac86c997e52ce98267463e015a3559323ee0ff1551225772f53071623f99c29c26

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Matt Brictson
+Copyright (c) 2023 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/cli/rules.rb

@@ -12,9 +12,9 @@ module Tomo
       }.freeze
 
       OPTION_PATTERNS = {
-        /\A--\[no-\]([\-a-z]+)\z/               => :on_off_switch_rule,
-        /\A(-[a-z]), (--[\-a-z]+)\z/            => :basic_switch_rule,
-        /\A(-[a-z]), (--[\-a-z]+) [A-Z=_\-]+\z/ => :value_switch_rule
+        /\A--\[no-\]([-a-z]+)\z/              => :on_off_switch_rule,
+        /\A(-[a-z]), (--[-a-z]+)\z/           => :basic_switch_rule,
+        /\A(-[a-z]), (--[-a-z]+) [A-Z=_-]+\z/ => :value_switch_rule
       }.freeze
 
       private_constant :ARG_PATTERNS, :OPTION_PATTERNS

data/lib/tomo/cli.rb

@@ -36,6 +36,10 @@ module Tomo
       "completion-script" => Tomo::Commands::CompletionScript
     }.freeze
 
+    COMMAND_ALIASES = {
+      "-T" => Tomo::Commands::Tasks
+    }.freeze
+
     def call(argv)
       prepare_completions(argv)
       command, command_name = lookup_command(argv)
@@ -56,12 +60,14 @@ module Tomo
     end
 
     def lookup_command(argv)
+      commands = COMMANDS.merge(COMMAND_ALIASES)
+
       command_name = argv.first unless Completions.active? && argv.length == 1
-      command_name = Abbrev.abbrev(COMMANDS.keys)[command_name]
+      command_name = Abbrev.abbrev(commands.keys)[command_name]
       argv.shift if command_name
 
       command_name = "run" if command_name.nil? && task_format?(argv.first)
-      command = COMMANDS[command_name] || Tomo::Commands::Default
+      command = commands[command_name] || Tomo::Commands::Default
       [command, command_name]
     end
 

data/lib/tomo/colors.rb

@@ -23,7 +23,7 @@ module Tomo
       def determine_color_support
         if ENV["CLICOLOR_FORCE"] == "1"
           true
-        elsif ENV["TERM"] == "dumb"
+        elsif ENV["TERM"] == "dumb" || !ENV["NO_COLOR"].to_s.empty?
           false
         else
           tty?($stdout) && tty?($stderr)

data/lib/tomo/commands/init.rb

@@ -29,7 +29,7 @@ module Tomo
         assert_no_tomo_project!
 
         app = args.first || current_dir_name || "default"
-        app = app.gsub(/([^\w\-]|_)+/, "_").downcase
+        app = app.gsub(/([^\w-]|_)+/, "_").downcase
         FileUtils.mkdir_p(".tomo/plugins")
 
         # TODO: use a template for this file

data/lib/tomo/commands/tasks.rb

@@ -24,7 +24,7 @@ module Tomo
 
         groups = tasks.group_by { |task| task[/^([^:]+):/, 1].to_s }
         groups.keys.sort.each do |group|
-          puts groups[group].sort.join("\n")
+          logger.info(groups[group].sort.join("\n"))
         end
       end
     end

data/lib/tomo/console/menu.rb

@@ -86,7 +86,7 @@ module Tomo
       end
 
       def clear
-        height = 2 + visible_options.length
+        height = visible_options.length + 2
         esc_codes = Array.new(height) { "\e[2K\e[1G" }.join("\e[1A")
         print esc_codes
       end

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

@@ -16,5 +16,11 @@ module Tomo::Plugin::Rails
       result = rake(*args, **opts.merge(raise_on_error: false))
       result.success?
     end
+
+    def thor(*args, **opts)
+      prepend("exec", "thor") do
+        bundle(*args, **opts)
+      end
+    end
   end
 end

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

@@ -44,7 +44,7 @@ module Tomo::Plugin::Rbenv
 
     def ruby_installed?(version)
       versions = remote.capture("rbenv versions", raise_on_error: false)
-      if versions.include?(version)
+      if versions.match?(/^\*?\s*#{Regexp.quote(version)}\s/)
         logger.info("Ruby #{version} is already installed.")
         return true
       end

data/lib/tomo/runtime/execution_plan.rb

@@ -70,7 +70,7 @@ module Tomo
         thread_pool.run_to_completion
         yield(remotes)
       ensure
-        (remotes || {}).values.each(&:close)
+        (remotes || {}).each_value(&:close)
       end
 
       def build_plan(tasks, task_filter)

data/lib/tomo/testing/ubuntu_setup.sh

@@ -17,7 +17,8 @@ touch /var/lib/systemd/linger/deployer
 
 # Packages needed for ruby, etc.
 apt-get -y update
-apt-get -y install build-essential zlib1g-dev libssl-dev libreadline-dev git-core curl locales libsqlite3-dev
+apt-get -y install build-essential pkg-config git-core curl locales \
+                   libffi-dev libreadline-dev libsqlite3-dev libssl-dev libyaml-dev zlib1g-dev
 
 apt-get -y install tzdata \
         -o DPkg::options::="--force-confdef" \

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "1.13.0".freeze
+  VERSION = "1.14.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.1
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-28 00:00:00.000000000 Z
+date: 2023-01-01 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
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.21
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨