devkitkat 0.1.18 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f15d601f70f02d45b6cfc8410752ee8a35ed92e3ae230b09420743e324929d12
-  data.tar.gz: 7db27646a5ed36bfde804db3ec120bd520b2a412eb5ebabaae8fafb0acdb7c53
+  metadata.gz: fc4e89605c7399f9d0552458cc97d8537427bac842b6914583fd387c3c5f38bc
+  data.tar.gz: 75e49494c401224ac04c7437c4cc6054444647370a226ce6d1e53c86beb83414
 SHA512:
-  metadata.gz: 631e86aac2dd91d2861c196c6245f131771b326522a0fb5394d945ee7f758f7e0e561e076999ce110f755268a99c90dc59cc4787c64e1b5e3801f5383bbe8d71
-  data.tar.gz: ce859f44ce06c155a56f0b3157c84001981545b646fddd9eef543f68332169ab75c72975c76a3ec583a455900a63ddb26e0436c9deb704ec79e908f6d12883ae
+  metadata.gz: 3ef8f4df847e466f3d33a4731a42d5537c6a2081a0e98e0ced285e92dc053ded777237fb7846d445bb5bbfb58f340c0418e042e194e8744eae1684f09d188a25
+  data.tar.gz: 04a41c6e24be0eed4b17dd559a2335dfd76f8641444cb07d1ca990819f3d3d5086a6ae94b030592aa4f7fdda8f4fb0c9a75f90a795c26bd195ea93ac8ce36c98

data/.gitignore

@@ -11,3 +11,4 @@
 .rspec_status
 services
 .devkitkat.yml
+.devkitkat

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devkitkat (0.1.18)
+    devkitkat (0.1.20)
       activesupport (~> 6.0.0)
       colorize (~> 0.8.1)
       docker-api (~> 1.34.2)
@@ -26,7 +26,7 @@ GEM
     docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
-    excon (0.67.0)
+    excon (0.68.0)
     i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)

data/bin/devkitkat

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'bundler/setup' if ENV['DEVKITKAT_DEBUG']
 require "devkitkat"
 require 'pry'
 

data/lib/devkitkat/command.rb

@@ -24,6 +24,10 @@ module Devkitkat
       options[:debug]
     end
 
+    def quiet?
+      options[:quiet]
+    end
+
     def tmp_dir
       File.join(kit_root, '.devkitkat')
     end
@@ -44,8 +48,8 @@ module Devkitkat
         opts.separator ""
         opts.separator "Options:"
 
-        opts.on("-p", "--path PATH", "The root path of the .devkitkat.yml") do |v|
-          options[:root_path] = v
+        opts.on("-d", "--debug", "Debug mode") do |v|
+          options[:debug] = v
         end
 
         opts.on("-e", "--exclude SERVICE", "Exclude serviced from the specified target") do |v|
@@ -58,23 +62,27 @@ module Devkitkat
           options[:variables].merge!(Hash[*v.split('=')])
         end
 
-        opts.on("-d", "--debug", "Debug mode") do |v|
-          options[:debug] = v
+        opts.on("-h", "--help", "Show help") do |v|
+          show_help
         end
 
         opts.on("-i", "--interactive", "Interactive mode. STDOUT is streamed in console.") do |v|
           options[:interactive] = v
         end
 
+        opts.on("-p", "--path PATH", "The root path of the .devkitkat.yml") do |v|
+          options[:root_path] = v
+        end
+
+        opts.on("-q", "--quiet", 'Quiet mode') do |v|
+          options[:quiet] = v
+        end
+
         opts.on("-v", "--version", "Show version") do |v|
           puts Devkitkat::VERSION
           exit
         end
 
-        opts.on("-h", "--help", "Show help") do |v|
-          show_help
-        end
-
         opts.separator ""
         opts.separator "Utility Commands:"
         opts.separator "add-script          - Add a script file"

data/lib/devkitkat/main.rb

@@ -24,18 +24,24 @@ module Devkitkat
         end
       end
 
-      exit(1) unless results&.all? { |result| result == true }
+      terminate_process_group! unless results&.all? { |result| result == true }
     end
 
     private
 
+    def terminate_process_group!
+      pgid = Process.getpgid(Process.pid)
+
+      Process.kill('TERM', -pgid)
+    end
+
     def target_services
       @target_services ||= config.resolve!(command.target, exclude: command.options[:exclude])
                                  .map { |name| Service.new(name, config, command) }
     end
 
     def print_log_paths
-      return if command.interactive?
+      return if command.interactive? || command.quiet?
 
       log_paths = target_services.map(&:log_path)
       puts %Q{See the log at \n#{log_paths.join("\n")}}

data/lib/devkitkat/service.rb

@@ -223,6 +223,7 @@ fi
     def pull
       return unless repo_defined?
 
+      executor.write("cd #{src_dir}")
       executor.write("git pull origin master")
     end
 

data/lib/devkitkat/version.rb

@@ -1,3 +1,3 @@
 module Devkitkat
-  VERSION = "0.1.18"
+  VERSION = "0.1.20"
 end

metadata

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