cocoapods-dev-env 2.1.9 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1282e851ae9b54c7bd13e7e05fe72de11a5a56662e1ecdc3af66745eb752e1d
-  data.tar.gz: 30f1d0e013d4d56f9f4ff6ea165f6e60d0b8e2a5385a8df85695872e7935507b
+  metadata.gz: 770d9cd062fae59894d853698e72d4b4e88f53e49a6dffc65304d1adb0df38eb
+  data.tar.gz: 3bfe86a60e7d68a08b7f0c54693105f95ee844f4e89d222fcf09d5e916aed625
 SHA512:
-  metadata.gz: 8f7628345e1abff5bddcd84d006a11e98e13d2b3cf8b03ab6c15f3e90760ea4087ecc12952544c89960ded37ddf76108133516b0f8097b4259325f0712a8889f
-  data.tar.gz: 7036a12b59e37c374a8377836a5968bf56424ad16b1e9f7d2adb4526b589ebd45c86da355fd8febdceac61f3459eb368425b22429d48c53917f94c412147cb9e
+  metadata.gz: 245ade96b80c3aac4bcad5a472af479d9e2f6ddabef802e207baa4adc713c21b647740ec2873b1256d185220e6786041a6d3ddb9f7e2ea9d003616554b115fe0
+  data.tar.gz: 573365ba899db746a113472ac26a22e5cc8aedc1058b2d0ce8852575b528c61ffe84fee90926a23454b9329853290dbda04b859b57a610ba63cbb027d9b9bd88

data/README.md

@@ -42,7 +42,7 @@ Finally the state clean submodule will be removed automatically.
 3. When you define "dev_env" to "release", and run ```pod install``` . 
 We want to use the release version in cocoapods repo. And do many check for state, and help you to release the not released pod.  
 
-新增功能: 支持读取宿主工程的Podfile.lock文件，来获取宿主工程中的依赖，无需在单独的库的example工程中引用对应的pod
+2.2.x 新增功能: 支持读取宿主工程的Podfile.lock文件，来获取宿主工程中的依赖，无需在单独的库的example工程中引用对应的pod
         此功能默认开启, 等同于在顶部写入如下配置: use_parent_lock_info!
         关闭方法 use_parent_lock_info! false
         宿主工程路径默认为"../../../"(因为默认放到developing_pods子文件夹下，对应的库文件夹下的Example文件夹下，故需要回溯三层)

data/lib/cocoapods/dev/env/version.rb

@@ -1,7 +1,7 @@
 module Cocoapods
   module Dev
     module Env
-      VERSION = '2.1.9'
+      VERSION = '2.2.4'
     end
   end
-end
+end

data/lib/dev_env_entry.rb

@@ -89,6 +89,7 @@ module Pod
 
                 defaultLocalPath = "./developing_pods/#{pod_name}"
                 UI.message "pod #{name.green} dev-env: #{dev_env.green}"
+                isFromSubProject = false
                 if dev_env == 'parent'
                     parentPodInfo = $parentPodlockDependencyHash[pod_name]
                     if parentPodInfo != nil
@@ -101,14 +102,15 @@ module Pod
                             if tag != nil
                                 options[:tag] = tag
                             end
-                            defaultLocalPath = $parrentPath + defaultLocalPath
-                        else
-                            UI.puts 'XXXXXXXXXXXXXXXX123' + parentPodInfo.requirement.to_s()
+                            path = parentPodInfo.external_source[:path]
+                            if path != nil
+                                options[:path] = path
+                            end
+                        elsif (parentPodInfo.podspec_repo.start_with?("http") || parentPodInfo.podspec_repo.start_with?("git"))
+                            #UI.puts 'XXXXXXXXXXXXXXXX123' + parentPodInfo.inspect
                             requirements.insert(0, parentPodInfo.requirement.to_s)
                             options[:source] = parentPodInfo.podspec_repo
                         end
-                        
-                        # dependency.setRequirement(parentPodInfo.requirement
                     end
                     return
                 elsif options[:git] == nil
@@ -131,11 +133,12 @@ module Pod
                         options[:branch] = branch
                         options[:tag] = tag
                         if path != nil
-                            options[:path] = $parrentPath + path
+                            options[:path] = path
                         else
-                            options[:path] = $parrentPath + defaultLocalPath
+                            options[:path] = defaultLocalPath
                         end
                         UI.puts "#{pod_name.green}采用了父组件的配置，并修改开发状态为#{dev_env.green}"
+                        isFromSubProject = true
                     end
                 end
             
@@ -144,10 +147,15 @@ module Pod
                 git = options.delete(:git)
                 branch = options.delete(:branch)
                 tag = options.delete(:tag)
-                path = options.delete(:path)
+                path = options.delete(:path) # 执行命令用的path
                 if path == nil 
                     path = defaultLocalPath
                 end
+                realpath = path
+                if isFromSubProject
+                    realpath = $parrentPath + path
+                end
+
                 if git == nil || git.length == 0 
                     raise "💔 #{pod_name.yellow} 未定义:git => 'xxx'库地址"
                 end
@@ -159,6 +167,9 @@ module Pod
                 end
 
                 if dev_env == 'subtree'
+                    if isFromSubProject
+                        raise "💔 子项目不支持subtree"
+                    end
                     if !File.directory?(path)
                         _toplevelDir = `git rev-parse --show-toplevel`
                         _currentDir = `pwd`
@@ -178,19 +189,26 @@ module Pod
                         system(_cmd)
                         Dir.chdir(_currentDir)
                     end
-                    options[:path] = path
+                    options[:path] = realpath
                     if requirements.length >= 2
                         requirements.delete_at(0)
                     end
                     UI.message "pod #{pod_name.green} enabled #{"subtree".green}-mode 🍺"
                 elsif dev_env == 'dev'
                     # 开发模式，使用path方式引用本地的submodule git库
-                    if !File.directory?(path)
+                    if !File.directory?(realpath)
                         UI.puts "add submodule for #{pod_name.green}".yellow
+                        curProjectDir = `pwd`
+                        if isFromSubProject
+                            # 进入父目录，避免当前工程目录是个submodule，当在submudle中执行addsubmodule时路径会不正确
+                            Dir.chdir($parrentPath)
+                        end
                         _cmd = "git submodule add --force -b #{branch} #{git} #{path}"
                         UI.puts _cmd
                         system(_cmd)
-
+                        if isFromSubProject
+                            Dir.chdir(curProjectDir)
+                        end
                         _currentDir = Dir.pwd
                         Dir.chdir(path)
 
@@ -216,7 +234,7 @@ module Pod
                         #     DevEnvUtils.searchAndOpenLocalExample(path)
                         # end
                     end
-                    options[:path] = path
+                    options[:path] = realpath
                     if requirements.length >= 2
                         requirements.delete_at(0)
                     end
@@ -232,8 +250,8 @@ module Pod
                         Dir.chdir(path)
                         # 已经进入到podspec的文件夹中了
                         DevEnvUtils.checkGitStatusAndPush(pod_name) # push一下
-                        ret = DevEnvUtils.checkRemoteTagExist(tag)
-                        if ret == true
+                        isRemoteTagExist = DevEnvUtils.checkRemoteTagExist(tag)
+                        if isRemoteTagExist == true
                             # tag已经存在，要么没改动，要么已经手动打过tag，要么是需要引用老版本tag的代码
                             if DevEnvUtils.checkTagOrBranchIsEqalToHead(tag, "./")
                                 UI.puts "#{pod_name.green} 检测到未做任何调整，或已手动打过Tag，直接引用远端库"
@@ -244,13 +262,16 @@ module Pod
                             end
                         else
                             # tag不存在，
+                            DevEnvUtils.checkIsOnTrankBrach()
                             DevEnvUtils.changeVersionInCocoapods(pod_name, originTag)
                             DevEnvUtils.checkGitStatusAndPush(pod_name) # 再push一下
                             DevEnvUtils.addGitTagAndPush(tag, pod_name)    
                         end
                         Dir.chdir(_currentDir)
                         DevEnvUtils.checkAndRemoveSubmodule(path)
-                        UI.puts "🍺🍺 #{pod_name.green} #{tag.green} release successfully!!"
+                        if !isRemoteTagExist
+                            UI.puts "🍺🍺 #{pod_name.green} #{tag.green} release successfully!!"
+                        end
                     end
                     options[:git] = git
                     options[:tag] = tag

data/lib/dev_env_utils.rb

@@ -1,169 +1,169 @@
 require 'cocoapods'
 
 class DevEnvUtils
-
-    def self.searchAndOpenLocalExample(path)
-        _currentDir = Dir.pwd
-        Dir.chdir(path)
-        Dir.chdir("Example")
-        `pod install`
-        projPaths = Dir::glob("*.xcworkspace")
-        if projPaths.count > 0
-            `open -a Terminal ./`
-            `open #{projPaths[0]}`
-        end
-        Dir.chdir(_currentDir)
+  def self.searchAndOpenLocalExample(path)
+    _currentDir = Dir.pwd
+    Dir.chdir(path)
+    Dir.chdir('Example')
+    `pod install`
+    projPaths = Dir.glob('*.xcworkspace')
+    if projPaths.count > 0
+      `open -a Terminal ./`
+      `open #{projPaths[0]}`
     end
-
-    def self.checkAndRemoveSubmodule(path)
-        _currentDir = Dir.pwd
-        Dir.chdir(path)
-        output = `git status -s`
-        puts output
-        if output.length == 0
-            output = `git status`
-            if output.include?("push")
-                raise "submodule #{path} 移除失败，有推送的修改"
-            end
-        else
-            raise "submodule #{path} 移除失败，有未提交的修改"
-        end
-        Dir.chdir(_currentDir)
-        `
+    Dir.chdir(_currentDir)
+  end
+
+  def self.checkAndRemoveSubmodule(path)
+    _currentDir = Dir.pwd
+    Dir.chdir(path)
+    output = `git status -s`
+    puts output
+    if output.length == 0
+      output = `git status`
+      raise "submodule #{path} 移除失败，有推送的修改" if output.include?('push')
+    else
+      raise "submodule #{path} 移除失败，有未提交的修改"
+    end
+    Dir.chdir(_currentDir)
+    `
         git submodule deinit #{path}
         rm -rf #{path}
         git rm #{path}
         `
+  end
+
+  def self.checkTagIsEqualToHead(tag, path)
+    _currentDir = Dir.pwd
+    Dir.chdir(path)
+    result = `git describe --abbrev=4 HEAD`
+    Dir.chdir(_currentDir)
+    if result.include?(tag)
+      true
+    else
+      checkTagOrBranchIsEqalToHead(tag, path)
     end
-
-    def self.checkTagIsEqualToHead(tag, path)
-        _currentDir = Dir.pwd
-        Dir.chdir(path)
-        result = `git describe --abbrev=4 HEAD`
-        Dir.chdir(_currentDir)
-        if result.include?(tag)
-            return true
-        else
-            return checkTagOrBranchIsEqalToHead(tag, path)
-        end
-    end
-
-    # 这个函数有问题有时候拿不到相同的commit id
-    def self.checkTagOrBranchIsEqalToHead(branchOrTag, path)
-        _currentDir = Dir.pwd
-        Dir.chdir(path)
-        headCommitID = `git rev-parse HEAD`
-        tagCommitID = `git rev-parse #{branchOrTag}`
-        Pod::UI.puts "#{`pwd`}  headCommitID:#{headCommitID} \n #{branchOrTag}ComitID:#{tagCommitID}"
-        Dir.chdir(_currentDir)
-        return (headCommitID.length > 0 && headCommitID == tagCommitID)
+  end
+
+  # 这个函数有问题有时候拿不到相同的commit id
+  def self.checkTagOrBranchIsEqalToHead(branchOrTag, path)
+    _currentDir = Dir.pwd
+    Dir.chdir(path)
+    headCommitID = `git rev-parse HEAD`
+    tagCommitID = `git rev-parse #{branchOrTag}`
+    Pod::UI.puts "#{`pwd`}  headCommitID:#{headCommitID} \n #{branchOrTag}ComitID:#{tagCommitID}"
+    Dir.chdir(_currentDir)
+    (headCommitID.length > 0 && headCommitID == tagCommitID)
+  end
+
+  def self.checkGitStatusAndPush(pod_name)
+    output = `git status -s`
+    puts output
+    if output.length == 0
+      output = `git status`
+      if output.include?('push')
+        ret = system('git push')
+        raise "💔 #{pod_name.yellow} push 失败" if ret != true
+      end
+    else
+      raise "💔 #{pod_name.yellow} 有未提交的数据"
     end
-
-    def self.checkGitStatusAndPush(pod_name)
-        output = `git status -s`
-        puts output
-        if output.length == 0
-            output = `git status`
-            if output.include?("push")
-                ret = system("git push")
-                if ret != true
-                    raise "💔 #{pod_name.yellow} push 失败"
-                end
-            end
-        else
-            raise "💔 #{pod_name.yellow} 有未提交的数据"
-        end
+  end
+
+  def self.checkRemoteTagExist(tag)
+    `git push --tags`
+    system("git ls-remote --exit-code origin refs/tags/#{tag}")
+  end
+
+  def self.addGitTagAndPush(tag, pod_name)
+    ret = system("git tag #{tag}")
+    if ret == true
+      ret = system("git push origin #{tag}")
+      raise "💔 #{pod_name.yellow} push tag 失败" if ret != true
     end
-
-    def self.checkRemoteTagExist(tag)
-        `git push --tags`
-        ret = system("git ls-remote --exit-code origin refs/tags/#{tag}")
-        return ret
+    ret
+  end
+
+  def self.inputNeedJumpForReson(str)
+    return false if ARGV.include? '--silent'
+
+    puts str.green
+    puts '是(Y), 任意其他输入或直接回车跳过'.green
+    input = STDIN.gets
+    input[0, 1] == 'Y'
+  end
+
+  # 检查是否在主分支上(main / master)
+  def self.checkIsOnTrankBrach()
+    branch = `git branch --show-current`.chomp
+    isOK = (branch == 'main' || branch == 'master')
+    if !isOK
+      puts ('💔 当前分支是: '.red + branch.green + ' 没在主分支，不符合规范，是否继续发布？'.red)
+      if !inputNeedJumpForReson("")
+        raise "已取消发布, 请切换子库分支到 master / main 后重新 pod install"
+      end
     end
+  end
 
-    def self.addGitTagAndPush(tag, pod_name)
-        ret = system("git tag #{tag}")
-        if ret == true
-            ret = system("git push origin #{tag}")
-            if ret != true
-                raise "💔 #{pod_name.yellow} push tag 失败"
-            end
-        end
-        return ret
+  def self.changeVersionInCocoapods(name, newVersion)
+    if newVersion.nil?
+      Pod::UI.puts '💔 传入的修改目标版本号为空，无法设置版本号'.yellow
+      return
     end
-
-    def self.inputNeedJumpForReson(str)
-        if ARGV.include? '--silent'
-            return false
-        end
-
-        puts str.green
-        puts '是(Y), 任意其他输入或直接回车跳过'.green
-        input = STDIN.gets
-        if input[0,1] == "Y"
-            return true
-        else
-            return false
-        end
-    end
-
-    def self.changeVersionInCocoapods(name, newVersion)
-        if (newVersion == nil)
-            Pod::UI.puts "💔 传入的修改目标版本号为空，无法设置版本号".yellow
-            return
-        end
-        newVersion = get_pure_version(newVersion)
-        specName = name + ".podspec"
-        FileProcesserManager.new(specName, 
-            [
-                FileProcesser.new(-> (fileContent) {
-                    return fileContent.gsub(/(\.version *= *')(.*')/, "\\1" + newVersion + "'")
-                })
-        ]).process()
-        `git add #{specName}
+    newVersion = get_pure_version(newVersion)
+    specName = name + '.podspec'
+    FileProcesserManager.new(specName,
+                             [
+                                FileProcesser.new(lambda { |fileContent|
+                                                   return fileContent.gsub(/(\.version *= *')(.*')/,
+                                                                           '\\1' + newVersion + "'")
+                                                 }),
+                                FileProcesser.new(lambda { |fileContent|
+                                                   return fileContent.gsub(/(\.version *= *")(.*")/,
+                                                                           '\\1' + newVersion + '"')
+                                                 })
+                             ]).process
+    `git add #{specName}
          git commit -m "Mod: 修改版本号为:#{newVersion} by cocoapods_dev_env plugin"`
-    end
+  end
 
-    def self.get_pure_version(version) 
-        return version.split.last.scan(/\d+/).join('.') 
-    end
+  def self.get_pure_version(version)
+    version.split.last.scan(/\d+/).join('.')
+  end
 end
 
-
-class Podfile
-
+module Pod
+  class Podfile
     class TargetDefinition
+      def getReposStrForLint
+        return '' if podfile.sources.size == 0
 
-        def getReposStrForLint()
-            if podfile.sources.size == 0
-                return ""
-            end
-            str = " --sources="
-            podfile.sources.each do |source|
-                str += source
-                str += ","
-            end
-            Pod::UI.puts str
-            return str
-        end
-
-        def getUserRepoAddress()
-            if podfile.sources.size == 0
-                raise "💔 发布release必须配置仓库的地址, e.g.: source 'https://github.com/CocoaPods/Specs.git'"
-            end
-            index = nil
-            begin
-                Pod::UI.puts  "\n\n⌨️  请输入要发布到的cocoapods仓库序号, 按回车确认: ".yellow
-                num = 1
-                podfile.sources.each do |source|
-                    Pod::UI.puts "#{num.to_s.yellow}. #{source.green}"
-                    num += 1
-                end
-                index = STDIN.gets.to_i - 1
-            end until (index >= 0 && index < podfile.sources.size)
-            source = podfile.sources[index]
-            Pod::UI.puts "#{"选择了发布到: ".yellow}. #{source.green}(#{index + 1})"
-            return source
+        str = ' --sources='
+        podfile.sources.each do |source|
+          str += source
+          str += ','
         end
+        Pod::UI.puts str
+        str
+      end
+
+      def getUserRepoAddress
+        raise "💔 发布release必须配置仓库的地址, e.g.: source 'https://github.com/CocoaPods/Specs.git'" if podfile.sources.size == 0
+
+        index = nil
+        begin
+          Pod::UI.puts "\n\n⌨️  请输入要发布到的cocoapods仓库序号, 按回车确认: ".yellow
+          num = 1
+          podfile.sources.each do |source|
+            Pod::UI.puts "#{num.to_s.yellow}. #{source.green}"
+            num += 1
+          end
+          index = STDIN.gets.to_i - 1
+        end until (index >= 0 && index < podfile.sources.size)
+        source = podfile.sources[index]
+        Pod::UI.puts "#{'选择了发布到: '.yellow}. #{source.green}(#{index + 1})"
+        source
+      end
     end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dev-env
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.2.4
 platform: ruby
 authors:
 - 吴锡苗
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luna-binary-uploader