cocoapods-dev-env 2.0.2 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f011b42c1df26a04c8ac866532a91eef0f0d7e1d854bf97e369714107c0844
-  data.tar.gz: 9befa3b3fe9f53aa5adbd201be02fa44d33ff48b56bada40c433e90235706f0d
+  metadata.gz: 1b812296f28342f1708bda8556027923934872fc111920e70317d551e6dca5db
+  data.tar.gz: 532daa402827318f2110aaed1da2fa3896c1c97897e23bced39bbb723e2d867d
 SHA512:
-  metadata.gz: ce2e9238b1dfb6dad9ce583adb3b9cd61bf7744e91e376dd51dfd7a516d2cbe1c8f95b2469a212c41d4b1f9cbb4be9f915f9ccb0d0b2055f52ff140fa23fe069
-  data.tar.gz: 7d30f8dd72ef7bc78625f144e5fdd517c10f55ffec6c6985ae00fe9023673d3c6132f8cca17908f350c2bf15e55845769c684c606d729a2932ed2f5073c69f03
+  metadata.gz: b5ded21c4b040ae5b50f72dba1627233af519d4de30d69f26c8249285d056a23a20220a589001e728f50103857ebf3537bdfbe9ae9e3060457a04c30170c8987
+  data.tar.gz: 8fbcaa555da7caed0cd31bb78855bdd0fe93c20a7717d537be71d914f364aab8b53aa61ba7e828a8486a40138f2136d203e453c5e0ac585161957f65f8c02337

data/Gemfile.lock

@@ -1,12 +1,113 @@
 PATH
   remote: .
   specs:
-    cocoapods-dev-env (2.0.2)
+    cocoapods-dev-env (2.1.8)
+      luna-binary-uploader
 
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (3.0.5)
+      rexml
+    activesupport (6.1.4.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    claide (1.1.0)
+    cocoapods (1.11.2)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.11.2)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.2)
+      activesupport (>= 5.0, < 7)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-disable-podfile-validations (0.1.1)
+    cocoapods-downloader (1.5.1)
+    cocoapods-generate (2.0.1)
+      cocoapods-disable-podfile-validations (~> 0.1.1)
+    cocoapods-imy-bin (0.3.1.3)
+      cocoapods
+      cocoapods-generate (~> 2.0.0)
+      parallel
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.9)
+    escape (0.0.4)
+    ethon (0.14.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.3)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    gli (2.19.0)
+    httpclient (2.8.3)
+    i18n (1.9.1)
+      concurrent-ruby (~> 1.0)
+    json (2.5.1)
+    luna-binary-uploader (0.1.26)
+      cocoapods
+      cocoapods-generate (~> 2.0.1)
+      cocoapods-imy-bin (= 0.3.1.3)
+      gli (= 2.19.0)
+      parallel
+    minitest (5.15.0)
+    molinillo (0.8.0)
+    nanaimo (0.3.0)
+    nap (1.1.0)
+    netrc (0.11.0)
+    parallel (1.21.0)
+    public_suffix (4.0.6)
     rake (10.5.0)
+    rexml (3.2.5)
+    ruby-macho (2.5.1)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.21.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -17,4 +118,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.20

data/README.md

@@ -42,6 +42,14 @@ 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
+        此功能默认开启, 等同于在顶部写入如下配置: use_parent_lock_info!
+        关闭方法 use_parent_lock_info! false
+        宿主工程路径默认为"../../../"(因为默认放到developing_pods子文件夹下，对应的库文件夹下的Example文件夹下，故需要回溯三层)
+        配置宿主工程相对路径的方法 use_parent_lock_info! :path => '../'
+        暂不支持配置绝对路径，未来也不建议配置绝对路径指向固定的位置
+        
+
 
 ## Development
 

data/cocoapods-dev-env.code-workspace

@@ -0,0 +1,21 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {
+		"ruby.useBundler": true, //run non-lint commands with bundle exec
+		"ruby.useLanguageServer": true, // use the internal language server (see below)
+		"ruby.lint": {
+  			"rubocop": {
+    			"useBundler": false // enable rubocop via bundler
+  			}
+		},
+		"ruby.format": "rubocop",
+		"ruby.codeCompletion": "rcodetools",
+		"ruby.intellisense": "rubyLocate",
+		"editor.formatOnPaste": true,
+		"editor.formatOnSave": true, // use rubocop for formatting
+	}
+}

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

@@ -1,7 +1,7 @@
 module Cocoapods
   module Dev
     module Env
-      VERSION = "2.0.2"
+      VERSION = '2.1.8'
     end
   end
 end

data/lib/cocoapods_plugin.rb

@@ -1,9 +1,10 @@
-require "file_processer"
-require "luna-binary-uploader"
+# frozen_string_literal: true
+
+require 'file_processer'
+require 'luna-binary-uploader'
 
 Pod::HooksManager.register('cocoapods-dev-env', :pre_install) do |installer|
-    podfile = installer.podfile
-    #puts installer.instance_variables
+    # puts installer.instance_variables
     # forbidden submodule not cloned
     # 会引起submodule HEAD回滚，不靠谱，先注释掉
     # `
@@ -12,14 +13,78 @@ Pod::HooksManager.register('cocoapods-dev-env', :pre_install) do |installer|
 end
 
 Pod::HooksManager.register('cocoapods-dev-env', :post_install) do |installer|
-    #puts installer.instance_variables
+    # puts installer.instance_variables
 end
 
 
 $processedPodsState = Hash.new
 $processedPodsOptions = Hash.new
 
+$podFileContentPodNameHash = Hash.new
+
+$parentPodlockDependencyHash = Hash.new
+
+$processedParentPods = Hash.new # 从父项目里读出来的pod当次已经下载或者加载过了就不需要再做一遍
+
+$parrentPath = '../../../'
+
+module Pod
+    class Dependency
+      def setRequirement(requirement)
+        @requirement = requirement
+      end
+    end
+end
+
+
 module Pod
+
+    class Resolver
+
+        def search_for(dependency)
+            UI.message "fake search_for" + dependency.inspect
+            if $podFileContentPodNameHash.has_key?(dependency.root_name)
+                # 双重保证已经存在在pofile里的不再重复下载覆盖成父项目的配置
+                UI.message "parrent extenal source has downloaded"
+            else
+                parentPodInfo = $parentPodlockDependencyHash[dependency.root_name]
+                if parentPodInfo != nil
+                    dependency.external_source = parentPodInfo.external_source
+                    dependency.setRequirement(parentPodInfo.requirement)
+                    #dependency.external_source = Hash[:path => '../../ZYSDK']
+                    # dependency.external_source = Hash.new
+                    UI.message "fake create_set_from_sources, changeexternal:" + dependency.inspect
+                    dep = dependency
+                    if !$processedParentPods.has_key?(dependency.root_name) && dependency.external_source != nil
+                        $processedParentPods[dependency.root_name] = true
+                        # 这里有缺陷: 已经下载过的不需要再下载了，但是不下载又进不到系统里，导致最后没有使用指定的依赖
+                        # 这个没用 podfile.pod(dependency.root_name, dependency.external_source)
+                        # if sandbox.specification_path(dep.root_name).nil? ||
+                        #     !dep.external_source[:path].nil? ||
+                        #     !sandbox.pod_dir(dep.root_name).directory? ||
+                        #     checkout_requires_update?(dep)
+                        #     # 已经存在就不再下载
+                            source = ExternalSources.from_dependency(dependency, podfile.defined_in_file, true)
+                            source.fetch(sandbox)
+                        # end
+                    end
+                end
+            end
+            
+            aggregate_for_dependency(dependency).search(dependency)
+
+            @search[dependency] ||= begin
+              additional_requirements = if locked_requirement = requirement_for_locked_pod_named(dependency.name)
+                                          [locked_requirement]
+                                        else
+                                          Array(@podfile_requirements_by_root_name[dependency.root_name])
+                                        end
+      
+              specifications_for_dependency(dependency, additional_requirements).freeze
+            end
+          end
+    end
+
     class DevEnv
         def self.keyword
             :dev_env # 'dev'/'beta'/'release'
@@ -29,457 +94,524 @@ module Pod
         end
         UI.message "🎉 plugin cocoapods-dev-env loaded 🎉".green
     end
-class Podfile
-    class TargetDefinition
-        attr_reader :binary_repo_url
-        attr_reader :binary_source
-
-        def 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)
-        end
-
-        def 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} 移除失败，有推送的修改"
+    class Podfile
+        module DSL
+            def use_parent_lock_info!(option = true)
+                case option
+                when true, false
+                    if !option
+                        $parrentPath = ''
+                        TargetDefinition.cleanParrentLockFile()
+                    end
+                when Hash
+                    $parrentPath = option.fetch(:path)
+                    TargetDefinition.readParrentLockFile()
+                else
+                  raise ArgumentError, "Got `#{option.inspect}`, should be a boolean or hash."
                 end
-            else
-                raise "submodule #{path} 移除失败，有未提交的修改"
             end
-            Dir.chdir(_currentDir)
-            `
-            git submodule deinit #{path}
-            rm -rf #{path}
-            git rm #{path}
-            `
         end
 
-        def 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
+        class TargetDefinition
+            attr_reader :binary_repo_url
+            attr_reader :binary_source
 
-# 这个函数有问题有时候拿不到相同的commit id
-        def checkTagOrBranchIsEqalToHead(branchOrTag, path)
-            _currentDir = Dir.pwd
-            Dir.chdir(path)
-            headCommitID = `git rev-parse HEAD`
-            tagCommitID = `git rev-parse #{branchOrTag}`
-            UI.puts "#{`pwd`}  headCommitID:#{headCommitID} \n #{branchOrTag}ComitID:#{tagCommitID}"
-            Dir.chdir(_currentDir)
-            return (headCommitID.length > 0 && headCommitID == tagCommitID)
-        end
+            def 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)
+            end
 
-        def 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 失败"
+            def 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
-            else
-                raise "💔 #{pod_name.yellow} 有未提交的数据"
+                Dir.chdir(_currentDir)
+                `
+                git submodule deinit #{path}
+                rm -rf #{path}
+                git rm #{path}
+                `
             end
-        end
-
-        def checkRemoteTagExist(tag)
-            `git push --tags`
-            ret = system("git ls-remote --exit-code origin refs/tags/#{tag}")
-            return ret
-        end
 
-        def 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 失败"
+            def 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
-            return ret
-        end
 
-        def inputNeedJumpForReson(str)
-            if ARGV.include? '--silent'
-                return false
+            # 这个函数有问题有时候拿不到相同的commit id
+            def checkTagOrBranchIsEqalToHead(branchOrTag, path)
+                _currentDir = Dir.pwd
+                Dir.chdir(path)
+                headCommitID = `git rev-parse HEAD`
+                tagCommitID = `git rev-parse #{branchOrTag}`
+                UI.puts "#{`pwd`}  headCommitID:#{headCommitID} \n #{branchOrTag}ComitID:#{tagCommitID}"
+                Dir.chdir(_currentDir)
+                return (headCommitID.length > 0 && headCommitID == tagCommitID)
             end
 
-            puts str.green
-            puts '是(Y), 任意其他输入或直接回车跳过'.green
-            input = STDIN.gets
-            if input[0,1] == "Y"
-                return true
-            else
-                return false
+            def 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
-        end
 
-        def getReposStrForLint()
-            if podfile.sources.size == 0
-                return ""
-            end
-            str = " --sources="
-            podfile.sources.each do |source|
-                str += source
-                str += ","
+            def checkRemoteTagExist(tag)
+                `git push --tags`
+                ret = system("git ls-remote --exit-code origin refs/tags/#{tag}")
+                return ret
             end
-            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
-                UI.puts  "\n\n⌨️  请输入要发布到的cocoapods仓库序号, 按回车确认: ".yellow
-                num = 1
-                podfile.sources.each do |source|
-                    UI.puts "#{num.to_s.yellow}. #{source.green}"
-                    num += 1
+            def 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
-                index = STDIN.gets.to_i - 1
-            end until (index >= 0 && index < podfile.sources.size)
-            source = podfile.sources[index]
-            UI.puts "#{"选择了发布到: ".yellow}. #{source.green}(#{index + 1})"
-            return source
-        end
-
-        def changeVersionInCocoapods(name, newVersion)
-            if (newVersion == nil)
-                UI.puts "💔 切换版本号的版本现在为空，无法设置版本号".yellow
-                return
+                return ret
             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}
-             git commit -m "Mod: 修改版本号为:#{newVersion} by cocoapods_dev_env plugin"`
-        end
 
-        ## --- option for setting using prebuild framework ---
-        
-        def parse_pod_dev_env(name, requirements)
-            options = requirements.last
-            pod_name = Specification.root_name(name)
-            last_options = $processedPodsOptions[pod_name]
-
-            if (last_options != nil)
-                UI.message "#{name.green} use last_options: #{last_options.to_s.green}"
-                if options != nil && options.is_a?(Hash)
-                    requirements[requirements.length - 1] = last_options
-                else
-                    requirements.push(last_options)
-                end 
-            elsif options.is_a?(Hash)
-                use_binary = options.delete(Pod::DevEnv::binary_key)
-                dev_env = options.delete(Pod::DevEnv::keyword)
-                
-                deal_dev_env_with_options(dev_env, options, pod_name, name, requirements)
-                if dev_env != 'dev' 
-                    binary_processer(dev_env, pod_name, use_binary, options, requirements)
+            def inputNeedJumpForReson(str)
+                if ARGV.include? '--silent'
+                    return false
                 end
 
-                
-                if dev_env || use_binary 
-                    $processedPodsOptions[pod_name] = options.clone
-                    requirements.pop if options.empty?
+                puts str.green
+                puts '是(Y), 任意其他输入或直接回车跳过'.green
+                input = STDIN.gets
+                if input[0,1] == "Y"
+                    return true
+                else
+                    return false
                 end
-            end    
-        end
-
-        def deal_dev_env_with_options(dev_env, options, pod_name, name, requirements) 
-            if dev_env == nil 
-                return
             end
-            UI.message "pod #{name.green} dev-env: #{dev_env.green}"
-            git = options.delete(:git)
-            branch = options.delete(:branch)
-            tag = options.delete(:tag)
-            path = options.delete(:path)
-            if path == nil 
-                path = "./developing_pods/#{pod_name}"
-            end
-            if git == nil || git.length == 0 
-                raise "💔 #{pod_name.yellow} 未定义:git => 'xxx'库地址"
+
+            def getReposStrForLint()
+                if podfile.sources.size == 0
+                    return ""
+                end
+                str = " --sources="
+                podfile.sources.each do |source|
+                    str += source
+                    str += ","
+                end
+                UI.puts str
+                return str
             end
-            if branch == nil || branch.length == 0 
-                raise "💔 #{pod_name.yellow} 未定义:branch => 'xxx'"
+
+            def getUserRepoAddress()
+                if podfile.sources.size == 0
+                    raise "💔 发布release必须配置仓库的地址, e.g.: source 'https://github.com/CocoaPods/Specs.git'"
+                end
+                index = nil
+                begin
+                    UI.puts  "\n\n⌨️  请输入要发布到的cocoapods仓库序号, 按回车确认: ".yellow
+                    num = 1
+                    podfile.sources.each do |source|
+                        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]
+                UI.puts "#{"选择了发布到: ".yellow}. #{source.green}(#{index + 1})"
+                return source
             end
-            if tag == nil || tag.length == 0 
-                raise "💔 #{pod_name.yellow} 未定义:tag => 'xxx', tag 将会作为 dev模式下载最新代码检查的依据，beta模式引用的tag 以及 release模式引用的版本号"
+
+            def changeVersionInCocoapods(name, newVersion)
+                if (newVersion == nil)
+                    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}
+                 git commit -m "Mod: 修改版本号为:#{newVersion} by cocoapods_dev_env plugin"`
             end
 
-            if dev_env == 'subtree'
-                if !File.directory?(path)
-                    _toplevelDir = `git rev-parse --show-toplevel`
-                    _currentDir = `pwd`
-                    _subtreeDir = path
-                    if _currentDir != _toplevelDir
-                        Dir.chdir(_toplevelDir)
-                        _end = path
-                        if _end[0,2] == './'
-                            _end = _end[1, _end.length - 1]
-                        else
-                            _end = '/' + _end
-                        end
-                        _subtreeDir = './' + _currentDir[_toplevelDir.length, _currentDir.length - _toplevelDir.length] + path
+            ## --- hook的入口函数 ---
+            def parse_pod_dev_env(name, requirements)
+                options = requirements.last
+                pod_name = Specification.root_name(name)
+                last_options = $processedPodsOptions[pod_name]
+                $podFileContentPodNameHash[pod_name] = true
+
+                if (last_options != nil)
+                    UI.message "#{name.green} use last_options: #{last_options.to_s.green}"
+                    if options != nil && options.is_a?(Hash)
+                        requirements[requirements.length - 1] = last_options
+                    else
+                        requirements.push(last_options)
+                    end 
+                elsif options.is_a?(Hash)
+                    use_binary = options.delete(Pod::DevEnv::binary_key)
+                    dev_env = options.delete(Pod::DevEnv::keyword)
+
+                    # 主功能，根据dev_env标记来管理使用代码的方式
+                    deal_dev_env_with_options(dev_env, options, pod_name, name, requirements)
+
+                    # 处理二进制
+                    if dev_env != 'dev' 
+                        binary_processer(dev_env, pod_name, use_binary, options, requirements)
                     end
-                    _cmd = "git subtree add --prefix #{_subtreeDir} #{git} #{branch} --squash"
-                    UI.puts _cmd
-                    system(_cmd)
-                    Dir.chdir(_currentDir)
+
+
+                    if dev_env || use_binary 
+                        $processedPodsOptions[pod_name] = options.clone
+                        requirements.pop if options.empty?
+                    end
+                end    
+            end
+
+            ## --- 主功能函数 ---
+            def deal_dev_env_with_options(dev_env, options, pod_name, name, requirements) 
+                if dev_env == nil 
+                    return
                 end
-                options[:path] = path
-                if requirements.length >= 2
-                    requirements.delete_at(0)
+                UI.message "pod #{name.green} dev-env: #{dev_env.green}"
+                git = options.delete(:git)
+                branch = options.delete(:branch)
+                tag = options.delete(:tag)
+                path = options.delete(:path)
+                if path == nil 
+                    path = "./developing_pods/#{pod_name}"
                 end
-                UI.message "pod #{pod_name.green} enabled #{"subtree".green}-mode 🍺"
-            elsif dev_env == 'dev'
-                # 开发模式，使用path方式引用本地的submodule git库
-                if !File.directory?(path)
-                    UI.puts "add submodule for #{pod_name.green}".yellow
-                    _cmd = "git submodule add --force -b #{branch} #{git} #{path}"
-                    UI.puts _cmd
-                    system(_cmd)
-
-                    _currentDir = Dir.pwd
-                    Dir.chdir(path)
-
-                    curGitRemoteUrl = `git remote get-url origin`.rstrip()
-                    if curGitRemoteUrl == git
-                        _cmd = "git reset --hard"
+                if git == nil || git.length == 0 
+                    raise "💔 #{pod_name.yellow} 未定义:git => 'xxx'库地址"
+                end
+                if branch == nil || branch.length == 0 
+                    raise "💔 #{pod_name.yellow} 未定义:branch => 'xxx'"
+                end
+                if tag == nil || tag.length == 0 
+                    raise "💔 #{pod_name.yellow} 未定义:tag => 'xxx', tag 将会作为 dev模式下载最新代码检查的依据，beta模式引用的tag 以及 release模式引用的版本号"
+                end
+
+                if dev_env == 'subtree'
+                    if !File.directory?(path)
+                        _toplevelDir = `git rev-parse --show-toplevel`
+                        _currentDir = `pwd`
+                        _subtreeDir = path
+                        if _currentDir != _toplevelDir
+                            Dir.chdir(_toplevelDir)
+                            _end = path
+                            if _end[0,2] == './'
+                                _end = _end[1, _end.length - 1]
+                            else
+                                _end = '/' + _end
+                            end
+                            _subtreeDir = './' + _currentDir[_toplevelDir.length, _currentDir.length - _toplevelDir.length] + path
+                        end
+                        _cmd = "git subtree add --prefix #{_subtreeDir} #{git} #{branch} --squash"
                         UI.puts _cmd
                         system(_cmd)
+                        Dir.chdir(_currentDir)
                     end
-                    Dir.chdir(_currentDir)
-                    
-                    # if inputNeedJumpForReson("本地库#{pod_name} 开发模式加载完成，是否自动打开Example工程")
-                    #     searchAndOpenLocalExample(path)
-                    # end
-                    if !checkTagIsEqualToHead(tag, path) && !checkTagIsEqualToHead("#{tag}_beta", path)
-                        raise "💔 #{pod_name.yellow} branch:#{branch.yellow} 与 tag:#{tag.yellow}[_beta] 内容不同步，请自行确认所用分支和tag后重新执行 pod install"
+                    options[:path] = path
+                    if requirements.length >= 2
+                        requirements.delete_at(0)
                     end
-                else
-                    # if inputNeedJumpForReson("本地库#{pod_name} 处于开发模式，是否自动打开Example工程")
-                    #     searchAndOpenLocalExample(path)
-                    # end
-                end
-                options[:path] = path
-                if requirements.length >= 2
-                    requirements.delete_at(0)
-                end
-                UI.message "pod #{pod_name.green} enabled #{"dev".green}-mode 🍺"
-            elsif dev_env == 'beta'
-                # Beta模式，使用tag引用远端git库的代码
-                originTag = tag
-                tag = "#{tag}_beta"
-                if File.directory?(path)
-                    # 从Dev模式刚刚切换过来，需要打tag并且push
-                    UI.puts "release beta-version for #{pod_name.green}".yellow
-                    _currentDir = Dir.pwd
-                    Dir.chdir(path)
-                    # 已经进入到podspec的文件夹中了
-                    checkGitStatusAndPush(pod_name) # push一下
-                    ret = checkRemoteTagExist(tag)
-                    if ret == true
-                        # tag已经存在，要么没改动，要么已经手动打过tag，要么是需要引用老版本tag的代码
-                        if checkTagOrBranchIsEqalToHead(tag, "./")
-                            UI.puts "#{pod_name.green} 检测到未做任何调整，或已手动打过Tag"
-                        else
-                            if !inputNeedJumpForReson("是否跳过beta发布并删除本地submodule(直接引用远端库)")
-                                raise "💔 #{pod_name.yellow} tag:#{tag.yellow} 已存在, 且与当前Commit不对应. 请确认拉到本地之后已经在podfile中手动修改tag版本号"
-                            end
+                    UI.message "pod #{pod_name.green} enabled #{"subtree".green}-mode 🍺"
+                elsif dev_env == 'dev'
+                    # 开发模式，使用path方式引用本地的submodule git库
+                    if !File.directory?(path)
+                        UI.puts "add submodule for #{pod_name.green}".yellow
+                        _cmd = "git submodule add --force -b #{branch} #{git} #{path}"
+                        UI.puts _cmd
+                        system(_cmd)
+
+                        _currentDir = Dir.pwd
+                        Dir.chdir(path)
+
+                        curGitRemoteUrl = `git remote get-url origin`.rstrip()
+                        if curGitRemoteUrl == git
+                            _cmd = "git reset --hard"
+                            UI.puts _cmd
+                            system(_cmd)
+                            _cmd = "git pull"
+                            UI.puts _cmd
+                            system(_cmd)
+                        end
+                        Dir.chdir(_currentDir)
+
+                        # if inputNeedJumpForReson("本地库#{pod_name} 开发模式加载完成，是否自动打开Example工程")
+                        #     searchAndOpenLocalExample(path)
+                        # end
+                        if !checkTagIsEqualToHead(tag, path) && !checkTagIsEqualToHead("#{tag}_beta", path)
+                            raise "💔 #{pod_name.yellow} branch:#{branch.yellow} 与 tag:#{tag.yellow}[_beta] 内容不同步，请自行确认所用分支和tag后重新执行 pod install"
                         end
                     else
-                        # tag不存在，
-                        changeVersionInCocoapods(pod_name, originTag)
-                        checkGitStatusAndPush(pod_name) # 再push一下
-                        addGitTagAndPush(tag, pod_name)    
-                    end
-                    Dir.chdir(_currentDir)
-                    checkAndRemoveSubmodule(path)
-                end
-                options[:git] = git
-                options[:tag] = tag
-                if requirements.length >= 2
-                    requirements.delete_at(0)
-                end
-                UI.message "enabled #{"beta".green}-mode for #{pod_name.green}"
-            elsif dev_env == 'release'
-                # Release模式，直接使用远端对应的版本
-                if File.directory?(path)
-                    UI.puts "release release-version for #{pod_name.green}".yellow
-                    _currentDir = Dir.pwd
-                    Dir.chdir(path)
-                    verboseParamStr = ""
-                    if Config.instance.verbose
-                        verboseParamStr = " --verbose"
+                        # if inputNeedJumpForReson("本地库#{pod_name} 处于开发模式，是否自动打开Example工程")
+                        #     searchAndOpenLocalExample(path)
+                        # end
                     end
-                    ret = system("pod lib lint --skip-import-validation --fail-fast --allow-warnings#{getReposStrForLint()}#{verboseParamStr}")
-                    if ret != true
-                        raise "💔 #{pod_name.yellow} lint 失败"
+                    options[:path] = path
+                    if requirements.length >= 2
+                        requirements.delete_at(0)
                     end
-                    checkGitStatusAndPush(pod_name)
-                    changeVersionInCocoapods(pod_name, tag)
-                    checkGitStatusAndPush(pod_name)
-                    ret = addGitTagAndPush(tag, pod_name)
-                    if ret == false
-                        if checkTagOrBranchIsEqalToHead(tag, "./")
-                            UI.puts "#{pod_name.green} 已经打过tag".yellow
+                    UI.message "pod #{pod_name.green} enabled #{"dev".green}-mode 🍺"
+                elsif dev_env == 'beta'
+                    # Beta模式，使用tag引用远端git库的代码
+                    originTag = tag
+                    tag = "#{tag}_beta"
+                    if File.directory?(path)
+                        # 从Dev模式刚刚切换过来，需要打tag并且push
+                        UI.puts "try to release beta-version for #{pod_name.green}".yellow
+                        _currentDir = Dir.pwd
+                        Dir.chdir(path)
+                        # 已经进入到podspec的文件夹中了
+                        checkGitStatusAndPush(pod_name) # push一下
+                        ret = checkRemoteTagExist(tag)
+                        if ret == true
+                            # tag已经存在，要么没改动，要么已经手动打过tag，要么是需要引用老版本tag的代码
+                            if checkTagOrBranchIsEqalToHead(tag, "./")
+                                UI.puts "#{pod_name.green} 检测到未做任何调整，或已手动打过Tag，直接引用远端库"
+                            else
+                                if !inputNeedJumpForReson("#{pod_name.green} 检测到已经存在#{tag.yellow}的tag，且与当前本地节点不同，是否跳过beta发布并删除本地submodule(直接引用远端库)")
+                                    raise "💔 #{pod_name.yellow} tag:#{tag.yellow} 已存在, 且与当前Commit不对应. 请确认拉到本地之后已经在podfile中手动修改tag版本号"
+                                end
+                            end
                         else
-                            raise "💔 #{pod_name.yellow} tag:#{tag.yellow} 已存在, 请确认已经手动修改tag版本号"
+                            # tag不存在，
+                            changeVersionInCocoapods(pod_name, originTag)
+                            checkGitStatusAndPush(pod_name) # 再push一下
+                            addGitTagAndPush(tag, pod_name)    
                         end
+                        Dir.chdir(_currentDir)
+                        checkAndRemoveSubmodule(path)
                     end
-                    ## TODO:: 发布到的目标库名称需要用变量设置
-                    repoAddrs = getUserRepoAddress()
-                    cmd = "pod repo push #{repoAddrs} #{pod_name}.podspec --skip-import-validation --allow-warnings --use-modular-headers#{getReposStrForLint()}#{verboseParamStr}"
-                    UI.puts cmd.green
-                    ret = system(cmd)
-                    if ret  != true
-                        raise "💔 #{pod_name.yellow} 发布失败"
+                    options[:git] = git
+                    options[:tag] = tag
+                    if requirements.length >= 2
+                        requirements.delete_at(0)
                     end
-                    ## 到最后统一执行，判断如果当次release过
-                    `pod repo update`
-                    Dir.chdir(_currentDir)
-                    checkAndRemoveSubmodule(path)
-                end
-                if requirements.length < 2
-                    requirements.insert(0, "#{get_pure_version(tag)}")
+                    UI.message "enabled #{"beta".green}-mode for #{pod_name.green}"
+                elsif dev_env == 'release'
+                    # Release模式，直接使用远端对应的版本
+                    if File.directory?(path)
+                        UI.puts "release release-version for #{pod_name.green}".yellow
+                        _currentDir = Dir.pwd
+                        Dir.chdir(path)
+                        verboseParamStr = ""
+                        if Config.instance.verbose
+                            verboseParamStr = " --verbose"
+                        end
+                        ret = system("pod lib lint --skip-import-validation --fail-fast --allow-warnings#{getReposStrForLint()}#{verboseParamStr}")
+                        if ret != true
+                            raise "💔 #{pod_name.yellow} lint 失败"
+                        end
+                        checkGitStatusAndPush(pod_name)
+                        changeVersionInCocoapods(pod_name, tag)
+                        checkGitStatusAndPush(pod_name)
+                        ret = addGitTagAndPush(tag, pod_name)
+                        if ret == false
+                            if checkTagOrBranchIsEqalToHead(tag, "./")
+                                UI.puts "#{pod_name.green} 已经打过tag".yellow
+                            else
+                                raise "💔 #{pod_name.yellow} tag:#{tag.yellow} 已存在, 请确认已经手动修改tag版本号"
+                            end
+                        end
+                        ## TODO:: 发布到的目标库名称需要用变量设置
+                        repoAddrs = getUserRepoAddress()
+                        cmd = "pod repo push #{repoAddrs} #{pod_name}.podspec --skip-import-validation --allow-warnings --use-modular-headers#{getReposStrForLint()}#{verboseParamStr}"
+                        UI.puts cmd.green
+                        ret = system(cmd)
+                        if ret  != true
+                            raise "💔 #{pod_name.yellow} 发布失败"
+                        end
+                        ## 到最后统一执行，判断如果当次release过
+                        `pod repo update`
+                        Dir.chdir(_currentDir)
+                        checkAndRemoveSubmodule(path)
+                    end
+                    if requirements.length < 2
+                        requirements.insert(0, "#{get_pure_version(tag)}")
+                    end
+                    UI.message "enabled #{"release".green}-mode for #{pod_name.green}"
+                else
+                    raise "💔 :dev_env 必须要设置成 dev/beta/release之一，不接受其他值"
                 end
-                UI.message "enabled #{"release".green}-mode for #{pod_name.green}"
-            else
-                raise "💔 :dev_env 必须要设置成 dev/beta/release之一，不接受其他值"
             end
-        end
-        
-        def binary_processer(dev_env, pod_name, use_binary, options, requirements)
-            if use_binary && use_binary == true
-                if options[:tag] != nil
-                    begin
-                        version = get_pure_version(options[:tag])
-                        spec = binary_source.specification_path(pod_name, Version.new(version))
-                        if spec 
-                            if requirements.length < 2
-                                options.delete(:git)
-                                options.delete(:path)
-                                options.delete(:tag)
-                                options[:source] = binary_repo_url
-                                requirements.insert(0, "#{version}")
+
+            def binary_processer(dev_env, pod_name, use_binary, options, requirements)
+                if use_binary && use_binary == true
+                    if options[:tag] != nil
+                        begin
+                            version = get_pure_version(options[:tag])
+                            spec = binary_source.specification_path(pod_name, Version.new(version))
+                            if spec 
+                                if requirements.length < 2
+                                    options.delete(:git)
+                                    options.delete(:path)
+                                    options.delete(:tag)
+                                    options[:source] = binary_repo_url
+                                    requirements.insert(0, "#{version}")
+                                else
+                                    UI.puts "pod '#{pod_name}' :tag => #{options[:tag]} version: #{version} 对应的版本,但是已经标记版本号#{requirements}, 不知道用哪个".red
+                                end
                             else
-                                UI.puts "pod '#{pod_name}' :tag => #{options[:tag]} version: #{version} 对应的版本,但是已经标记版本号#{requirements}, 不知道用哪个".red
+                                UI.puts "pod '#{pod_name}' :tag => #{options[:tag]} version: #{version} 没有找到: tag 对应的版本".red
                             end
-                        else
+                        rescue => exception
                             UI.puts "pod '#{pod_name}' :tag => #{options[:tag]} version: #{version} 没有找到: tag 对应的版本".red
+                        else
+
                         end
-                    rescue => exception
-                        UI.puts "pod '#{pod_name}' :tag => #{options[:tag]} version: #{version} 没有找到: tag 对应的版本".red
                     else
-                        
+                        options.delete(:git)
+                        options.delete(:path)
+                        options.delete(:tag)
+                        options[:source] = binary_repo_url
                     end
+
                 else
-                    options.delete(:git)
-                    options.delete(:path)
-                    options.delete(:tag)
-                    options[:source] = binary_repo_url
-                end
-                
-            else
-                if options[:source] == nil
-                    begin
-                        sources = find_pod_repos(pod_name).sources.select{|item| item.url.downcase != binary_repo_url.downcase } if options.empty?
-                        if sources != nil
-                            if sources.length >= 2
-                                UI.puts "#{pod_name.green} 有多个source #{sources}".yellow
-                                source_url = sources.detect{|item| item.url.downcase != Pod::TrunkSource::TRUNK_REPO_URL.downcase && item.url.downcase != "https://github.com/CocoaPods/Specs.git".downcase}.url
-                            else
-                                source_url = sources.first.url
+                    if options[:source] == nil
+                        begin
+                            sources = find_pod_repos(pod_name).sources.select{|item| item.url.downcase != binary_repo_url.downcase } if options.empty?
+                            if sources != nil
+                                if sources.length >= 2
+                                    UI.puts "#{pod_name.green} 有多个source #{sources}".yellow
+                                    source_url = sources.detect{|item| item.url.downcase != Pod::TrunkSource::TRUNK_REPO_URL.downcase && item.url.downcase != "https://github.com/CocoaPods/Specs.git".downcase}.url
+                                else
+                                    source_url = sources.first.url
+                                end
                             end
+                            options[:source] = source_url if source_url != nil
+                        rescue => exception
+                            UI.puts "#{pod_name} exception:#{exception}".red
+                        else
+
                         end
-                        options[:source] = source_url if source_url != nil
-                    rescue => exception
-                        UI.puts "#{pod_name} exception:#{exception}".red
-                    else
-                        
                     end
                 end
+                UI.puts "#{pod_name.green} :source=> #{options[:source].green} by cocoapods-dev-env" if options[:source] != nil
+                UI.message "#{pod_name.yellow} options #{options}  by cocoapods-dev-env" if options[:source] != nil
+                UI.message "#{pod_name.yellow} requirements #{requirements}  by cocoapods-dev-env" if options[:source] != nil
             end
-            UI.puts "#{pod_name.green} :source=> #{options[:source].green} by cocoapods-dev-env" if options[:source] != nil
-            UI.message "#{pod_name.yellow} options #{options}  by cocoapods-dev-env" if options[:source] != nil
-            UI.message "#{pod_name.yellow} requirements #{requirements}  by cocoapods-dev-env" if options[:source] != nil
-        end
 
-        def binary_repo_url
-            if @binary_repo_url == nil
-                @binary_repo_url = Luna::Binary::Common.instance.binary_repo_url #从luna-binary-uploader里获取binary_repo_url
+            def binary_repo_url
+                if @binary_repo_url == nil
+                    @binary_repo_url = Luna::Binary::Common.instance.binary_repo_url #从luna-binary-uploader里获取binary_repo_url
+                end
+                return @binary_repo_url
             end
-            return @binary_repo_url
-        end
 
-        def binary_source 
-            if @binary_source == nil
-                @binary_source = Pod::Config.instance.sources_manager.all.detect{|item| item.url.downcase == binary_repo_url.downcase}
+            def binary_source 
+                if @binary_source == nil
+                    @binary_source = Pod::Config.instance.sources_manager.all.detect{|item| item.url.downcase == binary_repo_url.downcase}
+                end
+                return @binary_source
             end
-            return @binary_source
-        end
 
-        def get_pure_version(version) 
-            return version.split.last.scan(/\d+/).join('.') 
-        end
+            def get_pure_version(version) 
+                return version.split.last.scan(/\d+/).join('.') 
+            end
 
-        def find_pod_repos(pod_name) #等同pod search
-            sets = Pod::Config.instance.sources_manager.search_by_name(pod_name)
-            if sets.count == 1
-                set = sets.first
-            elsif sets.map(&:name).include?(pod_name)
-                set = sets.find { |s| s.name == pod_name }
-            else
-                names = sets.map(&:name) * ', '
-                raise Informative, "More than one spec found for '#{pod_name}':\n#{names}"
-            end  
-            return set  
-          end
+            def find_pod_repos(pod_name) #等同pod search
+                sets = Pod::Config.instance.sources_manager.search_by_name(pod_name)
+                if sets.count == 1
+                    set = sets.first
+                elsif sets.map(&:name).include?(pod_name)
+                    set = sets.find { |s| s.name == pod_name }
+                else
+                    names = sets.map(&:name) * ', '
+                    raise Informative, "More than one spec found for '#{pod_name}':\n#{names}"
+                end  
+                return set  
+            end
+
+          # ---- patch method ----
+            # We want modify `store_pod` method, but it's hard to insert a line in the 
+            # implementation. So we patch a method called in `store_pod`.
+            old_method = instance_method(:parse_inhibit_warnings)
 
-      # ---- patch method ----
-        # We want modify `store_pod` method, but it's hard to insert a line in the 
-        # implementation. So we patch a method called in `store_pod`.
-        old_method = instance_method(:parse_inhibit_warnings)
+            define_method(:parse_inhibit_warnings) do |name, requirements|
+                parse_pod_dev_env(name, requirements)
+                old_method.bind(self).(name, requirements)
+            end
+
+            def self.cleanParrentLockFile()
+                $parentPodlockDependencyHash = Hash.new
+            end
 
-        define_method(:parse_inhibit_warnings) do |name, requirements|
-            parse_pod_dev_env(name, requirements)
-            old_method.bind(self).(name, requirements)
+            # 类方法
+            def self.readParrentLockFile()
+                # 获取路径（之后外边直接配置)
+                localPath = Pathname.new(Dir.pwd + "/" + $parrentPath)
+                lockPath ||= localPath + "Podfile.lock"
+                # 读取lockfile
+                _lockfile = Pod::Lockfile.from_file(lockPath)
+                if _lockfile == nil
+                    UI.message "dev_env, 读取父库的lockfile找不到对应路径的lock文件:" + lockPath.inspect
+                    return
+                end
+                # 读取lockfile中的依赖信息，用于之后提取使用，其中数据为 Pod::Dependency类型
+                localPodsMaps = Hash.new()
+                localpods = _lockfile.dependencies
+                localpods.each do |dep|
+                    # 数据为 Pod::Dependency类型
+                    if (dep.external_source == nil && dep.requirement == nil) || localPodsMaps.has_key?(dep.root_name)
+                        next
+                    end
+                    if dep.external_source == nil && dep.requirement.to_s == '>= 0'
+                        # dependence里可能没有版本信息（很奇怪，从version里单独取一下，写死版本限制）
+                        version = _lockfile.version(dep.root_name)
+                        dep.setRequirement(Requirement.new(version))
+                    end
+                    if dep.local?
+                        dep.external_source[:path] = $parrentPath + dep.external_source[:path]
+                    end
+                    # 测试代码 UI.puts "测试获取父项目podlock里的pod依赖列表: " + dep.inspect
+                    localPodsMaps[dep.root_name] = dep
+                end
+                $parentPodlockDependencyHash = localPodsMaps
+                # 读取 示例: ydASRInfo = localPodsMaps['YDASR']
+                # UI.puts ydASRInfo.inspect
+                # UI.puts "YDASR path:\n" + ydASRInfo.external_source[:path]
+            end
+
+            readParrentLockFile()
         end
     end
 end
-end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dev-env
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.8
 platform: ruby
 authors:
 - 吴锡苗
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luna-binary-uploader
@@ -68,6 +68,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- cocoapods-dev-env.code-workspace
 - cocoapods-dev-env.gemspec
 - lib/cocoapods/dev/env.rb
 - lib/cocoapods/dev/env/version.rb
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: a cocoapod plugin for dev in mutipods