cocoapods-tag 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab723fa1e07606d3664af7a1ec85aacd255a2782722be6c733d727f86f1e47d9
-  data.tar.gz: eefc4e3111d15c9504ca69e894aff85a76ba8531aff01028fdb52f75e1068173
+  metadata.gz: a72f4e68daa2d911dd619108de273824072102bcf41474da0744952efb9f481f
+  data.tar.gz: 5aaf617407f0136aca11b65d8e9aff5d59c3ee3775f63f7bebff40ebaadbc7ab
 SHA512:
-  metadata.gz: 8f7a3e6579264821c391fcd54a23fd5a9fea86ce3344b176a951825578d57a3a52b5b5c9e085b1e879bde0511f4d29c5fdcb82bb9001bf6cc6689fac1e1d1092
-  data.tar.gz: a282fea1a342b38eea54357ac0967910bf8a428dceae26b77a0616198a066b660baf339ac4d3ca1ef2599f0c81302c568039797e05fcff426fc4ee46be0c991e
+  metadata.gz: 578caf1cdb4c0954091e2ae9ed3a1f0974bed2daca2860b2edac05f1c1d887573c7ee1344c9a918fc84b6f30e9527b57fd218c5b31cd1b12b63ea25a8f7fc521
+  data.tar.gz: e2229325f9eb5a15b0c6b7a18f838efe7ad9abd7a59451673d6281d0ba7a9f3e008dc191245d2ee3be37a07fdf9f657928a9aa8bd5a0e69e2b715db19c240664

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/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.4"
+  VERSION = "0.0.7"
 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
@@ -28,7 +29,7 @@ module Pod
       # 正则校验版本号
       check_version
       # 检查本地是否有 spec_repo
-      check_spec_repo if @spec_repo
+      # check_spec_repo if @spec_repo
       # 检查 git repo
       check_git_repo
       # 加载 podspec
@@ -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"
 
+      # # 是否有未提交的改动
+      # raise Informative, "本地有未提交的改动，请先提交或暂存" unless `git status --porcelain`.split("\n").empty?
+
+      unless @quick
         # 检查本地是否已经有该 tag
         print "\n检查本地仓库是否有tag:`#{@tag}`\n".yellow
-        raise Informative, "本地已经存在tag:#{@tag}" if `git tag`.split("\n").include?(@tag)
+        raise Informative, "本地仓库已经存在tag:#{@tag}" if `git tag`.split("\n").include?(@tag)
 
         # 判断远端是否已经有该 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
@@ -140,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
@@ -161,8 +182,8 @@ 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}'#{@version}'")
@@ -172,9 +193,9 @@ module Pod
           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
 
@@ -185,7 +206,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 +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
@@ -249,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.4
+  version: 0.0.7
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-06-14 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