tomo 0.18.0 → 1.1.2

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

@@ -6,7 +6,6 @@ module Tomo::Plugin::Core
     RELEASE_REGEXP = /\d{14}/.freeze
     private_constant :RELEASE_REGEXP
 
-    # rubocop:disable Metrics/AbcSize
     def setup_directories
       dirs = [
         paths.deploy_to,
@@ -18,7 +17,6 @@ module Tomo::Plugin::Core
 
       remote.mkdir_p(*dirs)
     end
-    # rubocop:enable Metrics/AbcSize
 
     def symlink_shared
       return if linked_dirs.empty? && linked_files.empty?
@@ -36,8 +34,7 @@ module Tomo::Plugin::Core
       remote.run "mv", "-fT", tmp_link, paths.current
     end
 
-    # rubocop:disable Metrics/AbcSize
-    def clean_releases
+    def clean_releases # rubocop:disable Metrics/AbcSize
       desired_count = settings[:keep_releases].to_i
       return if desired_count < 1
 
@@ -51,15 +48,13 @@ module Tomo::Plugin::Core
         remote.rm_rf(*releases.take(releases.length - desired_count))
       end
     end
-    # rubocop:enable Metrics/AbcSize
 
     def write_release_json
       json = JSON.pretty_generate(remote.release)
       remote.write(text: "#{json}\n", to: paths.release_json)
     end
 
-    # rubocop:disable Metrics/AbcSize
-    def log_revision
+    def log_revision # rubocop:disable Metrics/AbcSize
       ref = remote.release[:ref]
       revision = remote.release[:revision]
 
@@ -71,7 +66,6 @@ module Tomo::Plugin::Core
 
       remote.write(text: message, to: paths.revision_log, append: true)
     end
-    # rubocop:enable Metrics/AbcSize
 
     private
 
@@ -83,7 +77,6 @@ module Tomo::Plugin::Core
       settings[:linked_files] || []
     end
 
-    # rubocop:disable Metrics/AbcSize
     def shared_directories
       result = linked_dirs.map { |name| paths.shared.join(name) }
       linked_files.each do |name|
@@ -91,7 +84,6 @@ module Tomo::Plugin::Core
       end
       result.map(&:to_s).uniq - [paths.shared.to_s]
     end
-    # rubocop:enable Metrics/AbcSize
 
     def symlink_shared_files
       return if linked_files.empty?
@@ -127,12 +119,7 @@ module Tomo::Plugin::Core
     end
 
     def read_current_release
-      result = remote.run(
-        "readlink",
-        paths.current,
-        raise_on_error: false,
-        silent: true
-      )
+      result = remote.run("readlink", paths.current, raise_on_error: false, silent: true)
       return nil if result.failure?
 
       result.stdout.strip[%r{/(#{RELEASE_REGEXP})$}, 1]

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

@@ -14,7 +14,6 @@ module Tomo::Plugin::Env
       modify_bashrc
     end
 
-    # rubocop:disable Metrics/MethodLength
     def update
       return if settings[:env_vars].empty?
 
@@ -30,7 +29,6 @@ module Tomo::Plugin::Env
         end
       end
     end
-    # rubocop:enable Metrics/MethodLength
 
     def set
       return if settings[:run_args].empty?
@@ -67,10 +65,7 @@ module Tomo::Plugin::Env
     end
 
     def read_existing
-      remote.capture(
-        "cat", paths.env,
-        raise_on_error: false, echo: false, silent: true
-      )
+      remote.capture("cat", paths.env, raise_on_error: false, echo: false, silent: true)
     end
 
     def replace_entry(text, name, value)
@@ -84,7 +79,7 @@ module Tomo::Plugin::Env
 
     def prepend_entry(text, name, value)
       text.prepend("\n") unless text.start_with?("\n")
-      text.prepend("export #{name.to_s.shellescape}=#{value.shellescape}")
+      text.prepend("export #{name.to_s.shellescape}=#{value.to_s.shellescape}")
     end
 
     def contains_entry?(text, name)

data/lib/tomo/plugin/git.rb

@@ -7,14 +7,11 @@ module Tomo::Plugin
 
     helpers Tomo::Plugin::Git::Helpers
     tasks Tomo::Plugin::Git::Tasks
-
-    # rubocop:disable Layout/LineLength
     defaults git_branch:     "master",
              git_repo_path:  "%{deploy_to}/git_repo",
              git_exclusions: [],
              git_env:        { GIT_SSH_COMMAND: "ssh -o PasswordAuthentication=no -o StrictHostKeyChecking=no" },
              git_ref:        nil,
              git_url:        nil
-    # rubocop:enable Layout/LineLength
   end
 end

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

@@ -3,7 +3,6 @@ require "time"
 
 module Tomo::Plugin::Git
   class Tasks < Tomo::TaskLibrary
-    # rubocop:disable Metrics/AbcSize
     def clone
       require_setting :git_url
 
@@ -15,8 +14,7 @@ module Tomo::Plugin::Git
       end
     end
 
-    # rubocop:disable Metrics/MethodLength
-    def create_release
+    def create_release # rubocop:disable Metrics/AbcSize
       remote.chdir(paths.git_repo) do
         remote.git("remote update --prune")
       end
@@ -32,8 +30,6 @@ module Tomo::Plugin::Git
         )
       end
     end
-    # rubocop:enable Metrics/MethodLength
-    # rubocop:enable Metrics/AbcSize
 
     private
 
@@ -66,19 +62,13 @@ module Tomo::Plugin::Git
       exclusions = settings[:git_exclusions] || []
       attributes = exclusions.map { |excl| "#{excl} export-ignore" }.join("\n")
 
-      remote.write(
-        text: attributes,
-        to: paths.git_repo.join("info/attributes")
-      )
+      remote.write(text: attributes, to: paths.git_repo.join("info/attributes"))
     end
 
-    # rubocop:disable Metrics/AbcSize
-    # rubocop:disable Metrics/MethodLength
-    def store_release_info
+    def store_release_info # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       log = remote.chdir(paths.git_repo) do
         remote.git(
-          'log -n1 --date=iso --pretty=format:"%H/%cd/%ae" '\
-          "#{ref.shellescape} --",
+          %Q(log -n1 --date=iso --pretty=format:"%H/%cd/%ae" #{ref.shellescape} --),
           silent: true
         ).stdout.strip
       end
@@ -92,7 +82,5 @@ module Tomo::Plugin::Git
       remote.release[:deploy_date] = Time.now.to_s
       remote.release[:deploy_user] = settings.fetch(:local_user)
     end
-    # rubocop:enable Metrics/MethodLength
-    # rubocop:enable Metrics/AbcSize
   end
 end

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

@@ -34,9 +34,7 @@ module Tomo::Plugin::Nodenv
       require_setting :nodenv_node_version
       node_version = settings[:nodenv_node_version]
 
-      unless node_installed?(node_version)
-        remote.run "nodenv install #{node_version.shellescape}"
-      end
+      remote.run "nodenv install #{node_version.shellescape}" unless node_installed?(node_version)
       remote.run "nodenv global #{node_version.shellescape}"
     end
 

data/lib/tomo/plugin/puma.rb

@@ -5,8 +5,6 @@ module Tomo::Plugin
     extend Tomo::PluginDSL
 
     tasks Tomo::Plugin::Puma::Tasks
-
-    # rubocop:disable Layout/LineLength
     defaults puma_check_timeout: 15,
              puma_host: "0.0.0.0",
              puma_port: "3000",
@@ -16,6 +14,5 @@ module Tomo::Plugin
              puma_systemd_socket_path: ".config/systemd/user/%{puma_systemd_socket}",
              puma_systemd_service_template_path: File.expand_path("puma/systemd/service.erb", __dir__),
              puma_systemd_socket_template_path: File.expand_path("puma/systemd/socket.erb", __dir__)
-    # rubocop:enable Layout/LineLength
   end
 end

data/lib/tomo/plugin/puma/systemd/service.erb

@@ -19,4 +19,4 @@ WorkingDirectory=<%= paths.current %>
 # Environment=PUMA_DEBUG=1
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target

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

@@ -2,8 +2,7 @@ module Tomo::Plugin::Puma
   class Tasks < Tomo::TaskLibrary
     SystemdUnit = Struct.new(:name, :template, :path)
 
-    # rubocop:disable Metrics/AbcSize
-    def setup_systemd
+    def setup_systemd # rubocop:disable Metrics/AbcSize
       linger_must_be_enabled!
 
       setup_directories
@@ -13,7 +12,6 @@ module Tomo::Plugin::Puma
       remote.run "systemctl --user daemon-reload"
       remote.run "systemctl", "--user", "enable", service.name, socket.name
     end
-    # rubocop:enable Metrics/AbcSize
 
     %i[start stop status].each do |action|
       define_method(action) do
@@ -37,9 +35,7 @@ module Tomo::Plugin::Puma
     end
 
     def log
-      remote.attach "journalctl", "-q",
-                    raw("--user-unit=#{service.name.shellescape}"),
-                    *settings[:run_args]
+      remote.attach "journalctl", "-q", raw("--user-unit=#{service.name.shellescape}"), *settings[:run_args]
     end
 
     private
@@ -102,22 +98,17 @@ module Tomo::Plugin::Puma
     end
 
     def assert_active!
-      return true if remote.run? "systemctl", "--user", "is-active",
-                                 service.name,
-                                 silent: true, raise_on_error: false
+      return true if remote.run? "systemctl", "--user", "is-active", service.name, silent: true, raise_on_error: false
 
-      remote.run "systemctl", "--user", "status", service.name,
-                 raise_on_error: false
-      remote.run "journalctl -q -n 50 --user-unit=#{service.name.shellescape}",
-                 raise_on_error: false
+      remote.run "systemctl", "--user", "status", service.name, raise_on_error: false
+      remote.run "journalctl -q -n 50 --user-unit=#{service.name.shellescape}", raise_on_error: false
 
       die "puma failed to start (see previous systemctl and journalctl output)"
     end
 
     def listening?
       test_url = "http://localhost:#{port}"
-      remote.run? "curl -sS --connect-timeout 1 --max-time 10 #{test_url}"\
-                  " > /dev/null"
+      remote.run? "curl -sS --connect-timeout 1 --max-time 10 #{test_url} > /dev/null"
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Tomo::Plugin::Rails
     end
 
     def rake(*args, **opts)
-      prepend("exec", "rails") do
+      prepend("exec", "rake") do
         bundle(*args, **opts)
       end
     end

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

@@ -40,11 +40,9 @@ module Tomo::Plugin::Rails
 
     def db_structure_load
       if !structure_sql_present?
-        logger.warn "db/structure.sql is not present; "\
-                    "skipping db:structure:load."
+        logger.warn "db/structure.sql is not present; skipping db:structure:load."
       elsif database_schema_loaded?
-        logger.info "Database structure already loaded; "\
-                    "skipping db:structure:load."
+        logger.info "Database structure already loaded; skipping db:structure:load."
       else
         remote.rake("db:structure:load")
       end

data/lib/tomo/plugin/testing.rb

@@ -1,6 +1,4 @@
-unless defined?(Tomo::Testing)
-  raise "The testing plugin cannot be used outside of unit tests"
-end
+raise "The testing plugin cannot be used outside of unit tests" unless defined?(Tomo::Testing)
 
 module Tomo::Plugin
   class Testing < Tomo::TaskLibrary

data/lib/tomo/remote.rb

@@ -21,9 +21,7 @@ module Tomo
 
     def attach(*command, default_chdir: nil, **command_opts)
       full_command = shell_builder.build(*command, default_chdir: default_chdir)
-      ssh.ssh_exec(
-        Script.new(full_command, **{ pty: true }.merge(command_opts))
-      )
+      ssh.ssh_exec(Script.new(full_command, **{ pty: true }.merge(command_opts)))
     end
 
     def run(*command, attach: false, default_chdir: nil, **command_opts)

data/lib/tomo/runtime.rb

@@ -3,8 +3,7 @@ require "time"
 module Tomo
   class Runtime
     autoload :ConcurrentRubyLoadError, "tomo/runtime/concurrent_ruby_load_error"
-    autoload :ConcurrentRubyThreadPool,
-             "tomo/runtime/concurrent_ruby_thread_pool"
+    autoload :ConcurrentRubyThreadPool, "tomo/runtime/concurrent_ruby_thread_pool"
     autoload :Context, "tomo/runtime/context"
     autoload :Current, "tomo/runtime/current"
     autoload :ExecutionPlan, "tomo/runtime/execution_plan"
@@ -28,8 +27,7 @@ module Tomo
 
     attr_reader :tasks
 
-    def initialize(deploy_tasks:, setup_tasks:, hosts:, task_filter:,
-                   settings:, plugins_registry:)
+    def initialize(deploy_tasks:, setup_tasks:, hosts:, task_filter:, settings:, plugins_registry:)
       @deploy_tasks = deploy_tasks.freeze
       @setup_tasks = setup_tasks.freeze
       @hosts = hosts.freeze
@@ -68,8 +66,7 @@ module Tomo
 
     private
 
-    attr_reader :deploy_tasks, :setup_tasks, :hosts, :task_filter, :settings,
-                :plugins_registry
+    attr_reader :deploy_tasks, :setup_tasks, :hosts, :task_filter, :settings, :plugins_registry
 
     def new_task_runner(release_type, args)
       run_settings = { release_path: release_path_for(release_type) }

data/lib/tomo/runtime/concurrent_ruby_thread_pool.rb

@@ -4,10 +4,7 @@ begin
   gem "concurrent-ruby", concurrent_ver
   require "concurrent"
 rescue LoadError => e
-  Tomo::Runtime::ConcurrentRubyLoadError.raise_with(
-    e.message,
-    version: concurrent_ver
-  )
+  Tomo::Runtime::ConcurrentRubyLoadError.raise_with(e.message, version: concurrent_ver)
 end
 
 module Tomo

data/lib/tomo/runtime/execution_plan.rb

@@ -77,10 +77,7 @@ module Tomo
       def build_plan(tasks, task_filter)
         tasks.each_with_object([]) do |task, result|
           steps = hosts.map do |host|
-            HostExecutionStep.new(
-              tasks: task, host: host,
-              task_filter: task_filter, task_runner: task_runner
-            )
+            HostExecutionStep.new(tasks: task, host: host, task_filter: task_filter, task_runner: task_runner)
           end
           steps.reject!(&:empty?)
           result << steps unless steps.empty?

data/lib/tomo/runtime/explanation.rb

@@ -7,10 +7,7 @@ module Tomo
         @concurrency = concurrency
       end
 
-      # rubocop:disable Metrics/MethodLength
-      # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/CyclomaticComplexity
-      def to_s
+      def to_s # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
         desc = []
         threads = [applicable_hosts.length, concurrency].min
         desc << "CONCURRENTLY (#{threads} THREADS):" if threads > 1
@@ -32,9 +29,6 @@ module Tomo
         end
         desc.join("\n")
       end
-      # rubocop:enable Metrics/MethodLength
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/CyclomaticComplexity
 
       private
 

data/lib/tomo/runtime/settings_interpolation.rb

@@ -35,9 +35,7 @@ module Tomo
       end
 
       def symbolize(hash)
-        hash.each_with_object({}) do |(key, value), symbolized|
-          symbolized[key.to_sym] = value
-        end
+        hash.transform_keys(&:to_sym)
       end
 
       def dump_settings(hash)

data/lib/tomo/runtime/settings_required_error.rb

@@ -21,9 +21,7 @@ module Tomo
       private
 
       def settings_sentence
-        if settings.length == 1
-          return "a value for the #{yellow(settings.first.to_s)} setting."
-        end
+        return "a value for the #{yellow(settings.first.to_s)} setting." if settings.length == 1
 
         sentence = "values for these settings:\n\n  "
         sentence << settings.map { |s| yellow(s.to_s) }.join("\n  ")

data/lib/tomo/runtime/task_runner.rb

@@ -19,11 +19,7 @@ module Tomo
       def validate_task!(name)
         return if tasks_by_name.key?(name)
 
-        UnknownTaskError.raise_with(
-          name,
-          unknown_task: name,
-          known_tasks: tasks_by_name.keys
-        )
+        UnknownTaskError.raise_with(name, unknown_task: name, known_tasks: tasks_by_name.keys)
       end
 
       def run(task:, remote:)
@@ -53,8 +49,7 @@ module Tomo
       attr_reader :helper_modules, :tasks_by_name
 
       def ssh_options
-        # TODO: replace with Hash#slice after dropping Ruby 2.4 support
-        settings.select { |key| SSH::Options::DEFAULTS.key?(key) }
+        settings.slice(*SSH::Options::DEFAULTS.keys)
       end
     end
   end

data/lib/tomo/runtime/unknown_task_error.rb

@@ -17,10 +17,7 @@ module Tomo
       private
 
       def spelling_suggestion
-        sugg = Error::Suggestions.new(
-          dictionary: known_tasks,
-          word: unknown_task
-        )
+        sugg = Error::Suggestions.new(dictionary: known_tasks, word: unknown_task)
         sugg.to_console if sugg.any?
       end