findr 0.0.7 → 0.0.8.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 264462a154498bd31f1314af9efa5dad2361ec1b
-  data.tar.gz: 160cc1ac2b4cbad3fa14d973566f516f57be7dac
+SHA256:
+  metadata.gz: b6de1fc5f3d2a5d0cb4cc25098d1fdad726ba1c7ce531e75a451792a9f403545
+  data.tar.gz: d5f0341e4712ed3d25ccff81cb0a6ef6902bdee32bb08927b0f15cfcb0267fc0
 SHA512:
-  metadata.gz: 7066b9fe2a434f04eaa5e5f591b33b30d9ca1c758ab54ca1297df406ba3eeeb1239cb16f2cb5040a5f20d9cd52d2404e627d80bc31a6041a337334c3daf78b05
-  data.tar.gz: 3cee5b2a3acb9242ab1895e02f4a9b73ecb17ea64ec1c73bb0b3d3ec60b00a164af9765c440df4c261a91bff102297f94c7921a5216cebe1972176d4a30a45ab
+  metadata.gz: 2e7b0a90bbc0739009df34e8813687931e01a9febfebe80df569b9c835cb29b8aaae292a507dd80608f4b64667e30c82ad0089e7c6006e4c75a18c0f61a2cc41
+  data.tar.gz: 6d3493e7cbc56f1b7c5820dba8106927e52765c1736bc8c80e3fcbe3698fc0d5b4f067d221ccb11e6c9d1f16cd005f17b2c02963e98f57a292a37b9645c9ee81

data/lib/findr/cli.rb

@@ -5,6 +5,7 @@ require 'optparse'
 require 'yaml'
 require 'pp'
 
+
 module Findr
 
   class CLI
@@ -16,6 +17,7 @@ module Findr
     end
 
     def red(text); colorize(text, 31); end
+    def light_red(text); colorize(text, 91); end
     def green(text); colorize(text, 32); end
     def yellow(text); colorize(text, 33); end
     def blue(text); colorize(text, 34); end
@@ -136,6 +138,7 @@ module Findr
       verbose "Building file tree..."
       files = Pathname.glob("#{options[:gglob]}")
       verbose ['  ', files.count, ' files found.']
+      stats[:exceptions] = 0
       files.each do |current_file|
         next unless current_file.file?
         verbose ["Reading file ", current_file]
@@ -145,48 +148,62 @@ module Findr
         linenumber = 0
         tempfile = Tempfile.new( 'current_file.basename' ) and verbose(['  Create tempfile ',tempfile.path]) if options[:replace] && options[:force]
         clear_context(); print_post_context = 0
-        current_file.each_line do |l|
-          begin
-            l, coding = coder.decode(l)
-          rescue Encoder::Error
-            stdout.puts "Skipping file #{current_file} because of error on line #{linenumber}: #{$!.original.class} #{$!.original.message}"
-            if tempfile
-              tempfile_path = tempfile.path
-              tempfile.unlink and verbose(['  Delete tempfile ', tempfile_path])
-            end
-            break
-          end
-          linenumber += 1
-          if l=~ options[:find]
-            stats[:local_hits] += 1
-            if firstmatch
-              stdout.puts red("#{current_file.cleanpath}:")
-            end
-            if @context_lines > 0
-              pop_context.map do |linenumber, l|
-                print_line( linenumber, l, coding, false )
+        begin
+          current_file.each_line do |l|
+            begin
+              l, coding = coder.decode(l)
+            rescue Encoder::Error
+              stdout.puts red "Skipping file #{current_file} because of error on line #{linenumber}: #{$!.original.class} #{$!.original.message}"
+              if tempfile
+                tempfile_path = tempfile.path
+                tempfile.unlink and verbose(['  Delete tempfile ', tempfile_path])
               end
-              print_post_context = @context_lines
+              break
             end
-            print_line( linenumber, l.gsub( /(#{options[:find]})/, bold('\1') ), coding, :bold )
-            firstmatch = false
-            if options[:replace]
-              l_repl = l.gsub( options[:find], options[:replace] )
-              tempfile.puts coder.encode(l_repl, coding) if tempfile
-              replacement_done = true
-              print_line( linenumber, l_repl, coding, :blue )
-            end
-          else
-            if tempfile
-              tempfile.puts coder.encode(l, coding)
-            end
-            if print_post_context > 0
-              print_post_context -= 1
-              print_line( linenumber, l, coding )
+            linenumber += 1
+            if l=~ options[:find]
+              stats[:local_hits] += 1
+              if firstmatch
+                stdout.puts red("#{current_file.cleanpath}:")
+              end
+              if @context_lines > 0
+                pop_context.map do |linenumber, l|
+                  print_line( linenumber, l, coding, false )
+                end
+                print_post_context = @context_lines
+              end
+              print_line( linenumber, l.gsub( /(#{options[:find]})/, bold('\1') ), coding, :bold )
+              firstmatch = false
+              if options[:replace]
+                l_repl = l.gsub( options[:find], options[:replace] )
+                tempfile.puts coder.encode(l_repl, coding) if tempfile
+                replacement_done = true
+                print_line( linenumber, l_repl, coding, :blue )
+              end
             else
-              push_context([linenumber, l])
+              if tempfile
+                tempfile.puts coder.encode(l, coding)
+              end
+              if print_post_context > 0
+                print_post_context -= 1
+                print_line( linenumber, l, coding )
+              else
+                push_context([linenumber, l])
+              end
             end
           end
+        rescue SystemCallError
+          puts light_red "EXCEPTION: #$!"
+          stats[:exceptions] += 1
+          next
+        rescue SignalException
+          puts light_red "\n#{$!.class} received."
+          return
+        ensure
+          if tempfile
+            tempfile.close
+            tempfile.unlink
+          end
         end
         if tempfile
           tempfile.close
@@ -207,6 +224,9 @@ module Findr
 
       # some statistics
       stdout.puts green( "#{stats[:total_hits]} occurences (lines) in #{stats[:hit_files]} of #{stats[:total_files]} files found." )
+      if stats[:exceptions] > 0
+        stdout.puts light_red( "#{stats[:exceptions]} exceptions occurenced." )
+      end
     end
 
     def print_line( linenumber, line, coding, color = nil )

data/lib/findr/version.rb

@@ -1,3 +1,3 @@
 module Findr
-  VERSION = '0.0.7'
+  VERSION = '0.0.8.pre1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: findr
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8.pre1
 platform: ruby
 authors:
 - Markus Strauss
@@ -89,6 +89,7 @@ files:
 - lib/findr/strategy_proxy.rb
 - lib/findr/version.rb
 - pkg/findr-0.0.7.gem
+- pkg/findr-0.0.8.pre1.gem
 - spec/findr/encoder_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mstrauss/findr
@@ -106,12 +107,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A ruby find and replace tool for mass editing text files.