codeobscure 0.1.6.2 → 0.1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf6549cfa1984c9002c7c558a47e8f8f231fb8be2470e41a9ad74d7f38fe8f1a
-  data.tar.gz: b8ff29b1897c25de827f1111216eb478ae7191cd41f38edef9a6d1b8cd18813b
+  metadata.gz: 656ad40428791163c0a6b154ea66172753244c7a983d0ea934c1d22d85740818
+  data.tar.gz: 737a69b35d646fddeb00e216e5271e3b4f035258178cc44a7b92858d95b224f6
 SHA512:
-  metadata.gz: 1ee7e44521b2b4bd767a8c2e1d4617adbef39aee0521db52a65ce655e13209474a05b19adf1434ceb9fc81148641fc5d4f03a2411b7887efd2ef98b3253aa109
-  data.tar.gz: 622d33937e01d8fafeb011dc950be17f0e4cf03ee994f6f66d341181bf00bc79c3161f91156e13d367853c70af076606cf69fe2f0f6f30528502023b057edba1
+  metadata.gz: e7f0f82b1a85a206f02a5289e66bab3ef6b0fd3e2286978563812bac65787460432a55f0184153b4b2248f0db07e3ef61803c7c7311966ce98ef2b299df38d3b
+  data.tar.gz: 1828a5d2fa756c05711db0caf8005ee4492df9994a08e6b699835d17593c3eeff89b464fc3b6e6e0094bdb79603a554cf96e4ac6cb1ba038e517fbef645d5586

data/lib/codeobscure/funclist.rb

@@ -1,19 +1,22 @@
 module FuncList
 
   require_relative "filtSymbols.rb"
+  require 'pathname'
 
   # @@func_regex = /\s*(\w+)\s*:\s*\(\s*\w*\s*\s*\w+\s*\*?\s*\)\s*\w+\s*/
   @@func_regex = /\s*[-\+]\s*(\w+)\s*:\s*\(\s*\w*\s*\s*\w+\s*\*?\s*\)\s*\w+\s*/
   @@func_simple_regex = /\s*[-\+]\s*\(\s*\w+\s*\*?\)\s*(\w+)\s*;*/
-  @@hcls_regex = /@interface\s+(\w+)\s*/
+  @@hcls_regex = /@interface\s+(\w+)\s*:\s*(\w+)/
   @@mcls_regex = /@implementation\s+(\w+)\s*/
   @@property_regex = /\s*@property\s*\(.*?getter=(\w+).*?\)\s*\w+\s*\*?\s*\w+\s*.*;/
   @@property_regex2 = /\s*@property\s*\(.*?\)\s*\w+\s*\*?\s*(\w+)\s*.*;/
   @@property_regex3 = /\s*@property\s*\(.*?\)\s*\w+\s*<.*>\s*\*?\s*(\w+)\s*.*;/
   #---------------filter regex----------------
+  @@storyboard_filt_regex = /customClass="(\w+)"/
   @@value_for_key_filte_regex = /\[\w*\s+setValue\s*:\s*.*\s* forKey\s*:\s*@\"(.*)\"\]/
   @@class_from_str_regex = /NSClassFromString\(\s*@"(\w+)"\s*\)/
   @@func_filt_keys = ["IBAction"]
+  @@cls_filt_keys = ["NSManagedObject"]
 
   def self.validate?(str, type) 
     for filt_key  in @@func_filt_keys
@@ -28,9 +31,26 @@ module FuncList
     str.encode("UTF-8", 'binary', invalid: :replace, undef: :replace, replace: '')
   end
 
-  def self.capture(content_str,type = "m",fetch_types=["p","f","c"]) 
-    results = []
+  def self.capture(content_str,type = "m",fetch_types=["p","f","c"],file_path=nil,is_need_filt=false) 
     str = to_utf8 content_str
+
+    #filter file  
+    if file_path.include? ".storyboard" 
+      str.scan @@storyboard_filt_regex do |curr_match|
+        md = Regexp.last_match
+        whole_match = md[0]
+        captures = md.captures
+
+        captures.each do |capture|
+          FiltSymbols.insertValue capture
+          p "过滤的#{File.basename(file_path)}数据：#{capture}"
+        end
+      end
+      return []
+    end
+
+    # begin capture 
+    results = []
     if fetch_types.include? "f"
       str.scan @@func_regex do |curr_match|
         md = Regexp.last_match
@@ -76,6 +96,14 @@ module FuncList
           captures = md.captures
 
           captures.each do |capture|
+            if is_need_filt 
+              if @@cls_filt_keys.include? capture 
+                puts "过滤类#{capture}..."
+                if file_path 
+                  FiltSymbols.loadFiltSymbols file_path
+                end
+              end 
+            end
             results << "c:#{capture}"
             #p [whole_match, capture]
             p "c:[#{capture}]"
@@ -118,7 +146,6 @@ module FuncList
         end
       end
     end
-
     #---------------记录可能引起崩溃的字段----------------
     str.scan @@value_for_key_filte_regex do |curr_match|
       md = Regexp.last_match
@@ -131,7 +158,6 @@ module FuncList
       end
     end
 
-
     str.scan @@class_from_str_regex do |curr_match|
       md = Regexp.last_match
       whole_match = md[0]
@@ -142,7 +168,6 @@ module FuncList
         p "过滤的[NSClassFromString]数据：#{capture}"
       end
     end
-   
     results
   end
 
@@ -150,6 +175,9 @@ module FuncList
     capture_methods = []
     p_methods = []
     funclist_path = "#{path}/func.list"  
+    if File.file?(path) 
+      funclist_path = "#{File.dirname(path)}/func.list"
+    end
     file = File.open(funclist_path, "w")
     file_pathes = []
     if type == "h" || type == "m"
@@ -158,9 +186,11 @@ module FuncList
       file_pathes += `find #{path} -name "*.h" -d`.split "\n"
       file_pathes += `find #{path} -name "*.m" -d`.split "\n"
     end
+    file_pathes += `find #{path} -name "*.storyboard" -d`.split "\n"
+
     file_pathes.each do |file_path|
       content = File.read file_path
-      captures = capture content , type , fetch_types
+      captures = capture content , type , fetch_types, file_path, need_filt
       captures.each do |capture_method| 
         method_type = capture_method.split(":").first
         method_content = capture_method.split(":").last

data/lib/codeobscure/version.rb

@@ -1,3 +1,3 @@
 module Codeobscure
-  VERSION = "0.1.6.2"
+  VERSION = "0.1.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeobscure
 version: !ruby/object:Gem::Version
-  version: 0.1.6.2
+  version: 0.1.6.3
 platform: ruby
 authors:
 - kaich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler