tomo 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5df4b79a1c4cb50739874de698f09346f009a47c11fa99f51d79c6604adb93e4
-  data.tar.gz: 7c02ea4319e293ec156b4cf54bad2b06f4c43bbe7f4872d93c24c5b1a75d3f24
+  metadata.gz: ecf2cc8af9f664f1144c1b0c17975ecb87ec5f1345e7ffa0b4c919f46287780f
+  data.tar.gz: c805af8340d195a83a636735de9ea14fb630e335582513397ad2694318029725
 SHA512:
-  metadata.gz: b803e5bf13962a2ecc92dfd61e332554ec72d45883d99255f4ef2e7464a668653e2579758e013527761ef6f7aa7a2a62e8750dd00883b97640732b914258a37a
-  data.tar.gz: a1c0c54ccf105d274c92a6ac84040c7682c7e3c5aae9c0719c7f2e75a202f8c2e6353afed9b483dc3f39e7ee63117ada23ea937fe88f374b24389b41e5bd9222
+  metadata.gz: bb100deafcaef09ed875c7d6100a133638884ca35298163b3621242ca33c178c27fbe6061ee9387f20ba50b5b089ddb0522b9b5184f6d8375b9835dc9d99c399
+  data.tar.gz: e8a67228094bbea79d492d4ab7666de8d1e4cffb902ae6c3c77acc6b6b8bc4d904ecbc1e90a046abc64b7bd81fc0a15be70f355925943bbc59d5cf028e94b2d1

data/README.md

@@ -150,7 +150,7 @@ And run it!
 
 And just like that, you are now already familiar with the basics of tomo and how to extend it! Tomo is even more friendly and powerful with the help of bash completions. If you use bash, run `tomo completion-script` for instructions on setting them up.
 
-To prepare your existing project for a real deploy, check out the sections of the reference documentation on [configuration](https://tomo-deploy.com/configuration/), [writing custom tasks](https://tomo-deploy.com/tutorials/writing-custom-tasks/) [TODO], the [setup command](https://tomo-deploy.com/commands/setup/), and the [deploy command](https://tomo-deploy.com/commands/deploy/). There is also a tutorial that walks through [deploying a new Rails app from scratch](https://tomo-deploy.com/tutorials/deploying-rails-from-scratch/) [TODO]. If you have questions, check out the [FAQ](#faq) and [support](#support) notes below. Enjoy using tomo!
+To prepare your existing project for a real deploy, check out the sections of the reference documentation on [configuration](https://tomo-deploy.com/configuration/), [writing custom tasks](https://tomo-deploy.com/tutorials/writing-custom-tasks/), the [setup command](https://tomo-deploy.com/commands/setup/), and the [deploy command](https://tomo-deploy.com/commands/deploy/). There is also a tutorial that walks through [deploying a new Rails app from scratch](https://tomo-deploy.com/tutorials/deploying-rails-from-scratch/) [TODO]. If you have questions, check out the [FAQ](#faq) and [support](#support) notes below. Enjoy using tomo!
 
 ## Reference documentation
 
@@ -172,7 +172,7 @@ To prepare your existing project for a real deploy, check out the sections of th
   - [rbenv](https://tomo-deploy.com/plugins/rbenv/)
 - Tutorials
   - [Deploying Rails From Scratch](https://tomo-deploy.com/tutorials/deploying-rails-from-scratch/) [TODO]
-  - [Writing Custom Tasks](https://tomo-deploy.com/tutorials/writing-custom-tasks/) [TODO]
+  - [Writing Custom Tasks](https://tomo-deploy.com/tutorials/writing-custom-tasks/)
   - [Publishing a Plugin](https://tomo-deploy.com/tutorials/publishing-a-plugin/) [TODO]
 - API
   - [Host](https://tomo-deploy.com/api/Host/)

data/lib/tomo/cli.rb

@@ -19,6 +19,10 @@ module Tomo
 
     class << self
       attr_accessor :show_backtrace
+
+      def exit(status=true)
+        Process.exit(status)
+      end
     end
 
     COMMANDS = {
@@ -74,7 +78,7 @@ module Tomo
       error.command_name = command_name if error.respond_to?(:command_name=)
       Tomo.logger.error(error.to_console)
       status = error.respond_to?(:exit_status) ? error.exit_status : 1
-      exit(status) unless Tomo::CLI.show_backtrace
+      CLI.exit(status) unless Tomo::CLI.show_backtrace
 
       raise error
     end

data/lib/tomo/cli/common_options.rb

@@ -21,7 +21,7 @@ module Tomo
           end
           option :help, "-h, --help", "Print this documentation" do |_help|
             puts instance_variable_get(:@parser)
-            exit
+            CLI.exit
           end
 
           after_parse :dump_runtime_info

data/lib/tomo/cli/completions.rb

@@ -9,22 +9,21 @@ module Tomo
         defined?(@active) && @active
       end
 
-      def initialize(literal: false, stdout: $stdout, exit_proc: nil)
+      def initialize(literal: false, stdout: $stdout)
         @literal = literal
         @stdout = stdout
-        @exit_proc = exit_proc || Kernel.method(:exit)
       end
 
       def print_completions_and_exit(rules, *args, state:)
         completions = completions_for(rules, *args, state)
         words = completions.map { |c| bash_word_for(c, args.last) }
-        stdout.puts(words.join("\n")) unless words.empty?
-        exit_proc.call
+        Tomo.logger.info(words.join("\n")) unless words.empty?
+        CLI.exit
       end
 
       private
 
-      attr_reader :literal, :stdout, :exit_proc
+      attr_reader :literal, :stdout
 
       def completions_for(rules, *prefix_args, word, state)
         all_candidates(rules, prefix_args, state).select do |cand|

data/lib/tomo/commands/default.rb

@@ -5,7 +5,7 @@ module Tomo
 
       option :version, "-v, --version", "Display tomo’s version and exit" do
         Version.parse([])
-        exit
+        CLI.exit
       end
 
       include CLI::CommonOptions
@@ -56,7 +56,7 @@ module Tomo
 
       def raise_unrecognized_command(command)
         error = "#{yellow(command)} is not a recognized tomo command."
-        if command.match?(/\A\S+:\S+\z/)
+        if command.match?(/\A\S+:/)
           suggestion = "tomo run #{command}"
           error << "\nMaybe you meant #{blue(suggestion)}?"
         end

data/lib/tomo/commands/init.rb

@@ -46,14 +46,14 @@ module Tomo
         return unless File.exist?(".tomo")
 
         logger.error("Can't create .tomo directory; a file already exists")
-        exit(1)
+        CLI.exit(1)
       end
 
       def assert_no_tomo_project!
         return unless File.exist?(DEFAULT_CONFIG_PATH)
 
         logger.error("A #{DEFAULT_CONFIG_PATH} file already exists")
-        exit(1)
+        CLI.exit(1)
       end
 
       def current_dir_name

data/lib/tomo/plugin/bundler.rb

@@ -12,6 +12,7 @@ module Tomo::Plugin
              bundler_gemfile:       nil,
              bundler_jobs:          "4",
              bundler_path:          "%<shared_path>/bundle",
+             bundler_version:       nil,
              bundler_without:       %w[development test]
   end
 end

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

@@ -11,7 +11,7 @@ module Tomo::Plugin::Bundler
     end
 
     def upgrade_bundler
-      needed_bundler_ver = extract_bundler_ver_from_lockfile
+      needed_bundler_ver = version_setting || extract_bundler_ver_from_lockfile
       return if needed_bundler_ver.nil?
 
       remote.run(
@@ -23,6 +23,10 @@ module Tomo::Plugin::Bundler
 
     private
 
+    def version_setting
+      settings[:bundler_version]
+    end
+
     def check_options
       gemfile = settings[:bundler_gemfile]
       path = paths.bundler

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

@@ -11,9 +11,7 @@ module Tomo::Plugin::Git
         set_origin_url
       else
         remote.mkdir_p(paths.git_repo.dirname)
-        remote.git(
-          "clone", "--mirror", settings[:git_url], paths.git_repo
-        )
+        remote.git("clone", "--mirror", settings[:git_url], paths.git_repo)
       end
     end
 

data/lib/tomo/ssh/connection.rb

@@ -9,7 +9,7 @@ module Tomo
         new(
           host,
           options,
-          exec_proc: proc { exit(0) },
+          exec_proc: proc { CLI.exit },
           child_proc: proc { Result.empty_success }
         )
       end

data/lib/tomo/testing.rb

@@ -2,12 +2,16 @@ require "tomo"
 
 module Tomo
   module Testing
+    autoload :CLIExtensions, "tomo/testing/cli_extensions"
+    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"
@@ -31,6 +35,9 @@ end
 Tomo.logger = Tomo::Logger.new(
   stdout: File.open(File::NULL, "w"), stderr: File.open(File::NULL, "w")
 )
+class << Tomo::CLI
+  prepend Tomo::Testing::CLIExtensions
+end
 Tomo::Colors.enabled = false
 Tomo::Host.prepend Tomo::Testing::HostExtensions
 Tomo::Remote.prepend Tomo::Testing::RemoteExtensions

data/lib/tomo/testing/cli_extensions.rb

@@ -0,0 +1,9 @@
+module Tomo
+  module Testing
+    module CLIExtensions
+      def exit(status=true)
+        raise MockedExitError, status
+      end
+    end
+  end
+end

data/lib/tomo/testing/cli_tester.rb

@@ -0,0 +1,45 @@
+require "securerandom"
+
+module Tomo
+  module Testing
+    class CLITester
+      include Local
+      include LogCapturing
+
+      def initialize
+        @token = SecureRandom.hex(8)
+      end
+
+      def run(*args, raise_on_error: true)
+        in_temp_dir(token) do
+          restoring_defaults do
+            capturing_logger_output do
+              handling_exit(raise_on_error) do
+                CLI.new.call(args.flatten)
+              end
+            end
+          end
+        end
+      end
+
+      private
+
+      attr_reader :token
+
+      def restoring_defaults
+        yield
+      ensure
+        Tomo.debug = false
+        Tomo.dry_run = false
+        Tomo::CLI.show_backtrace = false
+        Tomo::CLI::Completions.instance_variable_set(:@active, false)
+      end
+
+      def handling_exit(raise_on_error)
+        yield
+      rescue Tomo::Testing::MockedExitError => e
+        raise if raise_on_error && !e.success?
+      end
+    end
+  end
+end

data/lib/tomo/testing/local.rb

@@ -8,14 +8,14 @@ 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 in_temp_dir(token=nil, &block)
+        Local.in_temp_dir(token, &block)
+      end
+
       def capture(*command, raise_on_error: true)
         Local.capture(*command, raise_on_error: raise_on_error)
       end
@@ -29,8 +29,9 @@ module Tomo
           end
         end
 
-        def in_temp_dir(&block)
-          dir = File.join(Dir.tmpdir, "tomo_test_#{SecureRandom.hex(8)}")
+        def in_temp_dir(token=nil, &block)
+          token ||= SecureRandom.hex(8)
+          dir = File.join(Dir.tmpdir, "tomo_test_#{token}")
           FileUtils.mkdir_p(dir)
           Dir.chdir(dir, &block)
         end

data/lib/tomo/testing/log_capturing.rb

@@ -0,0 +1,25 @@
+module Tomo
+  module Testing
+    module LogCapturing
+      def stdout
+        @stdout_io&.string
+      end
+
+      def stderr
+        @stderr_io&.string
+      end
+
+      private
+
+      def capturing_logger_output
+        orig_logger = Tomo.logger
+        @stdout_io = StringIO.new
+        @stderr_io = StringIO.new
+        Tomo.logger = Tomo::Logger.new(stdout: @stdout_io, stderr: @stderr_io)
+        yield
+      ensure
+        Tomo.logger = orig_logger
+      end
+    end
+  end
+end

data/lib/tomo/testing/mocked_exit_error.rb

@@ -0,0 +1,16 @@
+module Tomo
+  module Testing
+    class MockedExitError < Exception # rubocop:disable Lint/InheritException
+      attr_reader :status
+
+      def initialize(status)
+        @status = status
+        super("tomo exited with status #{status}")
+      end
+
+      def success?
+        status == true || status == 0 # rubocop:disable Style/NumericPredicate
+      end
+    end
+  end
+end

data/lib/tomo/testing/plugin_tester.rb

@@ -1,6 +1,8 @@
 module Tomo
   module Testing
     class PluginTester
+      include LogCapturing
+
       def initialize(*plugin_names, settings: {}, host:)
         @host = host
         config = Configuration.new
@@ -23,27 +25,9 @@ module Tomo
         end
       end
 
-      def stdout
-        @stdout_io&.string
-      end
-
-      def stderr
-        @stderr_io&.string
-      end
-
       private
 
       attr_reader :host, :runtime
-
-      def capturing_logger_output
-        orig_logger = Tomo.logger
-        @stdout_io = StringIO.new
-        @stderr_io = StringIO.new
-        Tomo.logger = Tomo::Logger.new(stdout: @stdout_io, stderr: @stderr_io)
-        yield
-      ensure
-        Tomo.logger = orig_logger
-      end
     end
   end
 end

data/lib/tomo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2019-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -264,13 +264,17 @@ files:
 - lib/tomo/templates/config.rb.erb
 - lib/tomo/testing.rb
 - lib/tomo/testing/Dockerfile
+- lib/tomo/testing/cli_extensions.rb
+- 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