tomo 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f82eed57d49c1c93977def7e9a8074645470fe6066e73eb9882b5f9bd264020
-  data.tar.gz: 7c5813c23a7b4c26d8a3f0398b8c340d8efb587fde4f187176a3d1d8d4e08114
+  metadata.gz: 5df4b79a1c4cb50739874de698f09346f009a47c11fa99f51d79c6604adb93e4
+  data.tar.gz: 7c02ea4319e293ec156b4cf54bad2b06f4c43bbe7f4872d93c24c5b1a75d3f24
 SHA512:
-  metadata.gz: 01d1b2909f0aaf19cf0236e300a2817e2f654e8b95cf29f9a3fad6545b943d793b1d33dbf1ecd5df60ae7aa7a7f816874b3d821ebbd39046b9f7ce8ab216bc8f
-  data.tar.gz: 280ba8250c6c5f0b17f23147862c4245e639d175288fef07abe18fa250d1ee4da31a13cc67963519128b51edca4ed34906da99c244970c5520d362d56849c4b7
+  metadata.gz: b803e5bf13962a2ecc92dfd61e332554ec72d45883d99255f4ef2e7464a668653e2579758e013527761ef6f7aa7a2a62e8750dd00883b97640732b914258a37a
+  data.tar.gz: a1c0c54ccf105d274c92a6ac84040c7682c7e3c5aae9c0719c7f2e75a202f8c2e6353afed9b483dc3f39e7ee63117ada23ea937fe88f374b24389b41e5bd9222

data/lib/tomo/cli/completions.rb

@@ -6,7 +6,7 @@ module Tomo
       end
 
       def self.active?
-        !!@active
+        defined?(@active) && @active
       end
 
       def initialize(literal: false, stdout: $stdout, exit_proc: nil)

data/lib/tomo/cli.rb

@@ -51,14 +51,21 @@ module Tomo
       argv << "" if argv.shift == "--complete"
     end
 
+    # rubocop:disable Metrics/CyclomaticComplexity
     def lookup_command(argv)
       command_name = argv.first unless Completions.active? && argv.length == 1
       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, command_name]
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
+
+    def task_format?(arg)
+      arg.to_s.match?(/\A\S+:\S*\z/)
+    end
 
     def handle_error(error, command_name)
       return if Completions.active?

data/lib/tomo/commands/default.rb

@@ -10,6 +10,7 @@ module Tomo
 
       include CLI::CommonOptions
 
+      # rubocop:disable Metrics/AbcSize
       def banner
         <<~BANNER
           Usage: #{green('tomo')} #{yellow('COMMAND [options]')}
@@ -19,9 +20,13 @@ module Tomo
 
           #{commands.map { |name, help| "  #{yellow(name.ljust(10))} #{help}" }.join("\n")}
 
-          Tomo accepts abbreviations for its commands. For example, #{blue('tomo deploy')}
-          can be shortened to #{blue('tomo d')}. You can use bash completions as well!
-          Run #{blue('tomo completion-script')} for installation instructions.
+          The tomo CLI also provides some convenient shortcuts:
+
+          - Commands can be abbreviated, like #{blue('tomo d')} to run #{blue('tomo deploy')}.
+          - When running tasks, the #{yellow('run')} command is implied and can be omitted.
+            E.g., #{blue('tomo run rails:console')} can be shortened to #{blue('tomo rails:console')}.
+          - Bash completions are also available. Run #{blue('tomo completion-script')} for
+            installation instructions.
 
           For help with any command, add #{blue('-h')} to the command, like this:
 
@@ -32,6 +37,7 @@ module Tomo
             #{blue('https://tomo-deploy.com/')}
         BANNER
       end
+      # rubocop:enable Metrics/AbcSize
 
       def call(*args, options)
         # The bare `tomo` command (i.e. without `--help` or `--version`) doesn't

data/lib/tomo/commands/run.rb

@@ -34,6 +34,11 @@ module Tomo
 
             #{blue('tomo run core:clean_releases')}
 
+          When you specify a task name, the #{blue('run')} command is implied and can be
+          omitted, so this works as well:
+
+            #{blue('tomo core:clean_releases')}
+
           You can run any task defined by plugins loaded in #{DEFAULT_CONFIG_PATH}.
           To see a list of available tasks, run #{blue('tomo tasks')}.
 

data/lib/tomo/plugin/core.rb

@@ -8,24 +8,20 @@ module Tomo::Plugin
     helpers Tomo::Plugin::Core::Helpers
     tasks Tomo::Plugin::Core::Tasks
 
-    defaults application:                  "default",
-             concurrency:                  10,
-             current_path:                 "%<deploy_to>/current",
-             deploy_to:                    "/var/www/%<application>",
-             keep_releases:                10,
-             linked_dirs:                  [],
-             linked_files:                 [],
-             release_json_path:            "%<release_path>/.tomo_release.json",
-             releases_path:                "%<deploy_to>/releases",
-             revision_log_path:            "%<deploy_to>/revisions.log",
-             shared_path:                  "%<deploy_to>/shared",
-             tmp_path:                     "/tmp/tomo",
-             run_args:                     [],
-             ssh_connect_timeout:          5,
-             ssh_executable:               "ssh",
-             ssh_extra_opts:               %w[-o PasswordAuthentication=no],
-             ssh_forward_agent:            true,
-             ssh_reuse_connections:        true,
-             ssh_strict_host_key_checking: "accept-new"
+    defaults Tomo::SSH::Options::DEFAULTS.merge(
+      application:       "default",
+      concurrency:       10,
+      current_path:      "%<deploy_to>/current",
+      deploy_to:         "/var/www/%<application>",
+      keep_releases:     10,
+      linked_dirs:       [],
+      linked_files:      [],
+      release_json_path: "%<release_path>/.tomo_release.json",
+      releases_path:     "%<deploy_to>/releases",
+      revision_log_path: "%<deploy_to>/revisions.log",
+      shared_path:       "%<deploy_to>/shared",
+      tmp_path:          "/tmp/tomo",
+      run_args:          []
+    )
   end
 end

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

@@ -13,7 +13,7 @@ module Tomo::Plugin::Puma
 
     def try_restart
       ctl_result = remote.chdir(paths.current) do
-        ctl_result = remote.bundle(
+        remote.bundle(
           "exec", "pumactl", *control_options, "restart",
           raise_on_error: false,
           silent: true

data/lib/tomo/runtime/task_runner.rb

@@ -36,7 +36,7 @@ module Tomo
 
       def connect(host)
         Current.with(host: host) do
-          conn = SSH.connect(host: host, options: SSH::Options.new(settings))
+          conn = SSH.connect(host: host, options: ssh_options)
           remote = Remote.new(conn, context, helper_modules)
           return remote unless block_given?
 
@@ -51,6 +51,11 @@ module Tomo
       private
 
       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) }
+      end
     end
   end
 end

data/lib/tomo/ssh/options.rb

@@ -1,17 +1,22 @@
 module Tomo
   module SSH
     class Options
+      DEFAULTS = {
+        ssh_connect_timeout: 5,
+        ssh_executable: "ssh".freeze,
+        ssh_extra_opts: %w[-o PasswordAuthentication=no].map(&:freeze),
+        ssh_forward_agent: true,
+        ssh_reuse_connections: true,
+        ssh_strict_host_key_checking: "accept-new".freeze
+      }.freeze
+
       attr_reader :executable
 
-      def initialize(settings)
-        @executable = settings.fetch(:ssh_executable)
-        @extra_opts = settings.fetch(:ssh_extra_opts)
-        @forward_agent = settings.fetch(:ssh_forward_agent)
-        @reuse_connections = settings.fetch(:ssh_reuse_connections)
-        @connect_timeout = settings.fetch(:ssh_connect_timeout)
-        @strict_host_key_checking = settings.fetch(
-          :ssh_strict_host_key_checking
-        )
+      def initialize(options)
+        DEFAULTS.merge(options).each do |attr, value|
+          unprefixed_attr = attr.to_s.sub(/^ssh_/, "")
+          send(:"#{unprefixed_attr}=", value)
+        end
         freeze
       end
 
@@ -33,8 +38,9 @@ module Tomo
 
       private
 
-      attr_reader :connect_timeout, :extra_opts, :forward_agent,
-                  :reuse_connections, :strict_host_key_checking
+      attr_writer :executable
+      attr_accessor :connect_timeout, :extra_opts, :forward_agent,
+                    :reuse_connections, :strict_host_key_checking
 
       def control_opts(path, verbose)
         opts = [

data/lib/tomo/ssh.rb

@@ -13,7 +13,9 @@ module Tomo
     autoload :UnsupportedVersionError, "tomo/ssh/unsupported_version_error"
 
     class << self
-      def connect(host:, options:)
+      def connect(host:, options: {})
+        options = Options.new(options) unless options.is_a?(Options)
+
         Tomo.logger.connect(host)
         return Connection.dry_run(host, options) if Tomo.dry_run?
 

data/lib/tomo/testing/local.rb

@@ -8,6 +8,18 @@ require "tmpdir"
 module Tomo
   module Testing
     module Local
+      def in_temp_dir(&block)
+        Local.in_temp_dir(&block)
+      end
+
+      def with_tomo_gemfile(&block)
+        Local.with_tomo_gemfile(&block)
+      end
+
+      def capture(*command, raise_on_error: true)
+        Local.capture(*command, raise_on_error: raise_on_error)
+      end
+
       class << self
         def with_tomo_gemfile
           Bundler.with_original_env do
@@ -23,12 +35,13 @@ module Tomo
           Dir.chdir(dir, &block)
         end
 
-        def capture(command, raise_on_error: true)
-          progress(command) do
-            output, status = Open3.capture2e(command)
+        def capture(*command, raise_on_error: true)
+          command_str = command.join(" ")
+          progress(command_str) do
+            output, status = Open3.capture2e(*command)
 
             if raise_on_error && !status.success?
-              raise "Command failed: #{command}\n#{output}"
+              raise "Command failed: #{command_str}\n#{output}"
             end
 
             output

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "0.2.2".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.72.0
+        version: 0.73.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.72.0
+        version: 0.73.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement