devkitkat 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 421aca57d9ed36e6ed5bc0555ece96e45ba98546c7df5ae643235648fd2978c8
-  data.tar.gz: ffa96bdf80c4351dd19caaf3f85f57b3d4505c994c3e687755aafcb14a4599d8
+  metadata.gz: bc1ec65b940b53a2d04d473ed109dbd6b97256f09ac270f2b59edb607201b310
+  data.tar.gz: c14fa3b11c1fe1fd4e33e92fece3bfa9e5eaf3ad233cb34cf0e5b8dfe2783a10
 SHA512:
-  metadata.gz: fec93d309ccd8de925dc2f7c055fb86573c6ec2adb22a10946c04b4a10b24afb12601540d914df0b86e259777e30ac5718fb5878f264b9fb33e324354f168a2b
-  data.tar.gz: 36a6194e6db9d2464f8f24cf31f5c686ea2c83827bb24e3328ca1d023c546f1848ce4e73ce91979d8cfd531ce28be615a8ecd9797b131d027f0404edcd1934ed
+  metadata.gz: b331ae89d8c5cf523fe51b0b4cc36bad069b7f5750e7b8413ec4f41896ebcded43f680e42dfff6aa44bf4755aabf9d459e1f0c4c1e1243b80977baf787c06750
+  data.tar.gz: 78dcc4f8d93ddb3727c6f9ff254b9a4dd2ef406f7c95f07ae7bd6a216f622dc08b748811f3be5eec5d8822c2570375762d1f99063be2199589682cdc5ace505f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devkitkat (0.1.24)
+    devkitkat (0.1.25)
       activesupport (~> 6.0.0)
       colorize (~> 0.8.1)
       docker-api (~> 1.34.2)

data/lib/devkitkat/service/driver/docker/container.rb

@@ -10,36 +10,49 @@ module Devkitkat
           attr_reader :container
 
           def start
-            if @container = find
+            @container = find
+
+            if command.interactive?
+              raise 'Container has not started yet for interactive session' unless @container
+              return
+            end
+
+            if @container
               container.restart
             else
               @container = create
-              container.restart
+              container.start
               create_host_user
             end
           end
 
           def stop
+            return if command.interactive?
             raise 'Container has not started yet' unless container
 
             container.stop
           end
 
-          def exec(cmds, params = {})
+          def exec(cmds, params = {}, &block)
             params.merge!(user: user_name)
-            safe_exec(cmds, params)
+            safe_exec(cmds, params, &block)
           end
 
-          def exec_as_root(cmds, params = {})
-            safe_exec(cmds, params)
+          def exec_as_root(cmds, params = {}, &block)
+            safe_exec(cmds, params, &block)
+          end
+
+          def interactive_shell(cmd)
+            # container.exec([new_path], tty: true, stdin: STDIN) { |stream, chunk| print "#{stream}" }
+            Kernel.exec('docker', 'exec', '-ti', '--user', user_name, name, cmd)
           end
 
           private
 
-          def safe_exec(cmds, params)
+          def safe_exec(cmds, params, &block)
             params.merge!(wait: 604800) # Default timeout is 1 minute, so setting 1 week instead
             stdout_messages, stderr_messages, exit_code =
-              container.exec(cmds, params)
+              container.exec(cmds, params, &block)
 
             if exit_code != 0 || command.debug?
               puts "#{self.class.name} - #{__callee__}: stdout_messages: #{stdout_messages} stderr_messages: #{stderr_messages} exit_code: #{exit_code}"
@@ -55,11 +68,6 @@ module Devkitkat
             config.machine_image
           end
 
-          def name
-            @name ||=
-              "#{config.application}-#{service.name}-#{Digest::SHA1.hexdigest(command.kit_root)[8..12]}"
-          end
-
           def find
             ::Docker::Container.get(name)
           rescue ::Docker::Error::NotFoundError
@@ -123,6 +131,11 @@ module Devkitkat
             end
           end
 
+          def name
+            @name ||=
+              "#{config.application}-#{service.name}-#{Digest::SHA1.hexdigest(command.kit_root)[8..12]}"
+          end
+
           def user_name
             'devkitkat'
           end

data/lib/devkitkat/service/driver/docker.rb

@@ -14,7 +14,11 @@ module Devkitkat
         def execute(script_file)
           new_path = rewrite_root_path!(script_file)
 
-          container.exec([new_path])
+          if command.interactive?
+            container.interactive_shell(new_path)
+          else
+            container.exec([new_path])
+          end
         end
 
         def cleanup

data/lib/devkitkat/service/predefined_command/exec.rb

@@ -4,7 +4,9 @@ module Devkitkat
       class Exec < Base
         def to_script
           <<~EOS
-            cd #{service.src_dir}
+            if [ -d "#{service.src_dir}" ]; then
+              cd #{service.src_dir}
+            fi
             #{command.args.join(' ')}
           EOS
         end

data/lib/devkitkat/version.rb

@@ -1,3 +1,3 @@
 module Devkitkat
-  VERSION = "0.1.25"
+  VERSION = "0.1.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devkitkat
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Shinya Maeda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler