cocoapods-cafswitcher 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dabca190e44ceba2529e89ce358b5d6c7058e51e7c01502ac86bc9aa5dd89226
-  data.tar.gz: 1344e1608a8a323e1cb162e84fe3dc5965faba75d12432adf88733f918d82af2
+  metadata.gz: 0b7c82ff0bdb57b01a57970524a9811430ebf59c3ae17d0ed77a1ff7c215dead
+  data.tar.gz: c6430a5d542b76bdbb7a9558e5f56016284f63b34595ed393e6c16ffbf4eaee2
 SHA512:
-  metadata.gz: 934970392ac8f20b591b404404e10b048a1528d497db540e3778a45ce802eb4c3d88cb60a3f76a9547fc5221d83f8b8a33b1d7266d4f92f42bc5c441d390e3f2
-  data.tar.gz: 8b2d0580501649360e335a0bfa863d1bb30954e51297bf808da4feac10bdd191a70ec3ee378e14db3d9552ceba4a3cfb01804d156a1172c01ed61ada740e072f
+  metadata.gz: 266791826feee895c04cee0faffcb67a6b9e620eae2258a33d475c675c5ef76c80c32d6a77834057566064447a592f57a9c55c1984b3db2ea71477bddb7ab2f4
+  data.tar.gz: 11b9ad02463d0be2fabeae5be0fd71c7af11575e9a9aa42eafe6d86bcb3fc35e8919a0aa0c7db353288c3c7eaaf5b888540120054c5aac31c0789d93c7c2e1a4

data/Gemfile

@@ -6,7 +6,6 @@ gemspec
 group :development do
   gem 'cocoapods'
   gem 'cocoapods-plugins'
-  gem 'cocoapods-packager'
   gem 'mocha'
   gem 'bacon'
   gem 'mocha-on-bacon'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-cafswitcher (0.0.8)
+    cocoapods-cafswitcher (0.0.10)
 
 GEM
   remote: https://rubygems.org/
@@ -40,8 +40,6 @@ GEM
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.2)
     cocoapods-downloader (1.2.1)
-    cocoapods-packager (1.5.0)
-      cocoapods (>= 1.1.1, < 2.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -90,7 +88,6 @@ DEPENDENCIES
   bundler (~> 1.3)
   cocoapods
   cocoapods-cafswitcher!
-  cocoapods-packager
   cocoapods-plugins
   mocha
   mocha-on-bacon

data/lib/cocoapods-cafswitcher/Main.rb

@@ -35,6 +35,9 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
   #
   allNames = Pod::Podfile.allPodName.uniq
   needUpdatePodList = Pod::Podfile.needUpdatePodList.uniq
+  currentSourceList = Pod::Podfile.sourceList.uniq
+  currentArchiveList = Pod::Podfile.archiveList.uniq
+  currentFrameworkList = Pod::Podfile.frameworkList.uniq
 
   if ENV['IS_ARCHIVE']
     ENV.delete('IS_ARCHIVE')
@@ -50,41 +53,47 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
     end
   end
 
-  if ENV['IS_DEBUG']
-    ENV.delete('IS_DEBUG')
-    for name in allNames
-      setEnv(name, "_DEBUG")
-      # ENV["#{name}_DEBUG"] = '1'
-    end
+  # 对于git和path的直接设置成源码
+  for name in needUpdatePodList
+    currentSourceList = currentSourceList << name if !currentSourceList.include?(name)
   end
 
-  # 对debug和release切换，release级别高
-  for debugName in Pod::Podfile.debugPackageList.uniq
-    cleanDebugENV(debugName)
-    setEnv(debugName, "_DEBUG")
-    # ENV["#{debugName}_DEBUG"] = '1'
-  end
 
-  for releaseName in Pod::Podfile.releasePackageList.uniq
-    cleanDebugENV(releaseName)
-    setEnv(releaseName, "_RELEASE")
-    # ENV["#{releaseName}_RELEASE"] = '1'
-  end
+  # if ENV['IS_DEBUG']
+  #   ENV.delete('IS_DEBUG')
+  #   for name in allNames
+  #     setEnv(name, "_DEBUG")
+  #     # ENV["#{name}_DEBUG"] = '1'
+  #   end
+  # end
+
+  # 对debug和release切换，release级别高
+  # for debugName in Pod::Podfile.debugPackageList.uniq
+  #   cleanDebugENV(debugName)
+  #   setEnv(debugName, "_DEBUG")
+  #   # ENV["#{debugName}_DEBUG"] = '1'
+  # end
+  #
+  # for releaseName in Pod::Podfile.releasePackageList.uniq
+  #   cleanDebugENV(releaseName)
+  #   setEnv(releaseName, "_RELEASE")
+  #   # ENV["#{releaseName}_RELEASE"] = '1'
+  # end
 
   # 二进制切换
-  for sourceName in Pod::Podfile.sourceList.uniq
+  for sourceName in currentSourceList
     cleanENV(sourceName)
     setEnv(sourceName, "_SOURCE")
     # ENV["#{sourceName}_SOURCE"] = '1'
   end
 
-  for archiveName in Pod::Podfile.archiveList.uniq
+  for archiveName in currentArchiveList
     cleanENV(archiveName)
     setEnv(archiveName, "_ARCHIVE")
     # ENV["#{archiveName}_ARCHIVE"] = '1'
   end
 
-  for frameworkName in Pod::Podfile.frameworkList.uniq
+  for frameworkName in currentFrameworkList
     cleanENV(frameworkName)
     setEnv(frameworkName, "_FRAMEWORK")
     # ENV["#{frameworkName}_FRAMEWORK"] = '1'
@@ -93,19 +102,20 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
   sourceList = Array.new
   archiveList = Array.new
   frameworkList = Array.new
-  debugPackageList = Array.new
-  releasePackageList = Array.new
+  # debugPackageList = Array.new
+  # releasePackageList = Array.new
 
   for name in allNames
-    if ENV["#{name}_DEBUG"] == '1'
-      debugPackageList << name
-    else
-      releasePackageList << name
-    end
-
-    if ENV["#{name}_SOURCE"] == '1'
+    envName = name.gsub(/[\/]/, '_')
+    # if ENV["#{name}_DEBUG"] == '1'
+    #   debugPackageList << name
+    # else
+    #   releasePackageList << name
+    # end
+
+    if ENV["#{envName}_SOURCE"] == '1'
       sourceList << name
-    elsif ENV["#{name}_ARCHIVE"] == '1'
+    elsif ENV["#{envName}_ARCHIVE"] == '1'
       archiveList << name
     else
       frameworkList << name
@@ -115,8 +125,8 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
   Pod::UI.puts "is Source ：\n   #{sourceList}"
   Pod::UI.puts "is Archive ：\n   #{archiveList}"
   Pod::UI.puts "is Framework ：\n   #{frameworkList}"
-  Pod::UI.puts "is debugPackage ：\n   #{debugPackageList}"
-  Pod::UI.puts "is releasePackage ：\n   #{releasePackageList}"
+  # Pod::UI.puts "is debugPackage ：\n   #{debugPackageList}"
+  # Pod::UI.puts "is releasePackage ：\n   #{releasePackageList}"
 
   # 如果某一个Pod和上一次比发生变化，需要清除缓存
   # 1. 清除pod缓存
@@ -126,8 +136,10 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
   # 3. 保存本次配置
   #
 
-  caf_hash = Hash["sourceList" => sourceList, "archiveList" => archiveList, "frameworkList" => frameworkList,
-                  "debugPackageList" => debugPackageList, "releasePackageList" => releasePackageList]
+  # caf_hash = Hash["sourceList" => sourceList, "archiveList" => archiveList, "frameworkList" => frameworkList,
+  #                 "debugPackageList" => debugPackageList, "releasePackageList" => releasePackageList]
+  caf_hash = Hash["sourceList" => sourceList, "archiveList" => archiveList, "frameworkList" => frameworkList]
+
 
   config = Pod::Config.instance
 
@@ -141,17 +153,18 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
     cafConfig = YAML.load(File.open(configFile))
   else
     FileUtils.touch configFile
-    cafConfig = Hash["sourceList" => [], "archiveList" => [], "frameworkList" => [],
-                     "debugPackageList" => [], "releasePackageList" => []]
+    # cafConfig = Hash["sourceList" => [], "archiveList" => [], "frameworkList" => [],
+    #                  "debugPackageList" => [], "releasePackageList" => []]
+    cafConfig = Hash["sourceList" => [], "archiveList" => [], "frameworkList" => []]
   end
   # 比较不同
   changedSubPods = Array.new
   cafConfig.each do |key, value|
-    if key == "debugPackageList"
-      changedSubPods |= (value | debugPackageList) - (value & debugPackageList)
-    elsif key == "releasePackageList"
-      changedSubPods |= (value | releasePackageList) - (value & releasePackageList)
-    elsif key == "sourceList"
+    # if key == "debugPackageList"
+    #   changedSubPods |= (value | debugPackageList) - (value & debugPackageList)
+    # elsif key == "releasePackageList"
+    #   changedSubPods |= (value | releasePackageList) - (value & releasePackageList)
+    if key == "sourceList"
       changedSubPods |= (value | sourceList) - (value & sourceList)
     elsif key == "archiveList"
       changedSubPods |= (value | archiveList) - (value & archiveList)
@@ -162,11 +175,9 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
   Pod::UI.puts "\nchanged sub Pod is:\n   " + changedSubPods.to_s if changedSubPods.length > 0
   # changedPod 里是根据subspec来存的，需要进行合并，找到pod库而不是含有subspec的库
   changedPods = Array.new
-  changedSubPods.each do  |subPod|
-    subPod.chomp!("_SOURCE")
-    subPod.chomp!("_ARCHIVE")
-    subPod.chomp!("_FRAMEWORK")
-    changedPods << subPod
+  changedSubPods.each do |subPod|
+    podName  = subPod.split("/")[0]
+    changedPods << podName
   end
   # changedPods = changedPods | needUpdatePodList
   changedPods.uniq!
@@ -175,14 +186,15 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
 
   # 根据不同删除cache
   podRoot = config.project_pods_root
-  changedPods.each do |changedPod|
-    if needUpdatePodList.delete(changedPod)
+  changedSubPods.each do |changedSubPod|
+    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
     end
-    if changedPod =~ /^(?i)LJ/ or changedPod =~ /^(?i)Lianjia/
+    if changedSubPod =~ /^(?i)LJ/ or changedSubPod =~ /^(?i)Lianjia/
       # 清除目录 pods 文件夹下的缓存
       changedPodPath = podRoot + changedPod
       FileUtils.rm_r(changedPodPath) if changedPodPath.exist?
@@ -190,28 +202,30 @@ Pod::HooksManager.register('cocoapods-cafswitcher', :pre_install) do |installer_
   end
 
   # 把新的配置写入file
-  File.open(configFile, "wb") {|f| YAML.dump(caf_hash, f) }
+  File.open(configFile, "wb") {|f| YAML.dump(caf_hash, f) } if changedSubPods.length > 0
 end
 
 
 def setEnv(name, suffix)
-  ENV["#{name}#{suffix}"] = '1'
-  podName = name.split("_")[0]
+  envName = name.gsub(/[\/]/, '_')
+  ENV["#{envName}#{suffix}"] = '1'
+  podName = name.split("/")[0]
   ENV["#{podName}#{suffix}"] = '1'
 end
 
 
 
 def cleanENV(name)
-  ENV.delete("#{name}_SOURCE")
-  ENV.delete("#{name}_ARCHIVE")
-  ENV.delete("#{name}_FRAMEWORK")
+  envName = name.gsub(/[\/]/, '_')
+  ENV.delete("#{envName}_SOURCE")
+  ENV.delete("#{envName}_ARCHIVE")
+  ENV.delete("#{envName}_FRAMEWORK")
   ENV.delete('IS_SOURCE')
   ENV.delete('IS_ARCHIVE')
 end
 
-def cleanDebugENV(name)
-  ENV.delete("#{name}_DEBUG")
-  ENV.delete("#{name}_RELEASE")
-  ENV.delete('IS_DEBUG')
-end
+# def cleanDebugENV(name)
+#   ENV.delete("#{name}_DEBUG")
+#   ENV.delete("#{name}_RELEASE")
+#   ENV.delete('IS_DEBUG')
+# end

data/lib/cocoapods-cafswitcher/gem_version.rb

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

data/lib/cocoapods-cafswitcher/podfile_switch.rb

@@ -21,15 +21,15 @@ module Pod
 
     # add flag
     # :isDebugPackage
-    def self.isDebugPackage
-      :isDebugPackage
-    end
+    # def self.isDebugPackage
+    #   :isDebugPackage
+    # end
 
     # add flag
     # :isReleasePackage
-    def self.isReleasePackage
-      :isReleasePackage
-    end
+    # def self.isReleasePackage
+    #   :isReleasePackage
+    # end
 
     @@sourceList = Array.new
 
@@ -49,17 +49,17 @@ module Pod
       @@frameworkList
     end
 
-    @@debugPackageList = Array.new
-
-    def Podfile.debugPackageList
-      @@debugPackageList
-    end
-
-    @@releasePackageList = Array.new
-
-    def Podfile.releasePackageList
-      @@releasePackageList
-    end
+    # @@debugPackageList = Array.new
+    #
+    # def Podfile.debugPackageList
+    #   @@debugPackageList
+    # end
+    #
+    # @@releasePackageList = Array.new
+    #
+    # def Podfile.releasePackageList
+    #   @@releasePackageList
+    # end
 
     # all the name of Pod
     @@allPodName = Array.new
@@ -90,9 +90,9 @@ module Pod
 
       # Enable debug package for all pods
       # it has a lower priority to other binary settings
-      def all_debug_package!
-        ENV['IS_DEBUG'] = '1'
-      end
+      # def all_debug_package!
+      #   ENV['IS_DEBUG'] = '1'
+      # end
 
     end
 
@@ -105,7 +105,7 @@ module Pod
         isFramework = options.has_key?(Pod::Podfile.isFramework)
         # pod_name = Specification.root_name(name)
         if isFramework
-          Pod::Podfile.frameworkList << name.gsub(/[\/]/, '_')
+          Pod::Podfile.frameworkList << name
         end
         requirements.pop if options.empty?
       end
@@ -117,7 +117,7 @@ module Pod
         isSource = options.has_key?(Pod::Podfile.isSource)
         # pod_name = Specification.root_name(name)
         if isSource
-          Pod::Podfile.sourceList << name.gsub(/[\/]/, '_')
+          Pod::Podfile.sourceList << name
         end
         requirements.pop if options.empty?
       end
@@ -129,35 +129,35 @@ module Pod
         isArchive = options.has_key?(Pod::Podfile.isArchive)
         # pod_name = Specification.root_name(name)
         if isArchive
-          Pod::Podfile.archiveList << name.gsub(/[\/]/, '_')
+          Pod::Podfile.archiveList << name
         end
 
         requirements.pop if options.empty?
       end
 
-      def parse_debug_package(name, requirements)
-        options = requirements.last
-        return requirements unless options.is_a?(Hash)
-
-        isDebugPackage = options.has_key?(Pod::Podfile.isDebugPackage)
-        # pod_name = Specification.root_name(name)
-        if isDebugPackage
-          Pod::Podfile.debugPackageList << name.gsub(/[\/]/, '_')
-        end
-        requirements.pop if options.empty?
-      end
-
-      def parse_release_package(name, requirements)
-        options = requirements.last
-        return requirements unless options.is_a?(Hash)
-
-        isReleasePackage = options.has_key?(Pod::Podfile.isReleasePackage)
-        # pod_name = Specification.root_name(name)
-        if isReleasePackage
-          Pod::Podfile.releasePackageList << name.gsub(/[\/]/, '_')
-        end
-        requirements.pop if options.empty?
-      end
+      # def parse_debug_package(name, requirements)
+      #   options = requirements.last
+      #   return requirements unless options.is_a?(Hash)
+      #
+      #   isDebugPackage = options.has_key?(Pod::Podfile.isDebugPackage)
+      #   # pod_name = Specification.root_name(name)
+      #   if isDebugPackage
+      #     Pod::Podfile.debugPackageList << name.gsub(/[\/]/, '_')
+      #   end
+      #   requirements.pop if options.empty?
+      # end
+      #
+      # def parse_release_package(name, requirements)
+      #   options = requirements.last
+      #   return requirements unless options.is_a?(Hash)
+      #
+      #   isReleasePackage = options.has_key?(Pod::Podfile.isReleasePackage)
+      #   # pod_name = Specification.root_name(name)
+      #   if isReleasePackage
+      #     Pod::Podfile.releasePackageList << name.gsub(/[\/]/, '_')
+      #   end
+      #   requirements.pop if options.empty?
+      # end
 
       def parse_needUpdatePod_git(name, requirements)
         options = requirements.last
@@ -166,11 +166,7 @@ module Pod
         isGitPath = options.has_key?(:git)
         # pod_name = Specification.root_name(name)
         if isGitPath
-          index = name =~ /[\/]/
-          if not index
-            index = name.length
-          end
-          Pod::Podfile.needUpdatePodList << name[0,index]
+          Pod::Podfile.needUpdatePodList << name
         end
         requirements.pop if options.empty?
       end
@@ -182,11 +178,7 @@ module Pod
         isPath = options.has_key?(:path)
         # pod_name = Specification.root_name(name)
         if isPath
-          index = name =~ /[\/]/
-          if not index
-            index = name.length
-          end
-          Pod::Podfile.needUpdatePodList << name[0,index]
+          Pod::Podfile.needUpdatePodList << name
         end
         requirements.pop if options.empty?
       end
@@ -200,12 +192,12 @@ module Pod
         parse_isFramework(name, requirements)
         parse_isSource(name, requirements)
         parse_isArchive(name, requirements)
-        parse_debug_package(name, requirements)
-        parse_release_package(name, requirements)
+        # parse_debug_package(name, requirements)
+        # parse_release_package(name, requirements)
         parse_needUpdatePod_git(name, requirements)
         parse_needUpdatePod_path(name, requirements)
         # pod_name = Specification.root_name(name)
-        Pod::Podfile.allPodName << name.gsub(/[\/]/, '_')
+        Pod::Podfile.allPodName << name
         old_method.bind(self).(name, requirements)
       end
 
@@ -221,8 +213,8 @@ module Pod
         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)
+        # isDebugPackage = options.delete(Pod::Podfile.isDebugPackage)
+        # isReleasePackage = options.delete(Pod::Podfile.isReleasePackage)
         tmp_hash.pop if options.empty?
         tmp_hash
       end

metadata

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