cocoapods-tag 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab723fa1e07606d3664af7a1ec85aacd255a2782722be6c733d727f86f1e47d9
-  data.tar.gz: eefc4e3111d15c9504ca69e894aff85a76ba8531aff01028fdb52f75e1068173
+  metadata.gz: 8bcf6776d9aecce496fc5ee724891375b4244907a9cec5dc0cc68e0bec72e9b1
+  data.tar.gz: 47e3f0020ec0f2ebd1be45ae35fdf49f94d7f185a9f46b0186abd0681fe0fd2f
 SHA512:
-  metadata.gz: 8f7a3e6579264821c391fcd54a23fd5a9fea86ce3344b176a951825578d57a3a52b5b5c9e085b1e879bde0511f4d29c5fdcb82bb9001bf6cc6689fac1e1d1092
-  data.tar.gz: a282fea1a342b38eea54357ac0967910bf8a428dceae26b77a0616198a066b660baf339ac4d3ca1ef2599f0c81302c568039797e05fcff426fc4ee46be0c991e
+  metadata.gz: 0dec037cdb109bb8396ff9871f3ca00b89c83da4f1574f1e2df71d65eecec348523205d93a206819bd7c39882fd4a991e8b65903b95892e9599bf2db6d39dec9
+  data.tar.gz: 3e8190ebe75421b767616c7590646f8679fce382cf87bd3546d703643d6144a400df0fe6878e5a83a09c36b43717affb12a3cdaec6a2fa19b1559d1eb61436a4

data/README.md

@@ -53,7 +53,7 @@ $ gem install cocoapods-tag
   $ pod tag 0.1.7 "修改podspec版本号为0.1.7" --work-dir=xxx
   ```
 
-* 为tag添加前后缀**（前后缀与版本号中间会自动用`-`分隔，不需要手动添加）**
+* 为tag添加前后缀 **（前后缀与版本号中间会自动用`-`分隔，不需要手动添加）**
 
   以下面这行命令为例，`podspec`中的`version`为`0.1.7`，`source`字段中的`tag`为`mtxx-0.1.7-beta1`，最终推送到远端仓库的`tag`也是`mtxx-0.1.7-beta1`
 

data/lib/cocoapods-tag/command/tag/auto.rb

@@ -41,6 +41,7 @@ DESC
         def self.options
           [
             ['--quick', '跳过一些耗时校验，如：远端仓库是否已经有该tag'],
+            ['--skip-push-commit', '跳过推送commit到对应分支'],
             ['--remote=REMOTE', '指定tag推送到的远端仓库，可以通过`git remote -v`查看'],
             ['--spec-repo=SPECREPO', 'podspec推送到的repo，可以通过`pod repo list`查看'],
             ['--work-dir=WORKDIR', '执行命令的工作区'],
@@ -54,6 +55,7 @@ DESC
           @commit_msg = argv.shift_argument
           @tag_msg = argv.shift_argument
           @quick = argv.flag?('quick', false)
+          @skip_push_commit = argv.flag?('skip-push-commit', false)
           @remote = argv.option('remote', false)
           @spec_repo = argv.option('spec-repo', nil)
           @work_dir = argv.option('work-dir', nil)
@@ -75,7 +77,7 @@ DESC
             raise Informative, "不存在工作目录`#{@work_dir}`" unless File.exist?(@work_dir)
             Dir.chdir(@work_dir)
           end
-          tag = Pod::Tag.new(@version, @tag, @commit_msg, @tag_msg, @spec_repo, @quick, @remote)
+          tag = Pod::Tag.new(@version, @tag, @commit_msg, @tag_msg, @spec_repo, @quick, @remote, @skip_push_commit)
           tag.create
         end
 

data/lib/cocoapods-tag/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsTag
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/cocoapods-tag/tag.rb

@@ -8,7 +8,7 @@ module Pod
     GIT_REPO = ".git".freeze
     PODSPEC_EXT = %w[podspec podspec.json].freeze
 
-    def initialize(version, tag, commit_msg, tag_msg, spec_repo = nil, quick = false, remote_name = nil)
+    def initialize(version, tag, commit_msg, tag_msg, spec_repo = nil, quick = false, remote_name = nil, skip_push_commit = false )
       @version = version || raise(Informative, "缺少必填参数`version`")
       @tag = tag || raise(Informative, "缺少必填参数`tag`")
       @commit_msg = commit_msg || raise(Informative, "缺少必填参数`commit_msg`")
@@ -16,6 +16,7 @@ module Pod
       @spec_repo = spec_repo
       @quick = quick
       @remote = remote_name
+      @skip_push_commit = skip_push_commit
     end
 
     public
@@ -97,28 +98,44 @@ module Pod
       # 是否与远端仓库关联
       raise Informative, "本地git仓库没有与远端仓库关联，请先使用`git remote add`关联远端仓库" if remote.nil?
 
-      unless @quick
-        # 校验本地 git 是否与远端仓库同步
-        print "\n检查本地git仓库是否与远端仓库同步\n".yellow
-        local_commit = `git rev-parse #{remote}/HEAD`.chomp
-        remote_commit = `git ls-remote --head #{remote} #{current_branch}`.split("\t")[0]
-        unless local_commit == remote_commit
-          msg = <<-MSG
-本地git仓库没有与远端仓库同步，请先执行以下操作：
-1.`git pull`或`git fetch + git rebase`拉取最新代码
-2.`git push`推送本地仓库commit
-          MSG
-          raise Informative, msg
-        end
+      # 是否处于 detached 状态
+      raise Informative, "当前处于detached状态，请先切到分支再进行操作" if current_branch == "HEAD"
 
-        # 检查本地是否已经有该 tag
-        print "\n检查本地仓库是否有tag:`#{@tag}`\n".yellow
-        raise Informative, "本地已经存在tag:#{@tag}" if `git tag`.split("\n").include?(@tag)
+      # # 是否有未提交的改动
+      # raise Informative, "本地有未提交的改动，请先提交或暂存" unless `git status --porcelain`.split("\n").empty?
 
+      # 检查本地是否已经有该 tag
+      print "\n检查本地仓库是否有tag:`#{@tag}`\n".yellow
+      raise Informative, "本地仓库已经存在tag:#{@tag}" if `git tag`.split("\n").include?(@tag)
+
+      unless @quick
         # 判断远端是否已经有该 tag
         print "\n检查远端仓库是否有tag:`#{@tag}`\n".yellow
         tags = `git ls-remote --tags #{remote}`.split("\n").select { |tag| tag.include?("refs/tags/#{@tag}") }
-        raise Informative, "远端仓库已经有该tag:#{@tag}" unless tags.empty?
+        raise Informative, "远端仓库已经有tag:#{@tag}" unless tags.empty?
+
+        # 校验本地 git 是否与远端仓库同步
+        print "\n检查本地git仓库是否与远端仓库同步\n".yellow
+        `git fetch #{remote}`
+        remote_br = `git rev-parse --abbrev-ref #{current_branch}@{u}`
+        unless remote_br == ''
+          remote_commit_count = `git rev-list --right-only --count #{current_branch}...#{remote_br}`.chomp.to_i
+          local_commit_count = `git rev-list --left-only --count #{current_branch}...#{remote_br}`.chomp.to_i
+          # 本地落后远端
+          unless remote_commit_count == 0
+            msg = <<-MSG
+本地git仓库落后于远端仓库`#{remote_commit_count}`个提交
+请先执行`git pull`或`git fetch #{remote} + git rebase #{remote_br}`拉取最新代码
+            MSG
+            raise Informative, msg
+          end
+
+          # 本地有未 push 的 commit
+          unless local_commit_count == 0
+            msg = "本地git仓库有`#{local_commit_count}`个commit未提交，请先执行`git push`提交"
+            raise Informative, msg
+          end
+        end
       end
 
     end
@@ -161,7 +178,7 @@ module Pod
     def modify_podspec_ruby(file)
       org_source = @spec_hash['source']
       des_source = "{ :git => '#{org_source['git']}', :tag => '#{@tag}' }"
-      File.open(file, 'r') do |f|
+      File.open(file, 'r:utf-8') do |f|
         lines = []
         f.each_line do |line|
           if line =~ /(^\s*.+\.version\s*=\s*).*/
@@ -172,7 +189,7 @@ module Pod
           end
           lines << line
         end
-        File.open(file, 'w') do |f|
+        File.open(file, 'w:utf-8') do |f|
           f.write(lines.join(""))
         end
       end
@@ -185,7 +202,7 @@ module Pod
         'git'=> @spec_hash['source']['git'],
         'tag'=> "#{@tag}"
       }
-      File.open(file, 'w') do |f|
+      File.open(file, 'w:utf-8') do |f|
         f.write(@spec_hash)
       end
     end
@@ -196,7 +213,7 @@ module Pod
       begin
         `git add #{podspec}`
         `git commit -m "#{@commit_msg}"`
-        `git push #{remote} #{current_branch}`
+        `git push #{remote} #{current_branch}` unless @skip_push_commit
       rescue Pod::StandardError => e
         @error = e
         print "推送commit到远端git仓库`#{remote}/#{current_branch}`失败:#{e}".red
@@ -249,7 +266,7 @@ module Pod
     # 获取当前分支
     def current_branch
       @current_branch ||= begin
-                            `git branch`.split(' ')[1]
+                            `git rev-parse --abbrev-ref HEAD`.chomp
                           end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tag
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods