tomo 1.1.1 → 1.4.0

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"
@@ -11,11 +14,13 @@ host "user@hostname.or.ip.address"
 
 set application: <%= app.inspect %>
 set deploy_to: "/var/www/%{application}"
+<% unless ruby_version_file? -%>
 set rbenv_ruby_version: <%= RUBY_VERSION.inspect %>
+<% end -%>
 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 +77,6 @@ deploy do
   run "bundler:clean"
   run "core:log_revision"
 end
+<% if rubocop? -%>
+# rubocop:enable Style/FormatStringToken
+<% end -%>

data/lib/tomo/testing/cli_extensions.rb

@@ -1,7 +1,7 @@
 module Tomo
   module Testing
     module CLIExtensions
-      def exit(status=true)
+      def exit(status=true) # rubocop:disable Style/OptionalBooleanParameter
         raise MockedExitError, status
       end
     end

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

@@ -74,21 +74,15 @@ module Tomo
       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
 
       def build_image
-        Local.capture(
-          "docker build #{build_dir}"
-        )[/Successfully built (\S+)$/i, 1]
+        tag = "tomo_testing:latest"
+        Local.capture("docker build --tag #{tag} #{build_dir}")
+        tag
       end
 
       def start_container

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/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 = "1.1.1".freeze
+  VERSION = "1.4.0".freeze
 end

metadata

@@ -1,141 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Matt Brictson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-16 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-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.82.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.82.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.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-10-28 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
@@ -191,7 +65,6 @@ files:
 - lib/tomo/configuration/environment.rb
 - lib/tomo/configuration/glob.rb
 - lib/tomo/configuration/plugin_file_not_found_error.rb
-- lib/tomo/configuration/plugin_resolver.rb
 - lib/tomo/configuration/plugins_registry.rb
 - lib/tomo/configuration/plugins_registry/file_resolver.rb
 - lib/tomo/configuration/plugins_registry/gem_resolver.rb
@@ -298,9 +171,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
@@ -315,8 +188,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨
 test_files: []

data/lib/tomo/configuration/plugin_resolver.rb

@@ -1,63 +0,0 @@
-module Tomo
-  class Configuration
-    class PluginResolver
-      PLUGIN_PREFIX = "tomo/plugin".freeze
-      private_constant :PLUGIN_PREFIX
-
-      def self.resolve(name)
-        new(name).plugin_module
-      end
-
-      def initialize(name)
-        @name = name
-      end
-
-      def plugin_module
-        plugin_path = [PLUGIN_PREFIX, name.tr("-", "/")].join("/")
-        require plugin_path
-
-        plugin = constantize(plugin_path)
-        assert_compatible_api(plugin)
-
-        plugin
-      rescue LoadError => e
-        raise unless e.message.match?(/\s#{Regexp.quote(plugin_path)}$/)
-
-        raise_unknown_plugin_error(e)
-      end
-
-      private
-
-      attr_reader :name
-
-      def assert_compatible_api(plugin)
-        return if plugin.is_a?(::Tomo::PluginDSL)
-
-        raise "#{plugin} does not extend Tomo::PluginDSL"
-      end
-
-      def constantize(path)
-        parts = path.split("/")
-        parts.reduce(Object) do |parent, part|
-          child = part.gsub(/^[a-z]|_[a-z]/) { |str| str.chars.last.upcase }
-          parent.const_get(child, false)
-        end
-      end
-
-      def raise_unknown_plugin_error(error)
-        UnknownPluginError.raise_with(
-          error.message,
-          name: name,
-          gem_name: "#{PLUGIN_PREFIX}/#{name}".tr("/", "-"),
-          known_plugins: scan_for_plugins
-        )
-      end
-
-      def scan_for_plugins
-        Gem.find_latest_files("#{PLUGIN_PREFIX}/*.rb").map do |file|
-          file[%r{#{PLUGIN_PREFIX}/(.+).rb$}, 1].tr("/", "-")
-        end.uniq.sort
-      end
-    end
-  end
-end