cocoapods-vbbuildsource 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cb0a2843d6354a15edb4c2b4a7521163938e58dc85d0258b34f2c6d1dce529e
-  data.tar.gz: 1fd68295337dc3ad276282eaa5a2cb100fcf3d632995609c99af687fc7631eed
+  metadata.gz: e5148b5ba82eb4674ec9a26d3dc0b5d74ef179cfc6b49741af742da358cac735
+  data.tar.gz: a394049f02b7ed4268fb5f38034e5903d44376ff625c712cc2fe6baa4e5fce7c
 SHA512:
-  metadata.gz: 4840af4daa453010e6f8cd635aed6f1d3967455cf7946ea225b4b50e243edd77ba686167780b4cc77b186a96fdc57ac370f06fc8481ee3b1cd1aa7d9d1674493
-  data.tar.gz: 15427260291361cba7a0c4f222f72131b4f115ae55ffc33b9ad704311252cebd10a5436b8c076ba2b1d1d02b3f29ee68f4d2c828df6abfb2c65b52b99fe9f351
+  metadata.gz: 394956b24d2e83003e10baf78ab4786e03d34e5c85497737d4865bffda0dff04b979dd7cd84010cd6e42a2b31b3986d008f08a3984b014a42ff33359563a7ea9
+  data.tar.gz: 87bb12ac43058f8aea96d5b77725e5fcc2f589f15b13b94b8794eae3883826a426d6126dc5972c7fb5a91a826e32694f5035adb8ab8f71126efa854baf3e4077

data/Gemfile

@@ -6,8 +6,4 @@ gemspec
 group :development do
   gem 'cocoapods', '1.10.0'
 
-  gem 'mocha'
-  gem 'bacon'
-  gem 'mocha-on-bacon'
-  gem 'prettybacon'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-vbbuildsource (0.0.2)
+    cocoapods-vbbuildsource (0.0.7)
 
 GEM
   remote: https://rubygems.org/
@@ -18,7 +18,6 @@ GEM
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
-    bacon (1.2.0)
     claide (1.0.3)
     cocoapods (1.10.0)
       addressable (~> 2.6)
@@ -71,15 +70,10 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.5.1)
     minitest (5.14.4)
-    mocha (1.13.0)
-    mocha-on-bacon (0.2.3)
-      mocha (>= 0.13.0)
     molinillo (0.6.6)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    prettybacon (0.0.2)
-      bacon (~> 1.2)
     public_suffix (4.0.6)
     rake (13.0.6)
     rexml (3.2.5)
@@ -101,13 +95,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bacon
   bundler (~> 1.3)
   cocoapods (= 1.10.0)
   cocoapods-vbbuildsource!
-  mocha
-  mocha-on-bacon
-  prettybacon
   rake
 
 BUNDLED WITH

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

@@ -51,11 +51,17 @@ module Pod
 
         help! "该pod库 #{@module_name} 未找到" unless pod_target
 
-        framework_file_path = pod_target.all_files.first
-
-        framework_file_path = Pathname.new(framework_file_path) if framework_file_path.is_a? String
+        file_list = Array.new(pod_target.all_files.count) { |index|
+          file = pod_target.all_files[index]
+          if file.is_a? String
+            Pathname.new(file)
+          else
+            file
+          end
+        }
+        framework_file_path = file_list.detect {|each| each.extname.end_with? 'framework'}
 
-        help! "该pod库 #{@module_name} 不是一个framework" unless pod_target.all_files.count == 1 and framework_file_path.extname.end_with? 'framework'
+        help! "该pod库 #{@module_name} 不是一个framework" unless framework_file_path
 
         binary_build_path = find_binary_build_path framework_file_path
 
@@ -82,8 +88,8 @@ module Pod
         binary_file_path = find_binary_file_in_framework framework_file_path
         help! "未找到库 #{@module_name} 的二进制文件" unless binary_file_path
         # 找到framework里面的某一个.h头文件的 DW_AT_decl_file 字段
-        first_head_file = find_first_head_file_in_framework framework_file_path
-        binary_build_path_string = `dwarfdump #{binary_file_path.to_path} | grep #{File.basename(first_head_file)} | grep 'DW_AT_decl_file'`.gsub!(/\s/, '')
+        binary_build_path_string = find_file_path_string_in_binary(framework_file_path,binary_file_path)
+        help! "未找到库 #{@module_name} 的二进制path路径" unless binary_build_path_string
         binary_build_path_list = binary_build_path_string.split('DW_AT_decl_file').delete_if(&:empty?).uniq
         # 删掉所有的括号引号
         binary_build_path_list = binary_build_path_list.each { |item| item.gsub!('("','').gsub!('")', '') }
@@ -124,13 +130,14 @@ module Pod
         return Pathname.new("#{framework_file_path.to_path}/#{framework_file_path.basename.to_path.gsub!('.framework', '')}")
       end
 
-      def find_first_head_file_in_framework(framework_file_path, end_name='.h')
+      def find_file_path_string_in_binary(framework_file_path, binary_file_path)
         framework_file_path.children.collect do |child|
-          if child.file? && child.extname.end_with?(end_name)
-            return child
+          if child.file? && child.extname.end_with?('.h')
+            binary_build_path_string = `dwarfdump #{binary_file_path.to_path} | grep #{File.basename(child)} | grep 'DW_AT_decl_file'`.gsub!(/\s/, '')
+            return binary_build_path_string if binary_build_path_string
           elsif child.directory?
-            filePath = find_first_head_file_in_framework child
-            return filePath if filePath
+            binary_build_path_string = find_file_path_string_in_binary(child, binary_file_path)
+            return binary_build_path_string if binary_build_path_string
           end
         end
         return nil
@@ -147,7 +154,8 @@ module Pod
       end
       def find_spec_source_file_path specification
         source_path = specification.specification.attributes_hash['source_files']
-        source_path = specification.specification.subspecs.first.attributes_hash['source_files']
+        source_path = specification.specification.subspecs.first.attributes_hash['source_files'] unless source_path
+        source_path = specification.specification.subspecs.first.attributes_hash['ios']['source_files'] unless source_path
         help! "该库 #{@module_name} 的spec文件没填 source_file，暂不支持" unless source_path
         dir_list = source_path.split('/')
         help! "源码路径错误 #{source_path}" unless dir_list.count >= 2

data/lib/cocoapods-vbbuildsource/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsVbbuildsource
-  VERSION = "0.0.2"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-vbbuildsource
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - faliu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler