cocoapods-dev-env 0.2.4 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86ea3266601b7a7b150bcb8ebbdbd61244bb0047551856f28d36144a93ee2d9d
-  data.tar.gz: 11281a84183572629f5d3291e44f95b30b06aee4a0a032b79beaede2d25f210a
+  metadata.gz: 7ca8013b453d1e257cce0f668f9d55b690728054807b87d80307d234e33bb651
+  data.tar.gz: 24604dcbcdef57ce2cf10a2a0e376e417e3eb3336664a8dbb086d299ba7822d8
 SHA512:
-  metadata.gz: e29f5ea8412543bea24745770796baf459af98efdc84849112bd5be23be36d69a1f5e244b7cbcaea5218085ea41f84b5e994c2d31e6f36ca4472c0ea71787a5b
-  data.tar.gz: a0eea3c7c4afcc3b0ff08c0486e925c26d9823a67f198cf57dc7f87a6f15b0efb426114b91a944f24968985344685c34de1cbadd2a689a144aaf2bd296189a37
+  metadata.gz: 650079c36c495a2a9384972b92a40ffc770031c4158914e54e1e7e69c45e2937b88a3080d5dbb7eaa13b9aaed248aea545cd6383acaef36613f82d684d3ea1d9
+  data.tar.gz: 7f30ffe0691428cc7b50ebbfb86c6b3d3d77ede2b6edd657fc3fb7d44b002cfff1735f65c095c3a518a2288760a85c515138a9a8e08d7ebed440740430e2749d

data/README.md

@@ -54,6 +54,11 @@ 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.
 
+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` 
+
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

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

@@ -1,7 +1,7 @@
 module Cocoapods
   module Dev
     module Env
-      VERSION = "0.2.4"
+      VERSION = "0.9.1"
     end
   end
 end

data/lib/cocoapods_plugin.rb

@@ -1,6 +1,10 @@
 Pod::HooksManager.register('cocoapods-dev-env', :pre_install) do |installer|
     podfile = installer.podfile
     #puts installer.instance_variables
+    # forbidden submodule not cloned
+    `
+    git submodule update --init --recursive
+    `
 end
 
 Pod::HooksManager.register('cocoapods-dev-env', :post_install) do |installer|
@@ -16,6 +20,7 @@ module Pod
         def self.keyword
             :dev_env # 'dev'/'beta'/'release'
         end
+        puts "🎉 plugin cocoapods-dev-env loaded 🎉".green
     end
 class Podfile
     class TargetDefinition
@@ -46,7 +51,11 @@ class Podfile
             Dir.chdir(path)
             result = `git describe --abbrev=4 HEAD`
             Dir.chdir(currentDir)
-            return result.include?(tag)
+            if result.include?(tag)
+                return true
+            else
+                return checkTagOrBranchIsEqalToHead(tag, path)
+            end
         end
 
 # 这个函数有问题有时候拿不到相同的commit id
@@ -60,13 +69,69 @@ class Podfile
             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 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)
+            puts str
+            puts '是(Y), 否(N)'
+            input = STDIN.gets
+            if input[0,1] == "Y"
+                return true
+            else
+                return false
+            end
+        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]
+            return source
+        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.puts "####### #{name} use last_options: #{last_options}"
+                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
@@ -80,7 +145,7 @@ class Podfile
                 if dev_env == nil 
                     return
                 end
-                UI.puts "####### proccess dev-env for pod #{name} env: #{dev_env}"
+                UI.message "pod #{name.green} dev-env: #{dev_env.green}"
                 git = options.delete(:git)
                 branch = options.delete(:branch)
                 tag = options.delete(:tag)
@@ -88,57 +153,49 @@ class Podfile
                 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 == 'dev' 
                     # 开发模式，使用path方式引用本地的submodule git库
                     if !File.directory?(path)
-                        UI.puts "####### add submodule for #{pod_name}"
+                        UI.puts "add submodule for #{pod_name.green}".yellow
+                        # TODO 这个命令要想办法展示实际报错信息
                         `git submodule add --force -b #{branch} #{git} #{path}`
                         
                         if !checkTagIsEqualToHead(tag, path) && !checkTagIsEqualToHead("#{tag}_beta", path)
-                            raise "#{pod_name} branch:#{branch} 与 tag:#{tag}[_beta] 内容不同步，请自行确认所用分支和tag后重新执行 pod install"
+                            raise "💔 #{pod_name.yellow} branch:#{branch.yellow} 与 tag:#{tag.yellow}[_beta] 内容不同步，请自行确认所用分支和tag后重新执行 pod install"
                         end
                     end
                     options[:path] = path
                     if requirements.length >= 2
                         requirements.delete_at(0)
                     end
-                    UI.puts "####### enabled dev-mode for #{pod_name}"
+                    UI.message "enabled #{"dev".green}-mode for #{pod_name.green}"
                 elsif dev_env == 'beta'
                     # Beta模式，使用tag引用远端git库的代码
                     tag = "#{tag}_beta"
                     if File.directory?(path)
                         # 从Dev模式刚刚切换过来，需要打tag并且push
-                        UI.puts "####### gen beta env for #{pod_name}"
-                        if tag == nil || tag.length == 0 
-                            raise "#{pod_name} 未定义tag"
-                        end
+                        UI.puts "release beta-version for #{pod_name.green}".yellow
                         currentDir = Dir.pwd
                         Dir.chdir(path)
-                        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} push 失败"
-                                end
-                            end
-                        else
-                            raise "有未提交的数据"
-                        end
+                        checkGitStatusAndPush(pod_name)
                         ## TODO:: 检查tag版本号与podspec里的版本号是否一致
-                        ret = system("git tag #{tag}")
-                        if ret == true
-                            ret = system("git push origin #{tag}")
-                            if ret != true
-                                raise "#{pod_name} push tag 失败"
-                            end
-                        else
+                        ret = addGitTagAndPush(tag, pod_name)
+                        if ret != true
                             if checkTagOrBranchIsEqalToHead(tag, "./")
-                                UI.puts "#{pod_name} 没做任何调整，切换回beta"
+                                UI.puts "#{pod_name.green} 没做任何调整，切换回beta"
                             else
-                                raise "#{pod_name} tag:#{tag} 已存在, 请确认已经手动修改tag版本号"
+                                if !inputNeedJumpForReson("是否跳过beta发布并删除本地submodule(直接引用远端库)")
+                                    raise "💔 #{pod_name.yellow} tag:#{tag.yellow} 已存在, 请确认已经手动修改tag版本号"
+                                end
                             end
                         end
                         Dir.chdir(currentDir)
@@ -149,15 +206,45 @@ class Podfile
                     if requirements.length >= 2
                         requirements.delete_at(0)
                     end
-                    UI.puts "####### enabled beta-mode for #{pod_name}"
+                    UI.message "enabled #{"beta".green}-mode for #{pod_name.green}"
                 elsif dev_env == 'release'
                     # Release模式，直接使用远端对应的版本
-                    # 需要考虑从dev直接跳跃到release的情况，需要谨慎处理，给予报错或执行两次的操作
                     if File.directory?(path)
+                        UI.puts "release release-version for #{pod_name.green}".yellow
+                        currentDir = Dir.pwd
+                        Dir.chdir(path)
+                        ret = system("pod lib lint --allow-warnings")
+                        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
+                            else
+                                raise "💔 #{pod_name.yellow} tag:#{tag.yellow} 已存在, 请确认已经手动修改tag版本号"
+                            end
+                        end
+                        ## TODO:: 发布到的目标库名称需要用变量设置
+                        repoAddrs = getUserRepoAddress()
+                        cmd = "pod repo push #{repoAddrs} #{pod_name}.podspec --allow-warnings"
+                        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之一，不接受其他值"
+                    raise "💔 :dev_env 必须要设置成 dev/beta/release之一，不接受其他值"
                 end
                 $processedPodsOptions[pod_name] = options
                 requirements.pop if options.empty?
@@ -174,4 +261,4 @@ class Podfile
         end
     end
 end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dev-env
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.9.1
 platform: ruby
 authors:
 - 吴锡苗
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler