docker_core 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 275fb150858e7ab66ce56d30261f078e4298b38ef3c4e341c460c8e9fa13ec9b
-  data.tar.gz: dd21636922cc634f306a4573fb829ba329b51b8ac42a89c03bb94e651e8c1619
+  metadata.gz: 9e24b7a9fd2ff938ceda59f6846768c1e414dd54b9b99ee22d8384a3044d1978
+  data.tar.gz: 4b15e835e7b275c3b8dbbb5e82db512870a07d551f3064f7f0ce2a8e9606e625
 SHA512:
-  metadata.gz: cd9098dc3a100fffa7ba45cd9ea6b3fb78310769205c1d600fa8476307f6568a07e0894276975727be8ac05ca66c3f132db4d7d621139ef2db43f24d35b2f555
-  data.tar.gz: f2fb926a87426831461558903c764f256b553609d713e8bf9dfb2951f92d4c25b3bf4bc7945dade12eb3470bcee85475fd4585796784b9e3075a92a39b554ea0
+  metadata.gz: 4b35e8577e6893fd84518b7eeaa8bb364684b3d632806b1c33ad0a884a3ac3457e2dbbc3c5697355a1785722f11f0b8d6076d62185b5d56a0c0f8438bbf6201d
+  data.tar.gz: 2b73c1c304b64e38ffb065c948a5856753c7b33100b436816f9da02219ca1f6c73931b1db2b021ac40044572085e1f5b38a537c781555ff868ddbe7b3e0302c0

data/lib/docker_core.rb

@@ -108,10 +108,10 @@ module DockerCore
 
     # @param [Array] arguments
     # @param [Boolean] substitute
-    # @param [Boolean] force
+    # @param [Boolean] exception
     # @param [Boolean] strip
     # @param [Boolean] verbose
-    def self.capture(*arguments, substitute: false, force: false, strip: true, verbose: false)
+    def self.capture(*arguments, substitute: false, exception: false, strip: true, verbose: false)
       begin
         command = self.command(*arguments, substitute: substitute)
 
@@ -122,17 +122,18 @@ module DockerCore
         data = `#{command}`
         return strip ? "#{data}".strip : data
       rescue
-        raise unless force
+        raise unless exception
         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] exception
+    def self.run(*arguments, substitute: false, exception: true)
+      command = self.command(*arguments, substitute: substitute)
+      Color.echo("+ #{command}", Color::GREEN)
+      return system(command, exception: exception)
     end
 
     # @param [Array] arguments
@@ -352,8 +353,8 @@ 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, exception: false)
+      Process.run('delgroup', GROUP, exception: 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_core
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - agrozyme