cocoapods-dongjia 1.1.2 → 1.1.7

data/lib/dongjia_pods_iterator.rb

@@ -4,38 +4,62 @@ module Dongjia
 
   class PodsIterator
 
+    def self.update_build_setting(config, key, value)
+      if config.build_settings[key] != value
+        config.build_settings[key] = value
+        return true
+      else
+        return false
+      end
+    end
+
     # 关闭警告
     def self.disable_warnings(config, target_name)
+      changed = false
+
       # 禁用非 DJ 开头 Pod 的警告
-      config.build_settings['GCC_WARN_INHIBIT_ALL_WARNINGS'] = "YES" unless target_name.start_with?('DJ')
-                    
+      changed ||= update_build_setting(config, 'GCC_WARN_INHIBIT_ALL_WARNINGS', 'YES') unless target_name.start_with?('DJ')
+
       # 不检测 block 中的隐式 self 调用
-      config.build_settings['CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF'] = "NO"
+      changed ||= update_build_setting(config, 'CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF', "NO")
 
       # 不检测已废弃的方法
-      config.build_settings['GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS'] = "NO"
-
-      # 允许 objc_msgSend
-      config.build_settings['ENABLE_STRICT_OBJC_MSGSEND'] = "NO"
+      changed ||= update_build_setting(config, 'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS', "NO")
 
       # 不检测注释
-      config.build_settings['CLANG_WARN_DOCUMENTATION_COMMENTS'] = "NO"
+      changed ||= update_build_setting(config, 'CLANG_WARN_DOCUMENTATION_COMMENTS', "NO")
 
-      # 不严格的原型校验
-      config.build_settings['CLANG_WARN_STRICT_PROTOTYPES'] = "NO"
-
-      # 强制设置 deployment 版本为 8.0
-      if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 8.0
-          config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "8.0"
+      # 强制设置 deployment 版本为 9.0
+      if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 9.0
+        changed ||= update_build_setting(config, 'IPHONEOS_DEPLOYMENT_TARGET', "9.0")
       end
 
       # 关闭 bitcode
-      config.build_settings['ENABLE_BITCODE'] = "NO"
+      changed ||= update_build_setting(config, 'ENABLE_BITCODE', "NO")
+
+      changed
     end
 
     # 打开 LTO
     def self.enable_lto(config)
-      config.build_settings['LLVM_LTO'] = 'YES_THIN' if config.name == 'Release'
+      changed = false
+      # changed ||= update_build_setting(config, 'LLVM_LTO', 'YES_THIN') if config.name == 'Release'
+      changed
+    end
+
+    # 将 umbrella 导出的头文件改为尖括号形式
+    def self.convert_umbrella_header_import(pod_name)
+      umbrella_path = "./Pods/Target Support Files/#{pod_name}/#{pod_name}-umbrella.h"
+      return unless File.exist?(umbrella_path)
+      contents = File.read(umbrella_path)
+      return unless contents.include?("#import \"")
+      File.open(umbrella_path, 'r+') do |f|
+        x = f.read
+        begin x.gsub!("#import \"#{pod_name}/", "#import <#{pod_name}/").gsub!('.h"', '.h>') rescue nil end
+        begin x.gsub!('#import "', "#import <#{pod_name}/").gsub!('.h"', '.h>') rescue nil end
+        f.rewind
+        f.write(x)
+      end
     end
 
     # 遍历所有 Pod 工程配置
@@ -50,23 +74,27 @@ module Dongjia
 
         if name != 'Pods.xcodeproj'
           proj.build_configurations.each do | config |
-            # 强制设置 deployment 版本为 8.0
-            if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 8.0
-              config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "8.0"
+            # 强制设置 deployment 版本为 9.0
+            if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 9.0
+              config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "9.0"
             end
           end
         end
   
         # project 的每个 target 配置
+        changed = false
         proj.targets.select {|t| !t.name.start_with?('Pods')}.each do | target |
           next if target.name.start_with?('Pods')
           target.build_configurations.each do | config |
-            disable_warnings(config, target.name) if turn_off_warnings
-            enable_lto(config) if lto_enabled
+            changed ||= disable_warnings(config, target.name) if turn_off_warnings
+            changed ||= enable_lto(config) if lto_enabled
+            convert_umbrella_header_import(target.name)
           end
         end
   
-        proj.save
+        if changed
+          proj.save
+        end
   
       end
 

data/lib/dongjia_router.rb

@@ -14,6 +14,8 @@ module Dongjia
 
   注意：此处的实现仅供查看，如需修改，请点击对应的 _redirect{type} 方法跳转至对应的实现
 
+  跳转定义文档：https://cf.idongjia.cn/pages/viewpage.action?pageId=57351032
+  
 */
 
 

data/lib/helper/Core/podfile/dsl.rb

@@ -0,0 +1,16 @@
+module Pod
+  class Podfile
+    module DSL
+      # Hook Podfile 中的 install: 方法，将当前版本 Cocoapods 不支持的 option 剔除
+      original_install = instance_method(:install!)
+      define_method(:install!) do |installation_method, options = {}|
+        all_options = Installer::InstallationOptions::all_options
+        valid_options = {}
+        options.each do |k, v|
+          valid_options.merge!({k => v}) if all_options.include?(k.to_s)
+        end
+        original_install.bind(self).(installation_method, valid_options)
+      end
+    end
+  end
+end

data/lib/helper/{podfile_warnings.rb → installer.rb}

@@ -1,11 +1,11 @@
 require_relative 'dongjia_version_checker'
+require_relative '../dongjia_binarization'
 
 module Pod
 
   class Installer
 
     class PodSourceInstaller
-
       # 关闭自己仓库中 pod 的安全警告
       old_method = instance_method(:verify_source_is_secure)
       define_method(:verify_source_is_secure) do |root_spec|
@@ -14,15 +14,29 @@ module Pod
           old_method.bind(self).(root_spec)
         end
       end
-      
     end
 
+    # Hook post_installer
     origin_perform_post_install_actions = instance_method(:perform_post_install_actions)
     define_method :perform_post_install_actions do
       origin_perform_post_install_actions.bind(self).()
       Dongjia::DongjiaVersionChecker.check_version
     end
 
-  end
+    # Hook Pods.xcodeproj 尚未写入
+    origin_run_podfile_post_install_hooks = instance_method(:run_podfile_post_install_hooks)
+    define_method :run_podfile_post_install_hooks do
+      origin_run_podfile_post_install_hooks.bind(self).()
+      # 处理二进制化
+      # Dongjia::Binarization.process(self)
+    end
 
+    # Hook Pods.xcodeproj 已生成完毕
+    origin_generate_pods_project = instance_method(:generate_pods_project)
+    define_method :generate_pods_project do
+      origin_generate_pods_project.bind(self).()
+      # 处理二进制化
+      Dongjia::Binarization.process(self)
+    end
+  end
 end

data/lib/helper/podfile.rb

@@ -0,0 +1,60 @@
+require_relative 'pod'
+
+module Pod
+
+  class LocalSpec
+    @@local_spec_importing = false
+    @@local_spec_path = nil
+    def self.import_local_pod(path)
+      @@local_spec_importing = true
+      @@local_spec_path = path
+      yield if block_given?
+      @@local_spec_path = nil
+      @@local_spec_importing = false
+    end
+    def self.local_spec_importing?
+      @@local_spec_importing
+    end
+    def self.local_spec_path
+      @@local_spec_path
+    end
+  end
+
+  class Podfile
+
+    # 只在 debug 模式下集成的组件，默认为空
+    @@debug_only_pods = []
+
+    # 导入工程目录下相对位置的 pod
+    def import_relative_in(path = './')
+      LocalSpec.import_local_pod(path) do
+        yield if block_given?
+      end
+    end
+    
+    original_pod = instance_method(:pod)
+    define_method(:pod) do |name = nil, *requirements|
+
+      if Pod::Podfile::is_release_mode?
+        realname = name.split('/').first
+        if @@debug_only_pods.include?(realname)
+          puts "#{realname} is only for debug, it will be removed."
+          next
+        end
+      end
+
+      if LocalSpec.local_spec_importing?
+        path_cfg = { :path => "#{LocalSpec.local_spec_path}/#{Pod::repo_name(name)}" }
+        if requirements.length == 0
+          requirements = [path_cfg]
+        else
+          cfg = requirements.first
+          cfg.merge!(path_cfg) unless cfg.has_key?(:path)
+        end
+      end
+      original_pod.bind(self).(name, *requirements)
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dongjia
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.7
 platform: ruby
 authors:
 - jiangzhuoyi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-20 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: down
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: archive-zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 description: A short description of cocoapods-dongjia.
 email:
 - jiangzhuoyi@idongjia.cn
@@ -79,30 +107,31 @@ files:
 - lib/cocoapods-dongjia/command/install.rb
 - lib/cocoapods-dongjia/command/open.rb
 - lib/cocoapods-dongjia/command/reinstall.rb
+- lib/cocoapods-dongjia/command/release.rb
 - lib/cocoapods-dongjia/command/strip.rb
 - lib/cocoapods-dongjia/gem_version.rb
 - lib/cocoapods_plugin.rb
-- lib/dongjia_branch_inspector.rb
+- lib/dongjia_binarization.rb
 - lib/dongjia_config.rb
 - lib/dongjia_enterprise_inspector.rb
 - lib/dongjia_pods_iterator.rb
 - lib/dongjia_router.rb
-- lib/dongjia_scheme_manager.rb
 - lib/dongjia_source.rb
+- lib/helper/Core/podfile/dsl.rb
 - lib/helper/dongjia_version_checker.rb
+- lib/helper/installer.rb
 - lib/helper/pod.rb
-- lib/helper/podfile_local_importer.rb
+- lib/helper/podfile.rb
 - lib/helper/podfile_options.rb
-- lib/helper/podfile_warnings.rb
 - lib/helper/project.rb
 homepage: https://github.com/EXAMPLE/cocoapods-dongjia
 licenses:
 - MIT
 metadata:
   update_desc: |2
-      - 修复路由抓取错误
-      - 修复 pod strip
-post_install_message: 
+      - 修复源码和二进制切换后的集成依赖问题
+      - 修复一些导致 crash 的问题
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,8 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.19
+signing_key:
 specification_version: 4
 summary: A longer description of cocoapods-dongjia.
 test_files: []

data/lib/dongjia_branch_inspector.rb

@@ -1,43 +0,0 @@
-require 'cocoapods'
-
-module Pod
-  
-  class Podfile
-
-    gitdir = File.join(Dir.pwd, '.git')
-    if File.exist?(gitdir)
-
-      # 获取当前分支，仅对 dev 和 master 进行校验
-      branch = `git symbolic-ref --short -q HEAD`.strip
-      if branch == 'dev' or branch == 'master'
-
-        # Hook pod 方法
-        alias_method :pod_alias_by_inspector, :pod
-        
-        def pod(name = nil, *requirements, &block)
-          
-          if name.start_with?('DJ') && requirements.count > 0
-            req = requirements.first
-            if req[:branch] && req[:branch] != 'master'
-              UI.warn "检测到 #{name} 指向了分支 #{req[:branch]}\n"
-              exit -1
-            elsif req[:tag]
-              UI.warn "检测到 #{name} 指向了标签 #{req[:tag]}\n"
-              exit -1
-            elsif req[:commit]
-              UI.warn "检测到 #{name} 指向了节点 #{req[:commit]}\n"
-              exit -1
-            end
-          end
-          
-          pod_alias_by_inspector(name, *requirements, &block)
-        end
-        
-      end
-
-    end
-
-  end
-
-end
-

data/lib/dongjia_scheme_manager.rb

@@ -1,58 +0,0 @@
-require 'helper/project'
-
-module Dongjia
-
-  class SchemeManager
-
-    # 获取主工程的 development team
-    def self.development_team(ctx)
-      team = nil
-      project = ctx.umbrella_targets.first.user_project
-      return team unless project.is_a?(Xcodeproj::Project)
-
-      target = project.targets.find { |t|
-        !t.name.include?('企业版') && !t.name.end_with?('Extension')
-      }
-      return team unless target.is_a?(Xcodeproj::Project::PBXNativeTarget)
-
-      build_cfg = target.build_configurations.find { |c| c.name == 'Debug' }
-      return team unless build_cfg.is_a?(Xcodeproj::Project::XCBuildConfiguration)
-
-      team = build_cfg.build_settings['DEVELOPMENT_TEAM']
-    end
-
-    def self.setup(ctx, params)
-      visibled_appspecs = params[:visibled_appspecs]
-      # return if !visibled_appspecs || visibled_appspecs.empty?
-      sandbox_root = ctx.sandbox_root
-      
-      team = development_team(ctx)
-      
-      Dir.foreach(sandbox_root).select{|f| f.end_with?('xcodeproj')}.each do |name|
-        proj = Xcodeproj::Project.open(File.join(sandbox_root, name))
-        proj.targets.each do | target |
-          # 确保是 appspec
-          next unless target.name.include?('-')
-          # 确保是可执行程序
-          next unless target.product_type == 'com.apple.product-type.application'
-
-          # 设置签名信息
-          if team.is_a?(String)
-            target.build_configurations.first.build_settings['DEVELOPMENT_TEAM'] = team
-            target.build_configurations.each { |cfg|
-              cfg.build_settings['DEVELOPMENT_TEAM'] = team
-            }
-          end
-
-          if visibled_appspecs.include?(target.name.split('-').first)
-            # 将 visibled_appspecs 中指定的 target 设为可见状态
-            proj.set_target_scheme_visible(target, true)
-          end
-        end
-        proj.save if team.is_a?(String)
-      end
-    end
-
-  end
-
-end