deal 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64c55e863d6ae854a1dade765920e7f336f46672eab7561e042569e2ea4581f2
-  data.tar.gz: f29ef62a31c14a95d19008d2196b2c1f026e060d5cb69b47098ecd1f2e62d2f3
+  metadata.gz: f2082d55419ba7736db28c1fb684bc756b407ee50c4f8536cbf80a45b03d1d72
+  data.tar.gz: fddcb40d4610726f8b4baf2bec47e1a6e30f410648701bf6553538cb260b22bf
 SHA512:
-  metadata.gz: 4e81a5706b06d860156ca0868acd5714bd8f5797c1fab507919ec5488d8366c0b8b89c2a9bc81e17f5dc11001377207441becb558b2c59d906c8c401eb9855f8
-  data.tar.gz: bceed1b4f3192cd8e29782adc4257d782260d94e3461e1d751b24f10a2bffd3e916d4e9c807845c5208f13c39f4156717bb565a67eac26b79acb2e4415ece9e0
+  metadata.gz: 3154cccbb421c83f452dc91d89127a2b82ff50a9145967583f7f84e48de5a1dea1e951b2c758001370874d8d5994b1184058edd803e40b12f43c20bbb278b3f4
+  data.tar.gz: f7118afebf976b15e6ec417b6c2030ea4b2700d66626bff69704bda42c0f610c0f6701e40840d2cbc8e89f6a50e1a87f1b46387d1a925938cf7ad055b9d29bf0

data/lib/deal/command.rb

@@ -87,7 +87,6 @@ module Deal
             @jump_file = {}
             @results = []
             inputs = argv.option('inputs',"").split('|')
-            logN "--inputs:#{inputs.join("\n")}"
             @inputs = []
             for input in inputs
                 ls = Dir.glob(input,File::FNM_DOTMATCH|File::FNM_PATHNAME)
@@ -115,8 +114,6 @@ module Deal
                     i += 1
                 end
             end
-            logN "input glob:\n "+@inputs.join("\n")
-
 
         end
 
@@ -143,13 +140,50 @@ module Deal
         # end
 
 
-        def deal_item(config,input)
-            if items = config.judge_item(input)
-                @results = @results.concat items
-            else
-                return
+        def judeg_file_line(configs,path)
+            line_configs = []
+            for config in configs
+                line_configs.push config if config.judge_text_line?
             end
+            if line_configs.length > 0
+                lines = []
+                File.open(path, "r") do |aFile|
+                    is_binary = false
+                    while line=aFile.gets
+                        need_replace = false
+                        for i in 0...(line.length)
+                            begin
+                                if line[i].ord == 0
+                                    is_binary = true
+                                    break
+                                end
+                            rescue Exception =>e
+                                is_binary = true
+                                # logE "file prase error:#{e.to_s},path:#{path}"
+                                break
+                            end
+
+                        end
+                        if is_binary
+                            break
+                        end
 
+                        for config in line_configs
+                            replace = config.judge_line path,line,lines.length
+                            if replace && line != replace
+                                need_replace
+                            end
+                        end
+
+                        if !need_replace
+                            lines.push line
+                        end
+                    end
+                end
+            end
+
+        end
+        def deal_item(configs,input)
             @judge_count += 1
             progress = @judge_count*1.0/@total_count
             if progress - @progress > 0.01
@@ -157,53 +191,84 @@ module Deal
                 logW "处理进度:#{format("%.2f",progress*100).to_f}%"
             end
 
-            if not File.directory?(input)
-                return
+            configs = []+configs
+            line_configs = []
+            multi_configs = []
+            directory = File.directory?(input)
+            for config in configs
+                if directory
+                    if !config.judge_dir_path(input)
+                        configs.delete config
+                    end
+                else
+                    config.judge_file_path(input)
+                end
+                if config.judge_text_line?
+                    line_configs.push config
+                end
+                if config.judge_text_multi?
+                    multi_configs.push config
+                end
             end
 
-            Dir.entries(input).each do |sub|
-                if sub != '.' && sub != '..'
-                    deal_item(config,"#{input}/#{sub}")
-                else
-                    @judge_count += 0.5
+
+            if !directory
+                if line_configs.length > 0
+                    judeg_file_line(line_configs,input)
+                end
+            else
+                Dir.entries(input).each do |sub|
+                    if sub != '.' && sub != '..'
+                        deal_item(configs,"#{input}/#{sub}")
+                    else
+                        @judge_count += 0.5
+                    end
                 end
             end
         end
 
         def run
+            logN "--inputs glob:\n "+@inputs.join("\n")
+            logN '--configs'
             for config in @configs
-                for input in @inputs
-                    if FileTest.directory? input
-                        match = Pathname.new(input).join('**/*').to_s
-                        @total_count += Dir.glob(match,File::FNM_DOTMATCH).size
-                    else
-                        @total_count += 1
-                    end
+                logN config.to_s verbose?
+            end
+
+            for input in @inputs
+                if FileTest.directory? input
+                    match = Pathname.new(input).join('**/*').to_s
+                    @total_count += Dir.glob(match,File::FNM_DOTMATCH).size
+                else
+                    @total_count += 1
                 end
-                logW "开始扫描，总共#{@total_count}个文件"
-                for input in @inputs
-                    if FileTest.exist?(input)
-                        deal_item config, input
-                    else
-                        logE input+' file does not exist'
-                    end
+            end
+            logW "开始扫描，总共#{@total_count}个文件"
+            for input in @inputs
+                if FileTest.exist?(input)
+                    deal_item @configs, input
+                else
+                    logE input+' file does not exist'
                 end
-
             end
+
             progress = @judge_count*1.0/@total_count
             logW "处理进度:100%"
 
             logN '=============================='
             logN "共进行了#{@judge_count}次匹配"
-            if @results.length == 0
-                logN '没有匹配到结果'
-            else
-                logN "匹配到 #{@results.length} 个结果，如下："
-                for result in @results
-                    logN result.to_s
+            for config in @configs
+                logW  "config:#{config.to_s verbose?}"
+                if config.results.length == 0
+                    logN '没有匹配到结果'
+                else
+                    logN "匹配到 #{config.results.length} 个结果，如下："
+                    for result in config.results
+                        logN result.to_s verbose?
+                    end
                 end
+                logN '=============================='
             end
-            logN '=============================='
+
         end
     end
 end

data/lib/deal/gem_version.rb

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

data/lib/deal/utils/deal_config.rb

@@ -19,7 +19,7 @@ module Deal
     class DealResult
         def initialize(type,item,match_key,action,path)
             @type = type
-            @item = item.strip
+            @item = item.strip if item
             @match_key = match_key
             @action = action
             @file_path = path
@@ -32,25 +32,32 @@ module Deal
         def set_path(path)
             @file_path = path
         end
-        def to_s
-
-            s = []
-            s.push '{'
-            # s.push "type:#{@type}" if @type
-            s.push "match_item:#{@item}" if @item
-            s.push "match_key:#{@match_key}" if @match_key
-            s.push "action:#{@action}" if @action && @action.length > 0
-            s.push "file_path:#{@file_path}" if @file_path
-            # s.push "line_number:#{@line_n}" if @line_n
-            s.push '}'
-
-            return s.join("\n")
+        def to_s(verbose = false )
+            if verbose
+                s = []
+                s.push '{'
+                # s.push "type:#{@type}" if @type
+                s.push "match_item:#{@item}" if @item
+                s.push "match_key:#{@match_key}" if @match_key
+                s.push "action:#{@action}" if @action && @action.length > 0
+                s.push "file_path:#{@file_path}" if @file_path
+                s.push "line_number:#{@line_n}" if @line_n
+                s.push '}'
+
+                return s.join("\n")
+            else
+                s = []
+                s.push "#{@file_path}" if @file_path
+                s.push "#{@item}" if @item
+                return s.join(":")
+            end
+
         end
 
     end
     class DealRule
         include DealUtils
-
+        attr_reader :results
         def initialize(config)
             config['signs'] = [] if not config['signs']
             config['exclude_paths'] = [] if not config['exclude_paths']
@@ -76,21 +83,25 @@ module Deal
 
             check_type
             @need_content = @judge_types.include?(JUDEG_TYPE[:TEXT]) || @judge_types.include?(JUDEG_TYPE[:MACH])
-            logN to_s
+            @results = []
         end
 
-        def to_s
-            ls = []
-            ls.push "{"
-            ls.push "signs:#{@signs.join("\n")}" if @signs.length > 0
-            ls.push "exclude_paths:#{@exclude_paths.join("\n")}" if @exclude_paths.length > 0
-            ls.push "include_paths:#{@include_paths.join("\n")}" if @include_paths.length > 0
-            ls.push "judge_types:#{@judge_types.join("\n")}" if @judge_types.length > 0
-            ls.push "judge_action:#{@judge_action}"
-            ls.push "replace:#{@replace}" if @replace
-            ls.push "}"
-            return ls.join("\n")
-
+        def to_s(verbose = false )
+                ls = []
+                ls.push "{"
+                ls.push "signs:#{@signs.map{|item| if item.respond_to?(:source)
+                                                       item.source
+                                                   else
+                                                       item
+                                                   end
+                }.join(",")}" if @signs.length > 0
+                ls.push "exclude_paths:#{@exclude_paths.map{|item|item.source}.join("|")}" if @exclude_paths.length > 0
+                ls.push "include_paths:#{@include_paths.map{|item|item.source}.join("|")}" if @include_paths.length > 0
+                ls.push "judge_types:#{@judge_types.join("|")}" if @judge_types.length > 0
+                ls.push "judge_action:#{@judge_action}"
+                ls.push "replace:#{@replace}" if @replace
+                ls.push "}"
+                return ls.join("\n")
         end
         def check_type
             pass = true
@@ -149,6 +160,22 @@ module Deal
                 return line
             end
         end
+        def judge_dir?
+            return @judge_types.include?(JUDEG_TYPE[:DIR])
+        end
+
+        def judge_file?
+            return @judge_types.include?(JUDEG_TYPE[:FILE])
+        end
+
+        def judge_text_line?
+            return @judge_types.include?(JUDEG_TYPE[:TEXT])
+        end
+
+        def judge_text_multi?
+            return @judge_types.include?(JUDEG_TYPE[:TEXT])
+        end
+
         def judge_item(path)
             if  !include_path(path)
                 logW 'jump path :'+path
@@ -260,10 +287,52 @@ module Deal
             # end
             # return result
 
+        end
+        def judge_file_path(path)
+            if  !include_path(path)
+                logW 'jump path :'+path
+                return
+            end
+
+            if @judge_types.include?(JUDEG_TYPE[:FILE])
+                _judge_path(path)
+            end
+        end
+
+        def judge_dir_path(path)
+            if  !include_path(path)
+                logW 'jump path :'+path
+                return
+            end
+
+            if @judge_types.include?(JUDEG_TYPE[:DIR])
+                _judge_path(path)
+            end
+        end
+
+        def judge_line(path,line,line_n)
+            for sign in @signs
+                if sign.match? line
+                    action_tip = ''
+                    ret = action sign,line,path
+                    if ret
+                        if ret != line
+                            action_tip = "rename to #{ret}"
+                        end
+                    else
+                        action_tip = 'remove'
+                    end
+                    @results.push DealResult.new('text',line,sign.source,action_tip,path)
+                    break
+                end
+            end
+        end
+
+        def judge_context(path)
+
         end
 
-        def judge_path(path)
-            results = []
+        def _judge_path(path)
             for sign in @signs
                 if sign.match? path.to_s
                     action_tip = ''
@@ -279,10 +348,10 @@ module Deal
                         action_tip='remove files'
                         FileUtils.rm_rf path
                     end
-                    return results.push DealResult.new('path',nil ,sign.source,action_tip,path)
+                    @results.push DealResult.new('path',nil ,sign.source,action_tip,path)
+                    break
                 end
             end
-            return results
         end
 
         def judge_mach_o(line)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deal
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kyle.zhou