devkitkat 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e730a451bae542a99bfa35ea7f4f5c0eb3f65da04c1b6e686e3d8dce16770c07
-  data.tar.gz: e865d0c254cff4b007b2680ef0e61f62fff9cd2b1dbddb2c53dde21b888f4016
+  metadata.gz: 1637e6c031dc94fed2e73fe7663b9363c844d4e03ed2366b60f73cc2c2b6caeb
+  data.tar.gz: cb76526b40ecef0262144353ad818259a9b420f067ac93bc047dac03688f165b
 SHA512:
-  metadata.gz: 7f1f690b3a05189d32ba031d8f1b5d40b92a7ca9879af34142c45dc07565f50459e56f65cfa48b4b1368c768d27ebfd6d13c342af11663cd5893b42c696789c1
-  data.tar.gz: f80a184c8992db158b4750d0c3421109f3ea0e74f51f94bb480e6e5b245cc8802998650b38cace5beb1cf0147b0bc68f71485ada2aedc8c446f52f3bf122b546
+  metadata.gz: 17e7a1f6465aee29d9c49a68535d51148a857c2d91b7585db753f8764fb4e8a95da973b15ddd50eb140fdca37226bb3c1dcb3103247c2692dbbe109cac1fefa2
+  data.tar.gz: 22c906e910232a9e18ac648027a9ad97e93157c3353cba02c0bbbcb2ed91b594a635b9db0c9616421ba922cb2b5135f293d67acd6f1b6ab7993b63844e6e525f

data/.gitlab-ci.yml

@@ -1,25 +1,38 @@
-image: ruby:2.6
-
-services:
-  - docker:19.03.1-dind
-
-variables:
-  DOCKER_HOST: tcp://docker:2375
-  DOCKER_TLS_CERTDIR: ""
-
 rspec:
   stage: test
-  variables:
-    LANG: C.UTF-8
-    LC_ALL: C.UTF-8
+  tags:
+  - do-runner
   before_script:
-  - apt-get update
-  - apt-get install -y cmake docker.io
   - docker info
   - pwd
-  script:
-  - mkdir ../test
-  - cp -a . ../test
-  - cd ../test
+  - gem install bundler
   - bin/setup
+  script:
   - bundle exec rspec
+
+# services:
+#   - docker:19.03.1-dind
+
+# variables:
+#   DOCKER_HOST: tcp://docker:2375
+#   DOCKER_TLS_CERTDIR: ""
+
+# rspec:
+#   stage: test
+#   tags:
+#   - do-runner
+#   variables:
+#     LANG: C.UTF-8
+#     LC_ALL: C.UTF-8
+#   before_script:
+#   - sudo apt-get update
+#   - apt-get install -y cmake docker.io
+#   - docker info
+#   - pwd
+#   - gem install bundler
+#   script:
+#   - mkdir ../test
+#   - cp -a . ../test
+#   - cd ../test
+#   - bin/setup
+#   - bundle exec rspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devkitkat (0.1.0)
+    devkitkat (0.1.1)
       activesupport (~> 6.0.0)
       colorize (~> 0.8.1)
       docker-api (~> 1.34.2)
@@ -25,11 +25,11 @@ GEM
       excon (>= 0.47.0)
       multi_json
     excon (0.67.0)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
     minitest (5.12.2)
-    multi_json (1.13.1)
+    multi_json (1.14.0)
     parallel (1.17.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -56,7 +56,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    zeitwerk (2.1.10)
+    zeitwerk (2.2.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -269,3 +269,8 @@ The gem is available as open source under the terms of the [MIT License](https:/
 ## Code of Conduct
 
 Everyone interacting in the Devkitkat project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/devkitkat/blob/master/CODE_OF_CONDUCT.md).
+
+## How to release a new version
+
+1. Update `Devkitkat::VERSION`
+1. Execute `bin/release`

data/bin/release

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+file_name=$(gem build devkitkat.gemspec | grep 'File:' | awk '{ print $2 }')
+gem push ${file_name}
+rm ${file_name}

data/lib/devkitkat/command.rb

@@ -4,9 +4,40 @@ module Devkitkat
 
     def initialize
       @options = {}
+      option_parser.parse!
 
-      OptionParser.new do |opts|
+      @script, @target, *@args = ARGV
+
+      show_help if script == 'help'
+    end
+
+    def tty?
+      options[:tty]
+    end
+
+    def variables
+      options[:variables]
+    end
+
+    def tmp_dir
+      File.join(kit_root, 'tmp')
+    end
+
+    def create_tmp_dir
+      FileUtils.mkdir_p(tmp_dir)
+    end
+
+    def kit_root
+      Dir.pwd # TODO: root_path
+    end
+
+    private
+
+    def option_parser
+      @option_parser ||= OptionParser.new do |opts|
         opts.banner = "Usage: devkitkat <script> <target> [options]"
+        opts.separator ""
+        opts.separator "Options:"
 
         opts.on("-p", "--path PATH", "The root path of the .devkitkat.yml") do |v|
           options[:root_path] = v
@@ -37,29 +68,32 @@ module Devkitkat
         opts.on("-t", "--tty", "TTY mode. In this mode, log won't be emitted.") do |v|
           options[:tty] = v
         end
-      end.parse!
-
-      @script, @target, *@args = ARGV
-    end
 
-    def tty?
-      options[:tty]
-    end
-
-    def variables
-      options[:variables]
-    end
+        opts.on("-v", "--version", "Show version") do |v|
+          puts Devkitkat::VERSION
+          exit
+        end
 
-    def tmp_dir
-      File.join(kit_root, 'tmp')
-    end
+        opts.on("-h", "--help", "Show help") do |v|
+          show_help
+        end
 
-    def create_tmp_dir
-      FileUtils.mkdir_p(tmp_dir)
+        opts.separator ""
+        opts.separator "Commands:"
+        opts.separator "add-script          - Add a script file"
+        opts.separator "add-example         - Add an example file"
+        opts.separator "add-shared-script   - Add s shared script"
+        opts.separator "clone               - Clone repository"
+        opts.separator "pull                - Pull latest source code"
+        opts.separator "clean               - Clean the service dir"
+        opts.separator "poop                - Poop"
+        opts.separator "help                - Show help"
+      end
     end
 
-    def kit_root
-      Dir.pwd # TODO: root_path
+    def show_help
+      puts option_parser.help
+      exit
     end
   end
 end

data/lib/devkitkat/config.rb

@@ -3,7 +3,7 @@ module Devkitkat
     DEVKITKAT_FILE_NAME = '.devkitkat.yml'
     HIDDEN_SERVICES = %w[system]
     DEFAULT_APPLICATION_NAME = 'devkitkat'
-    DEFAULT_IMAGE = 'ubuntu:18.04'
+    DEFAULT_IMAGE = 'registry.gitlab.com/dosuken123/thin-gdk/thin-gdk-monolith:master'
 
     attr_reader :devkitkat_yml, :kit_root
 

data/lib/devkitkat/executor/docker.rb

@@ -4,17 +4,22 @@ require 'docker'
 module Devkitkat
   class Executor
     class Docker
+      PreparationError = Class.new(StandardError)
+
       attr_reader :service, :script_file
 
       delegate :config, :command, to: :service
 
+      ROOT_IN_CONTAINER = '/devkitkat'
+
       def initialize(service)
         @service = service
       end
 
       def prepare
-        pull_image
+        pull_image unless image_exist?
         start_container
+        sync_user_with_host
       end
 
       def cleanup
@@ -27,25 +32,25 @@ module Devkitkat
         rewrite_root_path!
         new_path = script_path_in_container
 
-        container.exec([new_path])
+        exec([new_path], user: user_name)
       end
 
       private
   
       def rewrite_root_path!
         content = File.read(script_file)
-        new_content = content.gsub(command.kit_root, root_in_container)
+        new_content = content.gsub(command.kit_root, ROOT_IN_CONTAINER)
         File.write(script_file, new_content)
       end
 
       def script_path_in_container
         relative_path = script_file.delete_prefix(command.kit_root)
-        File.join(root_in_container, relative_path)
+        File.join(ROOT_IN_CONTAINER, relative_path)
       end
 
       def log_path_in_container
         relative_path = service.log_path.delete_prefix(command.kit_root)
-        File.join(root_in_container, relative_path)
+        File.join(ROOT_IN_CONTAINER, relative_path)
       end
 
       def docker_image
@@ -57,13 +62,12 @@ module Devkitkat
       end
   
       def container_parameter
-        # TODO: Speicfy users otherwise the created files are owned by root
         params = {
           'Cmd' => %w[tail -f],
           'Image' => docker_image,
           'name' => service.container_name,
           'HostConfig' => {
-            'Binds' => ["#{command.kit_root}:#{root_in_container}"]
+            'Binds' => ["#{command.kit_root}:#{ROOT_IN_CONTAINER}"]
           }
         }
 
@@ -81,21 +85,65 @@ module Devkitkat
         params
       end
 
-      def root_in_container
-        "/devkitkat"
-      end
-
       def pull_image
+        puts "Pulling image #{docker_image}..."
         ::Docker::Image.create('fromImage' => docker_image)
+        puts "Pulled image #{docker_image}..."
+      end
+
+      def image_exist?
+        ::Docker::Image.get(docker_image)
+      rescue
+        false
       end
 
       def start_container
         container.start
       end
+
+      def user_name
+        'devkitkat'
+      end
+
+      def group_id
+        @group_id ||= `id -u`
+      end
+
+      def user_id
+        @user_id ||= `id -g`
+      end
+
+      def exec(cmds, params = {})
+        stdout_messages, stderr_messages, exit_code =
+          container.exec(cmds, params)
+
+        exit_code == 0 ? true : false
+      end
+
+      def exec!(cmds, params = {})
+        unless exec(cmds, params)
+          raise PreparationError, "Failed to execute command in container. cmds: #{cmds}"
+        end
+      end
+
+      def sync_user_with_host
+        exec!(['addgroup', '--gid', group_id, user_name])
+
+        exec!(['adduser',
+          '--uid', user_id,
+          '--gid', group_id,
+          '--shell', '/bin/bash',
+          '--home', ROOT_IN_CONTAINER,
+          '--gecos', '',
+          '--disabled-password',
+          user_name])
+
+        exec!(['chown', '-R', "#{user_name}:#{user_name}", ROOT_IN_CONTAINER])
+      end
   
       def stop_container
-        container.stop
-        container.remove
+        # container.stop
+        container.remove(force: true)
       end
     end
   end

data/lib/devkitkat/main.rb

@@ -12,15 +12,14 @@ module Devkitkat
         raise ArgumentError, 'TTY mode accepts only one service'
       end
 
-      log_paths = target_services.map(&:log_path)
-      puts %Q{See the log at \n#{log_paths.join("\n")}}
-
       if target_services.count == 1
         # If the target is only one, it could be console access (TTY)
         # so we can't run in parallel.
         service = target_services.first
         execute_for(service)
       else
+        print_log_paths
+
         Parallel.map(target_services, progress: 'Executing', in_processes: 8) do |service|
           execute_for(service)
         end
@@ -42,5 +41,10 @@ module Devkitkat
       @target_services ||= config.resolve!(command.target, exclude: command.options[:exclude])
                                   .map { |name| Service.new(name, config, command) }
     end
+
+    def print_log_paths
+      log_paths = target_services.map(&:log_path)
+      puts %Q{See the log at \n#{log_paths.join("\n")}}
+    end
   end
 end

data/lib/devkitkat/version.rb

@@ -1,3 +1,3 @@
 module Devkitkat
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devkitkat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Shinya Maeda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,6 +184,7 @@ files:
 - bin/console
 - bin/devkitkat
 - bin/fast_rspec
+- bin/release
 - bin/setup
 - devkitkat.gemspec
 - docs/READ.md