deal 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ae39b40eeecc6f975ba329d635d6253b8afeadaf1c3a13b2b6870bdedbbc4ee
-  data.tar.gz: 3f442e74e003f64498b314437064d2ee55f96ef1d34b67ba5b50568eec7757c5
+  metadata.gz: 64c55e863d6ae854a1dade765920e7f336f46672eab7561e042569e2ea4581f2
+  data.tar.gz: f29ef62a31c14a95d19008d2196b2c1f026e060d5cb69b47098ecd1f2e62d2f3
 SHA512:
-  metadata.gz: c9a864205ff7a952dc7f37629105a38bf292f8427b03943c26f79eb3a47f2b2b028d46dc2733a6cd54a933d8952a2266c004495111bb0904b0e46cc1dd86013d
-  data.tar.gz: f799d1a78bcefeadd5681fc454beeb306d0ce9d64619cb389e301f249c97a79a4d0d6a738157173d77b64571c0edd18c3a3d574e3b1c734649fa519e94bae587
+  metadata.gz: 4e81a5706b06d860156ca0868acd5714bd8f5797c1fab507919ec5488d8366c0b8b89c2a9bc81e17f5dc11001377207441becb558b2c59d906c8c401eb9855f8
+  data.tar.gz: bceed1b4f3192cd8e29782adc4257d782260d94e3461e1d751b24f10a2bffd3e916d4e9c807845c5208f13c39f4156717bb565a67eac26b79acb2e4415ece9e0

data/lib/deal/gem_version.rb

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

data/lib/deal/utils/deal_config.rb

@@ -17,11 +17,12 @@ module Deal
     }
 
     class DealResult
-        def initialize(type,item,match_key,action)
+        def initialize(type,item,match_key,action,path)
             @type = type
-            @item = item
+            @item = item.strip
             @match_key = match_key
             @action = action
+            @file_path = path
         end
 
         def set_line_n(line)
@@ -32,14 +33,15 @@ module Deal
             @file_path = path
         end
         def to_s
+
             s = []
             s.push '{'
-            s.push "type:#{@type}" if @type
+            # 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
+            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 "line_number:#{@line_n}" if @line_n
             s.push '}'
 
             return s.join("\n")
@@ -99,7 +101,7 @@ module Deal
                 end
             end
             if !JUDEG_ACTION.values.include? @judge_action
-                logE "judge_action value [#{type}] is invalid"
+                logE "judge_action value [#{@judge_action}] is invalid"
                 pass = false
             end
             if !pass
@@ -131,24 +133,25 @@ module Deal
             return true
         end
 
-        def action(sign,line)
+        def action(sign,line,path=nil )
             if @judge_action == JUDEG_ACTION[:REPLACE]
                 return @replace
             elsif @judge_action == JUDEG_ACTION[:REMOVE]
                 return nil
             elsif @judge_action == JUDEG_ACTION[:ABORT]
-                raise "
-                        find a error, do ABORT action:
-                        match key:#{sign.source}
-                        match item:#{line}
-                    "
+                error =[]
+                error.push "find a error, do ABORT action:"
+                error.push"match key:#{sign.source}"
+                error.push "match item:#{line}"
+                error.push "match path:#{path}"
+                raise error.join("\n")
             elsif @judge_action == JUDEG_ACTION[:REPORT]
                 return line
             end
         end
         def judge_item(path)
             if  !include_path(path)
-                logW 'jump path'
+                logW 'jump path :'+path
                 return
             end
 
@@ -196,8 +199,7 @@ module Deal
                     for sign in @signs
                         if sign.match? line
                             action_tip = ''
-                            ret = action sign,line
-                            result.push ret
+                            ret = action sign,line,path
                             need_replace = true
                             if ret
                                 lines.push ret
@@ -208,8 +210,9 @@ module Deal
                             else
                                 action_tip = 'remove'
                             end
-                            ret = DealResult.new('text',line,sign.source,action_tip)
+                            ret = DealResult.new('text',line,sign.source,action_tip,path)
                             ret.set_line_n lines.length
+                            result.push ret
                         end
                     end
                     if !need_replace
@@ -276,7 +279,7 @@ module Deal
                         action_tip='remove files'
                         FileUtils.rm_rf path
                     end
-                    return results.push DealResult.new('path',path,sign.source,action_tip)
+                    return results.push DealResult.new('path',nil ,sign.source,action_tip,path)
                 end
             end
             return results

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deal
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - kyle.zhou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler