devkitkat 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 707204a31dc5981d5d933d6f7b268727b61cb8c535e1abf856ea8ea944095ed3
-  data.tar.gz: e9358c4a44acc4636a55f42a0aaf862a103752a295702dd5f47e592a11f2fb0b
+  metadata.gz: 9503c19e647f80c25ed049cc5ff96089b903a953d5b42be1da32788236d6d2f2
+  data.tar.gz: 07f56dbc33f4a31bd5554148aef406d6ddd58ca0c3d690a630cba0fdb91ce175
 SHA512:
-  metadata.gz: 26866d980e84a0d55205a6fb716b74a91a3ba7be1b2c0667fa84e9085c356bdb43cf82cc1434209065eb29c5fb13485ad5f19947305da72345ad6326f740eb75
-  data.tar.gz: ce3de3f45076654f9972163f73c4f3ee641bde236fcefaa9c0312c46fa70d0d4e4f70feb1e3c743de6a735ef40fed58993d125c693c2a81f9893b3bf85a205d6
+  metadata.gz: ed82299c1adda7c574f7af3d007bea9fda838d98a98b9da77736870d0b9a528f30bcbc44e09ffc1568e1b6cbe750c77c71ff13fe3259b0b70ea5406d6ec3aba2
+  data.tar.gz: 44cd63fe05a894b2b98c8a2207c98558bea28799f46315d86ccc6ecb9ee2c06b9b004fb7090122238be4a1dbcf15bf4020027c789bd2b5c061ec3d73daf475ca

data/Gemfile.lock

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

data/README.md

@@ -163,10 +163,8 @@ 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.
+    -d, --debug                      Debug mode
+    -i, --interactive                Interactive mode. STDOUT is streamed in console.
     -v, --version                    Show version
     -h, --help                       Show help
 
@@ -177,7 +175,7 @@ add-shared-script   - Add s shared script
 help                - Show help
 
 Predefined scripts:
-clone               - Clone repository
+clone               - Clone repository (Available options: `GIT_DEPTH`)
 pull                - Pull latest source code
 clean               - Clean the service dir
 poop                - Poop

data/lib/devkitkat/command.rb

@@ -12,8 +12,8 @@ module Devkitkat
       show_version if script == 'version'
     end
 
-    def tty?
-      options[:tty]
+    def interactive?
+      options[:interactive]
     end
 
     def variables
@@ -62,20 +62,8 @@ module Devkitkat
           options[:debug] = v
         end
 
-        opts.on("-d", "--depth DEPTH", "Git depth for pull/fetch") do |v|
-          options[:git_depth] = v
-        end
-
-        opts.on("-r", "--remote REMOTE", "Git remote") do |v|
-          options[:git_remote] = v
-        end
-
-        opts.on("-b", "--branch BRANCH", "Git branch") do |v|
-          options[:git_branch] = v
-        end
-
-        opts.on("-t", "--tty", "TTY mode. In this mode, log won't be emitted.") do |v|
-          options[:tty] = v
+        opts.on("-i", "--interactive", "Interactive mode. STDOUT is streamed in console.") do |v|
+          options[:interactive] = v
         end
 
         opts.on("-v", "--version", "Show version") do |v|
@@ -95,7 +83,7 @@ module Devkitkat
         opts.separator "help                - Show help"
         opts.separator ""
         opts.separator "Predefined scripts:"
-        opts.separator "clone               - Clone repository"
+        opts.separator "clone               - Clone repository (Available options: `GIT_DEPTH`)"
         opts.separator "pull                - Pull latest source code"
         opts.separator "clean               - Clean the service dir"
         opts.separator "poop                - Poop"

data/lib/devkitkat/main.rb

@@ -8,10 +8,6 @@ module Devkitkat
     end
 
     def execute
-      if command.tty? && target_services.count > 1
-        raise ArgumentError, 'TTY mode accepts only one service'
-      end
-
       results = []
 
       print_log_paths
@@ -39,7 +35,7 @@ module Devkitkat
     end
 
     def print_log_paths
-      return if command.tty?
+      return if command.interactive?
 
       log_paths = target_services.map(&:log_path)
       puts %Q{See the log at \n#{log_paths.join("\n")}}

data/lib/devkitkat/service.rb

@@ -139,7 +139,7 @@ set -e
     end
 
     def setup_logger
-      return if command.tty?
+      return if command.interactive?
 
       executor.write("exec > #{log_path} 2>&1")
     end
@@ -209,22 +209,21 @@ See the log file: #{log_path}]
     def clone
       return unless repo_defined?
 
-      options = []
+      cmd = <<-EOS
+if [ -n "$GIT_DEPTH" ]; then
+  git clone #{repo} #{src_dir} --depth $GIT_DEPTH
+else
+  git clone #{repo} #{src_dir}
+fi
+      EOS
 
-      if command.options[:git_depth]
-        options << "--depth #{command.options[:git_depth]}"
-      end
-
-      executor.write("git clone #{repo} #{src_dir} #{options.join(' ')}")
+      executor.write(cmd)
     end
 
     def pull
       return unless repo_defined?
 
-      remote = command.options[:git_remote] || 'origin'
-      branch = command.options[:git_branch] || 'master'
-
-      executor.write("git pull #{remote} #{branch}")
+      executor.write("git pull origin master")
     end
 
     def clean

data/lib/devkitkat/version.rb

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

metadata

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