docker_core 0.0.20 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a39a514720435a65fbc3f039eee7c86503e501ab70b821656510b3ba8e8fe941
-  data.tar.gz: 7c95deb803d9b5a095a8cc2a5758e926000065e22aaac2a2420a896ef2be2c81
+  metadata.gz: 1ffc945fc5a13ce10567d97bdfda12a6f040ca26fb922f2e48b2537ae358aba6
+  data.tar.gz: 8814b75c42cf5e9793bbf4dcda92bde88d11e9bcf7cabd07cb14110d64bf6b7c
 SHA512:
-  metadata.gz: e0929e952d6d9c3bca9f1d0e5ca3a5f5fa9f193c545bbd0e286361ef7811f54c624db153354664f32e74eef2d20ce36632380a84c343273a05c5e71c435bf968
-  data.tar.gz: 4e8ede2a599f2d820649d667f8b64e14d33227cd25abba7838b16202b1002633f4b363a91c7cf9dd709b99c036ff59210fb4deb76c8818946292a3a853c537fc
+  metadata.gz: bcce5fd8318a6d5e3795ac2da04f1f33a0dc84213ca919c47207834e9189ac489a28b291391ec2c9ed3817fa69cdd75107424fa90e7064f5243c92effc3db74a
+  data.tar.gz: 941379233235b53f26b4b630166b64fcb2cce08b1db259e7ea6e4ba0a1d08ef4111c21899f167123c9a29919c7c5adb9ccd495e66d3b9f3c4e51884de748819d

data/lib/docker_core.rb

@@ -7,6 +7,7 @@ require('thor')
 require('zlib')
 
 module DockerCore
+  SUDO = false
   USER = 'core'
   GROUP = 'core'
 
@@ -56,15 +57,20 @@ module DockerCore
 
       if hash.is_a?(Hash)
         hash.each do |key, value|
-          name = '--' + self.kebab(key)
+          short = 1 == key.length
+          prefix = short ? '-' : '--'
+          separator = short ? ' ' : '='
+          name = prefix + self.kebab(key)
 
           if true == value
             items << name
             next
           end
 
-          value = "#{value}".gsub(/\\/, '\&\&').gsub('"', '\"')
-          items << %(#{name}="#{value}")
+          [value].flatten.each do |item|
+            item = "#{item}".gsub(/\\/, '\&\&').gsub('"', '\"')
+            items << %(#{name}#{separator}"#{item}")
+          end
           next
         end
       end
@@ -96,48 +102,82 @@ module DockerCore
   end
 
   module Process
+    # @param [Numeric] second
+    def self.wait(second = 0)
+      if second.is_a?(Numeric)
+        if 0 > second
+          return sleep
+        end
+        if 0 < second
+          return sleep(second)
+        end
+      end
+    end
+
     # @param [Array] arguments
-    # @param [Boolean] substitute
-    def self.command(*arguments, substitute: false)
-      if substitute
-        arguments.unshift('su-exec', USER)
+    # @param [Boolean, String] sudo
+    def self.command(*arguments, sudo: SUDO)
+      if true == sudo
+        arguments.unshift('sudo')
+      end
+
+      if sudo.is_a?(String) && false == "#{sudo}".empty?
+        arguments.unshift('su-exec', sudo)
       end
 
       return Paser.arguments(*arguments).join(' ')
     end
 
     # @param [Array] arguments
+    # @param [Boolean, String] sudo
+    # @param [Boolean] throw
+    # @param [Numeric] wait
     # @param [Boolean] strip
-    # @param [Boolean] verbose
-    # @param [Boolean] substitute
-    def self.capture(*arguments, strip: true, verbose: false, substitute: false)
-      command = self.command(*arguments, substitute: substitute)
+    # @param [Boolean] echo
+    def self.capture(*arguments, sudo: SUDO, throw: false, wait: 0, strip: true, echo: false)
+      begin
+        command = self.command(*arguments, substitute: sudo)
 
-      if verbose
-        Color.echo("+ #{command}", Color::GREEN)
-      end
+        if echo
+          Color.echo(": #{command}", Color::YELLOW)
+        end
 
-      data = `#{command}`
-      return strip ? "#{data}".strip : data
+        data = `#{command}`
+        result = strip ? "#{data}".strip : data
+        self.wait(wait)
+        return result
+      rescue
+        raise unless throw
+        return ''
+      end
     end
 
     # @param [Array] arguments
-    # @param [Boolean] force
-    # @param [Boolean] substitute
-    def self.run(*arguments, force: false, substitute: false)
-      begin
-        data = self.capture(*arguments, strip: false, verbose: true, substitute: substitute)
-        print(data)
-      rescue
-        raise unless force
+    # @param [Boolean, String] sudo
+    # @param [Boolean] throw
+    # @param [Numeric] wait
+    # @param [Boolean] echo
+    def self.run(*arguments, sudo: SUDO, throw: true, wait: 0, echo: true)
+      command = self.command(*arguments, substitute: sudo)
+
+      if echo
+        Color.echo("+ #{command}", Color::GREEN)
       end
+
+      result = system(command, exception: throw)
+      self.wait(wait)
+      return result
     end
 
     # @param [Array] arguments
-    # @param [Boolean] substitute
-    def self.execute(*arguments, substitute: false)
-      command = self.command(*arguments, substitute: substitute)
-      Color.echo("= #{command}", Color::CYAN)
+    # @param [Boolean, String] sudo
+    def self.execute(*arguments, sudo: SUDO, echo: true)
+      command = self.command(*arguments, substitute: sudo)
+
+      if echo
+        Color.echo("= #{command}", Color::CYAN)
+      end
+
       exec(command)
     end
 
@@ -253,8 +293,8 @@ module DockerCore
 
     # @param [Object] io
     # @param [String] path
-    # @param [Boolean] verbose
-    def self.unpack_archive(io, path, verbose: false)
+    # @param [Boolean] echo
+    def self.unpack_archive(io, path, echo: false)
       Gem::Package::TarReader.new(io) do
 
         # @type [Gem::Package::TarReader] reader
@@ -266,7 +306,7 @@ module DockerCore
           mode = header.mode
           file = File.join(path, entry.full_name)
 
-          if verbose
+          if echo
             Color.echo(": #{file}", Color::GREEN)
           end
 
@@ -287,19 +327,19 @@ module DockerCore
 
     # @param [String] file
     # @param [String] path
-    # @param [Boolean] verbose
-    def self.inflate_file(file, path, verbose: false)
+    # @param [Boolean] echo
+    def self.inflate_file(file, path, echo: false)
       Zlib::GzipReader.open(file) do
 
         # @type [Zlib::GzipReader] reader
       |reader|
-        self.unpack_archive(reader, path, verbose: verbose)
+        self.unpack_archive(reader, path, echo: echo)
       end
     end
 
     # @param [String] path
-    # @param [Boolean] verbose
-    def self.tape_archive(path, verbose: false)
+    # @param [Boolean] echo
+    def self.tape_archive(path, echo: false)
       io = StringIO.new('')
       offset = path.size + 1
 
@@ -311,7 +351,7 @@ module DockerCore
           mode = File.stat(name).mode
           file = name.slice(offset ..)
 
-          if verbose
+          if echo
             Color.echo(": #{file}", Color::GREEN)
           end
 
@@ -335,13 +375,13 @@ module DockerCore
 
     # @param [String] file
     # @param [String] path
-    # @param [Boolean] verbose
-    def self.deflate_file(file, path, verbose: false)
+    # @param [Boolean] echo
+    def self.deflate_file(file, path, echo: false)
       Zlib::GzipWriter.open(file, Zlib::BEST_COMPRESSION) do
 
         # @type [Zlib::GzipWriter] writer
       |writer|
-        writer.write(self.tape_archive(path, verbose: verbose))
+        writer.write(self.tape_archive(path, echo: echo))
       end
     end
 
@@ -350,8 +390,9 @@ module DockerCore
     def self.update_user(uid: 500, gid: 500)
       uid = ENV.fetch('DOCKER_CORE_UID', uid)
       gid = ENV.fetch('DOCKER_CORE_GID', gid)
-      Process.run('deluser', USER, force: true)
-      Process.run('delgroup', GROUP, force: true)
+
+      Process.run('deluser', USER, throw: false)
+      Process.run('delgroup', GROUP, throw: false)
       Process.run('addgroup', { system: true, gid: gid }, GROUP)
       Process.run('adduser', { system: true, 'disabled-password': true, 'no-create-home': true, ingroup: GROUP, gecos: USER, shell: '/bin/bash', uid: uid }, USER)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker_core
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.24
 platform: ruby
 authors:
 - agrozyme
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fileutils