devkitkat 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecae4680a42c6d7ad196463b79e0d5d82916854959f3fd03708e062b48ddbc26
-  data.tar.gz: ee12f3b11a6801dcdd2b26cb2a5e8476fab8c4767055f2a27474438db5826e4a
+  metadata.gz: 707204a31dc5981d5d933d6f7b268727b61cb8c535e1abf856ea8ea944095ed3
+  data.tar.gz: e9358c4a44acc4636a55f42a0aaf862a103752a295702dd5f47e592a11f2fb0b
 SHA512:
-  metadata.gz: 9c4e980362a3b2699edb4862bcd0c3199c6ddbcc516532499a0aabebbf31bcaecbdff40a80054ec1a340e0ea988c24e0b21a66414392cd46be1c1d56aecff1da
-  data.tar.gz: eebf977ed6e79c4e1ea8608e4ca4eaf208ac1b8a6f82a487e78ef711fa45bf8952bc2fa3dd98712211ed18d07ba563210c0678f05415cc0c71da7e1480bea928
+  metadata.gz: 26866d980e84a0d55205a6fb716b74a91a3ba7be1b2c0667fa84e9085c356bdb43cf82cc1434209065eb29c5fb13485ad5f19947305da72345ad6326f740eb75
+  data.tar.gz: ce3de3f45076654f9972163f73c4f3ee641bde236fcefaa9c0312c46fa70d0d4e4f70feb1e3c743de6a735ef40fed58993d125c693c2a81f9893b3bf85a205d6

data/Gemfile.lock

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

data/README.md

@@ -147,7 +147,7 @@ To include the shared script, you need to update your service script as the foll
 
 ```shell
 #!/bin/bash
-source ${MI_SYSTEM_SCRIPT_SHARED_DIR}
+source ${DK_SYSTEM_SCRIPT_SHARED_DIR}
 
 # Call a function defiend in the `shared` script
 ```
@@ -195,26 +195,26 @@ Example:
 
 Devkitkat inject these predefined variables into the scripts by default.
 
-- `MI_<service>_DIR` ... The root directory path of the service.
-- `MI_<service>_SCRIPT_DIR` ... The script directory path of the service.
-- `MI_<service>_SRC_DIR` ... The source directory path of the service.
-- `MI_<service>_CACHE_DIR` ... The cache directory path of the service.
-- `MI_<service>_DATA_DIR` ... The data directory path of the service.
-- `MI_<service>_LOG_DIR` ... The log directory path of the service.
-- `MI_<service>_EXAMPLE_DIR` ... The example directory path of the service.
-- `MI_<service>_<key>` ... The value of the user-defined variable.
+- `DK_<service>_DIR` ... The root directory path of the service.
+- `DK_<service>_SCRIPT_DIR` ... The script directory path of the service.
+- `DK_<service>_SRC_DIR` ... The source directory path of the service.
+- `DK_<service>_CACHE_DIR` ... The cache directory path of the service.
+- `DK_<service>_DATA_DIR` ... The data directory path of the service.
+- `DK_<service>_LOG_DIR` ... The log directory path of the service.
+- `DK_<service>_EXAMPLE_DIR` ... The example directory path of the service.
+- `DK_<service>_<key>` ... The value of the user-defined variable.
 
 NOTE:
  - User-defined variables are injected with the bare name. e.g. If you define
    `VERSION: 1`, then you get the value with `echo $VERSION`. From the other services,
-   the variable can be fetched as `MI_<service>_<key>`.
+   the variable can be fetched as `DK_<service>_<key>`.
  - `service` is the *uppercase* service *name*. e.g. if the service name is
-  `rails`, `MI_RAILS_DIR` is the root directory path of the service.
- - `key` is *uppercase* e.g. `MI_RAILS_HOST`
+  `rails`, `DK_RAILS_DIR` is the root directory path of the service.
+ - `key` is *uppercase* e.g. `DK_RAILS_HOST`
  - You can also use `SELF` instead of specifying a service name.
    The `SELF` indicates that it's a context specific parameter, for example,
-   if you run a script for `workhorse` service, `MI_SELF_DIR` is `services/workhorse`,
-   on the other hand, if you run a script for `gitaly` service, `MI_SELF_DIR` is `services/gitaly`.
+   if you run a script for `workhorse` service, `DK_SELF_DIR` is `services/workhorse`,
+   on the other hand, if you run a script for `gitaly` service, `DK_SELF_DIR` is `services/gitaly`.
 
 ## How to control services via scripts
 

data/lib/devkitkat/config.rb

@@ -23,10 +23,12 @@ module Devkitkat
                    all_services
                  elsif group = find_group(target)
                    services_for_group(group)
+                 elsif services = find_comma_separated_services(target)
+                  services
                  elsif service = find_service(target)
                    [service]
                  else
-                   raise ArgumentError, "The target name #{target} couldn't be resolved"
+                   raise_error(target)
                  end
 
       services = services - exclude if exclude
@@ -80,6 +82,16 @@ module Devkitkat
       services.find { |service| service == target }
     end
 
+    def find_comma_separated_services(target)
+      return unless target.include?(',')
+
+      target.split(',').map do |t|
+        find_service(t).tap do |service|
+          raise_error(t) unless service
+        end
+      end
+    end
+
     def load_config
       File.read(config_path).yield_self do |content|
         YAML.load(content)
@@ -89,5 +101,9 @@ module Devkitkat
     def config_path
       File.join(kit_root, DEVKITKAT_FILE_NAME)
     end
+
+    def raise_error(target)
+      raise ArgumentError, "The target name #{target} couldn't be resolved"
+    end
   end
 end

data/lib/devkitkat/service.rb

@@ -105,32 +105,32 @@ set -e
         executor.write("export #{key}=#{value}")
       end
 
-      executor.write("export MI_ROOT_DIR=#{kit_root}")
-      executor.write("export MI_ENVIRONMENT_TYPE=#{config.environment_type.to_s}")
-      executor.write("export MI_APPLICATION=#{config.application.to_s}")
+      executor.write("export DK_ROOT_DIR=#{kit_root}")
+      executor.write("export DK_ENVIRONMENT_TYPE=#{config.environment_type.to_s}")
+      executor.write("export DK_APPLICATION=#{config.application.to_s}")
     end
 
     def inject_public_variables
       all_services.each do |service|
-        executor.write("export MI_#{service.name.upcase}_DIR=#{service.service_dir}")
+        executor.write("export DK_#{service.name.upcase}_DIR=#{service.service_dir}")
 
         DIVISIONS.each do |division|
-          executor.write("export MI_#{service.name.upcase}_#{division.upcase}_DIR=#{service.send("#{division}_dir")}")
+          executor.write("export DK_#{service.name.upcase}_#{division.upcase}_DIR=#{service.send("#{division}_dir")}")
         end
 
-        executor.write("export MI_#{service.name.upcase}_SHARED_SCRIPT_DIR=#{service.shared_script_dir}")
+        executor.write("export DK_#{service.name.upcase}_SHARED_SCRIPT_DIR=#{service.shared_script_dir}")
 
         config.service_hash(service.name).each do |key, value|
-          executor.write("export MI_#{service.name.upcase}_#{key.upcase}=#{value}")
+          executor.write("export DK_#{service.name.upcase}_#{key.upcase}=#{value}")
         end
       end
     end
 
     def inject_private_variables
-      executor.write("export MI_SELF_DIR=#{service_dir}")
+      executor.write("export DK_SELF_DIR=#{service_dir}")
 
       DIVISIONS.each do |division|
-        executor.write("export MI_SELF_#{division.upcase}_DIR=#{send("#{division}_dir")}")
+        executor.write("export DK_SELF_#{division.upcase}_DIR=#{send("#{division}_dir")}")
       end
 
       config.service_hash(name).each do |key, value|

data/lib/devkitkat/version.rb

@@ -1,3 +1,3 @@
 module Devkitkat
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devkitkat
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Shinya Maeda