cocoapods-dongjia 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efc0ab6aa826c7a42d8327bc53a3a9f64aefc1356ea2b7f8537c9acda1f58ddd
-  data.tar.gz: 7f5be68a76076ee849c8e93354f2172d9d00cbbc3a98c77105b7b1bbdbc8b79a
+  metadata.gz: d5b4528303fd0cec1f74fc6cf438693b70f6fb791ff0f4f02cabd5d7a74fa461
+  data.tar.gz: 50a77d0e54c9a2ebdad88a59c8a58f9d06ba35f924852ffec73d867679eb35f8
 SHA512:
-  metadata.gz: 4bb4f8b1e01471ae6699f761d8dc3b50e320a34c4e943f10ea60b31facffcd2598b3c52d7c9daaedc12869cdee66e059c97796c841a6f90d48bc9ab858756de5
-  data.tar.gz: af313e23c27a894121796b5e30f67847ea9fe53bc77d5c51b0b66900f28a9461594b1dae752d28a9aa520398171cdb2f0c51ac2b6229040bcdacc327d752feab
+  metadata.gz: f203e960ce068e3e3a6a852ae8614faae63d481b50c458743b4be8ebeb4b033f76b2c36c51ee0766f8e4a97cce40fb94603cccbd42327e21f76b07c66474f8f2
+  data.tar.gz: 38da2b3d06573fb9f582f3725b45c77926432fa0e2c67240f8f7667200ed34c8d17b1bfd8ee074ff4c5783cb4462dd12c7c53c87e3ab3054bcc725a8dfea21c5

data/lib/cocoapods-dongjia/command.rb

@@ -1,5 +1,6 @@
 require 'cocoapods-dongjia/command/reinstall'
 require 'cocoapods-dongjia/command/install'
+require 'cocoapods-dongjia/command/release'
 require 'cocoapods-dongjia/command/demo'
 require 'cocoapods-dongjia/command/strip'
 require 'cocoapods-dongjia/command/open'

data/lib/cocoapods-dongjia/command/release.rb

@@ -0,0 +1,40 @@
+require 'cocoapods'
+
+module Pod
+
+  class Podfile
+    @@is_release_mode = false
+    def self.set_is_release_mode(mode)
+      @@is_release_mode = mode
+    end
+    def self.is_release_mode?
+      @@is_release_mode
+    end
+  end
+
+  class Command
+
+    class Release < Command
+
+      self.summary = '以 release 模式集成 pods'
+
+      self.description = <<-DESC
+        
+        以 release 模式集成 Pods
+        
+        可以在 Podfile 中通过 @@debug_only_pods = [pod_name] 的方式指定 debug 模式下的 Pod
+
+        当执行 pod release 时，会自动剔除 @@debug_only_pods 内所定义的 Pod
+
+      DESC
+
+      def run
+        Pod::Podfile::set_is_release_mode(true)
+        installer_for_config.install!
+      end
+
+    end
+
+  end
+
+end

data/lib/cocoapods-dongjia/command/strip.rb

@@ -1,6 +1,5 @@
 require 'cocoapods'
 require 'set'
-require 'pry'
 
 module Pod
 
@@ -105,17 +104,18 @@ module Pod
       def get_images
         images = Set[]
         except_dirs = [
-          'QYResource.bundle', 
-          'DJMate', 
-          'IQKeyboardManager', 
-          'EnterpriseEditionImages.xcassets',
+          'QYResource.bundle',
+          'DJMate',
+          'IQKeyboardManager',
           'MJRefresh.bundle',
           'AlipaySDK.bundle',
           'AppIcon.appiconset',
-          'KPCameraImages.xcassets'
+          'KPCameraImages.xcassets',
+          'UMSocialSDKResources.bundle',
+          'LaunchResource'
         ]
         except_files = [
-          'image_placeholder', 
+          'image_placeholder',
           'register_add_avatar'
         ]
         bk = Proc.new do |dir, name, ext|
@@ -128,20 +128,32 @@ module Pod
 
       # 分析
       def analyze(source_files, images)
-        source_files.map { |x| x.file_ref.real_path }.each do | path |
+        source_file_paths = source_files.map { |x| 
+          x.file_ref.real_path
+        }
+        .select { |x| 
+          File.exist?(x)
+        }
+        count = source_file_paths.count
+        source_file_paths.each_index do | index |
+          percent = index.to_f / count.to_f * 100
+          print "\r" if index != 0
+          print "#{format("%.2f", percent)}%"
+          path = source_file_paths[index]
           File.open(path, 'r') do |f|
             image_using = []
             f.each_line do |line|
               next unless line.include?('"')
-              images.each do |img|
-                if line.include?('"' + img.name)
-                  image_using << img
-                else
-                  # 根据下划线分割剔除最后一项，再尝试匹配
-                  if !img.fuzzy_name.empty?
-                    if line.include?('"' + img.fuzzy_name + '%') || 
-                      line.include?('"' + img.fuzzy_name + '"')
-                      image_using << img
+              ['"', '/'].each do |prefix|
+                images.each do |img|
+                  if line.include?(prefix + img.name)
+                    image_using << img
+                  else
+                    # 根据下划线分割剔除最后一项，再尝试匹配
+                    if !img.fuzzy_name.empty?
+                      ['%', '"'].each do |suffix|
+                        image_using << img if line.include?(prefix + img.fuzzy_name + suffix)
+                      end
                     end
                   end
                 end
@@ -150,15 +162,20 @@ module Pod
             images = images - image_using
           end
         end
+        print "\r"
         images
       end
 
       def run
         images = analyze(get_source_files, get_images)
-        puts "无效资源文件："
-        images.each do |img|
-          path = Pathname.new(img.fullpath).relative_path_from(Dir.pwd).to_s
-          puts "  #{path}"
+        if images.empty?
+          puts "未找到无效资源"
+        else
+          puts "无效资源文件："
+          images.each do |img|
+            path = Pathname.new(img.fullpath).relative_path_from(Dir.pwd).to_s
+            puts "  #{path}"
+          end
         end
       end
 

data/lib/cocoapods-dongjia/gem_version.rb

@@ -1,9 +1,6 @@
 module CocoapodsDongjia
-  VERSION = "1.1.0"
+  VERSION = "1.1.5"
   UPDATE_DESC = <<-EOS
-  - 增加 pod open 指令，用于快速打开工程
-  - 增加 pod strip 指令，用于查找无用资源
-  - 增加 LTO 开关
-  - 兼容新版 DJRouter 定义
+  - 优化 post_install 行为，避免 install 后导致全量编译
 EOS
 end

data/lib/cocoapods_plugin.rb

@@ -6,9 +6,10 @@ require_relative 'dongjia_pods_iterator'
 require_relative 'dongjia_router'
 require_relative 'dongjia_scheme_manager'
 
-require_relative 'helper/podfile_local_importer'
+require_relative 'helper/podfile'
 require_relative 'helper/podfile_options'
 require_relative 'helper/podfile_warnings'
+require_relative 'helper/Core/podfile/dsl'
 
 module Dongjia
 
@@ -33,11 +34,7 @@ module Dongjia
     PodsIterator.iterate(params, ctx.sandbox_root)
 
     # 处理 appspec 配置
-    SchemeManager.setup(ctx, params)
-
-    # 企业版文件引用校验
-    files = EnterpriseInspector.inspect()
-    Pod::UI.warn "文件未加入企业版：#{files}" if files.count > 0
+    # SchemeManager.setup(ctx, params)
 
     # 抓取所有路由汇总至
     router = Router.new

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
+  
 */
 
 
@@ -39,7 +41,10 @@ EOS
       end
       
       if @prefix != nil
-        @redirect_type = @defining_line[prefix_len, @defining_line.index(',') - prefix_len]
+        end_index = @defining_line.index(',') || @defining_line.index(')')
+        if !end_index.nil?
+          @redirect_type = @defining_line[prefix_len, end_index - prefix_len]
+        end
       end
     end
 

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.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.0
+  version: 1.1.5
 platform: ruby
 authors:
 - jiangzhuoyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 description: A short description of cocoapods-dongjia.
 email:
 - jiangzhuoyi@idongjia.cn
@@ -65,6 +79,7 @@ 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
@@ -75,9 +90,10 @@ files:
 - 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/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
@@ -85,11 +101,7 @@ homepage: https://github.com/EXAMPLE/cocoapods-dongjia
 licenses:
 - MIT
 metadata:
-  update_desc: |2
-      - 增加 pod open 指令，用于快速打开工程
-      - 增加 pod strip 指令，用于查找无用资源
-      - 增加 LTO 开关
-      - 兼容新版 DJRouter 定义
+  update_desc: "  - 优化 post_install 行为，避免 install 后导致全量编译\n"
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -105,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A longer description of cocoapods-dongjia.

data/lib/helper/podfile_local_importer.rb

@@ -1,34 +0,0 @@
-require_relative 'pod'
-
-module Pod
-
-  class Podfile
-
-    # 导入工程目录下相对位置的 pod
-    @local_spec_importing = false
-    @local_spec_path = nil
-    def import_relative_in(path = './')
-      @local_spec_importing = true
-      @local_spec_path = path
-      yield if block_given?
-      @local_spec_path = nil
-      @local_spec_importing = false
-    end
-    
-    original_pod = instance_method(:pod)
-    define_method(:pod) do |name = nil, *requirements|
-      if @local_spec_importing
-        path_cfg = { :path => "#{@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