tomo 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ad1c87df7e8fad626e90eb0606c0bb2899a3acf57eb2b9df969bd53c33332de
-  data.tar.gz: 49ce5c513dfccbe4db1269e0c9385e39aa9940690cd7a6e86c561d54eeb89b54
+  metadata.gz: 6475bf477c37fc9b1c28dfac30ed59d5b29a0f9c9bcde84e5df77a3bde38da66
+  data.tar.gz: 476f861ba1ed0f17f4767c168ca1c1984487df84c061980c02954111b2d20cbd
 SHA512:
-  metadata.gz: 1f2459465ef849c4dc012f594bcb672317909945c1061cb54a9f8e94acb07e91ed04334d28347f1dd4d708e10903ab168a142b4632289e5e9c375aa882c8bdc9
-  data.tar.gz: 3946a734793b215eb57296eb602ac9bdaf68791c9df541d381b41bd89ee0bc9681fff27a506dd72e5d427bee757727f613f8db7624216eefaf808062740ba9a8
+  metadata.gz: fefda893dcede7dff398410779e13bc33d4e23b2d79766cedb5e68268a32179614e3c6cb4a3ba2ab074860cb779142773b8cc786f54719777911901df735309c
+  data.tar.gz: d0c9ef9a4c696e3a80b59814f2c4790c4ee0979d72bfcad0d87bed69ac57966c61f43ae5b2cf78ef4ea29e23fd1bfca7163337d3e4fae905424a3d05db408750

data/README.md

@@ -191,7 +191,6 @@ Read the [Writing Custom Tasks](https://tomo-deploy.com/tutorials/writing-custom
   - [Result](https://tomo-deploy.com/api/Result/)
   - [TaskLibrary](https://tomo-deploy.com/api/TaskLibrary/)
   - [Testing::MockPluginTester](https://tomo-deploy.com/api/testing/MockPluginTester/)
-  - [Testing::DockerPluginTester](https://tomo-deploy.com/api/testing/DockerPluginTester/)
 
 ## FAQ
 

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/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/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,8 +69,8 @@ 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
@@ -121,8 +116,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/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/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-12 00:00:00.000000000 Z
+date: 2020-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !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
@@ -114,28 +100,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: 0.82.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: 0.82.0
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -292,14 +278,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
@@ -331,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨

data/lib/tomo/testing/docker_plugin_tester.rb

@@ -1,39 +0,0 @@
-require "fileutils"
-require "securerandom"
-require "tmpdir"
-
-module Tomo
-  module Testing
-    class DockerPluginTester < PluginTester
-      def initialize(*plugin_names, settings: {}, setup_script: nil)
-        @docker_image = DockerImage.new
-        @docker_image.setup_script = setup_script if setup_script
-        @docker_image.build_and_run
-        host = @docker_image.host
-        super(
-          *plugin_names,
-          settings: @docker_image.ssh_settings.merge(settings),
-          host: host
-        )
-      end
-
-      def run(shell_script, **kwargs)
-        call_helper(:run, shell_script, **kwargs)
-      end
-
-      def run_task(task, *args)
-        Testing.enabling_ssh do
-          super
-        end
-      end
-
-      def teardown
-        docker_image.stop
-      end
-
-      private
-
-      attr_reader :docker_image
-    end
-  end
-end

data/lib/tomo/testing/plugin_tester.rb

@@ -1,33 +0,0 @@
-module Tomo
-  module Testing
-    class PluginTester
-      include LogCapturing
-
-      def initialize(*plugin_names, settings: {}, host:)
-        @host = host
-        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
-
-      private
-
-      attr_reader :host, :runtime
-    end
-  end
-end