gct 0.3.93 → 0.3.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a90278a27edf99a940f703b359f26160c3534f51bb8e3ad7dc2b9af240209fe1
-  data.tar.gz: 9a62537fadb1678a6d8c1969e1b487c844117b1e58c9089038ccc9bbcaba8328
+  metadata.gz: 3a66d72b82441d12f72050bcb612ada7ed56a250b6f647eb7e8828f126dc1285
+  data.tar.gz: 793399e10ac9879a19a6088808f184ba2f1496749bee1b0d113c836bafa71047
 SHA512:
-  metadata.gz: acfa21c1c8cc42efc63f2d06fd49799146e8a17f6fcbcefc7480a9d2579db448280cdd78ea035bcb9906ab0facaa00926452fe429f7733c35c54b035ca6c411d
-  data.tar.gz: feafb9b42ecdbc68b5dd91ef4415ebb6d0b0f871a0e70f11fe49537ecfa1319ad282bf1dca09c5c42974ff203c6123dbb3a0bf78b3c749657f0be9fcfff9801c
+  metadata.gz: d9d2b0c7d925ec5f9fcb175615d87c9ca9440b836a003449d9afd70e295c46c6ea3ab91223b2cd4d98bef5c0d326c26c179bd1a9962754665a548aec9ae23138
+  data.tar.gz: ea22f65f15803aefaed9e8b447c9d113dc93d78409aa6af4de2c004ca218a1c3057d907af0d17ab6272a25cac976bf8f8a1f83d529e5d05299f5ba66e67b7529

data/lib/gct/command.rb

@@ -27,6 +27,7 @@ module Gct
     require 'gct/command/setup'
     require 'gct/command/update'
     require 'gct/command/robot'
+    require 'gct/command/clean'
 
     self.abstract_command = true
     self.command = 'gct'

data/lib/gct/command/clean.rb

@@ -0,0 +1,15 @@
+require 'gct/command/clean/cache'
+require 'gct/command/clean/ci'
+require 'gct/command/clean/lint'
+
+module Gct
+  class Command
+    class Clean < Command
+      self.abstract_command = true
+      self.summary = '清理缓存的相关操作'
+      self.description =  <<-DESC
+        清理lint缓存,Xcode build缓存,ci build 缓存
+      DESC
+    end
+  end
+end

data/lib/gct/command/clean/cache.rb

@@ -0,0 +1,26 @@
+module Gct
+  class Command
+    class Clean < Command
+      class Cache < Clean
+
+        self.summary = '清理Xcode build缓存'
+        self.description = <<-DESC
+          清理Xcode build缓存
+        DESC
+
+        def initialize(argv)
+         
+          super
+        end
+
+        def run 
+          home_path = Generator::GctFile.get_system_home_path().rstrip
+          xcache_path = "#{home_path}/Library/Developer/Xcode/DerivedData/"
+          `rm -rf #{xcache_path}`
+        end
+
+      
+      end
+    end
+  end
+end

data/lib/gct/command/clean/ci.rb

@@ -0,0 +1,23 @@
+module Gct
+  class Command
+    class Clean < Command
+      class Ci < Clean
+
+        self.summary = '清除ci缓存'
+        self.description = <<-DESC
+          清除ci缓存，默认清除所有
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('POD_NAME', false),
+        ]
+
+        def initialize(argv)
+          super
+        end
+
+      
+      end
+    end
+  end
+end

data/lib/gct/command/clean/lint.rb

@@ -0,0 +1,28 @@
+module Gct
+  class Command
+    class Clean < Command
+      class Lint < Clean
+
+        self.summary = '清除lint缓存'
+        self.description = <<-DESC
+          清除lint缓存，默认清除所有
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('POD_NAME', false),
+        ]
+
+        def initialize(argv)
+          @pod_name = argv.shift_argument
+          super
+        end
+
+        def run 
+          home_path = Generator::GctFile.get_system_home_path().rstrip
+          lintcahce_path = "#{home_path}/Library/Caches/CocoaPods/Pods/External/#{@pod_name}"
+          `rm -rf #{lintcahce_path}`
+        end
+      end
+    end
+  end
+end

data/lib/gct/command/init/gitlab-ci.rb

@@ -7,6 +7,7 @@ push_pod:
   script: 
     - gct robot start
     - echo "开始lint 和 push podspec"
+    - gct clean lint $CI_PROJECT_NAME
     - gct repo update
     - gct repo push
     - gct robot finish true
@@ -20,5 +21,7 @@ on_failure:
   script:
     - gct robot finish false
   when: on_failure
+  only: 
+    - tags
   tags:
     - iOS

data/lib/gct/command/op.rb

@@ -2,6 +2,7 @@ require 'gct/command/op/gems'
 require 'gct/command/op/gitconf'
 require 'gct/command/op/xcache'
 require 'gct/command/op/root'
+require 'gct/command/op/lint'
 
 module Gct
   class Command

data/lib/gct/command/op/lint.rb

@@ -0,0 +1,35 @@
+module Gct
+  class Command
+    class Op < Command
+      class Lint < Op
+
+        self.summary = '打开lint 缓存文件夹'
+        self.description = <<-DESC
+        打开lint 缓存文件夹
+      DESC
+
+        self.arguments = [
+        ]
+
+        def initialize(argv)
+          super
+        end
+
+        def validate!
+          super
+        end
+
+        def run
+          openLintCache
+        end
+
+        def openLintCache
+          lintCache = '~/Library/Caches/CocoaPods/Pods/External/'
+          puts "Xcode缓存路径为：#{lintCache}".green
+          system "open #{lintCache}"
+        end
+      end
+    end
+  end
+end
+

data/lib/gct/command/robot/finish.rb

@@ -33,6 +33,7 @@ module Gct
         end
 
         def run
+          puts "build_status == #{@build_status}"
           build_text = @build_status ? "<font color=\"info\">CI运行成功</font>" : "<font color=\"comment\">CI运行失败</font>，请相关人员注意"
           ci_text = "[点击跳转](#{@ci_url})"
           

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

@@ -31,7 +31,7 @@ module Gct
             @project_id = "#{Constant.NameSpace}#{@name}"
             super
         end
-
+        
         def run
           update_ci_method if @update_ci
           if @skip_tag 
@@ -44,8 +44,17 @@ module Gct
         def skip_tag_method 
           @new_tag = @spec.version
           puts "tag == #{@new_tag}"
-          delete_tag  # remove tag
-          create_tag  # create tag
+          if !@update_ci
+            isEmptyMR = mr_to_master
+            if !isEmptyMR
+              accept_merge_request
+            end
+          end
+          # remove tag
+          `git tag -d #{@new_tag}`
+          `git push origin :refs/tags/#{@new_tag}`  
+          # create tag
+          create_tag
         end
 
         def update_ci_method
@@ -54,8 +63,10 @@ module Gct
           path = File.expand_path("../../init", __FILE__)
           ci_content = temp_local_file.read_path_file(path, "gitlab-ci.rb")
           edit_file('.gitlab-ci.yml', ci_content, 'update ci')
-          mr_to_master
-          accept_merge_request
+          isEmptyMR = mr_to_master
+          if !isEmptyMR
+            accept_merge_request
+          end
         end
 
         def get_spec_file
@@ -90,12 +101,18 @@ module Gct
 
         def mr_to_master
           puts "正在创建MR请求将develop分支合并到master！".green
-          mr = Gitlab.create_merge_request("#{Constant.NameSpace}#{@name}", "更新版本podpesc版本号", { source_branch: "#{@update_version_branch}", target_branch: 'master' })
+          mr = Gitlab.create_merge_request("#{Constant.NameSpace}#{@name}", "mr", { source_branch: "#{@update_version_branch}", target_branch: 'master' })
+          # puts mr.to_hash
           @id = mr.iid
           puts mr.merge_status
-          if mr.merge_status == 'cannot_be_merged' 
+          isEmptyMR = mr.diff_refs.base_sha.eql?(mr.diff_refs.head_sha)
+          # puts mr.diff_refs.base_sha
+          # puts mr.diff_refs.head_sha
+          close_mr if isEmptyMR
+          if mr.merge_status == 'cannot_be_merged' && !isEmptyMR
             raise "Merge有冲突，请前往 https://gi-dev.ccrgt.com/#{Constant.NameSpace}#{@name}/merge_requests/#{@id} 解决".red
           end
+          isEmptyMR
         end
   
         def accept_merge_request
@@ -105,8 +122,8 @@ module Gct
           end
         end
 
-        def delete_tag
-          Gitlab.delete_tag("#{@project_id}", "#{@new_tag}")
+        def close_mr 
+          Gitlab.update_merge_request("#{@project_id}", @id, {state_event: 'close'})
         end
 
         def create_tag

data/lib/gct/gct_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gct
 version: !ruby/object:Gem::Version
-  version: 0.3.93
+  version: 0.3.95
 platform: ruby
 authors:
 - jieming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,6 +149,10 @@ files:
 - lib/gct/command/autotag.rb
 - lib/gct/command/build.rb
 - lib/gct/command/build/r.rb
+- lib/gct/command/clean.rb
+- lib/gct/command/clean/cache.rb
+- lib/gct/command/clean/ci.rb
+- lib/gct/command/clean/lint.rb
 - lib/gct/command/config.rb
 - lib/gct/command/config/get.rb
 - lib/gct/command/config/set.rb
@@ -163,6 +167,7 @@ files:
 - lib/gct/command/op.rb
 - lib/gct/command/op/gems.rb
 - lib/gct/command/op/gitconf.rb
+- lib/gct/command/op/lint.rb
 - lib/gct/command/op/root.rb
 - lib/gct/command/op/xcache.rb
 - lib/gct/command/repo.rb
@@ -204,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: '"gct ios 自动化脚本工具"'