cocoapods-dev-env 2.0.1 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3afe919528275cf8b10ba4dc9f641fb314d41973a20b3af3a04f4eb7d6b2490f
-  data.tar.gz: 89636fb4ea8ac5450f61b682a1e472bfaa2265d3488240c674135baa2bbcf78b
+  metadata.gz: c1282e851ae9b54c7bd13e7e05fe72de11a5a56662e1ecdc3af66745eb752e1d
+  data.tar.gz: 30f1d0e013d4d56f9f4ff6ea165f6e60d0b8e2a5385a8df85695872e7935507b
 SHA512:
-  metadata.gz: 88e9376cedc8fbee56febc9339c05f032bd7dba76793fba50145aa7f612af8f60331b8c523018c922d71c0083e5167e2220b6bf92b3f3c84b2c664343d591519
-  data.tar.gz: d32ccb577e9f11f1d935f12009ba6c60db7f6c4aef447ffe730f310afb20ed82e63aa858fe6157d318bf9b8e3c96fad7655093fdf9207e583101a9a3bafaeda2
+  metadata.gz: 8f7628345e1abff5bddcd84d006a11e98e13d2b3cf8b03ab6c15f3e90760ea4087ecc12952544c89960ded37ddf76108133516b0f8097b4259325f0712a8889f
+  data.tar.gz: 7036a12b59e37c374a8377836a5968bf56424ad16b1e9f7d2adb4526b589ebd45c86da355fd8febdceac61f3459eb368425b22429d48c53917f94c412147cb9e

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.1"
+      VERSION = '2.1.9'
     end
   end
 end

data/lib/cocoapods_plugin.rb

@@ -1,446 +1,3 @@
-require "file_processer"
-require "luna-binary-uploader"
-
-Pod::HooksManager.register('cocoapods-dev-env', :pre_install) do |installer|
-    podfile = installer.podfile
-    #puts installer.instance_variables
-    # forbidden submodule not cloned
-    # 会引起submodule HEAD回滚，不靠谱，先注释掉
-    # `
-    # git submodule update --init --recursive
-    # `
-end
-
-Pod::HooksManager.register('cocoapods-dev-env', :post_install) do |installer|
-    #puts installer.instance_variables
-end
-
-
-$processedPodsState = Hash.new
-$processedPodsOptions = Hash.new
-
-module Pod
-    class DevEnv
-        def self.keyword
-            :dev_env # 'dev'/'beta'/'release'
-        end
-        def self.binary_key
-            :dev_env_use_binary # true / false
-        end
-        UI.message "🎉 plugin cocoapods-dev-env loaded 🎉".green
-    end
-class Podfile
-    class TargetDefinition
-        attr_reader :binary_repo_url
-
-        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} 移除失败，有推送的修改"
-                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
-
-# 这个函数有问题有时候拿不到相同的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 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 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 失败"
-                end
-            end
-            return ret
-        end
-
-        def 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 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
-
-        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
-
-        def changeVersionInCocoapods(name, newVersion)
-            if (newVersion == nil)
-                UI.puts "💔 切换版本号的版本现在为空，无法设置版本号".yellow
-                return
-            end
-            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' 
-                    useBinary(dev_env, pod_name, use_binary, options, requirements)
-                end
-
-                
-                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
-            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'库地址"
-            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
-                options[:path] = path
-                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)
-                    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)
-                    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
-                    # 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
-                        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"
-                    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, "#{tag}")
-                end
-                UI.message "enabled #{"release".green}-mode for #{pod_name.green}"
-            else
-                raise "💔 :dev_env 必须要设置成 dev/beta/release之一，不接受其他值"
-            end
-        end
-        
-        def useBinary(dev_env, pod_name, use_binary, options, requirements)
-            if use_binary && use_binary == true
-                options.delete(:git)
-                options.delete(:tag)
-                options.delete(:path)
-                options[:source] = binary_repo_url
-            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
-                                p "#{pod_name} 有多个source #{sources}"
-                                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
-                        UI.puts "#{pod_name} :source=> #{options[:source]} by cocoapods-dev-env".yellow if options[:source] != nil
-                        
-                    rescue => exception
-                        UI.puts "#{pod_name} exception:#{exception}".red
-                    else
-                        
-                    end
-                end
-            end
-        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
-            end
-            return @binary_repo_url
-        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)
-
-        define_method(:parse_inhibit_warnings) do |name, requirements|
-            parse_pod_dev_env(name, requirements)
-            old_method.bind(self).(name, requirements)
-        end
-    end
-end
-end
+require 'dev_env_entry'
+require 'resolver_binary'
+require 'resolver_universal_dependency'