cocoapods-dongjia 1.0.7 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f3344d6aa8a82093be25e107fae8fdbc85978f62c37de24716bbc52f6e8adf9
-  data.tar.gz: 373230993613ea7c542a748b1047f54dc1d00b79b8f5d6738971b42b38036937
+  metadata.gz: fa6197291c8d0327124cdfe9a152f5a4cddc91a15fb42571ca10c175f96fa730
+  data.tar.gz: 4e68535d83b1c174b1e01314cf00f4fecd45c0131de4fbb4b37e64ffb4504c10
 SHA512:
-  metadata.gz: 7c9404e7d325cf8dfaddad1ccaa28ddba2ff76b8165a1831282299f0243ec7ae9f583d865d92d56024f04ca7592673be8ba9e7f169ec995639a8ed3350e5efe8
-  data.tar.gz: 3b07c1adfeb8df3c8b975586b6474a0053c0c2a8d2e317fbcb216942cc788b65afa16ece34d8d41972d0e8402f697aaecb1382b06e85e67bb9b612b70a39c616
+  metadata.gz: 6d3a68721994c607cace3a8bca9bd89832887ef55646f5d9950c71c23099881f7299449cfd37940201a703116819d9173f18f99aaffa4a5dc0272ff7256ef598
+  data.tar.gz: dc481b20dc7a3505f0a089ef465a513e4e026086df1a89fe7d97563c30accab74cd6492897a8debf79645aae1ffa0ac1241bd4356584cd7b6a5567e115cda484

data/lib/cocoapods-dongjia/command.rb

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

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

@@ -0,0 +1,47 @@
+require 'cocoapods'
+
+module Pod
+
+  class Command
+    
+    class Demo < Command
+
+      self.summary = '创建 Demo 工程在当前目录'
+
+      self.description = <<-DESC
+创建 Demo 工程在当前目录
+DESC
+
+      def run
+
+        dir = Dir.new('.')
+
+        is_pod_root = false
+        has_demo = false
+        dir.each do |name|
+          if name.end_with?('podspec') || name.end_with?('podspec.json')
+            is_pod_root = true
+          end
+          if name == 'Demo'
+            has_demo = true
+          end
+        end
+
+        if is_pod_root
+          if has_demo
+            Pod::UI.warn('已存在 Demo')
+          else
+            `git clone git@code.kaipao.cc:ios-team/AppSpecDemo.git Demo`
+            `rm -fr ./Demo/.git` if File.exist?('./Demo/.git')
+          end
+        else 
+          Pod::UI.warn('当前不在一个 Pod 的根目录')
+        end
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,26 @@
+require 'cocoapods'
+
+module Pod
+
+  class Command
+
+    class Install < Command
+
+      alias_method :run_retryable, :run
+      def run
+        begin
+          run_retryable()
+        rescue => exception
+          # 有异常，打开 --repo-update 重试
+          unless @repo_update
+            @repo_update = true
+            run_retryable()
+          end
+        end
+      end
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,32 @@
+require 'cocoapods'
+
+module Pod
+
+  class Command
+
+    class Open < Command
+
+      self.summary = '快速打开项目的 .xcworkspace'
+
+      self.description = <<-DESC
+        快速打开项目的 .xcworkspace
+      DESC
+
+      def validate!
+        super
+
+        workspace_list = Pathname.glob('*.xcworkspace')
+        @workspace_path = workspace_list.first if workspace_list.size == 1
+
+        help! '没有找到 xcworkspace' unless @workspace_path.exist?
+      end
+
+      def run
+        `open #{@workspace_path}`
+      end
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,182 @@
+require 'cocoapods'
+require 'set'
+
+module Pod
+
+  class Image
+    attr_accessor :dir
+    attr_accessor :name
+    attr_accessor :fuzzy_name
+    def initialize(dir, name)
+      @dir = dir
+      if name.end_with?('@2x') || name.end_with?('@3x')
+        name = name[0, name.length-3]
+      end
+      @name = name
+
+      # 只处理最后一段为数字，或分了三段及以上的命名形式
+      comps = name.split('_')
+      last = comps.last
+      if last.to_i > 0 || last.start_with?('0') || comps.count >= 3
+        @fuzzy_name = name[0, name.length - last.length]
+      else
+        @fuzzy_name = ''
+      end
+    end
+
+    def eql?(other)
+      @dir == other.dir && @name == other.name
+    end
+
+    def hash
+      [@dir, @name].hash
+    end
+
+    def fullpath
+      File.join(@dir, @name)
+    end
+  end
+
+  class Command
+
+    class Strip < Command
+
+      self.summary = '查找工程内所有无效资源'
+
+      self.description = <<-DESC
+        查找工程内所有无效资源
+      DESC
+
+      def validate!
+        super
+
+        @img_exts = ['.png', '.jpg', '.jpeg', '.webp', '.gif']
+
+        @proj_paths = []
+        @proj_paths |= Pathname.glob('*.xcodeproj')
+        @proj_paths |= Pathname.glob('Pods/*.xcodeproj')
+
+        help! '未发现任何工程' unless @proj_paths.count > 0
+      end
+
+      # 遍历目录找出所有图片
+      def traverse(path, except_dirs, bk = nil)
+        dir = File.dirname(path)
+        ext = File.extname(path)
+        name = File.basename(path, ext)
+        basename = File.basename(path)
+        if except_dirs.include?(basename)
+          return
+        end
+        if File.directory?(path)
+          if ext == '.imageset'
+            # imageset 直接返回
+            bk.call(dir, name, ext)
+          else
+            Dir.foreach(path) do |name|
+              unless name.start_with?('.') || name.end_with?('.launchimage')
+                traverse(File.join(path, name), except_dirs, bk)
+              end
+            end
+          end
+        else
+          bk.call(dir, name, ext) if @img_exts.include?(ext)
+        end
+      end
+
+      # 获取源文件
+      def get_source_files
+        source_files = []
+        @proj_paths.each do |path|
+          proj = Xcodeproj::Project.open(path)
+          proj.targets.each do |target| 
+            target.build_phases.each do |phase|
+              if phase.is_a?(Xcodeproj::Project::PBXSourcesBuildPhase)
+                source_files |= phase.files
+              end
+            end
+          end
+        end
+        source_files
+      end
+
+      # 获取所有图片资源
+      def get_images
+        images = Set[]
+        except_dirs = [
+          'QYResource.bundle',
+          'DJMate',
+          'IQKeyboardManager',
+          'MJRefresh.bundle',
+          'AlipaySDK.bundle',
+          'AppIcon.appiconset',
+          'KPCameraImages.xcassets',
+          'Umeng',
+          'LaunchResource'
+        ]
+        except_files = [
+          'image_placeholder',
+          'register_add_avatar'
+        ]
+        bk = Proc.new do |dir, name, ext|
+          next if except_files.include?(name)
+          images << Image.new(dir, name)
+        end
+        traverse(Dir.pwd, except_dirs, bk)
+        images
+      end
+
+      # 分析
+      def analyze(source_files, images)
+        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?('"')
+              ['"', '/'].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
+              end
+            end
+            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}"
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/cocoapods-dongjia/gem_version.rb

@@ -1,6 +1,7 @@
 module CocoapodsDongjia
-  VERSION = "1.0.7"
+  VERSION = "1.1.2"
   UPDATE_DESC = <<-EOS
-  - 添加路由信息汇总
+  - 修复路由抓取错误
+  - 修复 pod strip
 EOS
 end

data/lib/cocoapods_plugin.rb

@@ -2,8 +2,9 @@ require 'cocoapods-dongjia/command'
 require_relative 'dongjia_source'
 require_relative 'dongjia_branch_inspector'
 require_relative 'dongjia_enterprise_inspector'
-require_relative 'dongjia_warning_manager'
+require_relative 'dongjia_pods_iterator'
 require_relative 'dongjia_router'
+require_relative 'dongjia_scheme_manager'
 
 require_relative 'helper/podfile_local_importer'
 require_relative 'helper/podfile_options'
@@ -28,11 +29,11 @@ module Dongjia
   
   Pod::HooksManager.register('cocoapods-dongjia', :post_install) do |ctx, params|
 
-    # 关闭工程内的一些警告
-    WarningManager.turn_off_warnings(
-      params[:turn_off_warnings], 
-      ctx.sandbox_root
-    )
+    # 关闭警告 / 检查 LTO
+    PodsIterator.iterate(params, ctx.sandbox_root)
+
+    # 处理 appspec 配置
+    SchemeManager.setup(ctx, params)
 
     # 企业版文件引用校验
     files = EnterpriseInspector.inspect()

data/lib/dongjia_branch_inspector.rb

@@ -3,33 +3,38 @@ require 'cocoapods'
 module Pod
   
   class Podfile
-    
-    # 获取当前分支，仅对 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)
+
+    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
         
-        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
+        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
         
-        pod_alias_by_inspector(name, *requirements, &block)
       end
-      
+
     end
 
   end

data/lib/dongjia_config.rb

@@ -0,0 +1,56 @@
+require 'fileutils'
+require 'json'
+require 'time'
+
+module Dongjia
+
+  class Config
+
+    # 获取当前保存的配置
+    # 提供的 block 中会包含当前配置，以及一个用于保存的 Proc
+    def self.check
+
+      config_root = File.expand_path('~/.cocoapods-dongjia')
+      FileUtils.mkdir_p(config_root) unless File.exists?(config_root)
+      config_file = File.join(config_root, 'config.json')
+
+      config = {}
+      if File.exists?(config_file)
+        config = JSON.parse(File.read(config_file))
+      end
+
+      save_block = Proc.new do
+        File.open(config_file, 'w') do |f|
+          f.write(JSON.pretty_generate(config))
+        end
+      end
+
+      yield config, save_block if block_given?
+
+    end
+
+    # 将 key 字段记录的时间，与当前时间对比，是否超过了 interval（秒）
+    def self.is_expired?(key, interval)
+
+      check do |config, save| 
+
+        tm = config[key]
+        now = Time.now.to_i
+        if tm && (now > tm) && (now - tm < interval)
+          return
+        end
+
+        update_block = Proc.new do
+          config[key] = now
+          save.call
+        end
+
+        yield config, update_block if block_given?
+
+      end
+
+    end
+
+  end
+
+end

data/lib/dongjia_pods_iterator.rb

@@ -0,0 +1,77 @@
+require 'xcodeproj'
+
+module Dongjia
+
+  class PodsIterator
+
+    # 关闭警告
+    def self.disable_warnings(config, target_name)
+      # 禁用非 DJ 开头 Pod 的警告
+      config.build_settings['GCC_WARN_INHIBIT_ALL_WARNINGS'] = "YES" unless target_name.start_with?('DJ')
+                    
+      # 不检测 block 中的隐式 self 调用
+      config.build_settings['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"
+
+      # 不检测注释
+      config.build_settings['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"
+      end
+
+      # 关闭 bitcode
+      config.build_settings['ENABLE_BITCODE'] = "NO"
+    end
+
+    # 打开 LTO
+    def self.enable_lto(config)
+      config.build_settings['LLVM_LTO'] = 'YES_THIN' if config.name == 'Release'
+    end
+
+    # 遍历所有 Pod 工程配置
+    def self.iterate(params, sandbox_root)
+      turn_off_warnings = params[:turn_off_warnings]
+      lto_enabled = params[:lto_enabled]
+      return if (turn_off_warnings != true) && (lto_enabled != true)
+
+      Dir.foreach(sandbox_root).select{|f| f.end_with?('xcodeproj')}.each do |name|
+        
+        proj = Xcodeproj::Project.open(File.join(sandbox_root, name))
+
+        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"
+            end
+          end
+        end
+  
+        # project 的每个 target 配置
+        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
+          end
+        end
+  
+        proj.save
+  
+      end
+
+    end
+
+  end
+
+end

data/lib/dongjia_router.rb

@@ -1,5 +1,7 @@
 require 'xcodeproj'
 require 'fileutils'
+require 'dongjia_config'
+require 'time'
 
 module Dongjia
 
@@ -28,16 +30,19 @@ EOS
       @body = ''
       @prefix = nil
       prefix_len = 0
-      if @defining_line.start_with?('@redirectObj(')
-        @prefix = 'redirectObj'
+      if @defining_line.start_with?('@RedirectObj(') || @defining_line.start_with?('@redirectObj(')
+        @prefix = 'RedirectObj'
         prefix_len = @prefix.length + 2
-      elsif @defining_line.start_with?('@redirect(')
-        @prefix = 'redirect'
+      elsif @defining_line.start_with?('@Redirect(') || @defining_line.start_with?('@redirect(')
+        @prefix = 'Redirect'
         prefix_len = @prefix.length + 2
       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
 
@@ -67,11 +72,13 @@ EOS
         pre_line = nil
         file.each_line do |line|
           is_start = false
-          if line.start_with?('@redirect')
+          if line.start_with?('@Redirect') || line.start_with?('@redirect')
+            # 路由定义开始
             item = RouterItem.new(line)
             item.pre_line = pre_line
             is_start = true
           elsif item != nil && line.start_with?('}')
+            # 路由定义结束
             item.body << line
             route_items << item
             item = nil
@@ -88,24 +95,13 @@ EOS
       route_items
     end
 
-    def scrape_routers(sandbox_root, config)
-
-      if config == nil
-        return
-      end
-
-      result_file_path = ''
-      path = config[:path]
-      if path && path.length > 0
-        result_file_path = File.expand_path(File.join(sandbox_root, '..', path))
-      end
-      if !File.exist?(result_file_path)
-        Pod::UI.warn("Router scrapy: path not found.")
-        return
-      end
-
+    # 开始抓取
+    def start_scrapy(sandbox_root, result_file_path)
+      
       route_items = []
 
+      Pod::UI.puts("Scraping routers")
+
       Dir.foreach(sandbox_root).select{|f| f.end_with?('xcodeproj')}.each do |name|
         proj = Xcodeproj::Project.open(File.join(sandbox_root, name))
         if name != 'Pods.xcodeproj'
@@ -113,10 +109,6 @@ EOS
             next unless target.name.start_with?('DJ')
             next unless target.is_a?(Xcodeproj::Project::Object::PBXNativeTarget)
             target.source_build_phase.files_references.each do |file|
-              next if file.path.end_with?('Api.m')
-              next if file.path.end_with?('Model.m')
-              next if file.path.end_with?('-dummy.m')
-              next if file.path.end_with?('Log.m')
               route_items += route_items_from_file(file.real_path)
             end
           end
@@ -142,6 +134,46 @@ EOS
 
       # 将文件只读
       FileUtils.chmod('ugo-w', result_file_path)
+    end
+
+    # 外部入口
+    def scrape_routers(sandbox_root, config)
+
+      if config == nil
+        return
+      end
+
+      begin
+
+        result_file_path = ''
+        path = config[:path]
+        if path && path.length > 0
+          result_file_path = File.expand_path(File.join(sandbox_root, '..', path))
+        end
+        
+        if !File.exist?(result_file_path)
+          Pod::UI.warn("Router scrapy: path not found.")
+          return
+        end
+
+        key = 'latest_scrapy_router_tm'
+        content = File.read(result_file_path)
+        if content.length < 10
+          Config.check do |cfg, save| 
+            start_scrapy(sandbox_root, result_file_path)
+            cfg[key] = Time.now.to_i
+            save.call
+          end
+        else
+          Config.is_expired?(key, 24 * 60 * 60) do |_, update|
+            start_scrapy(sandbox_root, result_file_path)
+            update.call
+          end
+        end
+
+      rescue => e
+        puts "Error: #{e}"
+      end
 
     end
 

data/lib/dongjia_scheme_manager.rb

@@ -0,0 +1,58 @@
+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

data/lib/dongjia_source.rb

@@ -13,8 +13,6 @@ module Dongjia
         unless File.exist?(File.expand_path('~/.cocoapods/repos/djspecs'))
           # 克隆私有源，并命名为 djspecs
           system "pod repo add djspecs #{source_url}"
-        else
-          system "pod repo update djspecs"
         end
         podfile.source source_url
       end

data/lib/helper/dongjia_version_checker.rb

@@ -1,4 +1,5 @@
 require 'cocoapods-dongjia/gem_version'
+require 'dongjia_config'
 require 'gems'
 
 module Dongjia
@@ -10,21 +11,30 @@ module Dongjia
       Pod::UI.puts 'Done.'
 
       begin
-        info = Gems.info 'cocoapods-dongjia'
-        latest_version = info['version']
-        v = CocoapodsDongjia::VERSION
-
-        if v < latest_version
-          update_desc = info['metadata']['update_desc']
-          warnings = "cocoapods-dongjia #{latest_version} is available.\n\n"
-          warnings << update_desc
-          warnings << "To upgrade: [sudo] gem install cocoapods-dongjia\n"
-          Pod::UI.warn warnings
+
+        Config.is_expired?('latest_check_tm', 24 * 60 * 60) do |config, update|
+
+          info = Gems.info 'cocoapods-dongjia'
+          latest_version = info['version']
+          v = CocoapodsDongjia::VERSION
+
+          if Gem::Version.new(v) < Gem::Version.new(latest_version)
+            update_desc = info['metadata']['update_desc']
+            warnings = "cocoapods-dongjia #{latest_version} is available.\n\n"
+            warnings << update_desc.rstrip << "\n\n"
+            warnings << "To upgrade: [sudo] gem install cocoapods-dongjia\n"
+            Pod::UI.warn warnings
+          end
+
+          update.call
+
         end
-      rescue
+
+      rescue => e
+        puts "Error: #{e}"
       end
     end
 
   end
 
-end
+end

data/lib/helper/pod.rb

@@ -1,3 +1,5 @@
+require 'cocoapods'
+
 module Pod
 
   def self.repo_name(name)
@@ -19,13 +21,22 @@ module Pod
       local_path = File.join(local_root, repo_name(name))
     end
     if local_path
-      requirements.pop
-      requirements.push({:path => local_path})
+      cfg = requirements.pop
+      if cfg.is_a?(Hash)
+        cfg.reject! { |key, value|
+          [:git, :branch, :tag, :commit, :podspec].include?(key)
+        }
+      else
+        cfg = {:path => local_path}
+      end
+      cfg.merge!({:path => local_path})
+      requirements.push(cfg)
     end
   end
 
   # 注入远程仓库地址
   def self.inject_remote_git(name, requirements)
+    name = name.split('/').first
     options = requirements.pop
     options[:git] = "git@code.kaipao.cc:ios-team/components/#{name}.git"
     requirements.push(options)

data/lib/helper/podfile_local_importer.rb

@@ -18,8 +18,12 @@ module Pod
     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 => "#{@local_spec_path}/#{Pod::repo_name(name)}" }]
+          requirements = [path_cfg]
+        else
+          cfg = requirements.first
+          cfg.merge!(path_cfg) unless cfg.has_key?(:path)
         end
       end
       original_pod.bind(self).(name, *requirements)
@@ -27,4 +31,4 @@ module Pod
 
   end
 
-end
+end

data/lib/helper/project.rb

@@ -0,0 +1,27 @@
+require 'xcodeproj'
+
+module Xcodeproj
+
+  class Project
+
+    # 设置对应 target 为可见
+    # 逻辑参考 Xcodeproj::Project.recreate_user_schemes 方法
+    def set_target_scheme_visible(target, visible = true)
+      schemes_dir = XCScheme.user_data_dir(target.project.path)
+
+      xcschememanagement_path = schemes_dir + 'xcschememanagement.plist'
+
+      xcschememanagement = Plist.read_from_path(xcschememanagement_path)
+
+      user_state = xcschememanagement['SchemeUserState']
+
+      key = target.name + '.xcscheme'
+
+      user_state[key]['isShown'] = visible
+
+      Plist.write_to_path(xcschememanagement, xcschememanagement_path)
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dongjia
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.2
 platform: ruby
 authors:
 - jiangzhuoyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-06-20 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
@@ -61,24 +75,33 @@ extra_rdoc_files: []
 files:
 - lib/cocoapods-dongjia.rb
 - lib/cocoapods-dongjia/command.rb
-- lib/cocoapods-dongjia/command/dongjia.rb
+- lib/cocoapods-dongjia/command/demo.rb
+- lib/cocoapods-dongjia/command/install.rb
+- lib/cocoapods-dongjia/command/open.rb
+- lib/cocoapods-dongjia/command/reinstall.rb
+- lib/cocoapods-dongjia/command/strip.rb
 - lib/cocoapods-dongjia/gem_version.rb
 - lib/cocoapods_plugin.rb
 - lib/dongjia_branch_inspector.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/dongjia_warning_manager.rb
 - lib/helper/dongjia_version_checker.rb
 - lib/helper/pod.rb
 - lib/helper/podfile_local_importer.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: "  - 添加路由信息汇总\n"
+  update_desc: |2
+      - 修复路由抓取错误
+      - 修复 pod strip
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -94,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A longer description of cocoapods-dongjia.

data/lib/dongjia_warning_manager.rb

@@ -1,68 +0,0 @@
-require 'xcodeproj'
-
-module Dongjia
-
-  class WarningManager
-
-    def self.turn_off_warnings(turn_off, sandbox_root)
-      
-      return if (turn_off != true)
-
-      Dir.foreach(sandbox_root).select{|f| f.end_with?('xcodeproj')}.each do |name|
-        
-        proj = Xcodeproj::Project.open(File.join(sandbox_root, name))
-
-        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"
-            end
-          end
-        end
-  
-        # project 的每个 target 配置
-        proj.targets.each do | target |
-
-          next if target.name.start_with?('Pods')
-          
-          target.build_configurations.each do | config |
-          
-            # 禁用非 DJ 开头 Pod 的警告
-            config.build_settings['GCC_WARN_INHIBIT_ALL_WARNINGS'] = "YES" unless target.name.start_with?('DJ')
-            
-            # 不检测 block 中的隐式 self 调用
-            config.build_settings['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"
-            
-            # 不检测注释
-            config.build_settings['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"
-            end
-
-            # 关闭 bitcode
-            config.build_settings['ENABLE_BITCODE'] = "NO"
-          end
-  
-        end
-  
-        proj.save
-  
-      end
-
-    end
-
-  end
-
-end