cocoapods-dongjia 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f3344d6aa8a82093be25e107fae8fdbc85978f62c37de24716bbc52f6e8adf9
-  data.tar.gz: 373230993613ea7c542a748b1047f54dc1d00b79b8f5d6738971b42b38036937
+  metadata.gz: '09ee5f3903da98865392df97577a07edeb689c257ff99366254ae5a4372a32b8'
+  data.tar.gz: ca00ddd8cca267b055156c7b201dc4a96358eb7b2e214ae65ccab3992e94f133
 SHA512:
-  metadata.gz: 7c9404e7d325cf8dfaddad1ccaa28ddba2ff76b8165a1831282299f0243ec7ae9f583d865d92d56024f04ca7592673be8ba9e7f169ec995639a8ed3350e5efe8
-  data.tar.gz: 3b07c1adfeb8df3c8b975586b6474a0053c0c2a8d2e317fbcb216942cc788b65afa16ece34d8d41972d0e8402f697aaecb1382b06e85e67bb9b612b70a39c616
+  metadata.gz: c8e295e3c6c8d7f309ed6329268b8876fd8ee576fcb90af7b01e868a73776608d363b422b221c6b6ea094ebade9824718d4dac67ae8956cc99e9d7776dc570e4
+  data.tar.gz: aa1d10dda525fb3d28c1e2f8fd27a36666d6111f22b6c411b55a9411dcc4efe4b60ff672787e8a1db44a7a74c6a4ca05e5d70c21bb4856a46ae26dded88bfbda

data/lib/cocoapods-dongjia/command.rb

@@ -1 +1,3 @@
-require 'cocoapods-dongjia/command/dongjia'
+require 'cocoapods-dongjia/command/reinstall'
+require 'cocoapods-dongjia/command/install'
+require 'cocoapods-dongjia/command/demo'

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/gem_version.rb

@@ -1,6 +1,9 @@
 module CocoapodsDongjia
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
   UPDATE_DESC = <<-EOS
-  - 添加路由信息汇总
+  - 修复本地 pod 添加属性出错
+  - 添加 demo 指令
+  - 更为高效的 repo 更新机制
+  - 优化版本检测和路由抓取触发逻辑
 EOS
 end

data/lib/cocoapods_plugin.rb

@@ -4,6 +4,7 @@ require_relative 'dongjia_branch_inspector'
 require_relative 'dongjia_enterprise_inspector'
 require_relative 'dongjia_warning_manager'
 require_relative 'dongjia_router'
+require_relative 'dongjia_scheme_manager'
 
 require_relative 'helper/podfile_local_importer'
 require_relative 'helper/podfile_options'
@@ -34,6 +35,9 @@ module Dongjia
       ctx.sandbox_root
     )
 
+    # 处理 appspec 配置
+    SchemeManager.setup(ctx, params)
+
     # 企业版文件引用校验
     files = EnterpriseInspector.inspect()
     Pod::UI.warn "文件未加入企业版：#{files}" if files.count > 0

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_router.rb

@@ -1,5 +1,7 @@
 require 'xcodeproj'
 require 'fileutils'
+require 'dongjia_config'
+require 'time'
 
 module Dongjia
 
@@ -68,10 +70,12 @@ EOS
         file.each_line do |line|
           is_start = false
           if 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 +92,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 +106,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 +131,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,28 @@
+require 'helper/project'
+
+module Dongjia
+
+  class SchemeManager
+
+    def self.setup(ctx, params)
+      visibled_appspecs = params[:visibled_appspecs]
+      return if !visibled_appspecs || visibled_appspecs.empty?
+      sandbox_root = ctx.sandbox_root
+      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'
+          pod_name = target.name.split('-').first
+          if visibled_appspecs.include?(pod_name)
+            proj.set_target_scheme_visible(target, true)
+          end
+        end
+      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 v < 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,18 @@ 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
+      cfg.reject! { |key, value|
+        [:git, :branch, :tag, :commit, :podspec].include?(key)
+      }
+      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.0.8
 platform: ruby
 authors:
 - jiangzhuoyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2019-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,12 +61,16 @@ 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/reinstall.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_router.rb
+- lib/dongjia_scheme_manager.rb
 - lib/dongjia_source.rb
 - lib/dongjia_warning_manager.rb
 - lib/helper/dongjia_version_checker.rb
@@ -74,11 +78,16 @@ files:
 - 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 添加属性出错
+      - 添加 demo 指令
+      - 更为高效的 repo 更新机制
+      - 优化版本检测和路由抓取触发逻辑
 post_install_message: 
 rdoc_options: []
 require_paths: