fastlane-plugin-git_clone 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64eb120dee35d9d1e1e5e6fae180359223e450afa5d1e838903b9feea5102c2f
-  data.tar.gz: d8a21a8d511c01026c7fc3c42e06af2e9d976e31a29e3262fabfcb985cbd63dd
+  metadata.gz: 912e8917c6544d2868e9a09a43bba90c00c9aec135e82f0d7b7fcda3291f78df
+  data.tar.gz: 456f035ee3f441366d1bc4d3f39223990485f7b451b60524c2dd049cc7b1d725
 SHA512:
-  metadata.gz: acfe0b8f735ae5c78c4ca20d16831526632230d0b7abdb7561ad3334f33e74e8d999d5ca1bee7138260b625c4858c64c54f8e7dc8a33406065d139b3d7916a28
-  data.tar.gz: 7967cd0c99c8813699726b88329193f1af626fbd5647920e0898426e338477ee77c6d8b3f92610dd433d7293eb7c6996bf56d1ecc8078aab8af1c3b1b7fb89e7
+  metadata.gz: aac905f5787b17ce51612e83ede4b16ea6fe57cda1f04b33eaaef1f357dca385000a24fdfe9a61da4c0db881c65f9bcf066019d0f6ad5baa2cf928721804a642
+  data.tar.gz: dce3469415e7ce70ac9ab71e32402ee3dbaca0861deb63ab84ab578052c71f931da4a60f039092b7ede94855dab5e129931a7dd0ba90d63ef3788e00b70f8202

data/lib/fastlane/plugin/git_clone/actions/git_clone_action.rb

@@ -35,24 +35,22 @@ module Fastlane
         branch        = params[:branch]
         commit        = params[:commit]
         tag           = params[:tag]
-        depth         = params[:depth] || 1
+        depth         = params[:depth]
         single_branch = params[:single_branch] || false
 
-        cmd = if commit
-          [
-            "git clone #{git} #{path}",
-            "cd #{path}",
-            "git checkout #{commit}"
-          ].join(';')
-        else
-          [
-            "git clone #{git} #{path}",
-            ("-b #{branch} " if branch),
-            ("-b #{tag} " if tag),
-            ("--depth=#{depth} " if depth),
-            ("--single-branch " if single_branch)
-          ].compact.join(' ')
-        end
+        git_clone_cmd = [
+          "git clone #{git} #{path}",
+          ("-b #{branch}" if branch),
+          ("-b #{tag}" if tag),
+          ("--depth=#{depth}" if depth),
+          ("--single-branch" if single_branch)
+        ].compact.join(' ')
+        # UI.important(cmd)
+
+        cmd = [
+          git_clone_cmd,
+          (["cd #{path}", "git checkout #{commit}"] if commit)
+        ].compact.join(';')
 
         if sh(cmd) { |s| s.success? }
           UI.success "✅ clone #{git} to #{path}"
@@ -79,6 +77,7 @@ module Fastlane
           ("git pull origin #{branch}" if origin),
           ("git pull upstream #{branch}" if upstream)
         ].compact.join(';')
+        # UI.important(cmd)
 
         if sh(cmd) { |s| s.success? }
           UI.success "✅ update #{git} to #{path}"
@@ -119,7 +118,7 @@ module Fastlane
             optional: true,
             default_value: false,
             is_string: false,
-            conflicting_options: [:branch, :tag, :commit, :depth, :single_branch]
+            conflicting_options: [:tag, :commit, :depth, :single_branch]
           ),
           FastlaneCore::ConfigItem.new(
             key: :origin,
@@ -137,18 +136,11 @@ module Fastlane
             is_string: false,
             conflicting_options: [:origin]
           ),
-          FastlaneCore::ConfigItem.new(
-            key: :depth,
-            description: "--depth=1",
-            is_string: false,
-            type: Integer,
-            optional: true
-          ),
           FastlaneCore::ConfigItem.new(
             key: :branch,
             description: "-b master",
             optional: true,
-            conflicting_options: [:tag, :commit]
+            conflicting_options: [:tag]
           ),
           FastlaneCore::ConfigItem.new(
             key: :tag,
@@ -160,14 +152,23 @@ module Fastlane
             key: :commit,
             description: "git checkout commit",
             optional: true,
-            conflicting_options: [:branch, :tag, :depth, :single_branch]
+            conflicting_options: [:tag]
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :depth,
+            description: "--depth=1",
+            is_string: false,
+            type: Integer,
+            optional: true,
+            conflicting_options: [:commit]
           ),
           FastlaneCore::ConfigItem.new(
             key: :single_branch,
             description: "--single-branch",
             optional: true,
             default_value: false,
-            is_string: false
+            is_string: false,
+            conflicting_options: [:commit]
           )
         ]
       end

data/lib/fastlane/plugin/git_clone/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module GitClone
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-git_clone
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - xiongzenghui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry