cocoapods-dongjia 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f058eeb279bb4d5dd289e40603e490e3d53e59e34f2f83cb5c43ebe0bcb8479
-  data.tar.gz: 3d08fd738481fc88bc165772fc800aed48547b65dea27732d083f86f1b06b4cf
+  metadata.gz: fff0abb621b63173844d0bc61aac836d53b99409c3188dcf3cc9ed0010b8c57a
+  data.tar.gz: f7955cc93569b28eb0660b62f4909573718f1831f21c7f9160829fb2315b8d76
 SHA512:
-  metadata.gz: 74689cf1250bd97272fc9605a257544039f737f3ded014856a2cf03583a3d13b6f27d56fce5880fbbb601bda87376d21358fef5fdce43a0a9c44d7fb97b0fdbd
-  data.tar.gz: 6ee0bf4a3048313fd4fd67a8c24715427b5b84907fe1aac4e76570b070e34c8de02ca822c941e8693570cf91f1b9335a14e7aebe69381956a2536fd516bfbe53
+  metadata.gz: a61a7b1bd97990903f9186db5f5bb3d5745421f61cf1ac4aa59f4d7d8c85a0de52d4518dba9e8473e2c994b5e3aa60d768f97198b5c61c3ee2f4ceb9943d6745
+  data.tar.gz: 66133007037b29df7d8b083ed76102038dd8d07ca26cc98fdacd074a62f79d4835615dbb089e0e9b086ab3ee03b4cbec6b84f8840f426fc36d2c25a409633bce

data/lib/cocoapods-dongjia/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsDongjia
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/cocoapods_plugin.rb

@@ -1,9 +1,12 @@
 require 'cocoapods-dongjia/command'
 require_relative 'dongjia_source'
 require_relative 'dongjia_inspector'
-require_relative 'dongjia_import_helper'
 require_relative 'dongjia_warning_manager'
 
+require_relative 'helper/podfile_local_importer'
+require_relative 'helper/podfile_options'
+require_relative 'helper/podfile_warnings'
+
 module Dongjia
 
   Pod::HooksManager.register('cocoapods-dongjia', :pre_install) do |ctx, params|
@@ -20,7 +23,7 @@ module Dongjia
   
   Pod::HooksManager.register('cocoapods-dongjia', :post_install) do |ctx, params|
 
-    # 关闭一些警告
+    # 关闭工程内的一些警告
     DongjiaWarningManager.turn_off_warnings(
       params[:turn_off_warnings], 
       ctx.sandbox_root

data/lib/dongjia_inspector.rb

@@ -9,7 +9,7 @@ module Pod
     if branch == 'dev' or branch == 'master'
     
       # Hook pod 方法
-      alias_method :original_pod, :pod
+      alias_method :pod_alias_by_inspector, :pod
       
       def pod(name = nil, *requirements, &block)
         
@@ -27,7 +27,7 @@ module Pod
           end
         end
         
-        original_pod(name, *requirements, &block)
+        pod_alias_by_inspector(name, *requirements, &block)
       end
       
     end

data/lib/helper/pod.rb

@@ -0,0 +1,12 @@
+module Pod
+
+  def self.repo_name(name)
+    pos = name.index('/')
+    ret = pos == nil ? name : name[0, pos]
+    if ret == 'ProtocolBuffers'
+      ret = 'protobuf-objc'
+    end
+    ret
+  end
+
+end

data/lib/helper/podfile_local_importer.rb

@@ -0,0 +1,30 @@
+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
+        if requirements.length == 0
+          requirements = [{ :path => "#{@local_spec_path}/#{Pod::repo_name(name)}" }]
+        end
+      end
+      original_pod.bind(self).(name, *requirements)
+    end
+
+  end
+
+end

data/lib/helper/podfile_options.rb

@@ -0,0 +1,58 @@
+require_relative 'pod'
+
+module Pod
+
+  class Podfile
+
+    module DSL
+      def localpod(name = nil, *requirements)
+        local_path = nil
+        local_root = ENV['POD_LOCAL_ROOT']
+        if !local_root
+          UI.warn '环境变量中未发现 POD_LOCAL_ROOT 定义'
+        elsif local_root.length
+          local_path = File.join(local_root, Pod::repo_name(name))
+        end
+        if local_path
+          requirements.pop
+          requirements.push({:path => local_path})
+        end
+        pod(name, *requirements)
+      end
+
+      alias :lpod :localpod
+    end
+
+    class TargetDefinition
+
+      def parse_requirements(name, requirements)
+
+        local_path = nil
+
+        options = requirements.last
+        if options.is_a?(Hash) && options[:local] == true
+          local_root = ENV['POD_LOCAL_ROOT']
+          if !local_root
+            UI.warn '环境变量中未发现 POD_LOCAL_ROOT 定义'
+          elsif local_root.length
+            local_path = File.join(local_root, Pod::repo_name(name))
+          end
+        end
+
+        if local_path
+          requirements.pop
+          requirements.push({:path => local_path})
+        end
+      end
+
+      old_method = instance_method(:parse_inhibit_warnings)
+      define_method(:parse_inhibit_warnings) do |name, requirements|
+        parse_requirements(name, requirements)
+        old_method.bind(self).(name, requirements)
+      end
+
+    end
+
+  end
+
+end

data/lib/helper/podfile_warnings.rb

@@ -0,0 +1,20 @@
+module Pod
+
+  class Installer
+
+    class PodSourceInstaller
+
+      # 关闭自己仓库中 pod 的安全警告
+      old_method = instance_method(:verify_source_is_secure)
+      define_method(:verify_source_is_secure) do |root_spec|
+        url = root_spec.source[:http]
+        if url != nil && !url.start_with?('http://code.kaipao.cc')
+          old_method.bind(self).(root_spec)
+        end
+      end
+      
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dongjia
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - jiangzhuoyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,10 +50,13 @@ files:
 - lib/cocoapods-dongjia/command/dongjia.rb
 - lib/cocoapods-dongjia/gem_version.rb
 - lib/cocoapods_plugin.rb
-- lib/dongjia_import_helper.rb
 - lib/dongjia_inspector.rb
 - lib/dongjia_source.rb
 - lib/dongjia_warning_manager.rb
+- lib/helper/pod.rb
+- lib/helper/podfile_local_importer.rb
+- lib/helper/podfile_options.rb
+- lib/helper/podfile_warnings.rb
 homepage: https://github.com/EXAMPLE/cocoapods-dongjia
 licenses:
 - MIT

data/lib/dongjia_import_helper.rb

@@ -1,80 +0,0 @@
-#
-# 辅助导入第三方或本地的 pod
-#
-module Pod
-    
-  class Podfile
-      
-      $IS_WRAPED = false
-      $REMOTE_PATH = nil
-      # 导入 gitlab 上的远程 pod
-      def import_wrapper(path = 'components')
-          $IS_WRAPED = true
-          $REMOTE_PATH = path
-          yield if block_given?
-          $IS_WRAPED = false
-      end
-
-      # 导入本地 Components 目录下的 pod
-      $IS_IMPORTING_LOCAL_SPEC = false
-      def import_from_local_spec
-          $IS_IMPORTING_LOCAL_SPEC = true
-          yield if block_given?
-          $IS_IMPORTING_LOCAL_SPEC = false
-      end
-      
-      # Hook
-      alias_method :pod_alias_by_import, :pod
-      def pod(name = nil, *requirements)
-
-          if $IS_WRAPED
-              
-              local_path = nil
-              if requirements.include?(:local)
-                  local_root = ENV['POD_LOCAL_ROOT']
-                  if !local_root
-                      UI.warn '环境变量中未发现 POD_LOCAL_ROOT 定义'
-                  elsif local_root.length
-                      local_path = File.join(local_root, repo_name(name))
-                  end
-              end
-              
-              if local_path
-                  requirements = [{:path => local_path}]
-              end
-
-          elsif $IS_IMPORTING_LOCAL_SPEC
-
-              if requirements.length == 0
-                  requirements = [{ :path => "Components/#{repo_name(name)}" }]
-              end
-
-          end
-
-          pod_alias_by_import(name, *requirements)
-      end
-      
-      def repo_name(name)
-          pos = name.index('/')
-          ret = pos == nil ? name : name[0, pos]
-          if ret == 'ProtocolBuffers'
-            ret = 'protobuf-objc'
-          end
-          ret
-      end
-      
-  end
-
-  # 针对自己的 pod，关闭安全警告
-  class Installer
-      class PodSourceInstaller
-          alias_method :verify_source_is_secure_alias_by_import, :verify_source_is_secure
-          def verify_source_is_secure(root_spec)
-              url = root_spec.source[:http]
-              if url != nil && !url.start_with?('http://code.kaipao.cc')
-                  verify_source_is_secure_alias_by_import(root_spec)
-              end
-          end
-      end
-  end
-end