gct 0.4.6 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a862c669dd00f8f75eac90ea9438a8774dd6c5fb190de25cc34024c028bbf6c3
-  data.tar.gz: da2c3466907b592e4bc02775b5b07ca2e69b64ad0122031b99fa00d49c212ae7
+  metadata.gz: 5c5c117dbfd9e96df0f31a971dda44635658c33d6acb234829862932ed11377c
+  data.tar.gz: 4c23d03ead1cb929deb885ab802a83531afb0e8f6dcb3d1ffccfc1d433544496
 SHA512:
-  metadata.gz: 8c00440bc3426b6a629353a850bd652cb7a2d4d61efcbe4c1e81f45903606aa50c3c3bc5ea8983fff825a78de7c7d2a0231277aeedd85d526ce0ff7a63846f4c
-  data.tar.gz: c35c3dee9f8c30d38a334937eebc6203effa5cf38d6ff675e2876e04bd491fc64f4df3f38e1e0808b2d8707bc7cfd473696a7c5bfc8d974a0b333824a6422f36
+  metadata.gz: f407f15fa81efaf3233f67b6021551b0ebe62590d086e0f079ca7d2932815529be4f02ed258e126d44241bc9b1cb8a00eb3617bd0f9dd2082c50276ea14e6a99
+  data.tar.gz: a1a85a16d3d6c6e18d2a45e2c5fba28e0981102539dbd6ff9b458572765d0b3ceff4cffde1e72088ecdb54418ed7a27018c1c64d82a50e82386925187b59b585

data/lib/gct/command.rb

@@ -92,6 +92,7 @@ module Gct
     end
 
     def auto_add_tag(tag)
+      puts "current tag = #{tag}"
       tag_points = tag.to_s.split('.')
       index = tag_points.length - 1
       need_add_point = tag_points[index].to_i + 1

data/lib/gct/command/autotag.rb

@@ -249,7 +249,7 @@ module Gct
         db = Database::Data.new
         # 查询优先级最高的为完成打tag的数据
         where_statement = "and is_pre = " + (@pre ? "1" : "0")
-        sql = "select * from tag where priority = (select MAX(priority) from tag where project_version = '#{@version}' and tag_status != '#{SpecPublishStatus::SUCCESS}' #{where_statement})"
+        sql = "select * from tag where priority = (select MAX(priority) from tag) and project_version = '#{@version}' and tag_status != '#{SpecPublishStatus::SUCCESS}' #{where_statement}"
         result = db.query(sql)
         vals = ""
         ins = ""
@@ -258,8 +258,11 @@ module Gct
             if row["tag_status"].eql?(SpecPublishStatus::WAITING) || row["tag_status"].eql?(SpecPublishStatus::CANCELED) || row["tag_status"].eql?(SpecPublishStatus::FAILED)
               status = SpecPublishStatus::PENDING
               name = row["pod_name"]
+              puts "pod name is " + name
               vals.concat("when pod_name = '#{name}' then '#{status}' ")     
+              puts vals
               ins.concat("'#{name}',")
+              puts ins
               system "gct update dependency #{name} tag_status #{status}"
               skip_tag = ""
               if row["is_tag"].to_i == 1 

data/lib/gct/command/update/tag.rb

@@ -51,11 +51,9 @@ module Gct
         end
 
         def skip_tag_method 
-          if !@update_ci
-            isEmptyMR = mr_to_master
-            if !isEmptyMR
-              accept_merge_request
-            end
+          isEmptyMR = mr_to_master
+          if !isEmptyMR
+            accept_merge_request
           end
           remove_and_create_tag
         end

data/lib/gct/gct_version.rb

@@ -2,5 +2,5 @@ module Gct
   # freeze 冻结对象，将对象变成一个常量
   # unless 右边的代码块成立，才会运行左边的代码块
   # defined? 是用来判断本地变量是否存在，也可用来判断是否存在方法
-  VERSION = "0.4.6".freeze unless defined? Gct::VERSION
+  VERSION = "0.5.3".freeze unless defined? Gct::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gct
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.3
 platform: ruby
 authors:
 - jieming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-21 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler