cocoapods-cafswitcher 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b985979e76483821455bb55d0fb5e6337c0f22a6338e9f9fb83cab90691b5b9c
-  data.tar.gz: 9d1491a422e43fb1798127bf2d2736ca1b0dcc5d53daeeac89bb2c4f85395860
+  metadata.gz: 8cd842861b81414e85b735da0def3f2a6626a141d158890d2a1f3435c310a082
+  data.tar.gz: 3f1b176c56445dce3c0b64d6d857b9fa42a5ca14f55c85e01a58fb3f821b486e
 SHA512:
-  metadata.gz: 465bc02f429e46b7a24024241c82bad1ec36bea48684e9a90bd6fa59ca23dcd6fc00ad84a9a93adc31ab789c287052b26702c34216c701f37dd3f296cfd6ef2c
-  data.tar.gz: 95216c0d050c876f8264834561194fc39b50f3e6d68bfc388d85ccc1efb782beb0e15303cd7f8c408bc250c1b45c0f742da676fad15d09f78584df17c70595ea
+  metadata.gz: 54dad2be223d243d62047256783a314a214bfcf991085e7e1291efb7eb8dae5cc19caf74b4b89eb6ef32ab02f003ab2b00891786a7b994afcaa2fe9fee9e194c
+  data.tar.gz: 57a864d057f4981c6ee054921a975798ed9f2dd424d2b7b73d897219b29c7c52385133114211a114f7333529e9790b88038ab16a974cc0fad68205101017f24b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-cafswitcher (0.0.17)
+    cocoapods-cafswitcher (0.0.18)
 
 GEM
   remote: https://rubygems.org/

data/lib/cocoapods-cafswitcher/Main.rb

@@ -55,11 +55,6 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
     end
   end
 
-  # 对于git和path的直接设置成源码
-  needUpdatePodList.each do |name|
-    currentSourceList = currentSourceList << name unless currentSourceList.include?(name)
-  end
-
   isDebug = true
   if ENV['IS_RELEASE']
     isDebug = FALSE

data/lib/cocoapods-cafswitcher/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsCafswitcher
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/lib/cocoapods-cafswitcher/podfile_switch.rb

@@ -175,6 +175,7 @@ module Pod
         isGitPath = options.key?(:git)
         # pod_name = Specification.root_name(name)
         Pod::Podfile.needUpdatePodList << name if isGitPath
+        Pod::Podfile.sourceList << name if isGitPath
         requirements.pop if options.empty?
       end
 
@@ -185,6 +186,7 @@ module Pod
         isPath = options.key?(:path)
         # pod_name = Specification.root_name(name)
         Pod::Podfile.needUpdatePodList << name if isPath
+        Pod::Podfile.sourceList << name if isPath
         requirements.pop if options.empty?
       end
 
@@ -246,46 +248,38 @@ module Pod
 
 
   class Specification
-    class Set
-
-      old_specification_name = instance_method(:specification_name)
-      # 对于内部依赖，如果父依赖是源码，则子依赖也是源码，父依赖决定
-      define_method(:specification_name) do ||
-        versions_by_source.each do |source, versions|
-          next unless version = versions.first
-          spec = source.specification(name, version)
-          if (spec.name =~ /^(?i)LJ/ || spec.name =~ /^(?i)Lianjia/) && spec.subspecs
-            dependence_note =[]
-            spec.subspecs.each do |subspec|
-              next if Pod::Podfile.archiveList.include?(subspec.name)
-              next if Pod::Podfile.frameworkList.include?(subspec.name)
-              if Pod::Podfile.sourceList.include?(spec.name) || Pod::Podfile.tmpSourceList.include?(spec.name)
-                dependence_note << subspec.name
-                next
-              end
-              envName = subspec.name.gsub(/[\/]/, '_')
-              next unless Pod::Podfile.sourceList.include?(subspec.name) || Pod::Podfile.tmpSourceList.include?(subspec.name)
-              next unless subspec.dependencies
-              subspec.dependencies.each do |dependency|
-                next unless dependency.name =~ /^(?i)#{spec.name}/
-                next if Pod::Podfile.archiveList.include?(dependency.name)
-                next if Pod::Podfile.frameworkList.include?(dependency.name)
-                dependence_note << dependency.name
-                # Pod::Podfile.sourceList << dependency.name unless Pod::Podfile.sourceList.include?(dependency.name)
-              end
-            end
 
-            dependence_note.each do |note|
-              cleanENV note
-              setEnv note, '_SOURCE'
+      old_specification_from_file = method(:from_file)
+      define_singleton_method(:from_file) do |path, subspec_name = nil|
+        spec = old_specification_from_file.call(path, subspec_name)
+        if (spec.name =~ /^(?i)LJ/ || spec.name =~ /^(?i)Lianjia/) && spec.subspecs
+          dependence_note =[]
+          spec.subspecs.each do |subspec|
+            next if Pod::Podfile.archiveList.include?(subspec.name)
+            next if Pod::Podfile.frameworkList.include?(subspec.name)
+            if Pod::Podfile.sourceList.include?(spec.name) || Pod::Podfile.tmpSourceList.include?(spec.name)
+              dependence_note << subspec.name
+              next
+            end
+            envName = subspec.name.gsub(/[\/]/, '_')
+            next unless Pod::Podfile.sourceList.include?(subspec.name) || Pod::Podfile.tmpSourceList.include?(subspec.name)
+            next unless subspec.dependencies
+            subspec.dependencies.each do |dependency|
+              next unless dependency.name =~ /^(?i)#{spec.name}/
+              next if Pod::Podfile.archiveList.include?(dependency.name)
+              next if Pod::Podfile.frameworkList.include?(dependency.name)
+              dependence_note << dependency.name
+              # Pod::Podfile.sourceList << dependency.name unless Pod::Podfile.sourceList.include?(dependency.name)
             end
           end
-          return spec.name
+
+          dependence_note.each do |note|
+            cleanENV note
+            setEnv note, '_SOURCE'
+          end
         end
-        nil
+        spec
       end
-
-    end
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-cafswitcher
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - handa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler