devkitkat 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bc6a0d1d9391ed516c87cb476931a62d59c56ebeec5e52f4efad719f5e79581
-  data.tar.gz: a6bfa8f5bc4a49f0d83be3ac9d395432c7cb841cadf4380509d3f6a7d9a4cf09
+  metadata.gz: dd732b290dba1a084ac162b2051b2a330039f4cd3d4ee29722dbaf0727512545
+  data.tar.gz: 1d2e08a9f0ee07756027eb1e89c78033653819ddb6381906fab07ee0424adc64
 SHA512:
-  metadata.gz: f4e14b24694cb58569e815c6ce86afbb467bffda9b3a4702387cc4c30c35a41844ed4cbde5fb8f967795c7e532979cf381406bef391a6670a5359fdee76f6eb9
-  data.tar.gz: 55cd17e6bef92bc24abbd1dadc76c342231a190f1ad0a49720d2c26c79e80e1b48593a0824549e860c55ef67080e5e44badc451ee9a9eb532501261c35eba944
+  metadata.gz: 955b9030e45a72faeff84a960556b78968f32e2d402e1ebc52c9a52cd599bd71a29063193af56bd439dd9ed0479e7f1d3fd0e3938ad2d737cb82868b9244ca85
+  data.tar.gz: 56b093d253840f1787df90d3932bfcb6e94af61fbca3d1cb1693e07bd0c843b7465e40ce7b7ccf9a0956f26735e75f4010ab9ede8cbbe404410c53b42778fda6

data/.gitlab-ci.yml

@@ -22,8 +22,7 @@ release:
   script:
   - bin/release
   only:
-    changes:
-      - lib/devkitkat/version.rb
+    - tags
 
 # services:
 #   - docker:19.03.1-dind

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devkitkat (0.1.3)
+    devkitkat (0.1.6)
       activesupport (~> 6.0.0)
       colorize (~> 0.8.1)
       docker-api (~> 1.34.2)
@@ -31,7 +31,7 @@ GEM
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
     minitest (5.12.2)
-    multi_json (1.14.0)
+    multi_json (1.14.1)
     parallel (1.17.0)
     pry (0.12.2)
       coderay (~> 1.1.0)

data/README.md

@@ -1,4 +1,5 @@
 [![pipeline status](https://gitlab.com/dosuken123/devkitkat/badges/master/pipeline.svg)](https://gitlab.com/dosuken123/devkitkat/commits/master)
+[![Gem Version](https://badge.fury.io/rb/devkitkat.svg)](https://badge.fury.io/rb/devkitkat)
 
 # Devkitkat
 
@@ -151,23 +152,40 @@ source ${MI_SYSTEM_SCRIPT_SHARED_DIR}
 # Call a function defiend in the `shared` script
 ```
 
-## Predefined scripts
+## Utility commands, Predefined scripts and Options
 
 Devkitkat provides predefined scripts that are useful in common development scenarios.
 
-|Script name    |Available options        |Description|
-|---            |---                      |---|
-|`clone`        |`GIT_DEPTH` ... Speicify git-depth|Clone source code from the `services:<name>:repo:`|
-|`pull`         |`GIT_DEPTH` ... Speicify git-depth|Pull source code from the `services:<name>:repo:`|
-|`download`     |N/A                      |Download source code from the `services:<name>:repo:`|
-|`clean`        |N/A                      |Remove all files from `data`, `cache`, `log` and `src` dirs|
-|`docker-build` |`TAG`                    |Build a docker image|
-|`docker-push`  |`REGISTRY`               |Push a docker image|
-|`add-user`     |`TAG`                    |Add a user to the current system (It's useful for containerized images)|
-|`add-script`   |`--basic`                |Add a script to services|
-|`help`         |N/A                      |Show help|
-|`version`         |N/A                   |Show version|
-|`poop`         |N/A                      |:poop:|
+```
+Usage: devkitkat <command/script> <target> [args] [options]
+
+Options:
+    -p, --path PATH                  The root path of the .devkitkat.yml
+        --exclude SERVICE            Exclude serviced from the specified target
+    -e, --env-var VARIABLE           additional environment variables
+    -d, --depth DEPTH                Git depth for pull/fetch
+    -r, --remote REMOTE              Git remote
+    -b, --branch BRANCH              Git branch
+    -t, --tty                        TTY mode. In this mode, log won't be emitted.
+    -v, --version                    Show version
+    -h, --help                       Show help
+
+Utility Commands:
+add-script          - Add a script file
+add-example         - Add an example file
+add-shared-script   - Add s shared script
+help                - Show help
+
+Predefined scripts:
+clone               - Clone repository
+pull                - Pull latest source code
+clean               - Clean the service dir
+poop                - Poop
+```
+
+Example:
+
+`devkitkat start rails --path $HOME/awesome-app-dev-kit/ --env-var AWS_CRED=XXXXX`
 
 ## Predefined group names
 
@@ -220,7 +238,7 @@ For example, if you want to start `rails` service, your command would look like
 
 `devkitkat start backend --exclude redis`
 
-## Sample commands
+## Workflow example
 
 ```
 devkitkat pull default                          # Pull source code for the default group
@@ -230,16 +248,6 @@ devkitkat seed rails                            # It Seeds for `rails` service
 devkitkat start default                         # It starts services of the `default` group
 ```
 
-## Options for `devkitkat`
-
-- `--path /path/to/the` ... The root directory that contains `.devkitkat.yml` and manage the service dirs.
-- `--variables KEY=VAR` ... The additional environment variables for services.
-- `--exclude <name>` ... The excluded service from the group.
-
-Example:
-
-`devkitkat start rails --path $HOME/awesome-app-dev-kit/ --variables AWS_CRED=XXXXX`
-
 ## Installation
 
     $ gem install devkitkat

data/lib/devkitkat/command.rb

@@ -35,7 +35,7 @@ module Devkitkat
 
     def option_parser
       @option_parser ||= OptionParser.new do |opts|
-        opts.banner = "Usage: devkitkat <script> <target> [options]"
+        opts.banner = "Usage: devkitkat <command/script> <target> [args] [options]"
         opts.separator ""
         opts.separator "Options:"
 
@@ -79,15 +79,17 @@ module Devkitkat
         end
 
         opts.separator ""
-        opts.separator "Commands:"
+        opts.separator "Utility 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 "help                - Show help"
+        opts.separator ""
+        opts.separator "Predefined scripts:"
         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
 

data/lib/devkitkat/executor/docker.rb

@@ -106,7 +106,7 @@ module Devkitkat
       end
 
       def group_id
-        @group_id ||= `id -u`
+        @group_id ||= `id -u`.delete("\n")
       end
 
       def user_id

data/lib/devkitkat/main.rb

@@ -14,13 +14,13 @@ module Devkitkat
 
       results = []
 
+      print_log_paths
+
       if target_services.count == 1
         # If the target is only one, it could be console access (TTY)
         # so we can't run in parallel.
         results << target_services.first.execute
       else
-        print_log_paths
-
         results = Parallel.map(target_services, progress: 'Executing', in_processes: 8) do |service|
           service.execute.tap do |success|
             raise Parallel::Kill unless success
@@ -39,6 +39,8 @@ module Devkitkat
     end
 
     def print_log_paths
+      return if command.tty?
+
       log_paths = target_services.map(&:log_path)
       puts %Q{See the log at \n#{log_paths.join("\n")}}
     end

data/lib/devkitkat/service.rb

@@ -246,6 +246,11 @@ See the log file: #{log_path}]
       executor.write(%Q{echo "💩"})
     end
 
+    def exec
+      executor.write(%Q{cd #{src_dir}})
+      executor.write(%Q{#{args.join(' ')}})
+    end
+
     def executor
       @executor ||= Executor.new(self)
     end

data/lib/devkitkat/version.rb

@@ -1,3 +1,3 @@
 module Devkitkat
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devkitkat
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Shinya Maeda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-17 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler