docker_core 0.0.21 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 275fb150858e7ab66ce56d30261f078e4298b38ef3c4e341c460c8e9fa13ec9b
-  data.tar.gz: dd21636922cc634f306a4573fb829ba329b51b8ac42a89c03bb94e651e8c1619
+  metadata.gz: a1aa25b8f032a45928140b7f29a149f6dfd9e5b658775027a68c0af0149c3a56
+  data.tar.gz: 0e7384b6cfacba90eaea5a6fcc1c95fad176a350b644030a82aecb01ca41710d
 SHA512:
-  metadata.gz: cd9098dc3a100fffa7ba45cd9ea6b3fb78310769205c1d600fa8476307f6568a07e0894276975727be8ac05ca66c3f132db4d7d621139ef2db43f24d35b2f555
-  data.tar.gz: f2fb926a87426831461558903c764f256b553609d713e8bf9dfb2951f92d4c25b3bf4bc7945dade12eb3470bcee85475fd4585796784b9e3075a92a39b554ea0
+  metadata.gz: 1152e77399f32f7339b421a8f7a589d2c14545a40ca6670459a56a190e6e73749d01d055649dbc12c2c091aa67690101524ea9e890428a76f8a0217a35adc59b
+  data.tar.gz: 31bb09aa3c9c01d053764efd20264fc21453e6bb0a0f3c8d26ea71e7804f23f7b90bf190339a7dc91cb382a45cf151eca488bd2f37b595f080b2625e50b4eb66

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,50 +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] substitute
-    # @param [Boolean] force
+    # @param [Boolean, String] sudo
+    # @param [Boolean] throw
+    # @param [Numeric] wait
     # @param [Boolean] strip
-    # @param [Boolean] verbose
-    def self.capture(*arguments, substitute: false, force: false, strip: true, verbose: false)
+    # @param [Boolean] echo
+    def self.capture(*arguments, sudo: SUDO, throw: false, wait: 0, strip: true, echo: false)
       begin
-        command = self.command(*arguments, substitute: substitute)
+        command = self.command(*arguments, sudo: sudo)
 
-        if verbose
-          Color.echo("+ #{command}", Color::GREEN)
+        if echo
+          Color.echo(": #{command}", Color::YELLOW)
         end
 
         data = `#{command}`
-        return strip ? "#{data}".strip : data
+        result = strip ? "#{data}".strip : data
+        self.wait(wait)
+        return result
       rescue
-        raise unless force
+        raise unless throw
         return ''
       end
     end
 
     # @param [Array] arguments
-    # @param [Boolean] substitute
-    # @param [Boolean] force
-    def self.run(*arguments, substitute: false, force: false)
-      data = self.capture(*arguments, substitute: substitute, force: force, strip: false, verbose: true)
-      print(data)
+    # @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, sudo: 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, sudo: sudo)
+
+      if echo
+        Color.echo("= #{command}", Color::CYAN)
+      end
+
       exec(command)
     end
 
@@ -255,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
@@ -268,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
 
@@ -289,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
 
@@ -313,7 +351,7 @@ module DockerCore
           mode = File.stat(name).mode
           file = name.slice(offset ..)
 
-          if verbose
+          if echo
             Color.echo(": #{file}", Color::GREEN)
           end
 
@@ -337,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
 
@@ -352,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.21
+  version: 0.0.25
 platform: ruby
 authors:
 - agrozyme
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fileutils