cocoapods-jsource 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf67858eeff4f5e88ac1cef95df1f64695b8505061f2e1dbfeb0774c58b82bc
-  data.tar.gz: 3b0bf833fdc0027c4d15d5a31f955cf55ae922bcfead4384cabce9060ecd1787
+  metadata.gz: 6eeecb30b063be7b98e13e67bcaf2dcf8afe6216c2e2c8cb9ac340a227b9d40f
+  data.tar.gz: 7f4ca79756176dab296fc9e784b256effc33e77385cd6e60e9a62107fb745679
 SHA512:
-  metadata.gz: e4e1db75164b5329d869ae0f298ea5fa9cbe5015f5ff8d43a675438373ada0945486c3baab2f98160059cfd347728999d69287ef232206e4b1d95c3a201bd516
-  data.tar.gz: 392f0575a1b633ba16a252a4475876961613c9e8948f9f206b29b349fc2fc1e9e46f2b5b9841e1b468c5390caf242b4a6153bab394a4fe9dd7d3965ca67b7a16
+  metadata.gz: 851fc0bae0bd7723e1937d6a64697d1307e84f58399366353f2d74a0f33a753115898c3660ea3c84a48df9b700f8ab06d6a35c3a0281093261e81de433c7b332
+  data.tar.gz: 666b0d9de3eadad5f431c0990a543a931ac690c159f6b0f5f66d5ea03841fe8f00e11ee8f315958b334745c23cc6bf370d321877231755b4be9c89ade6afb1e1

data/Gemfile

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

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    cocoapods-jsource (0.0.4)
+    cocoapods-jsource (0.0.6)
       cocoapods
 
 GEM
   remote: https://gems.ruby-china.com/
   specs:
-    CFPropertyList (3.0.1)
+    CFPropertyList (3.0.2)
     activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -19,10 +19,10 @@ GEM
     atomos (0.1.3)
     bacon (1.2.0)
     claide (1.0.3)
-    cocoapods (1.8.4)
+    cocoapods (1.9.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.8.4)
+      cocoapods-core (= 1.9.1)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -37,13 +37,15 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.11.1, < 2.0)
-    cocoapods-core (1.8.4)
+      xcodeproj (>= 1.14.0, < 2.0)
+    cocoapods-core (1.9.1)
       activesupport (>= 4.0.2, < 6)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
+      netrc (~> 0.11)
+      typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
     cocoapods-downloader (1.3.0)
     cocoapods-plugins (1.0.0)
@@ -55,17 +57,20 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     escape (0.0.4)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    ffi (1.12.2)
     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)
-    json (2.2.0)
-    minitest (5.13.0)
-    mocha (1.10.1)
+    json (2.3.0)
+    minitest (5.14.0)
+    mocha (1.11.2)
     mocha-on-bacon (0.2.3)
       mocha (>= 0.13.0)
     molinillo (0.6.6)
@@ -77,9 +82,11 @@ GEM
     rake (13.0.1)
     ruby-macho (1.4.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    typhoeus (1.3.1)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    xcodeproj (1.13.0)
+    xcodeproj (1.16.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -100,4 +107,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.16.3
+   1.17.2

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

@@ -77,7 +77,12 @@ module Pod
 
         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"
+            if source_path.include?("Pods")
+              sandbox_path = source_path.split("Pods")[0] + "Pods"
+            else
+              sandbox_path = source_path.gsub(/\/#{component_name}$/,"")
+            end
+
             sandbox_component_path = "#{sandbox_path}/#{component_name}"
             binary_path = "#{sandbox_path}/#{binary_name}"
             if File.exist? sandbox_component_path
@@ -87,6 +92,7 @@ module Pod
             else
               UI.puts "downloading #{binary_name} #{version}"
               UI.puts "\t #{source_path.to_s}"
+              create_working_directory(sandbox_path)
               FileUtils.mkdir_p [binary_path] unless File.exist? binary_path
               sandbox = Sandbox.new(sandbox_path)
               spec = spec_with_name(component_name, version)
@@ -96,6 +102,12 @@ module Pod
               #installer.clean!
               # TODO validtarget
               # 改名
+              # 去掉framework
+              framework_path = "#{binary_path}/#{component_name}/Framework"
+              if File.directory?(framework_path)
+                UI.puts "正在清理无用资源：#{framework_path}"
+                `rm -rf #{framework_path}`
+              end
               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
@@ -147,12 +159,22 @@ module Pod
           #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}"
+              if source_path_list[0].include?("Pods")
+                dest_file_path = source_path_list[0].split("Pods")[0] + "Pods/#{binary_name}"
+              else
+                dest_file_path = file_path(source_path_list[0], component_name)
+              end
               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 dest_file_path.include?("/Pods/")
+                origin_file = dest_file_path.split("Pods/#{binary_name}")[-1]
+                origin_file_path = path + origin_file
+              else
+                tmp_path = file_path dest_file_path, component_name
+                origin_file = dest_file_path.gsub(tmp_path, "")
+                origin_file_path = path + "/#{origin_file}"
+              end
               if !File.exist? origin_file_path
                 UI.warn "本地不存在#{origin_file_path}, 可能使用了虚拟subspec或者本地源码缓存有问题。推荐加上 --remote 参数"
                 exit 1
@@ -177,6 +199,21 @@ module Pod
 
         end
 
+        def file_path(source_path, component_name)
+          tmp_list = source_path.split("#{component_name}/")
+          # if tmp_list.length == 4 and tmp_list[1] != "/"
+          #   path = "#{tmp_list[0]}#{binary_name}#{tmp_list[1]}#{binary_name}"
+          # end
+          # if tmp_list.length == 5 and tmp_list[2] == "_binary/"
+          #   path = source_paths[0].split(binary_name)[0] + "#{binary_name}/#{binary_name}"
+          # end
+          if tmp_list.length < 3
+            UI.puts "旧版本的不支持，请重新打二级制"
+            exit 1
+          end
+          path = source_path.gsub("#{component_name}/#{tmp_list[-1]}", "")
+          path
+        end
 
         def component_cache(component_name)
           if @cache_dict.has_key? component_name
@@ -206,10 +243,10 @@ module Pod
         end
 
 
-        def unite_source_paths_hash(source_paths_hash)
+        def unite_source_paths_hash(source_paths_hash, component_name)
           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
+            source_path_hash[binary_name] = file_path(source_paths[0], component_name)
           end
           source_path_hash
         end
@@ -237,7 +274,7 @@ module Pod
                 next
               end
               source_paths_hash = local_source_paths component_name, subspecs, source_paths_hash
-              source_path_hash = unite_source_paths_hash source_paths_hash
+              source_path_hash = unite_source_paths_hash source_paths_hash, component_name
               if @remote
                 # 需要把值合并。
                 download_component_to_path component_name, version, source_path_hash
@@ -316,10 +353,10 @@ module Pod
             at_name_list = []
             if binary_name.to_s.end_with? libbinary_file_name
               # .a 文件
-              at_name_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 'DW_AT_decl_file'`.strip.split("\n").sort
             else
               # framework 文件
-              at_name_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_decl_file'`.strip.split("\n").sort
             end
             #if source_file.length == 0
             #  UI.puts "在#{binary_path} 里没有找到合适的调试信息~"
@@ -327,16 +364,18 @@ module Pod
             #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("\")")[0]
-                source_list << source_path if source_path.to_s.length > 0
-              end
+              source_path = tmp_source_path.strip.split("(\"")[-1].split("\")")[0]
+              next if source_path.to_s.start_with?("/Applications/Xcode.app/Contents/Developer/Platforms/")
+              source_path = tmp_source_path.strip.split("(\"")[-1].split("\")")[0]
+              next unless source_path.to_s.include?("/../../")
+              source_path = File.expand_path(source_path)
+              source_list << source_path if source_path.to_s.length > 0 and not source_list.include?(source_path)
             end
             if source_list.length == 0
               UI.puts "#{component_name} 没有找到调试信息, 可能是早期打的组件。建议这个组件重新生成。"
               exit 1
             else
-              source_path_hash[binary_name] = source_list
+              source_path_hash[binary_name] = source_list.sort
             end
           end
           source_path_hash
@@ -345,9 +384,13 @@ module Pod
 
         # 创建源码的存放的目录，可能需要root权限
         def create_working_directory(source_path)
-          parent = source_path.split("T")[0]
-          parent = File.expand_path(parent)
-          return unless parent.length >0
+          # parent = File.dirname(source_path)
+          if not source_path.include? "/binary/"
+            UI.puts "旧版本的二进制不在支持，请通过keones重新打包"
+            exit 1
+          end
+          parent = source_path.split("/binary/")[0] + "/binary/"
+          return unless parent.length > 0
           return if Dir.exist? parent
           UI.puts "检测到没有源码目录，即将创建#{parent}目录"
           `sudo -S mkdir -p #{parent}`

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

@@ -100,7 +100,7 @@ module Pod
 
         def avaliable_dirs(file_path, dest_file_path)
           dir_list = []
-          if file_path.to_s == dest_file_path.to_s
+          if "#{file_path.to_s}/" == dest_file_path.to_s
             return dir_list
           else
             parent_dir = File.dirname file_path
@@ -117,7 +117,7 @@ module Pod
           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"]}"
+              source_files = "#{group.real_path}#{subspec_spec.attributes_hash["source_files"]}"
               tmp_files = Dir.glob (source_files)
               # 找到所有的文件夹
               tmp_files.each do |file_path|

data/lib/cocoapods-jsource/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsJsource
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test.rb

@@ -1,7 +1,7 @@
 require 'xcodeproj'
 require 'cocoapods'
 
-`cd /Users/handa/Documents/lianjia/B/lianjia_im;pod jsource add flutter_boost`
+`cd /Users/handa/Documents/lianjia/B/Lianjia_Alliance_Shell_Project;pod jsource add Lianjia_Alliance_User`
 
 #`cd /Users/handa/Downloads/Example;pod jsource clean LJRefresh --cache`
 #`cd /Users/handa/Documents/lianjia/C/lianjia_ios_platc;pod jsource add LJBaseToolKit`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-jsource
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - handa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2020-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -59,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gemrc"
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
@@ -98,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Add source code debugging capabilities to binary.