cocoapods-dev-env 2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a038dfb3ff16131336b6a19559894287912a3f6ced0744c49a86c652cd1ddaa
-  data.tar.gz: ad4a7ed1a167fe98f917d8fd0c88043e5044feac82b43f20caa876f35a6bb11e
+  metadata.gz: 5f274257ac096e92d97f5ece8b76e456180f593803650b9e42d206dd290cfd8a
+  data.tar.gz: b372bc76f7e6c0bddad646ebc2f461991c8921f9dd5a35086d0ade595665ad7d
 SHA512:
-  metadata.gz: 9aca16d5799bd66c625a996fff9bdb1d77ea5b54509403fadf000c9f4cea43d7fbc6cb2f593d3aa81a41465f5edd0cfe647c3d86da2105bdac5960238abc5f7d
-  data.tar.gz: 3eb99069ed6078dc8b66c912d3270abaa30a59ba704e384d7603882bde181d1a8022697e7e9fff7366f4d735744a988af65d290c3a733cb97b6572b26cff1668
+  metadata.gz: cd436b0f923be965a5b0e28caf4b92616f036f62c490ac201a4170ff4932946be8131ef2174ee73d935a9292d176ea23a7ccf0bfff53de8cdf22904790a2efda
+  data.tar.gz: 06703ba0d2ab152a06d588a34dcbc02a062173765721bbd184889f896e7524d34fc0eb35c20ee076ffc989bcbac112ded8f6373864ea72a99764a35259de1cb3

data/README.md

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

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

@@ -1,7 +1,7 @@
 module Cocoapods
   module Dev
     module Env
-      VERSION = '2.2.1'
+      VERSION = '2.2.3'
     end
   end
-end
+end

data/lib/dev_env_entry.rb

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

data/lib/dev_env_utils.rb

@@ -93,6 +93,18 @@ class DevEnvUtils
     input[0, 1] == 'Y'
   end
 
+  # 检查是否在主分支上(main / master)
+  def self.checkIsOnTrankBrach()
+    branch = `git branch --show-current`.chomp
+    isOK = (branch == 'main' || branch == 'master')
+    if !isOK
+      puts ('💔 当前分支是: '.red + branch.green + ' 没在主分支，不符合规范，是否继续发布？'.red)
+      if !inputNeedJumpForReson("")
+        raise "已取消发布, 请切换子库分支到 master / main 后重新 pod install"
+      end
+    end
+  end
+
   def self.changeVersionInCocoapods(name, newVersion)
     if newVersion.nil?
       Pod::UI.puts '💔 传入的修改目标版本号为空，无法设置版本号'.yellow

metadata

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