donce 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7ba4eef3f8cae9725b0919d93c200393d552c88688b8b448c9f2960a0dae2a9
-  data.tar.gz: 3383251951e61584d0ced59f93a421f73f68da0ace2ca9eda40f0cc701e415fb
+  metadata.gz: 794fd321c85b3efd46c082e5555c69dfe4d97cd2eaed233b812f50dfb4453f47
+  data.tar.gz: b8f59039bc21dc5e585ebba73bf825fdcfb30d249f77879d0e50666c9b5514c5
 SHA512:
-  metadata.gz: 071de606e7dde5336605819b229e83e3de1812109448fe647f95460e02a9129c16f2eacd240e06d796cfcbddedeb6d1cf8be7b6755fbfef00d2aa85127ec9b60
-  data.tar.gz: 4b522e4e6fdfd8f211d18834211983b5c0b95e2433c697d7834f92a153d32942b5fa8a97c398026195247eb2b8599526af0e8788c722a1dab8936993bbd075e8
+  metadata.gz: babea47d7f7d8b6c13541102167cea6b88e9e48be2d2233535b417cfd0144946a04a710b64eebd4ecffa894e3c88320e1def531f33d2d406ca5f9cbb4f867e26
+  data.tar.gz: fc734444357b9b2e7a6cd4b460b5ccad6f6316fee65f182345e0b2143e1b7398fa96fc64eba08759744fe4a528ed17be48ae0c0e26b830a8c7a327dbf439c905

data/Gemfile.lock

@@ -15,15 +15,17 @@ GEM
     builder (3.3.0)
     date (3.5.1)
     docile (1.4.1)
-    elapsed (0.2.1)
+    elapsed (0.2.2)
       loog (~> 0.6)
       tago (~> 0.1)
+    ellipsized (0.3.0)
     erb (6.0.1)
     json (2.18.0)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    loog (0.6.1)
+    loog (0.7.2)
+      ellipsized
       logger (~> 1.0)
     minitest (6.0.1)
       prism (~> 1.5)
@@ -32,18 +34,18 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    minitest-retry (0.3.0)
+    minitest-retry (0.3.1)
       minitest (>= 5.0)
     os (1.1.4)
     parallel (1.27.0)
-    parser (3.3.10.0)
+    parser (3.3.10.1)
       ast (~> 2.4.1)
       racc
-    prism (1.7.0)
+    prism (1.8.0)
     psych (5.3.1)
       date
       stringio
-    qbash (0.5.0)
+    qbash (0.7.1)
       backtrace (> 0)
       elapsed (> 0)
       loog (> 0)
@@ -51,7 +53,7 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.1)
-    rdoc (7.0.3)
+    rdoc (7.1.0)
       erb
       psych (>= 4.0.0)
       tsort
@@ -93,7 +95,7 @@ GEM
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     stringio (3.2.0)
-    tago (0.6.0)
+    tago (0.7.0)
     tsort (0.2.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)

data/donce.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=3.0'
   s.name = 'donce'
-  s.version = '0.4.0'
+  s.version = '0.6.0'
   s.license = 'MIT'
   s.summary = 'Builds and starts temporary Docker containers'
   s.description =

data/lib/donce.rb

@@ -57,7 +57,8 @@ module Kernel
   #   (if array is provided, it will be concatenated)
   # @param [String] home The directory with Dockerfile and all other necessary files
   # @param [String] image The name of Docker image, e.g. "ubuntu:22.04"
-  # @param [Logger] log The logging destination, can be +$stdout+
+  # @param [IO] stdout The stdout destination
+  # @param [IO] stderr The stderr destination
   # @param [String|Array<String>] args List of extra arguments for the +docker+ command
   # @param [Hash<String,String>] env Environment variables going into the container
   # @param [Hash<String,String>] volumes Local to container volumes mapping
@@ -70,8 +71,8 @@ module Kernel
   # @yield [String] Container ID if block is given (runs container in daemon mode)
   # @yieldparam [String] id The ID of the running container
   # @yieldreturn [void] The container will be stopped after the block execution
-  def donce(dockerfile: nil, image: nil, home: nil, log: $stdout, args: '', env: {}, root: false, command: '',
-            timeout: 60, volumes: {}, ports: {}, build_args: {})
+  def donce(dockerfile: nil, image: nil, home: nil, stdout: $stdout, stderr: $stdout, args: '', env: {}, root: false,
+            command: '', timeout: 60, volumes: {}, ports: {}, build_args: {})
     raise 'Either use "dockerfile" or "home"' if dockerfile && home
     raise 'Either use "dockerfile" or "image"' if dockerfile && image
     raise 'Either use "image" or "home"' if home && image
@@ -79,9 +80,11 @@ module Kernel
     raise 'The "timeout" must be an integer or nil' unless timeout.nil? || timeout.is_a?(Integer)
     raise 'The "volumes" is nil' if volumes.nil?
     raise 'The "volumes" must be a Hash' unless volumes.is_a?(Hash)
-    raise 'The "log" is nil' if log.nil?
+    raise 'The "stdout" is nil' if stdout.nil?
+    raise 'The "stderr" is nil' if stderr.nil?
     raise 'The "args" is nil' if args.nil?
-    raise 'The "args" must be a String' unless args.is_a?(String)
+    raise 'The "args" must be a String or Array' unless args.is_a?(String) || args.is_a?(Array)
+    args = args.join(' ') if args.is_a?(Array)
     raise 'The "env" is nil' if env.nil?
     raise 'The "env" must be a Hash' unless env.is_a?(Hash)
     raise 'The "command" is nil' if command.nil?
@@ -110,20 +113,21 @@ module Kernel
           Dir.mktmpdir do |tmp|
             dockerfile = dockerfile.join("\n") if dockerfile.is_a?(Array)
             File.write(File.join(tmp, 'Dockerfile'), dockerfile)
-            qbash("#{docker} build #{a} #{Shellwords.escape(tmp)}", log:)
+            qbash("#{docker} build #{a} #{Shellwords.escape(tmp)}", stdout:, stderr:)
           end
         elsif home
-          qbash("#{docker} build #{a} #{Shellwords.escape(home)}", log:)
+          qbash("#{docker} build #{a} #{Shellwords.escape(home)}", stdout:, stderr:)
         else
           raise 'Either "dockerfile" or "home" must be provided'
         end
         i
       end
     container = "donce-#{SecureRandom.hex(6)}"
-    stdout = nil
+    out = nil
     code = 0
     cmd = [
-      docker, 'run',
+      docker,
+      'run',
       ('--detach' if block_given?),
       '--name', Shellwords.escape(container),
       ("--add-host #{donce_host}:host-gateway" unless OS.linux?),
@@ -137,36 +141,37 @@ module Kernel
     ].compact.join(' ')
     begin
       begin
-        stdout, code =
+        out, code =
           Timeout.timeout(timeout) do
             qbash(
               cmd,
-              log:,
+              stdout:,
+              stderr:,
               accept: nil,
               both: true,
               env:
             )
           end
         unless code.zero?
-          log.error(stdout)
           raise \
             "Failed to run #{cmd} " \
-            "(exit code is ##{code}, stdout has #{stdout.split("\n").count} lines)"
+            "(exit code is ##{code}, stdout has #{out.split("\n").count} lines)"
         end
         yield container if block_given?
       ensure
         logs = qbash(
           "#{docker} logs #{Shellwords.escape(container)}",
           level: code.zero? ? Logger::DEBUG : Logger::ERROR,
-          log:
+          stdout:,
+          stderr:
         )
-        stdout = logs if block_given?
-        qbash("#{docker} rm --force #{Shellwords.escape(container)}", log:)
+        out = logs if block_given?
+        qbash("#{docker} rm --force #{Shellwords.escape(container)}", stdout:, stderr:)
       end
-      stdout
+      out
     ensure
       Timeout.timeout(10) do
-        qbash("#{docker} rmi #{img}", log:) unless image
+        qbash("#{docker} rmi #{img}", stdout:, stderr:) unless image
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: donce
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Yegor Bugayenko