donce 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03161908e407496425db2581fce2d802d834fce0e06cc97daf13de1c2edecc21'
-  data.tar.gz: 7339a08b6820ec2aa9e0bda4067e3fd8947b387509ea96f9ac4e9971399ac24e
+  metadata.gz: 5d852871b216457b9f3f4490f2d99437342c1cacfb984ea02db4d3b8ad15c6b2
+  data.tar.gz: 64a0b65f60ba9c57a22e96c51f2fcfb7061b9ec2258423d83c6a5dd5939274eb
 SHA512:
-  metadata.gz: 81203a7306ab4edd80ac3ce16a27bcacb8505bb73bd99c3d0ad629193cdd98222b7e954382d671a76e9a3f8f2a461914f5a18c2f7845955dc31242b3b8796c09
-  data.tar.gz: f4978002f8c14db6783e5480f0f50e064e6c6883c6c1de61d4728022fa522bdc98be1cba1449ad88ec2db8eb08c2a2f65f18691eef9a673f71ffbaf8157e322f
+  metadata.gz: 7a467ad471d9acc92d0379cc84c24f168e90ba5f85c2ab9255df51f3dec36f3cc7978e186484f484e7acaf45a80a05bf88997083d97ea390c7c5cef3b9767ea0
+  data.tar.gz: 7cc78fd133ccd9ce2da05f5a130eb802b274c0ab38cc94fc8d3e3218adc3c47a7520e8a3d612d6177f3c964653609cf147d2b1e127b76f7c90eced7a925e6f0e

data/Gemfile.lock

@@ -41,11 +41,11 @@ GEM
     parser (3.3.10.1)
       ast (~> 2.4.1)
       racc
-    prism (1.8.0)
+    prism (1.9.0)
     psych (5.3.1)
       date
       stringio
-    qbash (0.7.1)
+    qbash (0.7.2)
       backtrace (> 0)
       elapsed (> 0)
       loog (> 0)
@@ -59,7 +59,7 @@ GEM
       tsort
     regexp_parser (2.11.3)
     rexml (3.4.4)
-    rubocop (1.82.1)
+    rubocop (1.84.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -67,7 +67,7 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.49.0)

data/README.md

@@ -44,7 +44,7 @@ If you set `DONCE_SUDO` environment variable to `true`,
 Host group/user IDs are passed to the build, as `GID` and `UID` args.
 You can use them, when you copy resources into the image, for example:
 
-```
+```dockerfile
 FROM ubuntu
 ARG UID
 ARG GID

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.5.0'
+  s.version = '0.7.0'
   s.license = 'MIT'
   s.summary = 'Builds and starts temporary Docker containers'
   s.description =

data/lib/donce.rb

@@ -48,7 +48,7 @@ module Kernel
   # The name of the localhost inside Docker container.
   # @return [String] The hostname
   def donce_host
-    OS.linux? ? '172.17.0.1' : 'host.docker.internal'
+    'host.docker.internal'
   end
 
   # Build Docker image (or use existing one), run Docker container, and then clean up.
@@ -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,7 +80,8 @@ 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 or Array' unless args.is_a?(String) || args.is_a?(Array)
     args = args.join(' ') if args.is_a?(Array)
@@ -111,23 +113,24 @@ 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)}", stdout: log)
+            qbash("#{docker} build #{a} #{Shellwords.escape(tmp)}", stdout:, stderr:)
           end
         elsif home
-          qbash("#{docker} build #{a} #{Shellwords.escape(home)}", stdout: 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?),
+      "--add-host #{donce_host}:host-gateway",
       args,
       env.map { |k, v| "--env #{Shellwords.escape("#{k}=#{v}")}" }.join(' '),
       ports.map { |k, v| "--publish #{Shellwords.escape("#{k}:#{v}")}" }.join(' '),
@@ -138,36 +141,37 @@ module Kernel
     ].compact.join(' ')
     begin
       begin
-        stdout, code =
+        out, code =
           Timeout.timeout(timeout) do
             qbash(
               cmd,
-              stdout: 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,
-          stdout: log
+          stdout:,
+          stderr:
         )
-        stdout = logs if block_given?
-        qbash("#{docker} rm --force #{Shellwords.escape(container)}", stdout: 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}", stdout: 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.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Yegor Bugayenko