cocoapods-tag 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69b23947908cd9859abaa7dd628fca94b271c16653bc5c101061486fcb3cecff
-  data.tar.gz: ec017bb88326f01e4a5bf5481ea0b6b07caebb6c94b1233405b4e990dd422e44
+  metadata.gz: 750b94770c7e64be7c2fec845a40ec5f131b3bf37d401a25d5707e943e61eb18
+  data.tar.gz: 71f223370e85b4711acfcdd347b1ba4534f39eabf35828e8b1d6116887b0da86
 SHA512:
-  metadata.gz: 4a2b28788338735f7bf6a7e27142ea590db539412a86b00cc41412eced1101c38a2eb6b5af36a78ebc687f92ff304ae3ffd80622384546bf39b90ce62aa2d1b3
-  data.tar.gz: 59b0deeb4eacffc8e158016decc44b8379bcb16915af963be0a2654030a2470c37874bcf9608f9b3c101a256cb570e7967fe75b0dd2e0a308ba17f634cabbb07
+  metadata.gz: '099976d089ecaea62b573739b974970f1d3f590a880abede27ebcde14b7cb50ceb41d1fa4b223c20d5d7a91f6f107646a1941b47332def8788bc26c23edee383'
+  data.tar.gz: 8b6c5f648ae71bf9a59470f28c18f375f954c067f5fc07047268425d371b4291c19571fab2a026c7ab13f444fbd717dfe5a5a0573fc7328589537b14f7aad93c

data/README.md

@@ -41,6 +41,26 @@ $ gem install cocoapods-tag
   $ pod tag 0.1.7 "修改podspec版本号为0.1.7" "版本0.1.7" --spec-repo=xxx --quick
   ```
 
+* 指定tag推送到的远端仓库（可以通过`git remote -v`查看）
+
+  ```shell
+  $ pod tag 0.1.7 "修改podspec版本号为0.1.7" "版本0.1.7" --remote=origin
+  ```
+  
+* 指定工作目录（插件执行的目录）
+
+  ```shell
+  $ pod tag 0.1.7 "修改podspec版本号为0.1.7" --work-dir=xxx
+  ```
+
+* 为tag添加前后缀 **（前后缀与版本号中间会自动用`-`分隔，不需要手动添加）**
+
+  以下面这行命令为例，`podspec`中的`version`为`0.1.7`，`source`字段中的`tag`为`mtxx-0.1.7-beta1`，最终推送到远端仓库的`tag`也是`mtxx-0.1.7-beta1`
+
+  ```shell
+  $ pod tag 0.1.7 "修改podspec版本号为0.1.7" --prefix="mtxx" --suffix="beta1"
+  ```
+
 * 单独推送`podspec`到指定`spec repo`
 
   ```shell
@@ -60,3 +80,5 @@ ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/
 
 大概解释一下就是：以`数字0-9`开头，中间可以包含`数字0-9`、`字母a-z A-Z`，特殊字符只能包含`.`和`-`，版本号前后可以有`0个或多个空格`
 
+> 1. `cocoapods-tag`已经对版本号做了正则校验，不符合上面正则的版本号是无法通过的，这里写出来主要是为了提醒大家注意版本号的规范
+> 2. 不建议版本号前后加空格

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

@@ -11,11 +11,11 @@ module Pod
         self.description = <<-DESC
 #{self.summary}
 
-`TAG`: tag号【必填】\n
+`VERSION`: podspec中的version字段，如果没有prefix和suffix，version与tag一样【必填】\n
 `COMMIT_MSG`: commit信息【必填】\n
 `TAG_MSG`: tag信息【可选，默认为"v[tag号]"，比如：tag是"0.0.1"，则tag信息是"v0.0.1"】\n
 
-eg:\n
+e.g.\n
 1.使用默认tag信息\n
 pod tag 0.1.7 "修改podspec版本号为0.1.7"\n
 2.使用自定义tag信息\n
@@ -23,33 +23,61 @@ pod tag 0.1.7 "修改podspec版本号为0.1.7" "版本0.1.7"\n
 3.推送podspec到spec repo\n
 pod tag 0.1.7 "修改podspec版本号为0.1.7" "版本0.1.7" --spec-repo=xxx\n
 4.跳过耗时校验\n
-pod tag 0.1.7 "修改podspec版本号为0.1.7" "版本0.1.7" --spec-repo=xxx --quick
+pod tag 0.1.7 "修改podspec版本号为0.1.7" "版本0.1.7" --quick\n
+5.指定工作目录\n
+pod tag 0.1.7 "修改podspec版本号为0.1.7" --work-dir=xxx\n
+6.为tag指定前后缀\n
+pod tag 0.1.7 "修改podspec版本号为0.1.7" --prefix="xxx" --suffix="xxx"\n
+7.指定tag推送到的远端仓库\n
+pod tag 0.1.7 "修改podspec版本号为0.1.7" --remote=xxx
 DESC
 
         self.arguments = [
-          CLAide::Argument.new('TAG', true ),
+          CLAide::Argument.new('VERSION', true ),
           CLAide::Argument.new('COMMIT_MSG', true),
           CLAide::Argument.new('TAG_MSG', false)
         ]
 
         def self.options
           [
-            ['--spec-repo=SPECREPO', 'podspec 推送到的 spec repo ，可以通过`pod repo list`查看'],
-            ['--quick', '跳过一些耗时校验，如：远端仓库是否已经有该 tag ']
+            ['--quick', '跳过一些耗时校验，如：远端仓库是否已经有该tag'],
+            ['--skip-push-commit', '跳过推送commit到对应分支'],
+            ['--remote=REMOTE', '指定tag推送到的远端仓库，可以通过`git remote -v`查看'],
+            ['--spec-repo=SPECREPO', 'podspec推送到的repo，可以通过`pod repo list`查看'],
+            ['--work-dir=WORKDIR', '执行命令的工作区'],
+            ['--prefix=PREFIX', 'tag前缀'],
+            ['--suffix=SUFFIX', 'tag后缀']
           ].concat(super)
         end
 
         def initialize(argv)
-          @tag = argv.shift_argument
+          @version = argv.shift_argument
           @commit_msg = argv.shift_argument
           @tag_msg = argv.shift_argument
-          @spec_repo = argv.option('spec-repo', nil)
           @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)
+          @prefix = argv.option('prefix', nil)
+          @suffix = argv.option('suffix', nil)
+          @tag = @version
+          unless @prefix.nil?
+            @tag = "#{@prefix}-#{@tag}"
+          end
+          unless @suffix.nil?
+            @tag = "#{@tag}-#{@suffix}"
+          end
           super
         end
 
         def run
-          tag = Pod::Tag.new(@tag, @commit_msg, @tag_msg, @spec_repo, @quick)
+          # 传入了工作目录
+          unless @work_dir.nil?
+            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, @skip_push_commit)
           tag.create
         end
 

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

@@ -0,0 +1,77 @@
+
+module Pod
+  class Command
+    class Tag < Command
+      class RepoList < Tag
+        include Pod
+
+        self.summary = '打印本地的 podspec 仓库'
+
+        self.description = <<-DESC
+        #{self.summary}
+        DESC
+
+        def self.options
+          [
+            ['--format=FORMAT', '输出结果格式化，可选项为`json/yml(yaml)/plain`'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @format = argv.option('format', 'plain')
+          super
+        end
+
+        def run
+          @sources = config.sources_manager.all
+          if @format == 'json'
+            print_json
+          elsif @format == 'yml' || @format == 'yaml'
+            print_yml
+          else
+            print_plain
+          end
+        end
+
+        private
+
+        def print_json
+          require 'json'
+          UI.puts JSON.pretty_generate(sources)
+        end
+
+        def print_yml
+          require 'yaml'
+          UI.puts sources.to_yaml
+        end
+
+        def print_plain
+          list = Pod::Command::Repo::List.new(CLAide::ARGV.new([]))
+          list.validate!
+          list.run
+        end
+
+        def sources
+          result = []
+          @sources.each do |source|
+            type = source.type
+            if source.is_a?(Pod::CDNSource)
+              type = 'CDN'
+            elsif source.git?
+              type = 'git'
+            end
+            source_hash = {
+              'name' => source.name,
+              'url' => source.url,
+              'path' => source.repo.to_s,
+              'type' => type
+            }
+            result << source_hash
+          end
+          result
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 require 'cocoapods-tag/command/tag/auto'
 # require 'cocoapods-tag/command/tag/create'
 require 'cocoapods-tag/command/tag/spec_push'
+require 'cocoapods-tag/command/tag/repo_list'
 
 module Pod
   class Command

data/lib/cocoapods-tag/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsTag
-  VERSION = "0.0.3"
+  VERSION = "0.0.6"
 end

data/lib/cocoapods-tag/tag.rb

@@ -8,12 +8,15 @@ module Pod
     GIT_REPO = ".git".freeze
     PODSPEC_EXT = %w[podspec podspec.json].freeze
 
-    def initialize(tag, commit_msg, tag_msg, spec_repo = nil, quick = false)
+    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`")
       @tag_msg = tag_msg || "v#{@tag}"
       @spec_repo = spec_repo
       @quick = quick
+      @remote = remote_name
+      @skip_push_commit = skip_push_commit
     end
 
     public
@@ -64,9 +67,9 @@ module Pod
 
     # 正则校验版本号
     def check_version
-      unless Pod::Vendor::Gem::Version.correct?(@tag)
+      unless Pod::Vendor::Gem::Version.correct?(@version)
         msg = <<-ERROR
-版本号格式不正确
+版本号`#{@version}`格式不正确
 版本号必须以数字`0-9`开头，可以包含数字`0-9`、字母`a-z A-Z`，特殊字符只能是`.`和`-`
 具体请参考CocoaPods校验版本号的正则：
 #{Pod::Vendor::Gem::Version::ANCHORED_VERSION_PATTERN}
@@ -86,7 +89,7 @@ module Pod
 
     # 检查 git repo
     def check_git_repo
-      # print "检查本地git仓库：\n".yellow
+      print "检查本地git仓库\n".yellow
 
       # 本地是否有 .git 目录
       git_repo = File.join(Dir.pwd, GIT_REPO)
@@ -95,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
@@ -138,6 +157,10 @@ module Pod
       if source['git'] && source['git'].strip == ''
         raise Informative, "source中git字段不能为空"
       end
+      # git字段只能是ssh
+      if source['git'] && source['git'] =~ /^(http|https)/
+        raise Informative, "source中git字段不能是http或https，只能是ssh"
+      end
     end
 
     # 修改podspec
@@ -159,31 +182,31 @@ 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|
-        lines = []
+      lines = []
+      File.open(file, 'r:utf-8') do |f|
         f.each_line do |line|
           if line =~ /(^\s*.+\.version\s*=\s*).*/
-            line = line.sub(/(^\s*.+\.version\s*=\s*).*/, "#{$1}'#{@tag}'")
+            line = line.sub(/(^\s*.+\.version\s*=\s*).*/, "#{$1}'#{@version}'")
           end
           if line =~ /(^\s*.+\.source\s*=\s*).*/
             line = line.sub(/(^\s*.+\.source\s*=\s*).*/, "#{$1}#{des_source}")
           end
           lines << line
         end
-        File.open(file, 'w') do |f|
-          f.write(lines.join(""))
-        end
+      end
+      File.open(file, 'w:utf-8') do |f|
+        f.write(lines.join(""))
       end
     end
 
     # 修改 *.podspec.json
     def modify_podspec_json(file)
-      @spec_hash['version'] = @tag
+      @spec_hash['version'] = @version
       @spec_hash['source'] = {
         '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
@@ -194,7 +217,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
@@ -247,7 +270,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.3
+  version: 0.0.6
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -66,6 +66,7 @@ files:
 - lib/cocoapods-tag/command/tag.rb
 - lib/cocoapods-tag/command/tag/auto.rb
 - lib/cocoapods-tag/command/tag/create.rb
+- lib/cocoapods-tag/command/tag/repo_list.rb
 - lib/cocoapods-tag/command/tag/spec_push.rb
 - lib/cocoapods-tag/gem_version.rb
 - lib/cocoapods-tag/helper/asker.rb