cocoapods-dev-env 0.9.8 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba297c1e0a9132aa37caa6a96fd5d3c0c7f358ea37c7770c09d72060e21bee4
-  data.tar.gz: 914c791d30f0445ae40acefddcfb128128bb154ed59f7c9f2a805a149d3282eb
+  metadata.gz: 87f011b42c1df26a04c8ac866532a91eef0f0d7e1d854bf97e369714107c0844
+  data.tar.gz: 9befa3b3fe9f53aa5adbd201be02fa44d33ff48b56bada40c433e90235706f0d
 SHA512:
-  metadata.gz: ede85195fecf0b9996882ef34cd42eb23bf32df0e439e89dc57b119bc32c5135ecde8ec04d457907e820777239c01c01147d63569481e56a53f8bef5f0cd82e9
-  data.tar.gz: ee4b507a7a4d52cd0821217a8fad64147b694dc25701896aa6d5f96db68c63d151d51dc5d55b7060d71634ea4b24df797a43ff364827fde600ea7a4797178d8d
+  metadata.gz: ce2e9238b1dfb6dad9ce583adb3b9cd61bf7744e91e376dd51dfd7a516d2cbe1c8f95b2469a212c41d4b1f9cbb4be9f915f9ccb0d0b2055f52ff140fa23fe069
+  data.tar.gz: 7d30f8dd72ef7bc78625f144e5fdd517c10f55ffec6c6985ae00fe9023673d3c6132f8cca17908f350c2bf15e55845769c684c606d729a2932ed2f5073c69f03

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+vendor/

data/Gemfile.lock

@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    cocoapods-dev-env (2.0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.0)
+  cocoapods-dev-env!
+  rake (~> 10.0)
+
+BUNDLED WITH
+   2.1.4

data/cocoapods-dev-env.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency 'luna-binary-uploader'
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
 end

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

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

data/lib/cocoapods_plugin.rb

@@ -1,4 +1,5 @@
 require "file_processer"
+require "luna-binary-uploader"
 
 Pod::HooksManager.register('cocoapods-dev-env', :pre_install) do |installer|
     podfile = installer.podfile
@@ -23,10 +24,15 @@ module Pod
         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
+        attr_reader :binary_source
 
         def searchAndOpenLocalExample(path)
             _currentDir = Dir.pwd
@@ -161,10 +167,16 @@ class Podfile
                 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
+            newVersion = get_pure_version(newVersion)
             specName = name + ".podspec"
             FileProcesserManager.new(specName, 
                 [
@@ -177,6 +189,7 @@ class Podfile
         end
 
         ## --- option for setting using prebuild framework ---
+        
         def parse_pod_dev_env(name, requirements)
             options = requirements.last
             pod_name = Specification.root_name(name)
@@ -189,176 +202,275 @@ class Podfile
                 else
                     requirements.push(last_options)
                 end 
-                
-                return
-            end
-            if options.is_a?(Hash)
+            elsif options.is_a?(Hash)
+                use_binary = options.delete(Pod::DevEnv::binary_key)
                 dev_env = options.delete(Pod::DevEnv::keyword)
-                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}"
+                
+                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
-                if git == nil || git.length == 0 
-                    raise "💔 #{pod_name.yellow} 未定义:git => 'xxx'库地址"
+
+                
+                if dev_env || use_binary 
+                    $processedPodsOptions[pod_name] = options.clone
+                    requirements.pop if options.empty?
                 end
-                if branch == nil || branch.length == 0 
-                    raise "💔 #{pod_name.yellow} 未定义:branch => 'xxx'"
+            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
-                if tag == nil || tag.length == 0 
-                    raise "💔 #{pod_name.yellow} 未定义:tag => 'xxx', tag 将会作为 dev模式下载最新代码检查的依据，beta模式引用的tag 以及 release模式引用的版本号"
+                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)
 
-                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"
+                    _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)
-                        Dir.chdir(_currentDir)
                     end
-                    options[:path] = path
-                    if requirements.length >= 2
-                        requirements.delete_at(0)
+                    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
-                    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"
+                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
-                        # if inputNeedJumpForReson("本地库#{pod_name} 处于开发模式，是否自动打开Example工程")
-                        #     searchAndOpenLocalExample(path)
-                        # end
+                        # tag不存在，
+                        changeVersionInCocoapods(pod_name, originTag)
+                        checkGitStatusAndPush(pod_name) # 再push一下
+                        addGitTagAndPush(tag, pod_name)    
                     end
-                    options[:path] = path
-                    if requirements.length >= 2
-                        requirements.delete_at(0)
+                    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
-                    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
+                    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
-                            # tag不存在，
-                            changeVersionInCocoapods(pod_name, originTag)
-                            checkGitStatusAndPush(pod_name) # 再push一下
-                            addGitTagAndPush(tag, pod_name)    
+                            raise "💔 #{pod_name.yellow} tag:#{tag.yellow} 已存在, 请确认已经手动修改tag版本号"
                         end
-                        Dir.chdir(_currentDir)
-                        checkAndRemoveSubmodule(path)
                     end
-                    options[:git] = git
-                    options[:tag] = tag
-                    if requirements.length >= 2
-                        requirements.delete_at(0)
+                    ## 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
-                    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 --allow-warnings#{getReposStrForLint()}#{verboseParamStr}")
-                        if ret != true
-                            raise "💔 #{pod_name.yellow} lint 失败"
-                        end
-                        checkGitStatusAndPush(pod_name)
-                        ## TODO:: 检查tag版本号与podspec里的版本号是否一致
-                        ret = addGitTagAndPush(tag, pod_name)
-                        if ret == false
-                            if checkTagOrBranchIsEqalToHead(tag, "./")
-                                UI.puts "#{pod_name.green} 已经打过tag".yellow
+                    ## 到最后统一执行，判断如果当次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
+        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}")
                             else
-                                raise "💔 #{pod_name.yellow} tag:#{tag.yellow} 已存在, 请确认已经手动修改tag版本号"
+                                UI.puts "pod '#{pod_name}' :tag => #{options[:tag]} version: #{version} 对应的版本,但是已经标记版本号#{requirements}, 不知道用哪个".red
                             end
+                        else
+                            UI.puts "pod '#{pod_name}' :tag => #{options[:tag]} version: #{version} 没有找到: tag 对应的版本".red
                         end
-                        ## TODO:: 发布到的目标库名称需要用变量设置
-                        repoAddrs = getUserRepoAddress()
-                        cmd = "pod repo push #{repoAddrs} #{pod_name}.podspec --skip-import-validation --allow-warnings#{getReposStrForLint()}"
-                        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}")
+                    rescue => exception
+                        UI.puts "pod '#{pod_name}' :tag => #{options[:tag]} version: #{version} 没有找到: tag 对应的版本".red
+                    else
+                        
                     end
-                    UI.message "enabled #{"release".green}-mode for #{pod_name.green}"
                 else
-                    raise "💔 :dev_env 必须要设置成 dev/beta/release之一，不接受其他值"
+                    options.delete(:git)
+                    options.delete(:path)
+                    options.delete(:tag)
+                    options[:source] = binary_repo_url
                 end
-                $processedPodsOptions[pod_name] = options
-                requirements.pop if options.empty?
+                
+            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
+                            end
+                        end
+                        options[:source] = source_url if source_url != nil
+                    rescue => exception
+                        UI.puts "#{pod_name} exception:#{exception}".red
+                    else
+                        
+                    end
+                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
+
+        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 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
+
+        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
+
       # ---- 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`.

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dev-env
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 2.0.2
 platform: ruby
 authors:
 - 吴锡苗
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: luna-binary-uploader
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -48,6 +62,7 @@ files:
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile