cocoapods-cafswitcher 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b7c82ff0bdb57b01a57970524a9811430ebf59c3ae17d0ed77a1ff7c215dead
-  data.tar.gz: c6430a5d542b76bdbb7a9558e5f56016284f63b34595ed393e6c16ffbf4eaee2
+  metadata.gz: f4cb2218088b7d582c2096ff569b5b76fa713a778e11753091070153738fc35d
+  data.tar.gz: de86507394b201e011239d135392e6924c6c5800df6175633ec82fc90e907822
 SHA512:
-  metadata.gz: 266791826feee895c04cee0faffcb67a6b9e620eae2258a33d475c675c5ef76c80c32d6a77834057566064447a592f57a9c55c1984b3db2ea71477bddb7ab2f4
-  data.tar.gz: 11b9ad02463d0be2fabeae5be0fd71c7af11575e9a9aa42eafe6d86bcb3fc35e8919a0aa0c7db353288c3c7eaaf5b888540120054c5aac31c0789d93c7c2e1a4
+  metadata.gz: 607aa67ef50f0065f9979fd57bb531d640560bb53448a0233c02ca1ad8dce4ff228e01eee30fd80537b1765a5c45945bf55437b5ad739f671bc560bd62a0bf08
+  data.tar.gz: 4475e8ae542181376dc1818a61ad6cfda5a517d31af8d6a4071d04930e8ebe290ba432a295e2fd709ad0aae4a4ec8a8a5060f79ed578557cb73963cc3e5b44ae

data/Gemfile.lock

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

data/lib/cocoapods-cafswitcher/Main.rb

@@ -1,7 +1,8 @@
-# encoding: UTF-8
 require 'fileutils'
 require 'yaml'
 require 'pathname'
+require 'cocoapods/downloader'
+require 'cocoapods/config'
 
 require_relative('podfile_switch')
 
@@ -41,21 +42,22 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
 
   if ENV['IS_ARCHIVE']
     ENV.delete('IS_ARCHIVE')
-    for name in allNames
-      setEnv(name, "_ARCHIVE")
+    allNames.each do |name|
+      setEnv(name, '_ARCHIVE')
       # ENV["#{name}_ARCHIVE"] = '1'
     end
   elsif ENV['IS_SOURCE']
     ENV.delete('IS_SOURCE')
-    for name in allNames
-      setEnv(name, "_SOURCE")
+    allNames.each do |name|
+      setEnv(name, '_SOURCE')
       # ENV["#{name}_SOURCE"] = '1'
+      Pod::Podfile.tmpSourceList << name
     end
   end
 
   # 对于git和path的直接设置成源码
-  for name in needUpdatePodList
-    currentSourceList = currentSourceList << name if !currentSourceList.include?(name)
+  needUpdatePodList.each do |name|
+    currentSourceList = currentSourceList << name unless currentSourceList.include?(name)
   end
 
 
@@ -81,31 +83,31 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
   # end
 
   # 二进制切换
-  for sourceName in currentSourceList
+  currentSourceList.each do |sourceName|
     cleanENV(sourceName)
-    setEnv(sourceName, "_SOURCE")
+    setEnv(sourceName, '_SOURCE')
     # ENV["#{sourceName}_SOURCE"] = '1'
   end
 
-  for archiveName in currentArchiveList
+  currentArchiveList.each do |archiveName|
     cleanENV(archiveName)
-    setEnv(archiveName, "_ARCHIVE")
+    setEnv(archiveName, '_ARCHIVE')
     # ENV["#{archiveName}_ARCHIVE"] = '1'
   end
 
-  for frameworkName in currentFrameworkList
+  currentFrameworkList.each do |frameworkName|
     cleanENV(frameworkName)
-    setEnv(frameworkName, "_FRAMEWORK")
+    setEnv(frameworkName, '_FRAMEWORK')
     # ENV["#{frameworkName}_FRAMEWORK"] = '1'
   end
 
-  sourceList = Array.new
-  archiveList = Array.new
-  frameworkList = Array.new
+  sourceList = []
+  archiveList = []
+  frameworkList = []
   # debugPackageList = Array.new
   # releasePackageList = Array.new
 
-  for name in allNames
+  allNames.each do |name|
     envName = name.gsub(/[\/]/, '_')
     # if ENV["#{name}_DEBUG"] == '1'
     #   debugPackageList << name
@@ -138,7 +140,7 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
 
   # caf_hash = Hash["sourceList" => sourceList, "archiveList" => archiveList, "frameworkList" => frameworkList,
   #                 "debugPackageList" => debugPackageList, "releasePackageList" => releasePackageList]
-  caf_hash = Hash["sourceList" => sourceList, "archiveList" => archiveList, "frameworkList" => frameworkList]
+  caf_hash = Hash['sourceList' => sourceList, 'archiveList' => archiveList, 'frameworkList' => frameworkList]
 
 
   config = Pod::Config.instance
@@ -146,70 +148,81 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
   require_relative('cafswitcher_config')
 
   configPath = config.cafConfigPath
-  FileUtils.mkdir_p(configPath) if !configPath.exist?
+  FileUtils.mkdir_p(configPath) unless configPath.exist?
   configFile = config.cafConfigFile
-  cafConfig = Hash.new
+  cafConfig = Hash['sourceList' => [], 'archiveList' => [], 'frameworkList' => []]
   if configFile.exist?
     cafConfig = YAML.load(File.open(configFile))
+    cafConfig ||= Hash['sourceList' => [], 'archiveList' => [], 'frameworkList' => []]
   else
     FileUtils.touch configFile
-    # cafConfig = Hash["sourceList" => [], "archiveList" => [], "frameworkList" => [],
-    #                  "debugPackageList" => [], "releasePackageList" => []]
-    cafConfig = Hash["sourceList" => [], "archiveList" => [], "frameworkList" => []]
   end
   # 比较不同
-  changedSubPods = Array.new
+  changedSubPods = []
   cafConfig.each do |key, value|
     # if key == "debugPackageList"
     #   changedSubPods |= (value | debugPackageList) - (value & debugPackageList)
     # elsif key == "releasePackageList"
     #   changedSubPods |= (value | releasePackageList) - (value & releasePackageList)
-    if key == "sourceList"
+    if key == 'sourceList'
       changedSubPods |= (value | sourceList) - (value & sourceList)
-    elsif key == "archiveList"
+    elsif key == 'archiveList'
       changedSubPods |= (value | archiveList) - (value & archiveList)
-    elsif key == "frameworkList"
+    elsif key == 'frameworkList'
       changedSubPods |= (value | frameworkList) - (value & frameworkList)
     end
   end
-  Pod::UI.puts "\nchanged sub Pod is:\n   " + changedSubPods.to_s if changedSubPods.length > 0
+
+  Pod::UI.puts "\nchanged sub Pod is:\n   " + changedSubPods.to_s unless changedSubPods.empty?
   # changedPod 里是根据subspec来存的，需要进行合并，找到pod库而不是含有subspec的库
-  changedPods = Array.new
+  changedPods = []
   changedSubPods.each do |subPod|
-    podName  = subPod.split("/")[0]
+    podName  = subPod.split('/')[0]
     changedPods << podName
   end
   # changedPods = changedPods | needUpdatePodList
   changedPods.uniq!
+  Pod::Podfile.changedPods.concat changedPods if changedPods
+  Pod::Podfile.changedSubPods.concat changedSubPods if changedSubPods
+  Pod::UI.puts "\nchanged Pod is:\n   " + changedPods.to_s unless changedPods.empty?
 
-  Pod::UI.puts "\nchanged Pod is:\n   " + changedPods.to_s if changedPods.length > 0
-
+  @cache = Pod::Downloader::Cache.new(Pod::Config.instance.cache_root + 'Pods')
   # 根据不同删除cache
   podRoot = config.project_pods_root
   changedSubPods.each do |changedSubPod|
-    changedPod = changedSubPod.split("/")[0]
+    changedPod = changedSubPod.split('/')[0]
     if needUpdatePodList.delete(changedSubPod)
-      Pod::UI.puts "正在清理#{changedPod}的缓存"
-      cacheCleanCMD = "pod cache clean #{changedPod} --all"
-      out = `#{cacheCleanCMD}`.lines.to_a
-      Pod::UI.puts out
+      cache_descriptors = @cache.cache_descriptors_per_pod[changedPod]
+      if cache_descriptors
+        cache_descriptors.each do |desc|
+          next unless desc[:release] == false
+          Pod::UI.message("Removing spec #{desc[:spec_file]} (v#{desc[:version]})") do
+            FileUtils.rm desc[:spec_file]
+          end
+          Pod::UI.message("Removing cache #{desc[:slug]}") do
+            FileUtils.rm_rf(desc[:slug])
+          end
+        end
+      end
     end
-    if changedSubPod =~ /^(?i)LJ/ or changedSubPod =~ /^(?i)Lianjia/
-      # 清除目录 pods 文件夹下的缓存
-      changedPodPath = podRoot + changedPod
-      FileUtils.rm_r(changedPodPath) if changedPodPath.exist?
+    next unless changedSubPod =~ /^(?i)LJ/ || changedSubPod =~ /^(?i)Lianjia/
+    # 清除目录 pods 文件夹下的缓存
+    changedPodPath = podRoot + changedPod
+    if changedPodPath.exist?
+      Pod::UI.message "Removing Folder #{changedPodPath}"
+      FileUtils.rm_r(changedPodPath)
     end
   end
 
   # 把新的配置写入file
-  File.open(configFile, "wb") {|f| YAML.dump(caf_hash, f) } if changedSubPods.length > 0
+  File.open(configFile, 'wb') {|f| YAML.dump(caf_hash, f) } unless changedSubPods.empty?
 end
 
 
 def setEnv(name, suffix)
   envName = name.gsub(/[\/]/, '_')
   ENV["#{envName}#{suffix}"] = '1'
-  podName = name.split("/")[0]
+  podName = name.split('/')[0]
   ENV["#{podName}#{suffix}"] = '1'
 end
 
@@ -228,4 +241,7 @@ end
 #   ENV.delete("#{name}_DEBUG")
 #   ENV.delete("#{name}_RELEASE")
 #   ENV.delete('IS_DEBUG')
-# end
+# end
+#
+
+Pod

data/lib/cocoapods-cafswitcher/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsCafswitcher
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/lib/cocoapods-cafswitcher/podfile_switch.rb

@@ -1,7 +1,9 @@
+require 'cocoapods/installer'
+require 'cocoapods/resolver'
+require 'cocoapods-cafswitcher/Main'
 module Pod
 
   class Podfile
-
     # add flag
     # :isSource => true
     def self.isSource
@@ -31,21 +33,21 @@ module Pod
     #   :isReleasePackage
     # end
 
-    @@sourceList = Array.new
+    @@sourceList = []
 
-    def Podfile.sourceList
+    def self.sourceList
       @@sourceList
     end
 
-    @@archiveList = Array.new
+    @@archiveList = []
 
-    def Podfile.archiveList
+    def self.archiveList
       @@archiveList
     end
 
-    @@frameworkList = Array.new
+    @@frameworkList = []
 
-    def Podfile.frameworkList
+    def self.frameworkList
       @@frameworkList
     end
 
@@ -62,18 +64,36 @@ module Pod
     # end
 
     # all the name of Pod
-    @@allPodName = Array.new
+    @@allPodName = []
 
-    def Podfile.allPodName
+    def self.allPodName
       @@allPodName
     end
 
-    @@needUpdatePodList = Array.new
+    @@needUpdatePodList = []
 
-    def Podfile.needUpdatePodList
+    def self.needUpdatePodList
       @@needUpdatePodList
     end
 
+    @@changedSubPods = []
+
+    def self.changedSubPods
+      @@changedSubPods
+    end
+
+    @@changedPods= []
+
+    def self.changedPods
+      @@changedPods
+    end
+
+    @@tmpSourceList= []
+
+    def self.tmpSourceList
+      @@tmpSourceList
+    end
+
 
     module DSL
       # Enable code for all pods
@@ -102,11 +122,9 @@ module Pod
       def parse_isFramework(name, requirements)
         options = requirements.last
         return requirements unless options.is_a?(Hash)
-        isFramework = options.has_key?(Pod::Podfile.isFramework)
+        isFramework = options.key?(Pod::Podfile.isFramework)
         # pod_name = Specification.root_name(name)
-        if isFramework
-          Pod::Podfile.frameworkList << name
-        end
+        Pod::Podfile.frameworkList << name if isFramework
         requirements.pop if options.empty?
       end
 
@@ -114,11 +132,9 @@ module Pod
         options = requirements.last
         return requirements unless options.is_a?(Hash)
 
-        isSource = options.has_key?(Pod::Podfile.isSource)
+        isSource = options.key?(Pod::Podfile.isSource)
         # pod_name = Specification.root_name(name)
-        if isSource
-          Pod::Podfile.sourceList << name
-        end
+        Pod::Podfile.sourceList << name if isSource
         requirements.pop if options.empty?
       end
 
@@ -126,11 +142,9 @@ module Pod
         options = requirements.last
         return requirements unless options.is_a?(Hash)
 
-        isArchive = options.has_key?(Pod::Podfile.isArchive)
+        isArchive = options.key?(Pod::Podfile.isArchive)
         # pod_name = Specification.root_name(name)
-        if isArchive
-          Pod::Podfile.archiveList << name
-        end
+        Pod::Podfile.archiveList << name if isArchive
 
         requirements.pop if options.empty?
       end
@@ -163,11 +177,9 @@ module Pod
         options = requirements.last
         return requirements unless options.is_a?(Hash)
 
-        isGitPath = options.has_key?(:git)
+        isGitPath = options.key?(:git)
         # pod_name = Specification.root_name(name)
-        if isGitPath
-          Pod::Podfile.needUpdatePodList << name
-        end
+        Pod::Podfile.needUpdatePodList << name if isGitPath
         requirements.pop if options.empty?
       end
 
@@ -175,11 +187,9 @@ module Pod
         options = requirements.last
         return requirements unless options.is_a?(Hash)
 
-        isPath = options.has_key?(:path)
+        isPath = options.key?(:path)
         # pod_name = Specification.root_name(name)
-        if isPath
-          Pod::Podfile.needUpdatePodList << name
-        end
+        Pod::Podfile.needUpdatePodList << name if isPath
         requirements.pop if options.empty?
       end
 
@@ -198,7 +208,7 @@ module Pod
         parse_needUpdatePod_path(name, requirements)
         # pod_name = Specification.root_name(name)
         Pod::Podfile.allPodName << name
-        old_method.bind(self).(name, requirements)
+        old_method.bind(self).call(name, requirements)
       end
 
       def deep_copy(o)
@@ -227,18 +237,84 @@ module Pod
 
         # 去掉添加的字段
         tmp_hash = clean(name, requirements)
-        if tmp_hash && !tmp_hash.empty?
-          pod = { name => tmp_hash }
+        pod = if tmp_hash && !tmp_hash.empty?
+          { name => tmp_hash }
         else
-          pod = name
-        end
+          name
+              end
 
         get_hash_value('dependencies', []) << pod
         nil
       end
 
-
     end
+  end
+
 
+  class Specification
+    class Set
+
+      old_specification_name = instance_method(:specification_name)
+      # 对于内部依赖，如果父依赖是源码，则子依赖也是源码，父依赖决定
+      define_method(:specification_name) do ||
+        if Pod::Podfile.changedSubPods
+          spec = Specification.from_file(specification_paths_for_version(any_version).first)
+          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'
+            end
+          end
+        end
+        name = old_specification_name.bind(self).call
+        name
+      end
+
+    end
   end
+
+
+
+  # class Lockfile
+  #
+  #   old_detect_changes_with_podfile = instance_method(:detect_changes_with_podfile)
+  #
+  #   define_method(:detect_changes_with_podfile) do |podfile|
+  #     pods_by_state = old_detect_changes_with_podfile.bind(self).(podfile)
+  #     Pod::UI.puts Pod::Podfile.changedSubPods
+  #     Pod::Podfile.changedSubPods.each do |changedSubPod|
+  #       changedPod = changedSubPod.split("/")[0]
+  #       if changedSubPod =~ /^(?i)LJ/ or changedSubPod =~ /^(?i)Lianjia/
+  #         if pods_by_state.has_key?(:changed) and !pods_by_state[:changed].include? changedPod
+  #           pods_by_state[:changed] << changedPod
+  #           if pods_by_state.has_key?(:unchanged) and pods_by_state[:unchanged].include? changedPod
+  #               pods_by_state[:unchanged].delete changedPod
+  #           end
+  #         end
+  #       end
+  #     end
+  #     pods_by_state
+  #   end
+  #
+  # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-cafswitcher
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - handa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler