tomo 0.19.0 → 1.2.0

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
 

data/lib/tomo/script.rb

@@ -2,11 +2,7 @@ module Tomo
   class Script
     attr_reader :script
 
-    def initialize(script,
-                   echo: true,
-                   pty: false,
-                   raise_on_error: true,
-                   silent: false)
+    def initialize(script, echo: true, pty: false, raise_on_error: true, silent: false)
       @script = script
       @echo = echo
       @pty = pty

data/lib/tomo/shell_builder.rb

@@ -3,8 +3,9 @@ require "shellwords"
 module Tomo
   class ShellBuilder
     def self.raw(string)
-      string.define_singleton_method(:shellescape) { string }
-      string
+      string.dup.tap do |raw_string|
+        raw_string.define_singleton_method(:shellescape) { string }
+      end
     end
 
     def initialize
@@ -45,9 +46,7 @@ module Tomo
     end
 
     def build(*command, default_chdir: nil)
-      if @chdir.empty? && default_chdir
-        return chdir(default_chdir) { build(*command) }
-      end
+      return chdir(default_chdir) { build(*command) } if @chdir.empty? && default_chdir
 
       command_string = command_to_string(*command)
       modifiers = [cd_chdir, unset_env, export_env, set_umask].compact.flatten
@@ -97,11 +96,7 @@ module Tomo
     def set_umask
       return if @umask.nil?
 
-      umask_value = if @umask.is_a?(Integer)
-                      @umask.to_s(8).rjust(4, "0")
-                    else
-                      @umask
-                    end
+      umask_value = @umask.is_a?(Integer) ? @umask.to_s(8).rjust(4, "0") : @umask
       "umask #{umask_value.to_s.shellescape}"
     end
   end

data/lib/tomo/ssh/child_process.rb

@@ -30,27 +30,20 @@ module Tomo
       end
 
       def result
-        Result.new(
-          exit_status: exit_status,
-          stdout: stdout_buffer.string,
-          stderr: stderr_buffer.string
-        )
+        Result.new(exit_status: exit_status, stdout: stdout_buffer.string, stderr: stderr_buffer.string)
       end
 
       private
 
-      attr_reader :command, :exit_status, :on_data,
-                  :stdout_buffer, :stderr_buffer
+      attr_reader :command, :exit_status, :on_data, :stdout_buffer, :stderr_buffer
 
       def start_io_thread(source, buffer)
         new_thread_inheriting_current_vars do
-          begin
-            while (line = source.gets)
-              on_data&.call(line)
-              buffer << line
-            end
-          rescue IOError # rubocop:disable Lint/SuppressedException
+          while (line = source.gets)
+            on_data&.call(line)
+            buffer << line
           end
+        rescue IOError # rubocop:disable Lint/SuppressedException
         end
       end
 

data/lib/tomo/ssh/connection.rb

@@ -6,12 +6,7 @@ module Tomo
   module SSH
     class Connection
       def self.dry_run(host, options)
-        new(
-          host,
-          options,
-          exec_proc: proc { CLI.exit },
-          child_proc: proc { Result.empty_success }
-        )
+        new(host, options, exec_proc: proc { CLI.exit }, child_proc: proc { Result.empty_success })
       end
 
       attr_reader :host
@@ -38,9 +33,7 @@ module Tomo
         result = child_proc.call(*ssh_args, on_data: handle_data)
         logger.script_end(script, result)
 
-        if result.failure? && script.raise_on_error?
-          raise_run_error(script, ssh_args, result)
-        end
+        raise_run_error(script, ssh_args, result) if result.failure? && script.raise_on_error?
 
         result
       end
@@ -69,13 +62,7 @@ module Tomo
       end
 
       def raise_run_error(script, ssh_args, result)
-        ScriptError.raise_with(
-          result.output,
-          host: host,
-          result: result,
-          script: script,
-          ssh_args: ssh_args
-        )
+        ScriptError.raise_with(result.output, host: host, result: result, script: script, ssh_args: ssh_args)
       end
     end
   end

