docker_core 0.0.10 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad11481b8c2d460b9685c4022b1805220b64bf1db62bbf7faca9a0733d568169
-  data.tar.gz: aa21c991bfa072b42b378b7f569bbd55f54b7bd98b10b73a8b01a56a765bd8bd
+  metadata.gz: 0c701083c9a545230b1e4fac7502e31c418627da7dd0b0b90bd19bc14a9aec98
+  data.tar.gz: f3b7b98b2a654d247b21b4015f3388a2b6578708803ad0a88bc92020588ae565
 SHA512:
-  metadata.gz: c6b657275d527d98b636106b41f524ecf380743d525089affc0369240c6c93f243e0f9b646efea7195462c030e7f1813153b8a23a9e7551364b77ec5004eaf5e
-  data.tar.gz: 67897ef4a150344583d759fc9a89d333cf414c65496bd13cffaa2a6be3ccd644ed9fa3f0850cf0bc8b4646ed0643d6633df02bedc51c9e8ebafa4038bef27909
+  metadata.gz: fa4c150462533849c1760cfdbb27a780165ee079d652224e83ad84d4a9de081b0eedc148ea9c9799cfa224a4c3d99323ea15fa362b59405794427f41784e55da
+  data.tar.gz: 77f9c1ce5f6b1b6b803c6097ee50c866c400beffee23c472f9c3a01fa60f4449eb4388703b5a9c2d5a468744e2e911cac5dcc94822a3555f86300568302aa620

data/lib/docker_core.rb

@@ -34,36 +34,37 @@ module DockerCore
   end
 
   # @param [String] command
-  # @param [Boolean] verbose
-  # @param [Boolean] throw
-  def self.run(command, verbose: true, throw: true)
-    if verbose
-      self.echo("+ #{command}")
-    end
-
+  # @param [Boolean] force
+  def self.run(command, force: false)
     begin
+      self.echo("+ #{command}")
       print(`#{command}`)
     rescue
-      if throw
-        raise $!
-      end
+      raise unless force
     end
   end
 
+  # @param [String] command
+  # @param [Boolean] force
+  def self.suexec(command, force: false)
+    command = "su-exec core #{command}"
+    self.run(command, force: force)
+  end
+
   # @param [Integer] uid
   # @param [Integer] gid
   def self.update_user(uid: 500, gid: 500)
     uid = ENV.fetch('DOCKER_CORE_UID', uid)
     gid = ENV.fetch('DOCKER_CORE_GID', gid)
-    self.run('deluser core', throw: false)
-    self.run('delgroup core', throw: false)
+    self.run('deluser core', force: true)
+    self.run('delgroup core', force: true)
     self.run("addgroup --system --gid=#{gid} core")
     self.run("adduser --system --disabled-password --no-create-home --ingroup=core --gecos=core --shell=/bin/bash --uid=#{uid} core")
   end
 
   # @param [Array<String>] arguments
   def self.path(*arguments)
-    return Dir[*arguments].map { |item| File.path(item) }.uniq
+    return Dir.glob(arguments.flatten, File::FNM_DOTMATCH).map { |item| File.path(item) }.uniq
   end
 
   # @param [Array<String>] arguments
@@ -74,14 +75,31 @@ module DockerCore
   end
 
   # @param [Array<String>] arguments
-  def self.mkdir(*arguments, mode: nil)
+  def self.chmod(mode, *arguments)
     self.path(*arguments).each do |path|
+      FileUtils.chmod_R(mode, path, force: true)
+    end
+  end
+
+  # @param [Array<String>] arguments
+  def self.mkdir(*arguments, mode: nil)
+    stack = []
+    paths = arguments.map { |path| File.path(path) }.uniq
+
+    paths.each do |path|
+      until path == stack.last
+        stack << path
+        path = File.dirname(path)
+      end
+    end
+
+    stack.uniq.each do |path|
       if File.exist?(path) && false == File.directory?(path)
         File.delete(path)
       end
-
-      FileUtils.mkdir_p(path, mode: mode)
     end
+
+    FileUtils.mkdir_p(paths, mode: mode)
   end
 
   # @param [Array<String>] arguments
@@ -175,7 +193,7 @@ module DockerCore
         if entry.file?
           self.mkdir(File.dirname(file))
           File.binwrite(file, entry.read)
-          FileUtils.chmod(mode, file)
+          self.chmod(mode, file)
           next
         end
       end
@@ -201,7 +219,7 @@ module DockerCore
     # @type [Gem::Package::TarWriter] writer
     Gem::Package::TarWriter.new(io) do |writer|
       # @type [String] file
-      Dir[File.join(path, '**/*')].each do |name|
+      self.path(File.join(path, '**/*')).each do |name|
         mode = File.stat(name).mode
         file = name.slice(offset ..)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_core
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.14
 platform: ruby
 authors:
 - agrozyme
@@ -14,44 +14,44 @@ dependencies:
   name: fileutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: zlib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 description:
 email:
 executables: []
@@ -60,7 +60,8 @@ extra_rdoc_files: []
 files:
 - lib/docker_core.rb
 homepage: https://gitlab.com/agrozyme-package/ruby/docker_core
-licenses: []
+licenses:
+- Ruby
 metadata: {}
 post_install_message:
 rdoc_options: []