tomo 1.22.0 → 1.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37bdfaccc033913ce90f1f6efe579494272950799a735339e5f1ef17c4d10ce1
-  data.tar.gz: e88924edaee4847ca1656dfe0381c275ef04d9d0f8ecd09499a5b98e0c71c211
+  metadata.gz: a2e5e093589de77525a3e23c89ade9506ab805e6714185f223b517c855e9833f
+  data.tar.gz: '0162796e298153c9d102c49806f9e14e13a7a0b163b520ce7044c4ce2eaa3942'
 SHA512:
-  metadata.gz: 3ef5995f18228bb9c1631d89f88bbd63258f193c51a3ce40d506b5d56e4d9b4f2c5d030eef211db57ca81d57d4350f360e94ffb8979e00105c42ad8a644cfa7f
-  data.tar.gz: '08eac8929502a70fdb7c4696b875a3ab58cd25783990bb5d2bcff124aff251b59330394063a8c0277dc28b937e1a270f96107e6169efd5824609b9af7a798f21'
+  metadata.gz: de7fcac2ea42c90e56a7517527a55c451c78fe7b681f833c2e42ea25a9002b64c439efbaf97d202931ea63aba73a4db4a18746e51f077b2add9fdfafbe406679
+  data.tar.gz: a8e0fa50d90ab152f06ffcac8e56a30411e643c7a6f871a07967e4fe0e395312648bb4aa97885f9f53136e677a89aa5e4aeec59d4c98f6b4255f2d355ec7531b

data/lib/tomo/cli/deploy_options.rb

@@ -43,6 +43,7 @@ module Tomo
       end
 
       def prompt_for_environment(*, options)
+        options[:environment] ||= load_configuration(options).default_environment_name
         return unless options[:environment].nil?
 
         envs = environment_names(*, options)

data/lib/tomo/cli/project_options.rb

@@ -13,7 +13,7 @@ module Tomo
 
       def configure_runtime(options, strict: true)
         config = load_configuration(options)
-        env = options[:environment]
+        env = options[:environment] || config.default_environment_name
         env = config.environments.keys.first if env.nil? && !strict
         config = config.for_environment(env)
         config.settings.merge!(settings_from_env)

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

@@ -20,8 +20,8 @@ module Tomo
           self
         end
 
-        def environment(name, &)
-          environment = @config.environments[name.to_s] ||= Environment.new
+        def environment(name, default: false, &)
+          environment = @config.environments[name.to_s] ||= Environment.new(default:)
           EnvironmentBlock.new(environment).instance_eval(&)
           self
         end

data/lib/tomo/configuration/environment.rb

@@ -5,10 +5,15 @@ module Tomo
     class Environment
       attr_accessor :hosts, :settings
 
-      def initialize
+      def initialize(default: false)
+        @default = default
         @hosts = []
         @settings = {}
       end
+
+      def default?
+        !!@default
+      end
     end
   end
 end

data/lib/tomo/configuration/unknown_environment_error.rb

@@ -3,7 +3,7 @@
 module Tomo
   class Configuration
     class UnknownEnvironmentError < Tomo::Error
-      attr_accessor :name, :known_environments
+      attr_accessor :name, :known_environments, :default_environment
 
       def to_console
         known_environments.empty? ? no_envs : wrong_envs
@@ -27,7 +27,9 @@ module Tomo
         if suggestions.any?
           error + suggestions.to_console
         else
-          envs = known_environments.map { |env| blue("  #{env}") }
+          envs = known_environments.map do |env|
+            [blue("  #{env}"), env == default_environment ? gray(" (default)") : nil].compact.join
+          end
           error + <<~ENVS
 
             The following environments are available:

data/lib/tomo/configuration.rb

@@ -38,6 +38,11 @@ module Tomo
       @task_filter = RoleBasedTaskFilter.new
     end
 
+    def default_environment_name
+      default_env = environments.one? ? environments.first : environments.find { |_, env| env.default? }
+      default_env&.first
+    end
+
     def for_environment(environment)
       validate_environment!(environment)
 
@@ -109,12 +114,14 @@ module Tomo
       settings.merge(environments[environ].settings)
     end
 
-    def raise_no_environment_specified
-      UnspecifiedEnvironmentError.raise_with(environments: environments.keys)
-    end
+    def raise_no_environment_specified = UnspecifiedEnvironmentError.raise_with(environments: environments.keys)
 
     def raise_unknown_environment(environ)
-      UnknownEnvironmentError.raise_with(name: environ, known_environments: environments.keys)
+      UnknownEnvironmentError.raise_with(
+        name: environ,
+        default_environment: default_environment_name,
+        known_environments: environments.keys
+      )
     end
   end
 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/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/rbenv/tasks.rb

@@ -37,11 +37,21 @@ module Tomo::Plugin::Rbenv
 
       unless ruby_installed?(ruby_version)
         logger.info("Installing ruby #{ruby_version} -- this may take several minutes")
-        remote.run "CFLAGS=-O3 rbenv install #{ruby_version.shellescape} --verbose"
+        using_tmpdir do
+          remote.run "CFLAGS=-O3 rbenv install #{ruby_version.shellescape} --verbose"
+        end
       end
       remote.run "rbenv global #{ruby_version.shellescape}"
     end
 
+    def using_tmpdir(&)
+      tmpdir = paths.rbenv_tmpdir
+      return yield if tmpdir.nil?
+
+      remote.mkdir_p(tmpdir)
+      remote.env(TMPDIR: tmpdir, &)
+    end
+
     def ruby_installed?(version)
       versions = remote.capture("rbenv versions", raise_on_error: false)
       if versions.match?(/^\*?\s*#{Regexp.quote(version)}\s/)

data/lib/tomo/plugin/rbenv.rb

@@ -7,7 +7,8 @@ module Tomo::Plugin
     extend Tomo::PluginDSL
 
     defaults bashrc_path: ".bashrc",
-             rbenv_ruby_version: nil
+             rbenv_ruby_version: nil,
+             rbenv_tmpdir_path: nil
 
     tasks Tomo::Plugin::Rbenv::Tasks
   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/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.22.0"
+  VERSION = "1.23.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.23.0
 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.6
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨
 test_files: []