data/lib/tomo/ssh/connection_validator.rb

@@ -27,10 +27,7 @@ module Tomo
       end
 
       def assert_valid_connection!
-        script = Script.new(
-          "echo hi",
-          silent: !Tomo.debug?, echo: false, raise_on_error: false
-        )
+        script = Script.new("echo hi", silent: !Tomo.debug?, echo: false, raise_on_error: false)
         res = connection.ssh_subprocess(script, verbose: Tomo.debug?)
         raise_connection_failure(res) if res.exit_status == 255
         raise_unknown_error(res) if res.failure? || res.stdout.chomp != "hi"

data/lib/tomo/ssh/executable_error.rb

@@ -7,8 +7,7 @@ module Tomo
         hint = if executable.to_s.include?("/")
                  "Is the ssh binary properly installed in this location?"
                else
-                 "Is #{yellow(executable)} installed and in your "\
-                 "#{blue('$PATH')}?"
+                 "Is #{yellow(executable)} installed and in your #{blue('$PATH')}?"
                end
 
         <<~ERROR

data/lib/tomo/ssh/options.rb

@@ -20,8 +20,7 @@ module Tomo
         freeze
       end
 
-      # rubocop:disable Metrics/AbcSize
-      def build_args(host, script, control_path, verbose)
+      def build_args(host, script, control_path, verbose) # rubocop:disable Metrics/AbcSize
         args = [verbose ? "-v" : ["-o", "LogLevel=ERROR"]]
         args << "-A" if forward_agent
         args << connect_timeout_option
@@ -34,13 +33,11 @@ module Tomo
 
         [executable, args, script.to_s].flatten
       end
-      # rubocop:enable Metrics/AbcSize
 
       private
 
       attr_writer :executable
-      attr_accessor :connect_timeout, :extra_opts, :forward_agent,
-                    :reuse_connections, :strict_host_key_checking
+      attr_accessor :connect_timeout, :extra_opts, :forward_agent, :reuse_connections, :strict_host_key_checking
 
       def control_opts(path, verbose)
         opts = [

data/lib/tomo/task_api.rb

@@ -9,11 +9,7 @@ module Tomo
     def_delegators :context, :paths, :settings
 
     def die(reason)
-      Runtime::TaskAbortedError.raise_with(
-        reason,
-        task: context.current_task,
-        host: remote.host
-      )
+      Runtime::TaskAbortedError.raise_with(reason, task: context.current_task, host: remote.host)
     end
 
     def dry_run?
@@ -26,13 +22,9 @@ module Tomo
 
     def merge_template(path)
       working_path = paths.tomo_config_file&.dirname
-      if working_path && path.start_with?(".")
-        path = File.expand_path(path, working_path)
-      end
+      path = File.expand_path(path, working_path) if working_path && path.start_with?(".")
 
-      unless File.file?(path)
-        Runtime::TemplateNotFoundError.raise_with(path: path)
-      end
+      Runtime::TemplateNotFoundError.raise_with(path: path) unless File.file?(path)
       template = IO.read(path)
       ERB.new(template).result(binding)
     end
@@ -49,10 +41,7 @@ module Tomo
       missing = names.flatten.select { |sett| settings[sett].nil? }
       return if missing.empty?
 
-      Runtime::SettingsRequiredError.raise_with(
-        settings: missing,
-        task: context.current_task
-      )
+      Runtime::SettingsRequiredError.raise_with(settings: missing, task: context.current_task)
     end
     alias require_settings require_setting
   end

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

@@ -1,3 +1,6 @@
+<% if rubocop? -%>
+# rubocop:disable Style/FormatStringToken
+<% end -%>
 plugin "git"
 plugin "env"
 plugin "bundler"
@@ -15,7 +18,7 @@ set rbenv_ruby_version: <%= RUBY_VERSION.inspect %>
 set nodenv_node_version: <%= node_version&.inspect || "nil # FIXME" %>
 set nodenv_yarn_version: <%= yarn_version.inspect %>
 set git_url: <%= git_origin_url&.inspect || "nil # FIXME" %>
-set git_branch: "master"
+set git_branch: <%= git_branch&.inspect || "nil # FIXME" %>
 set git_exclusions: %w[
   .tomo/
   spec/
@@ -72,3 +75,6 @@ deploy do
   run "bundler:clean"
   run "core:log_revision"
 end
+<% if rubocop? -%>
+# rubocop:enable Style/FormatStringToken
+<% end -%>

data/lib/tomo/testing.rb

@@ -6,14 +6,12 @@ module Tomo
     autoload :CLITester, "tomo/testing/cli_tester"
     autoload :Connection, "tomo/testing/connection"
     autoload :DockerImage, "tomo/testing/docker_image"
-    autoload :DockerPluginTester, "tomo/testing/docker_plugin_tester"
     autoload :HostExtensions, "tomo/testing/host_extensions"
     autoload :Local, "tomo/testing/local"
     autoload :LogCapturing, "tomo/testing/log_capturing"
     autoload :MockedExecError, "tomo/testing/mocked_exec_error"
     autoload :MockedExitError, "tomo/testing/mocked_exit_error"
     autoload :MockPluginTester, "tomo/testing/mock_plugin_tester"
-    autoload :PluginTester, "tomo/testing/plugin_tester"
     autoload :RemoteExtensions, "tomo/testing/remote_extensions"
     autoload :SSHExtensions, "tomo/testing/ssh_extensions"
 

data/lib/tomo/testing/Dockerfile

@@ -1,10 +1,8 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 WORKDIR /provision
 COPY ./tomo_test_ed25519.pub /root/.ssh/authorized_keys
 COPY ./ubuntu_setup.sh ./
 RUN ./ubuntu_setup.sh
-COPY ./custom_setup.sh ./
-RUN ./custom_setup.sh
 COPY ./systemctl.rb /usr/local/bin/systemctl
 RUN chmod a+x /usr/local/bin/systemctl
 EXPOSE 22

data/lib/tomo/testing/connection.rb

@@ -2,12 +2,7 @@ module Tomo
   module Testing
     class Connection < Tomo::SSH::Connection
       def initialize(host, options)
-        super(
-          host,
-          options,
-          exec_proc: proc { raise MockedExecError },
-          child_proc: method(:mock_child_process)
-        )
+        super(host, options, exec_proc: proc { raise MockedExecError }, child_proc: method(:mock_child_process))
       end
 
       def ssh_exec(script)

data/lib/tomo/testing/docker_image.rb

@@ -22,13 +22,8 @@ module Tomo
       end
       @running_images = []
 
-      attr_accessor :setup_script
       attr_reader :host
 
-      def initialize
-        @setup_script = "#!/bin/bash\n"
-      end
-
       def build_and_run
         raise "Already running!" if frozen?
 
@@ -74,19 +69,13 @@ module Tomo
       attr_reader :container_id, :image_id, :private_key_path
 
       def pull_base_image_if_needed
-        images = Local.capture('docker images --format "{{.ID}}" ubuntu:18.04')
-        Local.capture("docker pull ubuntu:18.04") if images.strip.empty?
+        images = Local.capture('docker images --format "{{.ID}}" ubuntu:20.04')
+        Local.capture("docker pull ubuntu:20.04") if images.strip.empty?
       end
 
       def set_up_private_key
-        @private_key_path = File.join(
-          Dir.tmpdir,
-          "tomo_test_ed25519_#{SecureRandom.hex(8)}"
-        )
-        FileUtils.cp(
-          File.expand_path("tomo_test_ed25519", __dir__),
-          private_key_path
-        )
+        @private_key_path = File.join(Dir.tmpdir, "tomo_test_ed25519_#{SecureRandom.hex(8)}")
+        FileUtils.cp(File.expand_path("tomo_test_ed25519", __dir__), private_key_path)
         FileUtils.chmod(0o600, private_key_path)
       end
 
@@ -121,8 +110,6 @@ module Tomo
         FILES_TO_COPY.each do |file|
           FileUtils.cp(File.expand_path(file, __dir__), build_dir)
         end
-        IO.write(File.join(build_dir, "custom_setup.sh"), setup_script)
-        FileUtils.chmod(0o755, File.join(build_dir, "custom_setup.sh"))
       end
 
       def build_dir

data/lib/tomo/testing/local.rb

@@ -41,9 +41,7 @@ module Tomo
           progress(command_str) do
             output, status = Open3.capture2e(*command)
 
-            if raise_on_error && !status.success?
-              raise "Command failed: #{command_str}\n#{output}"
-            end
+            raise "Command failed: #{command_str}\n#{output}" if raise_on_error && !status.success?
 
             output
           end

data/lib/tomo/testing/mock_plugin_tester.rb

@@ -1,10 +1,29 @@
 module Tomo
   module Testing
-    class MockPluginTester < PluginTester
+    class MockPluginTester
+      include LogCapturing
+
       def initialize(*plugin_names, settings: {}, release: {})
-        host = Host.parse("testing@host")
-        host.release.merge!(release)
-        super(*plugin_names, settings: settings, host: host)
+        @host = Host.parse("testing@host")
+        @host.release.merge!(release)
+        config = Configuration.new
+        config.hosts << @host
+        config.plugins.push(*plugin_names, "testing")
+        config.settings[:application] = "testing"
+        config.settings.merge!(settings)
+        @runtime = config.build_runtime
+      end
+
+      def call_helper(helper, *args, **kwargs)
+        run_task("testing:call_helper", helper, args, kwargs)
+        host.helper_values.pop
+      end
+
+      def run_task(task, *args)
+        capturing_logger_output do
+          runtime.run!(task, *args, privileged: false)
+          nil
+        end
       end
 
       def executed_script
@@ -21,6 +40,10 @@ module Tomo
         host.mock(script, **kwargs)
         self
       end
+
+      private
+
+      attr_reader :host, :runtime
     end
   end
 end

data/lib/tomo/testing/ubuntu_setup.sh

@@ -17,8 +17,7 @@ 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 zlib1g-dev libssl-dev libreadline-dev git-core curl locales libsqlite3-dev
 
 apt-get -y install tzdata \
         -o DPkg::options::="--force-confdef" \

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "0.19.0".freeze
+  VERSION = "1.2.0".freeze
 end

metadata

@@ -1,155 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Matt Brictson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.11'
-- !ruby/object:Gem::Dependency
-  name: minitest-ci
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: minitest-hooks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.81.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.81.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
+date: 2020-07-11 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
   set of defaults, but is easily extensible via a well-documented plugin system. Unlike
@@ -292,14 +152,12 @@ files:
 - lib/tomo/testing/cli_tester.rb
 - lib/tomo/testing/connection.rb
 - lib/tomo/testing/docker_image.rb
-- lib/tomo/testing/docker_plugin_tester.rb
 - lib/tomo/testing/host_extensions.rb
 - lib/tomo/testing/local.rb
 - lib/tomo/testing/log_capturing.rb
 - lib/tomo/testing/mock_plugin_tester.rb
 - lib/tomo/testing/mocked_exec_error.rb
 - lib/tomo/testing/mocked_exit_error.rb
-- lib/tomo/testing/plugin_tester.rb
 - lib/tomo/testing/remote_extensions.rb
 - lib/tomo/testing/ssh_extensions.rb
 - lib/tomo/testing/systemctl.rb
@@ -314,9 +172,9 @@ metadata:
   bug_tracker_uri: https://github.com/mattbrictson/tomo/issues
   changelog_uri: https://github.com/mattbrictson/tomo/releases
   source_code_uri: https://github.com/mattbrictson/tomo
-  homepage_uri: https://tomo-deploy.com/
+  homepage_uri: https://github.com/mattbrictson/tomo
   documentation_uri: https://tomo-deploy.com/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -324,15 +182,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨
 test_files: []