docker_core 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85249b5bf70ef8b313ad2ff28898889db66e92c5b96af40a024e61131453ec4c
-  data.tar.gz: e4dafbe9bfdcc3fd40fcc3d93b76b8557b599ba07201fdfddff0bcb08ff9c65f
+  metadata.gz: 2f80afb4258260ec1da58951eca584f9321f0f21b13f0137865ca42c5852944f
+  data.tar.gz: 8d1c6a6d11b3365c23fb67f618e63d20087afe72bc11b09c9c005cf666daac4b
 SHA512:
-  metadata.gz: '0489e8827a51d214072b11f7bc4d32bfb8624484670da293839727de7586c408863728cf84a1e5f83df9be8b1d14df844debf129570f587a377496dbb5aadee6'
-  data.tar.gz: e3d7a871d1ac19786b3cc06bd8525d33000e76b70208d61e44eaaa794bc7c4e9749ff507ec6ba93a09a636961d81c8cb539555714bb56b6053fd1cdb2351a518
+  metadata.gz: d79c07a8abea54822b90858b3a27e6894dc2d51dd509f37769e879a60c33ee66806fb663480aef403524e93243c4ca02fbfdb3cef23672f1acd132cc41cdf128
+  data.tar.gz: 2e497a18fc9afcefcadc97fc0b89fc364e7dc6c70d78100d426ce05e18db49fe99122f4075c68376eb4737862bfd6577ceafd2f51114cef4659e01449ab7734c

data/lib/docker_core.rb

@@ -7,67 +7,60 @@ require('thor')
 require('zlib')
 
 module DockerCore
-  module Image
-  end
+  module Shell
+    # include(Thor::Shell)
 
-  module Command
-  end
+    USER = 'core'
+    GROUP = 'core'
 
-  module Paser
-    # @param [String] value
-    def self.boolean(value)
-      return %w[true yes on].include?("#{value}".strip.downcase)
+    class Color < Thor::Shell::Color
     end
 
-    # @param [String] text
-    def self.kebab(text)
-      return "#{text}".gsub(/_/, '-')
-    end
+    module Paser
+      # @param [String] value
+      def self.boolean(value)
+        return %w[true yes on].include?("#{value}".strip.downcase)
+      end
+
+      # @param [String] text
+      def self.kebab(text)
+        return "#{text}".gsub(/_/, '-')
+      end
 
-    # @param [Hash] hash
-    def self.options(hash = {})
-      items = []
+      # @param [Hash] hash
+      def self.options(hash = {})
+        items = []
 
-      hash.each do |key, value|
-        name = '--' + self.kebab(key)
-        item = (true == value) ? name : %Q(#{name}="#{value}")
-        items << item
+        hash.each do |key, value|
+          name = '--' + self.kebab(key)
+          item = (true == value) ? name : %Q(#{name}="#{value}")
+          items << item
+        end
+
+        return items
       end
 
-      return items
-    end
+      def self.make(*arguments)
+        items = []
 
-    def self.make(*arguments)
-      items = []
+        arguments.each do |item|
+          if item.is_a?(Array)
+            items.concat(item.map { |value| "#{value}" })
+            next
+          end
 
-      arguments.each do |item|
-        if item.is_a?(Array)
-          items.concat(item.map { |value| "#{value}" })
-          next
-        end
+          if item.is_a?(Hash)
+            items.concat(self.options(item))
+            next
+          end
 
-        if item.is_a?(Hash)
-          items.concat(self.options(item))
+          items << "#{item}"
           next
         end
 
-        items << "#{item}"
-        next
+        return items
       end
-
-      return items
-    end
-
-    def self.command(*arguments)
-      return self.make(*arguments).join(' ')
     end
-  end
-
-  module Shell
-    include(Thor::Shell)
-
-    USER = 'core'
-    GROUP = 'core'
 
     # @param [String] text
     # @param [Array<String>] colors
@@ -87,19 +80,31 @@ module DockerCore
       return puts("#{color}#{text}#{Color::CLEAR}")
     end
 
+    def self.command(*arguments, substitute: false)
+      if substitute
+        arguments.unshift('su-exec', USER)
+      end
+
+      return Paser.make(*arguments).join(' ')
+    end
+
     # @param [Boolean] strip
-    def self.capture(*arguments, strip: true)
-      command = Paser.command(*arguments)
+    def self.capture(*arguments, strip: true, verbose: false, substitute: false)
+      command = self.command(*arguments, substitute: substitute)
+
+      if verbose
+        self.echo("+ #{command}", Color::GREEN)
+      end
+
       data = `#{command}`
       return strip ? "#{data}".strip : data
     end
 
     # @param [Boolean] force
-    def self.execute(*arguments, force: false)
+    def self.run(*arguments, force: false, substitute: false)
       begin
-        command = Paser.command(*arguments)
-        self.echo("+ #{command}", Color::GREEN)
-        print(`#{command}`)
+        data = self.capture(*arguments, strip: false, verbose: true, substitute: substitute)
+        print(data)
       rescue
         raise unless force
       end
@@ -107,9 +112,10 @@ module DockerCore
 
     # @param [Boolean] force
     # @param [String] user
-    def self.sudo(*arguments, force: false, user: USER)
-      arguments.unshift('su-exec', user)
-      self.execute(*arguments, force: force)
+    def self.execute(*arguments, substitute: false)
+      command = self.command(*arguments, substitute: substitute)
+      self.echo("= #{command}", Color::CYAN)
+      exec(command)
     end
 
     # @param [String] title
@@ -124,7 +130,7 @@ module DockerCore
 
     # @param [Array<String>] arguments
     # @return [Array<String>]
-    def self.find_files(*arguments)
+    def self.find_paths(*arguments)
       return Dir.glob(arguments.flatten, File::FNM_DOTMATCH).map do |item|
         next File.path(item)
       end.filter do |item|
@@ -136,14 +142,14 @@ module DockerCore
     # @param [String] user
     # @param [String] group
     def self.change_owner(*arguments, user: USER, group: GROUP)
-      self.find_files(*arguments).each do |path|
+      self.find_paths(*arguments).each do |path|
         FileUtils.chown_R(user, group, path, force: true)
       end
     end
 
     # @param [Array<String>] arguments
     def self.change_mode(mode, *arguments)
-      self.find_files(*arguments).each do |path|
+      self.find_paths(*arguments).each do |path|
         FileUtils.chmod_R(mode, path, force: true)
       end
     end
@@ -172,17 +178,17 @@ module DockerCore
     end
 
     # @param [Array<String>] arguments
-    def self.remove_folders(*arguments)
-      self.find_files(*arguments).each do |path|
+    def self.remove_paths(*arguments)
+      self.find_paths(*arguments).each do |path|
         FileUtils.rm_rf(path)
       end
     end
 
     # @param [String, Array<String>] source
     # @param [String] target
-    def self.move_files(source, target)
+    def self.move_paths(source, target)
       files = [source].flatten
-      FileUtils.mv(self.find_files(*files), target)
+      FileUtils.mv(self.find_paths(*files), target)
     end
 
     # @param [String] uri
@@ -266,7 +272,7 @@ module DockerCore
 
         # @type [Gem::Package::TarWriter] writer
       |writer|
-        self.find_files(File.join(path, '**/*')).each do |name|
+        self.find_paths(File.join(path, '**/*')).each do |name|
           mode = File.stat(name).mode
           file = name.slice(offset ..)
 
@@ -307,10 +313,10 @@ module DockerCore
     # @param [Integer] uid
     # @param [Integer] gid
     def self.update_user(uid: 500, gid: 500)
-      self.execute('deluser', USER, force: true)
-      self.execute('delgroup', GROUP, force: true)
-      self.execute('addgroup', { system: true, gid: ENV.fetch('DOCKER_CORE_GID', gid) }, GROUP)
-      self.execute('adduser', { system: true, 'disabled-password': true, 'no-create-home': true, ingroup: GROUP, gecos: USER, shell: '/bin/bash', uid: ENV.fetch('DOCKER_CORE_UID', uid) }, USER)
+      self.run('deluser', USER, force: true)
+      self.run('delgroup', GROUP, force: true)
+      self.run('addgroup', { system: true, gid: ENV.fetch('DOCKER_CORE_GID', gid) }, GROUP)
+      self.run('adduser', { system: true, 'disabled-password': true, 'no-create-home': true, ingroup: GROUP, gecos: USER, shell: '/bin/bash', uid: ENV.fetch('DOCKER_CORE_UID', uid) }, USER)
     end
 
     # @param [String] stdout
@@ -327,12 +333,12 @@ module DockerCore
 
     # @param [Array<String>] arguments
     def self.clear_folders(*arguments, mode: nil)
-      self.remove_folders(*arguments)
+      self.remove_paths(*arguments)
       self.make_folders(*arguments, mode: mode)
     end
 
     def self.architecture
-      hash = { x86: '386', x86_64: 'amd64', armhf: 'armv6', aarch64: 'arm64' }
+      hash = { x86: '386', x86_64: 'amd64', armhf: 'armv6', armv7l: 'armv7', aarch64: 'arm64' }
       machine = "#{Etc.uname[:machine]}"
       return hash.fetch(machine.to_sym, machine)
     end

metadata

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