cocoapods-cafswitcher 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2b650e49c2c0a6f19a7f0aa37fa64c9b64c09f0359ee306dfcc8a659c1725bc
-  data.tar.gz: 0c9dfea436263167b1f129ac65490967800cc670a838267cb32456d40f06ccab
+  metadata.gz: 9b914e51d70ab8f4c673a9bc4265217530e571af68a11618788609f6b4293bdf
+  data.tar.gz: d167d17a0c93504b734398163946cb32ad401724b29918e3dedeb2fc375ea01f
 SHA512:
-  metadata.gz: 7676648a65cabf108a3f69013afcfe0ae95d6a1db77d012d589609d1d9d9cf28d270dddf5ff1b20f4343bf5f24a164976a1278ad4ae25406fb7a86bcb70efdef
-  data.tar.gz: 2e3b89f31b5d7012a7d9d68d4de22b08a4d344702cc96e7e916048bd5422d042e04aa6ced600eb1a4ff31c831d48d6709dbd4d350f85c892773ce8624cf4d74b
+  metadata.gz: 9b5b2afac7a88114d1a19bd9dc566abd14716e140726b915acda1992511b49e7036b32152d66f9681840701965a8eccbe9456895581ad01fd432bb696a035728
+  data.tar.gz: f933357fd7bc46b6f42d7a4a79b9b41d3e64ff1350606d4b0e1bad56eacec27aa610a10229141996db3c37c73c4cd123a4d14cf6b3e89620247711cacd12fdac

data/lib/cocoapods-cafswitcher/Main.rb

@@ -120,6 +120,7 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
   Pod::Podfile.frameworkList.clear()
   Pod::Podfile.debugPackageList.clear()
   Pod::Podfile.releasePackageList.clear()
+  Pod::Podfile.unspecifiedList.clear()
 
   Pod::Podfile.sourceList.concat(sourceList)
   Pod::Podfile.frameworkList.concat(frameworkList)
@@ -198,32 +199,33 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
   changedPods.uniq!
   Pod::UI.puts "\nchanged Pod is:\n   " + changedPods.to_s + "\n" unless changedPods.empty?
 
-  clean(changedSubPods)
+  gitPathList.each do |gitPathSubPod|
+    changedSubPods << gitPathSubPod
+  end
+  changedSubPods.uniq!
+
+  cleanPodsDir(changedSubPods)
+  # cleanCocoapodsCache(gitPathList)
 
   # 把新的配置写入file
   File.open(configFile, 'wb') {|f| YAML.dump(caf_hash, f) } unless changedSubPods.empty?
 end
 
-
-def clean(changedSubPods)
-  config = Pod::Config.instance
-  @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]
-
-    # 清除本地的localFile 的JSON
-    localspecPath = podRoot + "Local Podspecs/" + "#{changedPod}.podspec.json"
-    if localspecPath.exist?
-      Pod::UI.message "Removing local Podspecs.json #{localspecPath}"
-      FileUtils.rm_r(localspecPath)
-    end
+def cleanCocoapodsCache(gitPathList)
+  cachePath = Pod::Config.instance.cache_root + 'Pods'
+  @cache = Pod::Downloader::Cache.new(cachePath)
+  gitPathList.each do |gitPathSubPod|
+    gitPathPod = gitPathSubPod.split('/')[0]
+    cache_descriptors = @cache.cache_descriptors_per_pod[gitPathPod]
     # 清空缓存，因为缓存里有podspec.json
-    cache_descriptors = @cache.cache_descriptors_per_pod[changedPod]
     if cache_descriptors
       # TODO 检查changedSubPod
       cache_descriptors.each do |desc|
+        specs_dir = cachePath + 'Specs'
+        release_specs_dir = specs_dir + 'Release'
+        if desc[:spec_file].include?(release_specs_dir)
+          continue
+        end
         Pod::UI.message("Removing spec #{desc[:spec_file]} (v#{desc[:version]})") do
           FileUtils.rm desc[:spec_file]
         end
@@ -232,6 +234,22 @@ def clean(changedSubPods)
         # end
       end
     end
+  end
+
+end
+
+def cleanPodsDir(changedSubPods)
+  config = Pod::Config.instance
+  # 根据不同删除cache
+  podRoot = config.project_pods_root
+  changedSubPods.each do |changedSubPod|
+    changedPod = changedSubPod.split('/')[0]
+    # 清除本地的localFile 的JSON
+    localspecPath = podRoot + "Local Podspecs/" + "#{changedPod}.podspec.json"
+    if localspecPath.exist?
+      Pod::UI.message "Removing local Podspecs.json #{localspecPath}"
+      FileUtils.rm_r(localspecPath)
+    end
     # next unless changedSubPod =~ /^(?i)LJ/ || changedSubPod =~ /^(?i)Lianjia/ || changedSubPod.include?('/')
     # 清除目录 pods 文件夹下的缓存
     changedPodPath = podRoot + changedPod

data/lib/cocoapods-cafswitcher/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsCafswitcher
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

data/lib/cocoapods-cafswitcher/podfile_switch.rb

@@ -90,9 +90,12 @@ module Pod
 
       def parse_source_framework_key(name, requirements)
         options = requirements.last
-        return requirements unless options.is_a?(Hash)
-        isFramework = options.delete(Pod::Podfile.isFramework)
-        isSource = options.delete(Pod::Podfile.isSource)
+        if not options.is_a?(Hash)
+          Pod::Podfile.unspecifiedList << name
+          return requirements
+        end
+        isFramework = options.key?(Pod::Podfile.isFramework)
+        isSource = options.key?(Pod::Podfile.isSource)
         if isSource or (isSource and isFramework)
           Pod::Podfile.sourceList << name
         elsif isFramework
@@ -105,10 +108,12 @@ module Pod
 
       def parse_debug_release_package(name, requirements)
         options = requirements.last
-        return requirements unless options.is_a?(Hash)
-
-        isDebugPackage = options.delete(Pod::Podfile.isDebugPackage)
-        isReleasePackage = options.delete(Pod::Podfile.isReleasePackage)
+        if not options.is_a?(Hash)
+          Pod::Podfile.debugPackageList << name
+          return requirements
+        end
+        isDebugPackage = options.key?(Pod::Podfile.isDebugPackage)
+        isReleasePackage = options.key?(Pod::Podfile.isReleasePackage)
         if (isDebugPackage and isReleasePackage) or isReleasePackage
           Pod::Podfile.releasePackageList << name
         else
@@ -142,41 +147,40 @@ module Pod
         old_method.bind(self).call(name, requirements)
       end
 
-      # def deep_copy(o)
-      #   Marshal.load(Marshal.dump(o))
-      # end
-
-      # def clean(name, requirements)
-      #   tmp_hash = deep_copy(requirements)
-      #   options = tmp_hash.last
-      #   return tmp_hash unless options.is_a?(Hash)
-      #
-      #   isFramework = options.delete(Pod::Podfile.isFramework)
-      #   isSource = options.delete(Pod::Podfile.isSource)
-      #   isArchive = options.delete(Pod::Podfile.isArchive)
-      #   # isDebugPackage = options.delete(Pod::Podfile.isDebugPackage)
-      #   # isReleasePackage = options.delete(Pod::Podfile.isReleasePackage)
-      #   tmp_hash.pop if options.empty?
-      #   tmp_hash
-      # end
-
-      #
-      # define_method(:store_pod) do |name, *requirements|
-      #   return if parse_subspecs(name, requirements) # This parse method must be called first
-      #   parse_inhibit_warnings(name, requirements)
-      #   parse_configuration_whitelist(name, requirements)
-      #
-      #   # 去掉添加的字段
-      #   tmp_hash = clean(name, requirements)
-      #   pod = if tmp_hash && !tmp_hash.empty?
-      #     { name => tmp_hash }
-      #   else
-      #     name
-      #         end
-      #
-      #   get_hash_value('dependencies', []) << pod
-      #   nil
-      # end
+      def deep_copy(o)
+        Marshal.load(Marshal.dump(o))
+      end
+
+      def clean(name, requirements)
+        tmp_hash = deep_copy(requirements)
+        options = tmp_hash.last
+        return tmp_hash unless options.is_a?(Hash)
+
+        isFramework = options.delete(Pod::Podfile.isFramework)
+        isSource = options.delete(Pod::Podfile.isSource)
+        isDebugPackage = options.delete(Pod::Podfile.isDebugPackage)
+        isReleasePackage = options.delete(Pod::Podfile.isReleasePackage)
+        tmp_hash.pop if options.empty?
+        tmp_hash
+      end
+
+
+      define_method(:store_pod) do |name, *requirements|
+        return if parse_subspecs(name, requirements) # This parse method must be called first
+        parse_inhibit_warnings(name, requirements)
+        parse_configuration_whitelist(name, requirements)
+
+        # 去掉添加的字段
+        tmp_hash = clean(name, requirements)
+        pod = if tmp_hash && !tmp_hash.empty?
+          { name => tmp_hash }
+        else
+          name
+              end
+
+        get_hash_value('dependencies', []) << pod
+        nil
+      end
 
     end
   end
@@ -239,18 +243,19 @@ module Pod
             end
           end
 
-          framework_dependence_note.each do |note|
+          framework_dependence_note.uniq.each do |note|
             need_reload = true
             cleanENV note
             setEnv note, '_FRAMEWORK'
           end
 
-          source_dependence_note.each do |note|
+          source_dependence_note.uniq.each do |note|
             need_reload = true
             cleanENV note
             setEnv note, '_SOURCE'
           end
 
+
         end
         if need_reload
           spec = old_specification_from_file.call(path, subspec_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-cafswitcher
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - handa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler