cocoapods-jsource 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84f411236d55c44d8e5ded06d8c13833fb30b2012357041dba72ad0d4abea1e5
-  data.tar.gz: fe0c3f61fde6e36456b6e87d52169a33ad0cf11846f19d4d587b1b1d8e43a396
+  metadata.gz: a1f41012354f907c69ab430275b225d557aae7816be39059850418b839aafda6
+  data.tar.gz: 8f1e481b717aae28942f3e153da93e147499524c883fc6c3fd11f664044d491f
 SHA512:
-  metadata.gz: 0a7d9681ba01c2f683f137c22d70a69b4c917419e7d106d4013b8a6f4067260779f3d6432425c5ed811e3a958c48f2e0a160dae4dcc3f8e13a1037b40458960c
-  data.tar.gz: 32feba2d0eaebbc6e2624412bba5cb950f26b649d06a35f39f08e9fafa081b0d2e8c5d66d1a66601502733b216083fa9043d64869efc0065d99ae928041d817c
+  metadata.gz: 6113c095233da159a99fad3311a1c999e377e64b4eaf4835ae3a5d7cedf687b0d8b0294c8c8e5cc8e66176b11d6b43d41f68bff094a90ec2cd029f9cad9d9733
+  data.tar.gz: dcf0a3f39a72152b9b985cb83340f85a487e0f4c1a6aaf27783eef3f95622514c1ec97525b8802921086ac076480fe0dadc8f5e3255f64c07be0ce6686a60643

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-jsource (0.0.1)
+    cocoapods-jsource (0.0.2)
       cocoapods
 
 GEM

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

@@ -45,23 +45,30 @@ module Pod
               pod_cache_dict = cache_dict[component_name]
             end
             version = component_version 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][:source]}"
+              UI.puts "#{component_name} #{version} 已经存在，缓存为 #{pod_cache_dict[version][:sourcelist].to_s}"
               next
             end
             git = @gits[index]
-            source_path = get_source_path_from_binary component_name
-            if source_path.length >0 and version
+            # 获取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}/#{component_name} >/dev/null 2>&1"
-              # UI.puts "执行：#{cmd}"
+              cmd ="git clone -b #{component_name}-#{version} --depth 1 #{git} #{source_path} >/dev/null 2>&1"
               `#{cmd}`
-              pod_cache_dict[version] = {"git":git,"source":source_path,"version":version}
-              cache_dict[component_name] = pod_cache_dict
-              UI.puts "#{component_name} 源码创建成功，目录为 #{source_path}"
-            else
-              UI.puts "#{component_name} 找不到二进制组件或者找不到对应的版本信息，不做任何处理"
             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
           end
           dump_to_yaml cache_dict
@@ -82,37 +89,45 @@ module Pod
         end
 
         # 根据组件名获取组件的源码调试地址
-        def get_source_path_from_binary(component_name)
-          source_path = ""
+        def get_source_file_list_from_binary(component_name)
+          source_file_list = []
           component_pod_path = config.sandbox_root + component_name
-          binary_path_list = `find #{component_pod_path} -name "#{component_name}" -type f`.strip.split("\n").sort
-          if binary_path_list.length > 0
-            binary_file = binary_path_list[0]
-            source_path_list = `dwarfdump -arch x86_64 #{binary_file} | grep 'DW_AT_name.*#{component_name}'`.strip.split("\n").sort
+          binary_path_list = `find #{component_pod_path} -name "#{component_name}*" -type l`.strip.split("\n").sort
+          binary_hash = {}
+          for path in binary_path_list
+            name = path.to_s.strip.split("/")[-1]
+            if name.to_s.include? ".a" or not name.to_s.include? "."
+              binary_hash[name]=path unless binary_hash.has_key? name
+            end
+          end
+          if binary_hash.length == 0
+            UI.puts "#{component_name} 找不到二进制组件或者找不到对应的版本信息，不做任何处理"
+            return source_file_list
+          end
+
+          binary_hash.each do |binary_name, binary_path|
+            libbinary_file_name = "lib#{component_name}.a"
+            source_path_list = []
+            UI.puts "正在解析二进制#{binary_path}源码位置"
+            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
+            else
+              # framework 文件
+              source_path_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 tmp_source_path.include?("Pods/#{component_name}")
-                source_path = tmp_source_path.strip.split("(\"")[-1].split(component_name)[0]
+              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
               end
             end
-          else
-            # 可能是.a
-            binary_file_name = "lib#{component_name}.a"
-            binary_path_list = `find #{component_pod_path} -name "#{binary_file_name}" -type f`.strip.split("\n").sort
-            if binary_file_name.length > 0
-              binary_file = binary_path_list[0]
-              source_path_list = `dwarfdump -arch x86_64 #{binary_file} | grep 'AT_name.*#{component_name}'`.strip.split("\n").sort
-              source_path_list.each do |tmp_source_path|
-                if tmp_source_path.include?("Pods/#{component_name}")
-                  source_path = tmp_source_path.strip.split("(\"")[-1].split("component_name")[0]
-                  break
-                end
-              end
-            end
           end
-          source_path
+          source_file_list
         end
 
+
         # 创建源码的存放的目录，可能需要root权限
         def create_working_directory(source_path)
           parent = source_path.split("T")[0]

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

@@ -70,7 +70,13 @@ module Pod
         #
         def remove_caches(cache_descriptors)
           cache_descriptors.each do |desc|
-            UI.puts "Removing cache #{desc[:source]} (#{desc[:version]})"
+            sourcelist = desc[:sourcelist]
+            next if sourcelist.length == 0
+            sourcelist.each do |source|
+              UI.puts "Removing cache #{source} (#{desc[:version]})"
+              parent = source.split("Pods")[0]
+              FileUtils.rm_rf(parent) if File.exist? parent
+            end
             if @cache_dict[@pod_name].has_key? desc[:version]
               if @cache_dict[@pod_name].length == 1
                 @cache_dict.delete @pod_name
@@ -78,8 +84,6 @@ module Pod
                 @cache_dict[@pod_name].delete (desc[:version]) if @cache_dict[@pod_name].has_key? desc[:version]
               end
             end
-            parent = File.dirname desc[:source]
-            FileUtils.rm_rf(parent) if File.exist? parent
           end
         end
 
@@ -89,11 +93,14 @@ module Pod
               git=""
               source=""
               git=pod_dict[:git] if pod_dict.has_key? :git
-              source=pod_dict[:source] if pod_dict.has_key? :source
-              UI.message("Removing the #{pod_name} jsource cache dir #{cache_dir}") do
-                parent = File.dirname source
-                FileUtils.rm_rf(parent) if File.exist? parent
+              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]
+                  FileUtils.rm_rf(parent) if File.exist? parent
+                end
               end
+
             end
           end
           UI.message("Removing the jsource configuration dir #{cache_file}") do

data/lib/cocoapods-jsource/gem_version.rb

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

data/test.rb

@@ -1,5 +1,5 @@
 
-`cd /Users/handa/Documents/test/testZSource;pod jsource add --names=LJCache --gits=http://gerrit.lianjia.com/mobile_ios/LJCache`
+`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/Documents/test/testZSource;pod jsource list`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-jsource
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - handa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods