cocoapods-dev-env 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdaaaa859c28266f342600dc39eacd9a82817496b8680c85970ae5642a6e75b1
-  data.tar.gz: e8b52c83fc9ebf8fa185e4ff5d621408871750034ed858e774c2adb03f822330
+  metadata.gz: 86ea3266601b7a7b150bcb8ebbdbd61244bb0047551856f28d36144a93ee2d9d
+  data.tar.gz: 11281a84183572629f5d3291e44f95b30b06aee4a0a032b79beaede2d25f210a
 SHA512:
-  metadata.gz: 75e8545e0f78c61f9b0a4f52daee4040b40571be323a05868732b895846cffea23608ef44f352a3212120338490b71d8e88384a05571dab3dad69996455d4fb8
-  data.tar.gz: 2dd3097002e4b0b93d02106ef84286d466009afef74a178ef5e78f0f39e3463eaf9b36b85c238c25b0c38d83a4d046843e68baf80f95806eae74989608ef3397
+  metadata.gz: e29f5ea8412543bea24745770796baf459af98efdc84849112bd5be23be36d69a1f5e244b7cbcaea5218085ea41f84b5e994c2d31e6f36ca4472c0ea71787a5b
+  data.tar.gz: a0eea3c7c4afcc3b0ff08c0486e925c26d9823a67f198cf57dc7f87a6f15b0efb426114b91a944f24968985344685c34de1cbadd2a689a144aaf2bd296189a37

data/lib/cocoapods/dev/env/version.rb

@@ -1,7 +1,7 @@
 module Cocoapods
   module Dev
     module Env
-      VERSION = "0.2.3"
+      VERSION = "0.2.4"
     end
   end
 end

data/lib/cocoapods_plugin.rb

@@ -41,6 +41,15 @@ class Podfile
             `
         end
 
+        def checkTagIsEqualToHead(tag, path)
+            currentDir = Dir.pwd
+            Dir.chdir(path)
+            result = `git describe --abbrev=4 HEAD`
+            Dir.chdir(currentDir)
+            return result.include?(tag)
+        end
+
+# 这个函数有问题有时候拿不到相同的commit id
         def checkTagOrBranchIsEqalToHead(branchOrTag, path)
             currentDir = Dir.pwd
             Dir.chdir(path)
@@ -85,7 +94,7 @@ class Podfile
                         UI.puts "####### add submodule for #{pod_name}"
                         `git submodule add --force -b #{branch} #{git} #{path}`
                         
-                        if !checkTagOrBranchIsEqalToHead(tag, path) && !checkTagOrBranchIsEqalToHead("#{tag}_beta", path)
+                        if !checkTagIsEqualToHead(tag, path) && !checkTagIsEqualToHead("#{tag}_beta", path)
                             raise "#{pod_name} branch:#{branch} 与 tag:#{tag}[_beta] 内容不同步，请自行确认所用分支和tag后重新执行 pod install"
                         end
                     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dev-env
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - 吴锡苗