cocoapods-dongjia 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e84142456adb1a7aafa2395706f044bb374b6afd2c2a9e0cc3543a202f3c7e
-  data.tar.gz: 64d4f993f3637cff64296e9e4616f889543a985c531e6a1ad39c589d540a4560
+  metadata.gz: f18bc9b7c748f76da031b3c7399e77fa0cc7d0de5f9ce4ee35081e82cdf4fa0a
+  data.tar.gz: 0535a37844a08856aa30e77820d5ab8ee15364997521aee38b6d71ec1ef86052
 SHA512:
-  metadata.gz: ab2c71217234370fc4648d13711d1e88a3a1be68310e9084ff27b90b8cf207b6e533f97f41c62e4abe3a4a8397e8f6c24c6363eb47d93d13bb46bfcea2724854
-  data.tar.gz: 90acc42e03382bcf0f8f47da18a51630c9bd09bfbd6e6a622f0af8017ecff2116c17e865890947284ed4bd3b129b752090fdad49b47ceae4ba9c8892ca4152a1
+  metadata.gz: f4ad0844ad88e3c0f1e911c54f924e4f0117d63ada80009a769ed77688ec14435932b5653f05157274a826d14c6c3866fd3ead7e493b825e4f3cd186727c4d54
+  data.tar.gz: a89af33980896a67d37f4517a9f12e3d6d93386e11cb25b4ad1f0d081e6f8eee428285eefe92d5dcb6ee627cad68f584ae9bcc0b50f3905ffdd5fa18b0d182e0

data/lib/cocoapods-dongjia/gem_version.rb

@@ -1,3 +1,4 @@
 module CocoapodsDongjia
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
+  UPDATE_DESC = "  - 远程仓库支持 :branch / :tag / :commit 直接指定"
 end

data/lib/helper/dongjia_version_checker.rb

@@ -9,12 +9,18 @@ module Dongjia
 
       Pod::UI.puts 'Done.'
 
-      info = Gems.info 'cocoapods-dongjia'
-      latest_version = info['version']
-      v = CocoapodsDongjia::VERSION
-
-      if v < latest_version
-        Pod::UI.warn "发现新版本插件(#{latest_version})，更新：[sudo] gem install cocoapods-dongjia"
+      begin
+        info = Gems.info 'cocoapods-dongjia'
+        latest_version = info['version']
+        v = CocoapodsDongjia::VERSION
+
+        if v < latest_version
+          update_desc = info['metadata']['update_desc']
+          Pod::UI.warn "cocoapods-dongjia #{latest_version} is available."
+          Pod::UI.warn "#{update_desc}"
+          Pod::UI.warn "to upgrade: [sudo] gem install cocoapods-dongjia"
+        end
+      rescue
       end
     end
 

data/lib/helper/pod.rb

@@ -9,4 +9,26 @@ module Pod
     ret
   end
 
-end
+  # 注入本地路径
+  def self.inject_local_path(name, 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, repo_name(name))
+    end
+    if local_path
+      requirements.pop
+      requirements.push({:path => local_path})
+    end
+  end
+
+  # 注入远程仓库地址
+  def self.inject_remote_git(name, requirements)
+    options = requirements.pop
+    options[:git] = "git@code.kaipao.cc:ios-team/components/#{name}.git"
+    requirements.push(options)
+  end
+
+end

data/lib/helper/podfile_options.rb

@@ -1,4 +1,5 @@
 require_relative 'pod'
+require 'pry'
 
 module Pod
 
@@ -6,17 +7,7 @@ module Pod
 
     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::inject_local_path(name, requirements)
         pod(name, *requirements)
       end
 
@@ -27,22 +18,14 @@ module Pod
 
       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))
+        if options.is_a?(Hash)
+          if options[:local] == true
+            Pod::inject_local_path(name, requirements)
+          elsif not ([:branch, :commit, :tag] & options.keys).empty? and options[:git] == nil
+            Pod::inject_remote_git(name, requirements)
           end
         end
-
-        if local_path
-          requirements.pop
-          requirements.push({:path => local_path})
-        end
       end
 
       old_method = instance_method(:parse_inhibit_warnings)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dongjia
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - jiangzhuoyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2019-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,8 @@ files:
 homepage: https://github.com/EXAMPLE/cocoapods-dongjia
 licenses:
 - MIT
-metadata: {}
+metadata:
+  update_desc: "  - 远程仓库支持 :branch / :tag / :commit 直接指定"
 post_install_message: 
 rdoc_options: []
 require_paths: