findr 0.0.3 → 0.0.4

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/Gemfile.lock

@@ -0,0 +1,16 @@
+PATH
+  remote: .
+  specs:
+    findr (0.0.4)
+      rake
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (0.9.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  findr!

data/README.md

@@ -0,0 +1,3 @@
+*findr* is a ruby find and replace tool for batch editing text files.
+
+[![Build Status](https://travis-ci.org/mstrauss/findr.svg)](https://travis-ci.org/mstrauss/findr)

data/Rakefile

@@ -0,0 +1,5 @@
+task :default => [:test]
+
+task :test do
+  exit system "bin/findr -g '*.rb' VERSION"
+end

data/findr.gemspec

@@ -6,33 +6,34 @@ require "findr/version"
 Gem::Specification.new do |s|
   s.name     = "findr"
   s.version  = Findr::VERSION.dup
-  s.date     = "2012-06-01"
+  s.date     = "2014-11-20"
   s.summary  = "A ruby find and replace tool for batch editing text files."
   s.email    = "Markus@ITstrauss.eu"
   s.homepage = "https://github.com/mstrauss/findr"
   s.authors  = ['Markus Strauss']
-  
+
   s.description = <<-EOF
 A ruby find and replace tool for batch editing text files.
 EOF
-  
+
   dependencies = [
+    [:test, 'rake']
     # Examples:
     # [:runtime,     "rack",  "~> 1.1"],
     # [:development, "rspec", "~> 2.1"],
   ]
-  
+
   s.files         = Dir['**/*']
   s.test_files    = Dir['test/**/*'] + Dir['spec/**/*']
   s.executables   = Dir['bin/*'].map { |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
-  
+
+
   ## Make sure you can build the gem on older versions of RubyGems too:
   s.rubygems_version = "1.8.11"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.specification_version = 3 if s.respond_to? :specification_version
-  
+
   dependencies.each do |type, name, version|
     if s.respond_to?("add_#{type}_dependency")
       s.send("add_#{type}_dependency", name, version)

data/lib/findr/cli.rb

@@ -3,47 +3,45 @@ require 'pathname'
 require 'tempfile'
 require 'optparse'
 require 'yaml'
-
-# this is deprecated on 1.9, but still works fine
-require 'iconv'
+require 'pp'
 
 require 'findr/version'
-
+require 'findr/encoder'
 
 module Findr
-  
+
   class CLI
-    
+
     CONFIGFILE = '.findr-config'
-    
+
     def colorize(text, color_code)
       "\e[#{color_code}m#{text}\e[0m"
     end
-    
+
     def red(text); colorize(text, 31); end
     def green(text); colorize(text, 32); end
     def yellow(text); colorize(text, 33); end
     def blue(text); colorize(text, 34); end
-    
+
     def banner
       red( "FINDR VERSION #{Findr::VERSION}. THIS PROGRAM COMES WITH NO WARRANTY WHATSOEVER. MAKE BACKUPS!") + $/ +
       "Usage: #{Pathname($0).basename} [options] <search regex> [<replacement string>]"
     end
-    
+
     def show_usage
       puts(@option_parser.help)
       exit
     end
-    
+
     def execute(stdout, arguments=[])
       # unless arguments[0]
       # end
-      
+
       # default options
       options = {}
       options[:glob] = '*'
       options[:coding] = 'utf-8'
-      
+
       # options from file, if present
       if File.exists?( CONFIGFILE )
         file_options = YAML.load_file(CONFIGFILE)
@@ -51,7 +49,7 @@ module Findr
         options.merge!( file_options )
         stdout.puts green "Using #{CONFIGFILE}."
       end
-      
+
       # parse command line
       @option_parser = OptionParser.new do |opts|
         opts.on('-g', '--glob FILE SEARCH GLOB', 'e.g. "*.{rb,erb}"') do |glob|
@@ -66,10 +64,14 @@ module Findr
         opts.on('-s', '--save', "saves your options to #{CONFIGFILE} for future use") do
           options[:save] = true
         end
+        opts.on('-C', '--codings-list', "list available encodings") do
+          pp Encoder.list
+          exit
+        end
       end
       @option_parser.banner = self.banner
       @option_parser.parse!( arguments )
-      
+
       # optionally save the configuration to file
       if options[:save]
         options.delete(:save)
@@ -78,7 +80,7 @@ module Findr
         stdout.puts green "Saved options to file #{CONFIGFILE}."
         exit
       end
-      
+
       show_usage if arguments.size == 0
       arguments.clone.each do |arg|
         if !options[:find]
@@ -91,21 +93,20 @@ module Findr
           show_usage
         end
       end
-      
+
       show_usage if arguments.size != 0
       stdout.puts green "File inclusion glob: " + options[:glob]
       stdout.puts green "Searching for regex " + options[:find].to_s
-      
+
       # some statistics
       stats = {}
       stats[:total_hits] = stats[:local_hits] = stats[:hit_files] = stats[:total_files] = 0
-      
+
       replacement_done = false
       tempfile = nil
-      
-      coding_to_utf8 = Iconv.new('utf-8', options[:coding])
-      utf8_to_coding = Iconv.new(options[:coding], 'utf-8')
-      
+
+      coder = Encoder.new( options[:coding] )
+
       Pathname.glob("**/#{options[:glob]}").each do |current_file|
         next unless current_file.file?
         stats[:total_files] += 1
@@ -115,9 +116,9 @@ module Findr
         tempfile = Tempfile.new( 'current_file.basename' ) if options[:replace] && options[:force]
         current_file.each_line do |l|
           begin
-            l = coding_to_utf8.iconv(l)
-          rescue Iconv::IllegalSequence
-            stdout.puts "Skipping file #{current_file} because of error on line #{linenumber}: #{$!.class} #{$!.message}"
+            l = coder.decode(l)
+          rescue Encoder::Error
+            stdout.puts "Skipping file #{current_file} because of error on line #{linenumber}: #{$!.original.class} #{$!.original.message}"
             tempfile.unlink if tempfile
             break
           end
@@ -125,7 +126,7 @@ module Findr
           if l=~ options[:find]
             stats[:local_hits] += 1
             if firstmatch
-              stdout.puts red("#{current_file.cleanpath}:") 
+              stdout.puts red("#{current_file.cleanpath}:")
             end
             stdout.write( yellow( "%6d:" % [linenumber, l] ) )
             stdout.puts l
@@ -133,12 +134,12 @@ module Findr
             if options[:replace]
               stdout.write( blue( "%6d:" % [linenumber, l] ) )
               l_repl = l.gsub( options[:find], options[:replace] )
-              tempfile.puts utf8_to_coding.iconv(l_repl) if tempfile
+              tempfile.puts coder.encode(l_repl) if tempfile
               stdout.puts blue l_repl
               replacement_done = true
             end
           elsif tempfile
-            tempfile.puts utf8_to_coding.iconv(l)
+            tempfile.puts coder.encode(l)
           end
         end
         if tempfile
@@ -146,18 +147,18 @@ module Findr
           FileUtils.cp( tempfile.path, current_file ) if stats[:local_hits] > 0
           tempfile.unlink
         end
-        
+
         if stats[:local_hits] > 0
           stats[:total_hits] += stats[:local_hits]
           stats[:hit_files] += 1
         end
-        
+
       end
-    
+
       # some statistics
       stdout.puts green( "#{stats[:total_hits]} occurences (lines) in #{stats[:hit_files]} of #{stats[:total_files]} files found." )
     end
-    
+
   end
 
 end

data/lib/findr/encoder.rb

@@ -0,0 +1,57 @@
+FIRST_RUBY_WITHOUT_ICONV = '1.9'
+require 'iconv' if RUBY_VERSION < FIRST_RUBY_WITHOUT_ICONV
+
+module Findr
+
+  # Class for wrapping original exceptions, which could be from Iconv (Ruby 1.8)
+  # or String (Ruby >=1.9).
+  # ()
+  class Error < ::StandardError
+    attr_reader :original
+    def initialize(msg, original=$!)
+      super(msg)
+      @original = original;
+    end
+  end
+
+  # Wrapper class for String#encode (Ruby >=1.9) and Iconv#iconv (Ruby 1.8).
+  class Encoder
+
+    class Error < Findr::Error; end
+
+    class <<self
+      def list
+        return Iconv.list if RUBY_VERSION < FIRST_RUBY_WITHOUT_ICONV
+        return Encoding.list.map(&:to_s)
+      end
+    end
+
+    def initialize( other_coding )
+      if RUBY_VERSION < FIRST_RUBY_WITHOUT_ICONV
+        @coding_to_utf8 = Iconv.new('UTF-8', other_coding)
+        @utf8_to_coding = Iconv.new(other_coding, 'UTF-8')
+      else
+        @other_coding = Encoding.find(other_coding)
+      end
+    end
+
+    # Encodes given +string+ from +@other_coding+ to utf8.
+    def decode( string )
+      return @coding_to_utf8.iconv(string) if RUBY_VERSION < FIRST_RUBY_WITHOUT_ICONV
+      string.force_encoding(@other_coding)
+      fail Error.new("Encoding '#{@other_coding}' is invalid.") unless string.valid_encoding?
+      return string.encode('UTF-8')
+    rescue
+      raise Error, "Error when decoding from '#{@other_coding}' into 'UTF-8'."
+    end
+
+    # Encodes given utf8 +string+ into +@other_coding+.
+    def encode( string )
+      return @utf8_to_coding.iconv(string) if RUBY_VERSION < FIRST_RUBY_WITHOUT_ICONV
+      return string.encode(@other_coding)
+    rescue
+      raise Error, "Error when encoding from 'UTF-8' into '#{@other_coding}'."
+    end
+  end
+
+end

data/lib/findr/version.rb

@@ -1,3 +1,3 @@
 module Findr
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,74 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: findr
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Markus Strauss
 autorequire: 
 bindir: bin
 cert_chain: []
+date: 2014-11-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'A ruby find and replace tool for batch editing text files.
 
-date: 2012-06-01 00:00:00 Z
-dependencies: []
-
-description: |
-  A ruby find and replace tool for batch editing text files.
-
+'
 email: Markus@ITstrauss.eu
-executables: 
+executables:
 - findr
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/findr
-- findr-0.0.1.gem
-- findr-0.0.2.gem
 - findr.gemspec
+- Gemfile
+- Gemfile.lock
 - lib/findr/cli.rb
+- lib/findr/encoder.rb
 - lib/findr/version.rb
 - lib/findr.rb
+- Rakefile
+- README.md
 homepage: https://github.com/mstrauss/findr
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: A ruby find and replace tool for batch editing text files.
 test_files: []
-
-has_rdoc: