cocoapods-dev-env 0.9.2 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ef1f311749dfda8fe62e3edef726bb735d556ad02653554fd54ff66770602c
-  data.tar.gz: 8c845b54a33e312faef38db386f712b578758f35c2bbaed17211f887243da539
+  metadata.gz: c819e17e2e938cabcc1855c0990b2d0eaaba2af6f53af8a16677c341bc055429
+  data.tar.gz: 73f66541b3cf873f2b88e99766b103dc388551ac06b315bad6862b3658f98e67
 SHA512:
-  metadata.gz: 32462311303b31c4d70aa6642219a3c53d9178c6a9ff7804bc23e2fd029ab34b178bef0d8edb795c5686d403baf335518d10d52b1446fb7e6b783e7eed171fde
-  data.tar.gz: d5cd32f589aa2c9f9cfb21106d71476ab39eb15ee4320f63372effd519b89382dea03b32b659ce2699ed7e85010e3b9c17e13368eeb82daca30bab1b3b68b3c4
+  metadata.gz: 1b3838c06c15f347f2464c6b641e6781f9c3d1166c8f32897db7c728c3595ab1736b95beb8f3624bc8174b45d9c099d53949a271d235a46f4d36035a5f00c585
+  data.tar.gz: 5f91efccbc4ed658d2c5383ed0555649bd42491631c26aef42b5235028ec18e2d1decbc833fb27d5bd9991a07d39b39a16f7ad2ad655627d56278e8e71044166

data/README.md

@@ -41,7 +41,6 @@ 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.  
-**But we hav't done it.**
 
 
 ## Development
@@ -54,6 +53,21 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/YoudaoMobile/cocoapods-dev-env. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
+### prepare
+install gem bundler:  
+    
+    gem install bundler
+
+create Gemfile:
+    
+    bundler init
+
+edit GemFile for local path, e.g.:
+
+    gem 'cocoapods'
+    gem 'cocoapods-dev-env', :path => '../cocoapods-dev-env'
+
+### debug and package
 1. How to develop: put gem in your project and exec `bundle exec pod install`
 2. How to packagae: `rake build` 
 3. How to release: `rake release` or `gem push ./pkg/cocoapods-dev-env-0.2.2.gem` 

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

@@ -1,7 +1,7 @@
 module Cocoapods
   module Dev
     module Env
-      VERSION = "0.9.2"
+      VERSION = "0.9.9"
     end
   end
 end

data/lib/cocoapods_plugin.rb

@@ -1,3 +1,5 @@
+require "file_processer"
+
 Pod::HooksManager.register('cocoapods-dev-env', :pre_install) do |installer|
     podfile = installer.podfile
     #puts installer.instance_variables
@@ -21,13 +23,13 @@ module Pod
         def self.keyword
             :dev_env # 'dev'/'beta'/'release'
         end
-        puts "🎉 plugin cocoapods-dev-env loaded 🎉".green
+        UI.message "🎉 plugin cocoapods-dev-env loaded 🎉".green
     end
 class Podfile
     class TargetDefinition
 
         def searchAndOpenLocalExample(path)
-            currentDir = Dir.pwd
+            _currentDir = Dir.pwd
             Dir.chdir(path)
             Dir.chdir("Example")
             `pod install`
@@ -36,11 +38,11 @@ class Podfile
                 `open -a Terminal ./`
                 `open #{projPaths[0]}`
             end
-            Dir.chdir(currentDir)
+            Dir.chdir(_currentDir)
         end
 
         def checkAndRemoveSubmodule(path)
-            currentDir = Dir.pwd
+            _currentDir = Dir.pwd
             Dir.chdir(path)
             output = `git status -s`
             puts output
@@ -52,7 +54,7 @@ class Podfile
             else
                 raise "submodule #{path} 移除失败，有未提交的修改"
             end
-            Dir.chdir(currentDir)
+            Dir.chdir(_currentDir)
             `
             git submodule deinit #{path}
             rm -rf #{path}
@@ -61,10 +63,10 @@ class Podfile
         end
 
         def checkTagIsEqualToHead(tag, path)
-            currentDir = Dir.pwd
+            _currentDir = Dir.pwd
             Dir.chdir(path)
             result = `git describe --abbrev=4 HEAD`
-            Dir.chdir(currentDir)
+            Dir.chdir(_currentDir)
             if result.include?(tag)
                 return true
             else
@@ -74,12 +76,12 @@ class Podfile
 
 # 这个函数有问题有时候拿不到相同的commit id
         def checkTagOrBranchIsEqalToHead(branchOrTag, path)
-            currentDir = Dir.pwd
+            _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)
+            Dir.chdir(_currentDir)
             return (headCommitID.length > 0 && headCommitID == tagCommitID)
         end
 
@@ -99,6 +101,12 @@ class Podfile
             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
@@ -111,6 +119,10 @@ class Podfile
         end
 
         def inputNeedJumpForReson(str)
+            if ARGV.include? '--silent'
+                return false
+            end
+
             puts str.green
             puts '是(Y), 任意其他输入或直接回车跳过'.green
             input = STDIN.gets
@@ -121,6 +133,19 @@ class Podfile
             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'"
@@ -136,14 +161,28 @@ 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)
+            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)
@@ -176,22 +215,61 @@ class Podfile
                 if tag == nil || tag.length == 0 
                     raise "💔 #{pod_name.yellow} 未定义:tag => 'xxx', tag 将会作为 dev模式下载最新代码检查的依据，beta模式引用的tag 以及 release模式引用的版本号"
                 end
-                if dev_env == 'dev' 
+
+                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
-                        # TODO 这个命令要想办法展示实际报错信息
-                        `git submodule add --force -b #{branch} #{git} #{path}`
-                        if inputNeedJumpForReson("本地库#{pod_name} 开发模式加载完成，是否自动打开Example工程")
-                            searchAndOpenLocalExample(path)
+                        _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
+                        # if inputNeedJumpForReson("本地库#{pod_name} 处于开发模式，是否自动打开Example工程")
+                        #     searchAndOpenLocalExample(path)
+                        # end
                     end
                     options[:path] = path
                     if requirements.length >= 2
@@ -200,25 +278,32 @@ class Podfile
                     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
+                        _currentDir = Dir.pwd
                         Dir.chdir(path)
-                        checkGitStatusAndPush(pod_name)
-                        ## TODO:: 检查tag版本号与podspec里的版本号是否一致
-                        ret = addGitTagAndPush(tag, pod_name)
-                        if ret != true
+                        # 已经进入到podspec的文件夹中了
+                        checkGitStatusAndPush(pod_name) # push一下
+                        ret = checkRemoteTagExist(tag)
+                        if ret == true
+                            # tag已经存在，要么没改动，要么已经手动打过tag，要么是需要引用老版本tag的代码
                             if checkTagOrBranchIsEqalToHead(tag, "./")
-                                UI.puts "#{pod_name.green} 没做任何调整，切换回beta"
+                                UI.puts "#{pod_name.green} 检测到未做任何调整，或已手动打过Tag"
                             else
                                 if !inputNeedJumpForReson("是否跳过beta发布并删除本地submodule(直接引用远端库)")
-                                    raise "💔 #{pod_name.yellow} tag:#{tag.yellow} 已存在, 请确认已经手动修改tag版本号"
+                                    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)
+                        Dir.chdir(_currentDir)
                         checkAndRemoveSubmodule(path)
                     end
                     options[:git] = git
@@ -231,14 +316,19 @@ class Podfile
                     # Release模式，直接使用远端对应的版本
                     if File.directory?(path)
                         UI.puts "release release-version for #{pod_name.green}".yellow
-                        currentDir = Dir.pwd
+                        _currentDir = Dir.pwd
                         Dir.chdir(path)
-                        ret = system("pod lib lint --allow-warnings")
+                        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)
-                        ## TODO:: 检查tag版本号与podspec里的版本号是否一致
+                        changeVersionInCocoapods(pod_name, originTag)
+                        checkGitStatusAndPush(pod_name)
                         ret = addGitTagAndPush(tag, pod_name)
                         if ret == false
                             if checkTagOrBranchIsEqalToHead(tag, "./")
@@ -249,14 +339,15 @@ class Podfile
                         end
                         ## TODO:: 发布到的目标库名称需要用变量设置
                         repoAddrs = getUserRepoAddress()
-                        cmd = "pod repo push #{repoAddrs} #{pod_name}.podspec --allow-warnings"
+                        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)
+                        Dir.chdir(_currentDir)
                         checkAndRemoveSubmodule(path)
                     end
                     if requirements.length < 2

data/lib/file_processer.rb

@@ -0,0 +1,121 @@
+#!/usr/bin/ruby
+
+$LOAD_PATH << '.'
+
+class YDFileUtils
+    def self.writeFile (filePath, buffer)
+        File.open(filePath, "w") { |source_file|
+            source_file.write buffer
+        }
+        return
+    end
+end
+
+class FileProcesserInterface
+    def process(filePath)
+        puts filePath
+    end
+end
+
+class FileProcesser < FileProcesserInterface
+    def initialize(processFunc)
+        @processFunc = processFunc
+    end
+
+    def process(filePath)
+        fileContent = File.read(filePath)
+        result = @processFunc.call(fileContent)
+        File.write(filePath, result)
+    end
+end
+
+class RegexFileProcesser < FileProcesserInterface
+
+    def initialize(regex, genLineFunc)
+        @regex = regex
+        @genLineFunc = genLineFunc
+    end
+
+    def process(filePath)
+        buffer = ""
+        IO.foreach(filePath) { |line|
+            current_number_regex = line =~ @regex
+            if current_number_regex
+                regexCatchedValue = $~
+                buffer += line.gsub(@regex, @genLineFunc.call(regexCatchedValue))
+            else
+                buffer += line
+            end
+        }
+        YDFileUtils.writeFile(filePath, buffer)
+    end
+end
+
+
+
+class FileProcesserManager
+
+    def initialize(files, fileProcesserList)
+        @files = files
+        @fileProcesserList = fileProcesserList
+    end
+
+    private def getFiles()
+        mappingFiles = Dir::glob(@files)
+        return mappingFiles
+    end
+
+    private def processFile(filePath)
+        @fileProcesserList.each { |processer|
+            processer.process(filePath)
+        }
+    end
+
+    public def process()
+        ocFiles = getFiles()
+        puts "共发现 #{ocFiles.count} 个文件可能需要替换"
+        
+        @@count = 0
+        ocFiles.each do |filePath|
+            processFile(filePath)
+        end
+    end
+end
+
+##### 最简调用示例
+# FileProcesserManager.new("../**/*.{m,mm}", [FileProcesserInterface.new()]).process()
+
+#### 通过 RegexFileProcesser 处理文件
+# FileProcesserManager.new("../YoudaoDict/Vendor/SwipeView/SwipeView.m", 
+#     [
+#         RegexFileProcesser.new(/SwipeView/, -> (regexCatchedValue) {
+#             return "#{regexCatchedValue.to_s}aaa"
+#         })
+# ]).process()
+
+#### 通过gsub处理文件
+# FileProcesserManager.new("../YoudaoDict/Vendor/SwipeView/SwipeView.m", 
+#     [
+#         FileProcesser.new(-> (fileContent) {
+#             fileContent.gsub(/(SwipeView)/, "aaa\\1")
+#         })
+# ]).process()
+
+# FileProcesserManager.new("../YoudaoDict/Vendor/SwipeView/SwipeView.m", 
+#     [
+#         FileProcesser.new(-> (fileContent) {
+#             fileContent.gsub(/(SwipeView)/) do |ste|
+#                 "#{$1} use gsub block"
+#             end
+#         })
+# ]).process()
+
+
+#FileProcesserManager.new("../YoudaoDict/Application/UIColor+HEXStringToColor.m",
+#    [
+#        FileProcesser.new(-> (fileContent) {
+#            fileContent.gsub(/([self commonHEXStringToColor:@")0xF73944("])/) do |ste|
+#                "#{$1} use gsub block"
+#            end
+#        })
+#]).process()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dev-env
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.9
 platform: ruby
 authors:
 - 吴锡苗
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,6 +57,7 @@ files:
 - lib/cocoapods/dev/env.rb
 - lib/cocoapods/dev/env/version.rb
 - lib/cocoapods_plugin.rb
+- lib/file_processer.rb
 homepage: https://github.com/YoudaoMobile/cocoapods-dev-env
 licenses:
 - MIT