cocoapods-jsource 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1f41012354f907c69ab430275b225d557aae7816be39059850418b839aafda6
-  data.tar.gz: 8f1e481b717aae28942f3e153da93e147499524c883fc6c3fd11f664044d491f
+  metadata.gz: 67322efccb2959369205ff4e95f974670f0f0dd9fc3a1b9f60bb94584958a42b
+  data.tar.gz: e51f5e1d5bb70389a5d7ba501c7e5f32a4b3c468bb02727fdfa64c67874a5819
 SHA512:
-  metadata.gz: 6113c095233da159a99fad3311a1c999e377e64b4eaf4835ae3a5d7cedf687b0d8b0294c8c8e5cc8e66176b11d6b43d41f68bff094a90ec2cd029f9cad9d9733
-  data.tar.gz: dcf0a3f39a72152b9b985cb83340f85a487e0f4c1a6aaf27783eef3f95622514c1ec97525b8802921086ac076480fe0dadc8f5e3255f64c07be0ce6686a60643
+  metadata.gz: 958bfe53fad947326aa12c53f313ff2f4cbbb0f0ad2ce6ff013c63a18226299237af9a989a6ebf419c8ee0542277cf1ae0d001ce204d0767e39735ee78da62fc
+  data.tar.gz: 29158cd9629837b9189e8ea7dfc8ff5a0b71b763eeafee391f41fe7da8d2ac6780fae8fa5871f04495153b00f24dc64ea4d4318bb7dad10b33169d5207aa3e05

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://gems.ruby-china.com/"
 
 # Specify your gem's dependencies in cocoapods-jsource.gemspec
 gemspec

data/Gemfile.lock

@@ -1,31 +1,34 @@
 PATH
   remote: .
   specs:
-    cocoapods-jsource (0.0.2)
+    cocoapods-jsource (0.0.3)
       cocoapods
 
 GEM
-  remote: https://rubygems.org/
+  remote: https://gems.ruby-china.com/
   specs:
-    CFPropertyList (3.0.0)
+    CFPropertyList (3.0.1)
     activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    algoliasearch (1.27.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     atomos (0.1.3)
     bacon (1.2.0)
-    claide (1.0.2)
-    cocoapods (1.7.5)
+    claide (1.0.3)
+    cocoapods (1.8.4)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.5)
+      cocoapods-core (= 1.8.4)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.1, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -34,18 +37,20 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.10.0, < 2.0)
-    cocoapods-core (1.7.5)
+      xcodeproj (>= 1.11.1, < 2.0)
+    cocoapods-core (1.8.4)
       activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.2.2)
+    cocoapods-downloader (1.3.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.3.1)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
@@ -55,12 +60,12 @@ GEM
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
+    httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    metaclass (0.0.4)
-    minitest (5.11.3)
-    mocha (1.9.0)
-      metaclass (~> 0.0.1)
+    json (2.2.0)
+    minitest (5.13.0)
+    mocha (1.10.1)
     mocha-on-bacon (0.2.3)
       mocha (>= 0.13.0)
     molinillo (0.6.6)
@@ -69,12 +74,12 @@ GEM
     netrc (0.11.0)
     prettybacon (0.0.2)
       bacon (~> 1.2)
-    rake (12.3.2)
+    rake (13.0.1)
     ruby-macho (1.4.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.11.0)
+    xcodeproj (1.13.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

data/lib/cocoapods-jsource/command/jsource.rb

@@ -39,7 +39,6 @@ module Pod
         path
       end
 
-
       def cache_file
         cache_path = cache_dir
         return cache_path + "jsource.yaml"
@@ -55,6 +54,21 @@ module Pod
         cache_dict
       end
 
+      def version_from_path(component_name, path)
+        cache_dict = cache_object
+        version = nil
+        cache_dict.each do |name, verision_hash|
+          verision_hash.each do |version_string, detail_hash|
+            return version unless detail_hash.include? :source_paths
+            detail_hash[:source_paths].each do |binary_name, source_path|
+              return version_string if source_path == path and binary_name == component_name
+            end
+          end
+        end
+        return version
+      end
+
+
       def dump_to_yaml(hash)
         File.open(cache_file, "wb+") {|f| YAML.dump(hash, f) }
       end

data/lib/cocoapods-jsource/command/jsource/add.rb

@@ -1,6 +1,7 @@
-
 require "cocoapods-core/lockfile"
 require 'fileutils'
+require 'cocoapods-jsource/command/xcode_manager'
+require 'cocoapods'
 
 module Pod
   class Command
@@ -12,85 +13,286 @@ module Pod
           Add source code debugging capabilities to binary.
         DESC
 
-        def self.options
-          [
-              ['--names', 'component names to be added'],
-              ['--gits', 'component git url to be added'],
-          ].concat(super)
-        end
+        self.arguments = [
+            CLAide::Argument.new('NAMES', true),
+        ]
 
         def initialize(argv)
-          @namesString = argv.option('names')
+          @namesString = argv.shift_argument
           @names = @namesString.split(',') unless @namesString.nil?
-          @gitsString = argv.option('gits')
-          @gits = @gitsString.split(',') unless  @gitsString.nil?
+          @cache_dict = cache_object
+          @manager = XcodeManager.new(argv)
+          @remote = argv.flag?('remote')
+          @index = -1
           super
         end
 
+        def self.options
+          [
+              ['--remote', 'add components from internet'],
+          ].concat(super)
+        end
+
         def validate!
           super
-          help! 'component name is required.' unless @names.length > 0
-          help! 'component git url is required.' unless @gits.length > 0
-          help! 'names number must be equal to gits number' unless @names.length == @gits.length
+          help! 'component name is required.' if @namesString.nil?
+          #help! 'component git url is required.' unless @gits.length > 0
+          #help! 'names number must be equal to gits number' unless @names.length == @gits.length
           help! 'podfile.lock file is required. you need pod install/update' unless File.exist? config.lockfile_path
         end
 
+        def have_cached(component_name, version, subspecs)
+          return false unless @cache_dict.has_key? component_name
+          pod_cache_dict = @cache_dict[component_name]
+          return false unless pod_cache_dict.has_key? version
+          return false unless pod_cache_dict[version].has_key? :source_paths
+          source_path_hash = pod_cache_dict[version][:source_paths]
+          return false unless source_path_hash.length > 0
+          if subspecs.length > 0
+            tem_list = subspecs & (source_path_hash.keys - [component_name])
+            return false unless tem_list == subspecs
+            subspecs.each do |binary_name|
+              return false unless source_path_hash.keys.include? binary_name
+              dir_path = source_path_hash[binary_name]
+              return false unless File.exist? dir_path
+            end
+          else
+            source_path_hash.each do |binary_name, dir_path|
+              return false unless File.exist? dir_path
+            end
+          end
+          return true
+        end
+
+        def spec_with_name(name, version)
+          set = config.sources_manager.search(Dependency.new(name, version))
+          if set
+            path = set.specification_paths_for_version(Version.new(version)).first
+            spec = Specification.from_file(path)
+            spec.root
+          else
+            raise Informative, "Unable to find a specification for `#{name}`"
+          end
+        end
+
+        def download_component_to_path(component_name, version, source_path_hash={})
+          source_path_hash.each do |binary_name, source_path|
+            sandbox_path = source_path.split("Pods")[0] + "Pods"
+            sandbox_component_path = "#{sandbox_path}/#{component_name}"
+            binary_path = "#{sandbox_path}/#{binary_name}"
+            if File.exist? sandbox_component_path
+              UI.puts "using #{binary_name} #{version}"
+              UI.puts "\t#{source_path.to_s}"
+              FileUtils.copy_entry(sandbox_component_path, binary_path) unless File.exist? binary_path
+            else
+              UI.puts "downloading #{binary_name} #{version}"
+              UI.puts "\t #{source_path.to_s}"
+              FileUtils.mkdir_p [binary_path] unless File.exist? binary_path
+              sandbox = Sandbox.new(sandbox_path)
+              spec = spec_with_name(component_name, version)
+              specs = { :ios => [spec] }
+              installer = Installer::PodSourceInstaller.new(sandbox, config.podfile, specs, :can_cache => true)
+              installer.install!
+              #installer.clean!
+              # TODO validtarget
+              # 改名
+              if binary_name != component_name and File.exist? sandbox_component_path
+                FileUtils.copy_entry(sandbox_component_path, binary_path) unless File.exist? binary_name
+              end
+            end
+          end
+        end
+
+        def local_have_source_files(component_name)
+          files = Dir::glob "Pods/#{component_name}/**/*.m"
+          if files and files.length > 0
+            return true
+          end
+          return false
+        end
+
+        def source_files(component_name)
+          return nil unless local_have_source_files component_name
+          souces = []
+          Dir::foreach "Pods/#{component_name}" do |path|
+            next if path.include? "Frameworks"
+            souces << path
+          end
+          souces
+        end
+
+        def get_file_list(path)
+          list = []
+          Dir.entries(path).each do |sub|
+            if sub != '.' && sub != '..'
+              if File.directory?("#{path}/#{sub}")
+                list << "#{path}/#{sub}"
+                list = list + get_file_list("#{path}/#{sub}")
+              else
+                list << "#{path}/#{sub}"
+              end
+            end
+          end
+          list
+        end
+
+        def local_component_to_path(component_name, version, source_paths_hash)
+          path = "Pods/#{component_name}"
+          # TODO 没有源码状态
+          if !File.exist? path
+            # copy files to source_paths
+            UI.puts "本地目录不存在，请执行pod install/update 或者输入远程仓库地址"
+            exit 1
+          end
+          #file_list = get_file_list path
+          source_paths_hash.each do |binary_name, source_path_list|
+            if source_path_list.length > 0
+              dest_file_path = source_path_list[0].split("Pods")[0] + "Pods/#{binary_name}"
+              UI.puts "copying #{binary_name} to #{dest_file_path}"
+            end
+            source_path_list.each do |dest_file_path|
+              origin_file = dest_file_path.split("Pods/#{binary_name}")[-1]
+              origin_file_path = path + origin_file
+              if !File.exist? origin_file_path
+                UI.warn "本地不存在#{origin_file_path}, 可能使用了虚拟subspec或者本地源码缓存有问题。推荐加上 --remote 参数"
+                exit 1
+              end
+              if File.directory? origin_file_path
+                FileUtils.mkdir_p [dest_file_path], :mode => 0700 unless File.exist? dest_file_path
+              else
+                parent_dir = File.dirname dest_file_path
+                FileUtils.mkdir_p [parent_dir], :mode => 0700 unless File.exist? parent_dir
+                FileUtils.copy origin_file_path, dest_file_path unless File.exist? dest_file_path
+                h_origin_file_path = origin_file_path.gsub(/(mm|m|c)$/, "h")
+                h_dest_file_path = dest_file_path.gsub(/(mm|m|c)$/, "h")
+                parent_dir = File.dirname h_dest_file_path
+                FileUtils.mkdir_p [parent_dir], :mode => 0700 unless File.exist? parent_dir
+                FileUtils.copy h_origin_file_path, h_dest_file_path unless File.exist? h_dest_file_path
+              end
+            end
+          end
+
+        end
+
+
+        def component_cache(component_name)
+          if @cache_dict.has_key? component_name
+            component_cache_dict = @cache_dict[component_name]
+          end
+          component_cache_dict
+        end
+
+
+        def local_source_paths(component_name, subspecs, source_paths_hash)
+          local_hash = {}
+          source_paths_hash.each do |binary_name, source_paths|
+            need_add = false
+            if binary_name != component_name
+              if subspecs.include? binary_name
+                need_add = true
+              end
+              if subspecs.length == 0
+                need_add = true
+              end
+            else
+              need_add = true
+            end
+            local_hash[binary_name] = source_paths if need_add
+          end
+          local_hash
+        end
+
+
+        def unite_source_paths_hash(source_paths_hash)
+          source_path_hash = {}
+          source_paths_hash.each do |binary_name, source_paths|
+            source_path_hash[binary_name] = source_paths[0].split("Pods")[0] + "Pods/#{binary_name}" if source_paths.length > 0
+          end
+          source_path_hash
+        end
+
         def run
-          # 获取当前目录
-          index = 0
-          cache_dict = cache_object
+          # 在Pods 目录下创建Debug.xcodeproj 文件。
+          debug_xcodeproj = @manager.generate_debug_xcodeproj
+
+          # 获取源码，并添加到工程里。
           @names.each do |component_name|
-            pod_cache_dict = {}
-            if cache_dict.has_key? component_name
-              pod_cache_dict = cache_dict[component_name]
-            end
-            version = component_version component_name
+            @index = @index + 1
+            version, subspecs = component_info component_name
             if version.length == 0
               UI.puts "#{component_name} 找不到对应的版本信息，不做任何处理"
               next
             end
-            if pod_cache_dict.has_key? version
-              UI.puts "#{component_name} #{version} 已经存在，缓存为 #{pod_cache_dict[version][:sourcelist].to_s}"
-              next
-            end
-            git = @gits[index]
-            # 获取subspec
-            source_file_list = get_source_file_list_from_binary(component_name)
-            if source_file_list.length == 0
-              UI.puts "#{component_name} 找不到对应的二进制，不做任何处理"
-              next
-            end
-            UI.puts "开始下载源码..."
-            for source_path in source_file_list
-              create_working_directory source_path
-              cmd ="git clone -b #{component_name}-#{version} --depth 1 #{git} #{source_path} >/dev/null 2>&1"
-              `#{cmd}`
+            source_path_hash = {}
+            if have_cached component_name, version, subspecs
+              UI.puts "Using #{component_name} #{version} in #{@cache_dict[component_name][version][:source_paths]}"
+              source_path_hash = @cache_dict[component_name][version][:source_paths]
+            else
+              source_paths_hash = source_paths_from_binary(component_name)
+              if source_paths_hash.length == 0
+                UI.puts "#{component_name} 找不到对应的二进制，不做任何处理"
+                next
+              end
+              source_paths_hash = local_source_paths component_name, subspecs, source_paths_hash
+              source_path_hash = unite_source_paths_hash source_paths_hash
+              if @remote
+                # 需要把值合并。
+                download_component_to_path component_name, version, source_path_hash
+              else
+                local_component_to_path component_name, version, source_paths_hash
+              end
+
             end
-            pod_cache_dict[version] = {"git":git, "sourcelist":source_file_list, "version":version}
-            cache_dict[component_name] = pod_cache_dict
-            UI.puts "#{component_name} 源码创建成功，目录为 #{source_file_list.to_s}"
-            index = index + 1
+
+            # add_component_to_debug
+            ENV["IS_SOURCE"] = "1"
+            spec = spec_with_name component_name, version
+            @manager.add_component_to_debug component_name, source_path_hash, debug_xcodeproj, spec
+            # add_component_to_cache
+            pod_cache_dict = {}
+            pod_cache_dict[version] = {"source_paths":source_path_hash, "version":version}
+            #if @use_remote
+            #  pod_cache_dict[version]["git"] = @gits[@index]
+            #end
+            @cache_dict[component_name] = pod_cache_dict
+            UI.puts "#{component_name} 源码创建成功，目录为 #{source_path_hash.to_s}"
           end
-          dump_to_yaml cache_dict
+          @manager.add_debug_to_workspace
+          dump_to_yaml @cache_dict
         end
 
-        def component_version(component_name)
+        def component_info(component_name)
           return unless File.exist? config.lockfile_path
           version=""
           lockfile = Lockfile.from_file config.lockfile_path
           dependencies = lockfile.internal_data["DEPENDENCIES"]
+          subspecs = []
           dependencies.each do |dependency|
+            if !dependency.include? "(="
+              UI.puts "podfile中 #{component_name} 可能没有指定版本，需要指定确定的版本才能使用。"
+              exit 1
+            end
             list = dependency.split(" (")
             name = list[0]
+            if name.include? "/"
+              name_list = name.split("/")
+              subspec = name.gsub(/\//,"")
+              name = name_list[0]
+            end
             next unless name == component_name
-            version = list[-1].sub(")", "").sub("=", "").sub(" ", "")
+            version = list[-1].split("/")[0].sub(")", "").sub("=", "").sub(" ", "") if version == ""
+            subspecs << subspec if subspec
+            spec = spec_with_name component_name, version
+            spec.default_subspecs.each do |subspec_spec|
+              subspecs = subspecs | ["#{component_name}#{subspec_spec}"]
+            end
           end
-          version
+          return version, subspecs
         end
 
         # 根据组件名获取组件的源码调试地址
-        def get_source_file_list_from_binary(component_name)
-          source_file_list = []
+        def source_paths_from_binary(component_name)
+          source_path_hash = {}
           component_pod_path = config.sandbox_root + component_name
           binary_path_list = `find #{component_pod_path} -name "#{component_name}*" -type l`.strip.split("\n").sort
           binary_hash = {}
@@ -102,29 +304,38 @@ module Pod
           end
           if binary_hash.length == 0
             UI.puts "#{component_name} 找不到二进制组件或者找不到对应的版本信息，不做任何处理"
-            return source_file_list
+            exit 1
           end
 
           binary_hash.each do |binary_name, binary_path|
             libbinary_file_name = "lib#{component_name}.a"
-            source_path_list = []
-            UI.puts "正在解析二进制#{binary_path}源码位置"
+            at_name_list = []
             if binary_name.to_s.end_with? libbinary_file_name
               # .a 文件
-              source_path_list = `dwarfdump -arch x86_64 #{binary_path} | grep 'AT_name.*#{binary_name}'`.strip.split("\n").sort
+              at_name_list = `dwarfdump -arch x86_64 #{binary_path} | grep 'AT_name.*#{binary_name}'`.strip.split("\n").sort
             else
               # framework 文件
-              source_path_list = `dwarfdump -arch x86_64 #{binary_path} | grep 'DW_AT_name.*#{binary_name}'`.strip.split("\n").sort
+              at_name_list = `dwarfdump -arch x86_64 #{binary_path} | grep 'DW_AT_name.*#{binary_name}'`.strip.split("\n").sort
             end
-            source_path_list.each do |tmp_source_path|
+            #if source_file.length == 0
+            #  UI.puts "在#{binary_path} 里没有找到合适的调试信息~"
+            #  next
+            #end
+            source_list = []
+            at_name_list.each do |tmp_source_path|
               if tmp_source_path.include?("Pods/#{binary_name}")
-                source_path = tmp_source_path.strip.split("(\"")[-1].split(binary_name)[0] + "#{binary_name}"
-                source_file_list << source_path if source_path.to_s.length > 0
-                break
+                source_path = tmp_source_path.strip.split("(\"")[-1].split("\")")[0]
+                source_list << source_path if source_path.to_s.length > 0
               end
             end
+            if source_list.length == 0
+              UI.puts "#{component_name} 没有找到调试信息, 可能是早期打的组件。建议这个组件重新生成。"
+              exit 1
+            else
+              source_path_hash[binary_name] = source_list
+            end
           end
-          source_file_list
+          source_path_hash
         end
 
 

data/lib/cocoapods-jsource/command/jsource/clean.rb

@@ -1,4 +1,3 @@
-
 require "cocoapods-core/lockfile"
 require 'fileutils'
 
@@ -6,10 +5,22 @@ module Pod
   class Command
     class Jsource < Command
       class Clean < Jsource
-        self.summary = 'Add source debugging function'
+        self.summary = 'Clean source debugging function'
 
         self.description = <<-DESC
-          Clean the cache of the jsource(s) whose name matches `NAME`.
+          Remove the cache for a given pod, or clear the cache completely.
+
+          If you want to clean Debug_xcodeproj, please add "NAME",
+          if you want to clean all, please add "—all"
+
+          If you want to clear the cache, add "--cache":
+
+              If there is multiple cache for various versions of the requested pod, you
+              will be asked which one to clean. Use `--all` to clean them all.
+
+              If you do not give a pod `NAME`, you need to specify the `--all` flag
+              (this is to avoid cleaning all the cache by mistake).
+
         DESC
 
         self.arguments = [
@@ -18,46 +29,57 @@ module Pod
 
         def self.options
           [
-              ['--all', 'Remove all the cached pods without asking'],
+              ['--all', 'Remove all the project debug pods without asking'],
+              ['--cache', 'Remove all the cached pods without asking']
           ].concat(super)
         end
 
         def initialize(argv)
           @pod_name = argv.shift_argument
           @wipe_all = argv.flag?('all')
+          @wipe_cache = argv.flag?('cache')
           @cache_dict = cache_object
+          @manager = XcodeManager.new(argv)
           super
         end
 
         def validate!
           super
-          if @pod_name.nil? && !@wipe_all
-            # Security measure, to avoid removing the pod cache too agressively by mistake
-            help! 'You should either specify a pod name or use the --all flag'
+          if @pod_name.nil?
+            help! 'You should use the --all flag' if @wipe_all.nil?
           end
         end
 
         def run
           if @pod_name.nil?
             # Note: at that point, @wipe_all is always true (thanks to `validate!`)
-            # Remove all
-            clear_cache
+            if @wipe_all
+              if @wipe_cache
+                clear_cache
+              else
+                @manager.clean_debug
+              end
+            end
           else
             # Remove only cache for this pod
-            cache_descriptors = @cache_dict[@pod_name].values
-            if cache_descriptors.nil?
-              UI.notice("No cache for pod named #{@pod_name} found")
-            elsif cache_descriptors.count > 1 && !@wipe_all
-              # Ask which to remove
-              choices = cache_descriptors.map { |c| "#{@pod_name} v#{c[:version]}" }
-              index = UI.choose_from_array(choices, 'Which pod cache do you want to remove?')
-              remove_caches([cache_descriptors[index]])
+            if @wipe_cache
+              cache_descriptors = @cache_dict[@pod_name].values
+              if cache_descriptors.nil?
+                UI.notice("No cache for pod named #{@pod_name} found")
+              elsif cache_descriptors.count > 1 && !@wipe_all
+                # Ask which to remove
+                choices = cache_descriptors.map { |c| "#{@pod_name} v#{c[:version]}" }
+                index = UI.choose_from_array(choices, 'Which pod cache do you want to remove?')
+                # 删除debug
+                remove_caches([cache_descriptors[index]])
+              else
+                # Remove all found cache of this pod
+                remove_caches(cache_descriptors)
+              end
             else
-              # Remove all found cache of this pod
-              remove_caches(cache_descriptors)
+              @manager.remove_component_from_debug(@pod_name)
             end
           end
-          dump_to_yaml @cache_dict
         end
 
         private
@@ -70,11 +92,11 @@ module Pod
         #
         def remove_caches(cache_descriptors)
           cache_descriptors.each do |desc|
-            sourcelist = desc[:sourcelist]
-            next if sourcelist.length == 0
-            sourcelist.each do |source|
-              UI.puts "Removing cache #{source} (#{desc[:version]})"
-              parent = source.split("Pods")[0]
+            source_paths = desc[:source_paths]
+            next if source_paths.length == 0
+            source_paths.each do |binary_name, source_path|
+              UI.puts "Removing cache #{source_path} (#{desc[:version]})"
+              parent = source_path.split("Pods")[0]
               FileUtils.rm_rf(parent) if File.exist? parent
             end
             if @cache_dict[@pod_name].has_key? desc[:version]
@@ -85,30 +107,27 @@ module Pod
               end
             end
           end
+          dump_to_yaml @cache_dict
         end
 
         def clear_cache
           @cache_dict.each do |pod_name, version_dict|
             version_dict.each do |version, pod_dict|
-              git=""
-              source=""
-              git=pod_dict[:git] if pod_dict.has_key? :git
-              sourcelist=pod_dict[:sourcelist] if pod_dict.has_key? :sourcelist
-              sourcelist.each do |source|
-                UI.message("Removing the #{pod_name} jsource cache dir #{cache_dir}") do
-                  parent = source.split("Pods")[0]
+              source_paths=pod_dict[:source_paths] if pod_dict.has_key? :source_paths
+              source_paths.each do |binary_name, source_path|
+                UI.message("Removing the #{binary_name} jsource cache dir #{source_path}") do
+                  parent = source_path.split("Pods")[0]
                   FileUtils.rm_rf(parent) if File.exist? parent
                 end
               end
-
             end
           end
           UI.message("Removing the jsource configuration dir #{cache_file}") do
             FileUtils.rm_rf(cache_file)
             @cache_dict = {}
           end
+          dump_to_yaml @cache_dict
         end
-
       end
     end
   end

data/lib/cocoapods-jsource/command/jsource/list.rb

@@ -17,15 +17,18 @@ module Pod
         ]
 
         def self.options
-          [[
-               '--short', 'Only print the path relative to the cache root'
-           ]].concat(super)
+          [
+              ['--short', 'Only print the path relative to the cache root'],
+              ['--cache', 'Only print the cached pods']
+          ].concat(super)
         end
 
         def initialize(argv)
           @pod_name = argv.shift_argument
           @short_output = argv.flag?('short')
+          @pod_cache = argv.flag?('cache')
           @cache_dict = cache_object
+          @manager = XcodeManager.new(argv)
           super
         end
 
@@ -33,9 +36,19 @@ module Pod
           return if @cache_dict.nil?
           result = ""
           if @pod_name
-            result = @cache_dict[@pod_name] if @cache_dict.has_key? @pod_name
+            if @pod_cache
+              result = @cache_dict[@pod_name] if @cache_dict.has_key? @pod_name
+            else
+              # 获取debug里 这个pod_name 的关键信息
+              result = @manager.component_in_debug @pod_name
+            end
           else
-            result = @cache_dict
+            if @pod_cache
+              result = @cache_dict
+            else
+              # 获取debug里所有的group信息。
+              result = @manager.all_components_in_debug
+            end
           end
           if @short_output
             result = result.keys

data/lib/cocoapods-jsource/command/xcode_manager.rb

@@ -0,0 +1,218 @@
+require 'xcodeproj'
+require 'cocoapods'
+require 'cocoapods-jsource/command/xcodeproj_extern'
+
+module Pod
+  class Command
+    class Jsource < Command
+      class XcodeManager < Jsource
+
+        def initialize(argv)
+          @debug_path = 'Pods/Debug.xcodeproj'
+          @workspace_name = `ls | grep .xcworkspace`.strip
+          @cache_dict = cache_object
+          super
+        end
+
+        def validate!
+          super
+          help! '请先pod install/update 之后,在运行这个命令' if !File.exist? @workspace_name or !File.exist? "Pods"
+        end
+
+        def generate_debug_xcodeproj()
+          debug_xcodeproj = get_debug_xcodeproj
+          if debug_xcodeproj.nil?
+            debug_xcodeproj = Xcodeproj::Project.new(@debug_path)
+            # 去掉Frameworks和Products
+            #debug_xcodeproj.groups.each do |component_group|
+            #  component_group.clear
+            #  component_group.remove_from_project
+            #end
+          end
+          debug_xcodeproj
+        end
+
+        def get_debug_xcodeproj()
+          debug_xcodeproj = nil
+          if File.exist? @debug_path
+            debug_xcodeproj = Xcodeproj::Project.open(@debug_path)
+          end
+          debug_xcodeproj
+        end
+
+        def add_files_to_group(debug_xcodeproj, group, files=[])
+          Dir.foreach(group.real_path).sort_by { |object| object.to_s }.each do |entry|
+            filePath = File.join(group.real_path, entry)
+            next unless files.length == 0 or files.include? filePath
+            ext_name = File.extname(entry)
+            # 过滤目录和.DS_Store文件
+            if !File.directory?(filePath) && entry != ".DS_Store" then
+              # 向group中增加文件引用
+              group.new_reference(filePath)
+              # 目录情况下, 递归添加
+            elsif File.directory?(filePath) && entry != '.' && entry != '..' then
+              hierarchy_path = group.hierarchy_path[1, group.hierarchy_path.length]
+              subGroup = debug_xcodeproj.main_group.find_subpath(hierarchy_path + '/' + entry, true)
+              subGroup.set_source_tree('<group>')
+              subGroup.set_path(group.real_path + entry)
+              add_files_to_group(debug_xcodeproj, subGroup, files)
+            end
+          end
+        end
+
+        # 感觉没啥必要
+        def include_component(component_name, source_path, debug_xcodeproj)
+          debug_xcodeproj.groups.each do |group|
+            return true if group.name == component_name and File.exist? group.path
+          end
+          return false
+        end
+
+
+        def all_components_in_debug()
+          component_info = {}
+          debug_xcodeproj = get_debug_xcodeproj
+          if debug_xcodeproj.nil?
+            return component_info
+          end
+          debug_xcodeproj.groups.each do |component_group|
+            detail_hash = {}
+            source_path_hash = {}
+            source_path_hash[component_group.display_name] = component_group.real_path.to_s
+            detail_hash[:source_paths] = source_path_hash
+            version = version_from_path component_group.display_name, component_group.real_path.to_s
+            detail_hash[:version] = version if version
+            component_info[component_group.display_name] = detail_hash if detail_hash.length > 0
+          end
+          component_info
+        end
+
+        def component_in_debug(component_name)
+          all_component_hash = all_components_in_debug
+          component_hash = {}
+          all_component_hash.each do |binary_name, detail_hash|
+            if binary_name.start_with? component_name
+              component_hash[binary_name] = detail_hash
+            end
+          end
+          component_hash
+        end
+
+        def avaliable_dirs(file_path, dest_file_path)
+          dir_list = []
+          if file_path.to_s == dest_file_path.to_s
+            return dir_list
+          else
+            parent_dir = File.dirname file_path
+            dir_list << parent_dir
+            dir_list = dir_list | avaliable_dirs(parent_dir, dest_file_path)
+          end
+          dir_list
+        end
+
+        def avaliable_file(group, spec)
+          component_name = spec.name
+          subspec = group.name.gsub(/#{component_name}/, "")
+          files = []
+          if subspec
+            spec.subspecs.each do |subspec_spec|
+              next unless subspec_spec.name == "#{component_name}/#{subspec}"
+              source_files = "#{group.real_path}/#{subspec_spec.attributes_hash["source_files"]}"
+              tmp_files = Dir.glob (source_files)
+              # 找到所有的文件夹
+              tmp_files.each do |file_path|
+                files << file_path
+                parent_path = File.dirname file_path
+                if !files.include? parent_path
+                  files = files | avaliable_dirs(file_path, group.real_path)
+                end
+              end
+              break
+            end
+          end
+          files
+        end
+
+        def add_component_to_debug(component_name, source_path_hash, debug_xcodeproj, spec)
+          source_path_hash.each do |binary_name, source_path|
+            # 将源码添加到Debug.xcodeproj 里。
+            UI.puts "add #{binary_name} to Debug.xcodeproj"
+            component_group = debug_xcodeproj.main_group.find_subpath(binary_name, true)
+            component_group.set_source_tree('<absolute>')
+            component_group.set_path(source_path)
+            component_group.clear
+            files = avaliable_file component_group, spec
+            add_files_to_group(debug_xcodeproj, component_group, files)
+          end
+          debug_xcodeproj.save
+        end
+
+        def remove_component_from_debug(component_name)
+          debug_xcodeproj = get_debug_xcodeproj
+          if debug_xcodeproj.nil?
+            return
+          end
+          debug_xcodeproj.groups.each do |component_group|
+            if component_group.display_name.start_with? component_name
+              UI.puts "removing #{component_group.display_name} from Debug.xcodeproj"
+              if !component_group.empty?
+                component_group.clear
+                component_group.remove_from_project
+              end
+            end
+          end
+          debug_xcodeproj.save
+        end
+
+        def clean_debug()
+          debug_xcodeproj = get_debug_xcodeproj
+          remove_debug_from_workspace
+          if debug_xcodeproj
+            FileUtils.rm_rf [@debug_path]
+          end
+
+        end
+
+        def component_count_in_debug(debug_xcodeproj)
+          count = debug_xcodeproj.groups.length
+          if count >= 2
+            return count - 2
+          else
+            UI.puts "获取component的个数可能发成错误"
+          end
+          return count
+        end
+
+        def add_debug_to_workspace()
+          # 获取主工程的名字。
+          if File.exist? @workspace_name
+            workspace = Xcodeproj::Workspace.new_from_xcworkspace @workspace_name
+          else
+            UI.puts "找不到对应的workspace: #{@workspace_name}，请检查。"
+            exit 1
+          end
+          if !workspace.schemes.values.include? File.realdirpath @debug_path
+            workspace << @debug_path
+            workspace.save_as @workspace_name
+          end
+        end
+
+        def remove_debug_from_workspace()
+          if File.exist? @workspace_name
+            workspace = Xcodeproj::Workspace.new_from_xcworkspace @workspace_name
+          else
+            UI.puts "找不到对应的workspace: #{@workspace_name}，请检查。"
+            exit 1
+          end
+          if workspace.schemes.values.include? File.realdirpath @debug_path
+            workspace >> @debug_path
+            workspace.save_as @workspace_name
+          end
+        end
+
+      end
+    end
+  end
+end
+
+

data/lib/cocoapods-jsource/command/xcodeproj_extern.rb

@@ -0,0 +1,34 @@
+require 'xcodeproj'
+require "rexml/xpath"
+
+module Xcodeproj
+  # Provides support for generating, reading and serializing Xcode Workspace
+  # documents.
+  #
+  class Workspace
+
+    # removes a new path to the list of the of projects contained in the
+    # workspace.
+    # @param [String, Xcodeproj::Workspace::FileReference] path_or_reference
+    #        A string or Xcode::Workspace::FileReference containing a path to an Xcode project
+    #
+    # @raise [ArgumentError] Raised if the input is neither a String nor a FileReference
+    #
+    # @return [void]
+    #
+    def >>(path_or_reference)
+      return unless @document && @document.respond_to?(:root)
+      debug_element = nil
+      @document.elements.each("*/FileRef") do |element|
+        location = element.attributes["location"]
+        if location == "group:#{path_or_reference}"
+          debug_element = element
+        end
+      end
+      @document.root.delete_element(debug_element)
+      load_schemes_from_project File.expand_path(path_or_reference)
+    end
+  end
+
+end
+

data/lib/cocoapods-jsource/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsJsource
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test.rb

@@ -1,7 +1,131 @@
+require 'xcodeproj'
+require 'cocoapods'
 
-`cd /Users/handa/Documents/lianjia/C/lianjia_ios_platc;pod jsource add --names=Lianjia_Beike_Home --gits=http://gerrit.lianjia.com/mobile_ios/Lianjia_Beike_Home`
-
+`cd /Users/handa/Downloads/Example;pod jsource add --help`
+#`cd /Users/handa/Downloads/Example;pod jsource clean LJRefresh --cache`
+#`cd /Users/handa/Documents/lianjia/C/lianjia_ios_platc;pod jsource add LJBaseToolKit`
+#`cd /Users/handa/Downloads/Example;pod jsource add LJRefresh http://gerrit.lianjia.com/mobile_ios/LJRefresh`
+#
 
 # `cd /Users/handa/Documents/test/testZSource;pod jsource list`
 
-# `cd /Users/handa/Documents/test/testZSource;pod jsource clean LJCache`
+# `cd /Users/handa/Documents/test/testZSource;pod jsource clean LJCache`
+#
+#`cd /Users/handa/Documents/lianjia/LJBaseContext/Example; pod update`
+
+# require 'cocoapods-core'
+# spec = Pod::Specification.from_file("/Users/handa/Documents/lianjia/LJPlatBPodSpecs/LJMessengerSDK/2.30.3.0/LJMessengerSDK.podspec")
+
+
+def addFilesToGroup(project, aTarget, aGroup)
+  Dir.foreach(aGroup.real_path) do |entry|
+    filePath = File.join(aGroup.real_path, entry)
+    # 过滤目录和.DS_Store文件
+    if !File.directory?(filePath) && entry != ".DS_Store" then
+          # 向group中增加文件引用
+          fileReference = aGroup.new_reference(filePath)
+          # 如果不是头文件则继续增加到Build Phase中，PB文件需要加编译标志
+      if filePath.to_s.end_with?("pbobjc.m", "pbobjc.mm") then
+        aTarget.add_file_references([fileReference], '-fno-objc-arc')
+      elsif filePath.to_s.end_with?(".m", ".mm", ".cpp") then
+        aTarget.source_build_phase.add_file_reference(fileReference, true)
+      elsif filePath.to_s.end_with?(".plist") then
+        aTarget.resources_build_phase.add_file_reference(fileReference, true)
+      end
+      # 目录情况下, 递归添加
+    elsif File.directory?(filePath) && entry != '.' && entry != '..' then
+      hierarchy_path = aGroup.hierarchy_path[1, aGroup.hierarchy_path.length]
+      subGroup = project.main_group.find_subpath(hierarchy_path + '/' + entry, true)
+      subGroup.set_source_tree('<group>')
+      subGroup.set_path(aGroup.real_path + entry)
+      addFilesToGroup(project, aTarget, subGroup)
+    end
+  end
+end
+
+
+
+def addFilesToGroupNew(project, aGroup)
+  Dir.foreach(aGroup.real_path) do |entry|
+    filePath = File.join(aGroup.real_path, entry)
+    # 过滤目录和.DS_Store文件
+    if !File.directory?(filePath) && entry != ".DS_Store" then
+      # 向group中增加文件引用
+      aGroup.new_reference(filePath)
+      # 目录情况下, 递归添加
+    elsif File.directory?(filePath) && entry != '.' && entry != '..' then
+      hierarchy_path = aGroup.hierarchy_path[1, aGroup.hierarchy_path.length]
+      subGroup = project.main_group.find_subpath(hierarchy_path + '/' + entry, true)
+      subGroup.set_source_tree('<group>')
+      subGroup.set_path(aGroup.real_path + entry)
+      addFilesToGroupNew(project,subGroup)
+    end
+  end
+end
+
+ # 添加Pods/JSources.xcodeproj
+
+ # 在Pods/JSources.xcodeproj 添加group Pods
+ #
+ # 在Pods目录添加每个组件的调试信息。
+ #
+ # 如果不指定-u 则用的是本地的源码，如果指定-u，则用的是网络里的源码。
+ #
+ #
+#
+#project_path = '/Users/handa/Documents/lianjia/cocoapods-jsource/test.xcodeproj'
+#project = ""
+#if File.exist? project_path
+#  project = Xcodeproj::Project.open(project_path)
+#else
+#  project = Xcodeproj::Project.new(project_path)
+#end
+#
+#path = "/var/folders/qb/qcgb09sx36l65jj4vglxz3nw0000gq/T/cocoapods-uru6ziwd/Pods/LJRefresh/LJRefresh/"
+#exampleGroup=project.main_group.new_group("LJRefresh", path)
+#exampleGroup.set_source_tree('<absolute>')
+##target = project.new_target(:application,"LJRefresh",:ios)
+#addFilesToGroupNew(project, exampleGroup)
+#
+#
+#
+#project.save
+#
+#
+#new_path = "/Users/handa/Downloads/Example/"
+#file = "Example.xcworkspace"
+#Dir.chdir(new_path)
+##workspace = Xcodeproj::Workspace.new_from_xcworkspace(file)
+#
+#ref = Xcodeproj::Workspace::FileReference.new(project_path)
+##if workspace.include? ref
+##  print "already included"
+##else
+##  workspace << project_path
+##end
+##workspace.save_as(file)
+#
+#new_path = "/Users/handa/Downloads/Example/Pods/Pods.xcodeproj"
+#if File.exist? new_path
+#  pod_project = Xcodeproj::Project.open(new_path)
+#end
+
+
+#
+#`mkdir Pods/JSources`
+#jsource_group=pod_project.main_group.new_group("JSources", "./Pods/JSources")
+#
+#
+#jsource_group.add_referrer(ref)
+#
+#
+#
+#pod_project.save
+
+
+
+#config = Pod::Config.instance
+#installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
+#installer.repo_update = false
+#installer.update = false
+#installer.generated_pod_targets

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-jsource
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - handa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -72,6 +72,8 @@ files:
 - lib/cocoapods-jsource/command/jsource/add.rb
 - lib/cocoapods-jsource/command/jsource/clean.rb
 - lib/cocoapods-jsource/command/jsource/list.rb
+- lib/cocoapods-jsource/command/xcode_manager.rb
+- lib/cocoapods-jsource/command/xcodeproj_extern.rb
 - lib/cocoapods-jsource/gem_version.rb
 - lib/cocoapods_plugin.rb
 - spec/command/jsource_spec.rb