rak 0.9 → 1.0

data/History.txt

@@ -1,4 +1,15 @@
 
+== 1.0 / 2009-09-27
+
+* MinGW is a valid Windows platform type.
+* Can use ~bang and ~ques in a regex and they will be turned into ! and ?
+  This is to get around bash.
+* Added -k negative file match option (Contributed by Juozas Gaigalas')
+* Added .cc and .hpp to the C++ file types
+* Added Vala file types
+* 20% faster on average
+* Moved to Github
+
 == 0.9 / 2008-02-03
 
 * Added .rake to ruby files

data/README.txt

@@ -1,9 +1,9 @@
 rak
-    by Daniel Lucraft
-    http://rubyforge.org/projects/rak
+http://rubyforge.org/projects/rak
+Daniel Lucraft (http://danlucraft.com/blog/)
 
 == DESCRIPTION:
-  
+
 Replacement for grep. Recursively scans directories to match a given
 Ruby regular expression. Prints highlighted results.
 

data/bin/rak

@@ -2,7 +2,7 @@
 
 require 'rubygems'
 
-if RUBY_PLATFORM =~ /mswin/
+if RUBY_PLATFORM =~ /mswin|mingw/
   begin
     require 'win32console'
   rescue LoadError
@@ -20,8 +20,6 @@ rescue LoadError
   $use_onig = false
 end
 
-$use_onig = false
-
 class Rak
   VERSION = "0.9"
   
@@ -42,7 +40,7 @@ END
   FILE_TYPES = {
     :asm         => %w( .s .S ),
     :cc          => %w( .c .h .xs ),
-    :cpp         => %w( .cpp .m .h .C .H ),
+    :cpp         => %w( .cpp .cc .m .h .hpp .C .H ),
     :csharp      => %w( .cs ),
     :css         => %w( .css ),
     :elisp       => %w( .el ),
@@ -69,6 +67,7 @@ END
     :tex         => %w( .tex .cls .sty ),
     :text        => %w( .txt .text ),
     :tt          => %w( .tt .tt2 .ttml ),
+    :vala        => %w( .vala .vapi ),
     :vb          => %w( .bas .cls .frm .ctl .vb .resx ),
     :vim         => %w( .vim ),
     :yaml        => %w( .yaml .yml ),
@@ -134,6 +133,7 @@ END
                             [ '--before-context', '-B', GetoptLong::REQUIRED_ARGUMENT ],
                             [ '--context', '-C', GetoptLong::OPTIONAL_ARGUMENT ],
                             [ '-g', GetoptLong::REQUIRED_ARGUMENT ],
+                            [ '-k', GetoptLong::REQUIRED_ARGUMENT ],
                             [ '-x', '--line-regexp', GetoptLong::NO_ARGUMENT ],
                             [ '-s', '--line-start', GetoptLong::NO_ARGUMENT ],
                             [ '-e', '--line-end', GetoptLong::NO_ARGUMENT ]
@@ -170,6 +170,7 @@ END
     opt[:before_context] = 0
     opt[:collect_context] = false
     opt[:filename_regex] = nil
+    opt[:neg_filename_regex] = nil
     
     # if redirected (RAK_TEST allows us to redirect in testing and still 
     # get the non-redirected defaults).
@@ -291,6 +292,8 @@ END
           opt[:after_context] = val
         when '-g'
           opt[:filename_regex] = arg
+        when '-k'
+          opt[:neg_filename_regex] = arg
         when '-x'
           opt[:match_whole_lines] = true
         when '-s'
@@ -452,6 +455,16 @@ END
       files = files.select {|fn| fn =~ fn_re }
     end
     
+    # filter based on -k=REGEX
+    if opt[:neg_filename_regex]
+      if $use_onig
+        fn_re = Oniguruma::ORegexp.new(opt[:neg_filename_regex])
+      else
+        fn_re = Regexp.new(opt[:neg_filename_regex])
+      end
+      files = files.reject {|fn| fn =~ fn_re }
+    end
+    
     # remove the "./"
     files.map! {|fn| fn[0..1] == "./" ? fn[2..-1] : fn}
     
@@ -469,16 +482,20 @@ END
       rescue
         line = ""
       end
-      if line =~ /^#!/
-          if line =~ /\b(ruby|perl|php|python)\b/
-            return "."+FILE_TYPES[$1.intern].first
-          elsif line =~ /\b(bash|csh|ksh|zsh)\b/
-            return ".sh"
+      begin
+        if line =~ /^#!/
+            if line =~ /\b(ruby|perl|php|python)\b/
+              return "."+FILE_TYPES[$1.intern].first
+            elsif line =~ /\b(bash|csh|ksh|zsh)\b/
+              return ".sh"
+            end
+        else
+          if line =~ /\Q<?xml /
+            return ".xml"
           end
-      else
-        if line =~ /\Q<?xml /
-          return ".xml"
         end
+      rescue
+        return nil
       end
       return false
     end
@@ -500,6 +517,7 @@ END
     if opt[:match_line_ends]
       str = str + "$"
     end
+    str = str.gsub("~bang", "!").gsub("~ques", "?")
     if $use_onig
       if opt[:ignore_case]
         re = Oniguruma::ORegexp.new(str, :options => Oniguruma::OPTION_IGNORECASE)
@@ -523,10 +541,7 @@ END
   # the match method based on them. This is gives a 2x speedup over
   # the alternative.
   def self.compile_match_file
-    code = ""
-    def code.<<(str)
-      self.concat(str + "\n")
-    end
+    code = []
     code << %{def self.match_file(re, fn)        }
     code << %{  displayed_filename = false       }
     code << %{  count = 0                        }
@@ -544,7 +559,19 @@ END
     code << %{    f = fn                        }
     code << %{  end                             }
 
-    code << %{  f.each_line do |line|                                          }
+    code << %{  all = f.read                    }
+#     code << %{  p fn }
+#     code << %{  all =~ re rescue p all }
+    code << %{  if all !~ re and not opt[:invert_match] and not opt[:print_entire_line_if_no_match]               }
+                  if opt[:print_file_if_no_match]
+    code << %{      if count == 0                                }
+    code << %{        puts fn                                     }
+    code << %{      end                                 }
+                  end
+    code << %{    return                     }
+    code << %{  end                   }
+  
+    code << %{  all.each_line do |line|                                          }
     code << %{    i += 1                                                         }
     code << %{    rest = line                                                      }
     code << %{    while md = re.match(rest)                                   }
@@ -651,7 +678,9 @@ END
                   if opt[:invert_match]
     code << %{      puts "\#{fn}:\#{i-count}"                                                 }
                   else       
-    code << %{      puts "\#{fn}:\#{count}"                                                 }
+    code << %{      if count > 0                                        }
+    code << %{        puts "\#{fn}:\#{count}"                           }
+    code << %{      end                                                 }
                   end
                 end
                 if opt[:print_file_if_match]
@@ -666,7 +695,7 @@ END
     code << %{    end                                                                      }
                 end 
     code << %{end }
-    module_eval code
+    module_eval code.join("\n")
   end
   
   def self.print_highlighted(prefix, line, matches)
@@ -755,7 +784,8 @@ File finding:
 
 File inclusion/exclusion:
   -n                    No descending into subdirectories
-  -g REGEX              Only search in file matching REGEX.
+  -g REGEX              Only search in files matching REGEX.
+  -k REGEX              Only search in files not matching REGEX.
   -a, --all             All files, regardless of extension (but still skips
                         blib, pkg, CVS, _darcs, .git, .pc, RCS, SCCS and .svn dirs)
   --ruby                Include only Ruby files.

data/lib/rak.rb

@@ -1,4 +1,4 @@
 
 class Rak
-  VERSION = "0.9"
+  VERSION = "1.0"
 end

data/spec/rak_spec.rb

@@ -158,14 +158,10 @@ Cap
 END
   end
   
-  
   it "-c prints only the number of matches found per file" do
     t=<<END
-quux.py:0
 dir1/bar.rb:2
 foo.rb:2
-shebang:0
-Rakefile:0
 END
     sort_lines(strip_ansi(%x{rak Pik -c})).should == sort_lines(t)
   end
@@ -447,12 +443,23 @@ foo.rb
 
 END
   end
+
   it "-g REGEX only searches in files matching REGEX" do
     asterize_ansi(%x{rak Pikon -g f.o}).should == t=<<END
 *foo.rb*
    6|foo foo foo foo foo *Pikon* foo foo
    8|foo *Pikon* foo foo foo foo foo foo
 
+END
+
+  end
+
+  it "-k REGEX only searches in files not matching REGEX" do
+    asterize_ansi(%x{rak Pikon -k f.o}).should == t=<<END
+*dir1/bar.rb*
+   2|bar bar bar bar *Pikon* bar
+   9|bar bar *Pikon* bar bar bar
+
 END
   end
   

metadata

@@ -1,33 +1,49 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: rak
 version: !ruby/object:Gem::Version 
-  version: "0.9"
-date: 2008-02-03 00:00:00 +00:00
-summary: A grep replacement in Ruby, type "$rak pattern".
-require_paths: 
-- lib
-email: dan@fluentradical.com
-homepage: "    by Daniel Lucraft"
-rubyforge_project: rak
-description: "Based on the Perl tool 'ack' by Andy Lester.  Examples with similar grep:  $ rak pattern $ grep pattern $(find . | grep -v .svn)  $ rak --ruby pattern $ grep pattern $(find . -name '*.rb' | grep -v .svn)  == FEATURES/PROBLEMS:  * Ruby regular expression syntax (uses oniguruma gem if installed). * Highlighted output. * Automatically recurses down the current directory or any given directories. * Skips version control directories, backups like '~' and '#' and your * ruby project's pkg directory. * Allows inclusion and exclusion of files based on types. * Many options similar to grep."
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: "1.0"
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Daniel Lucraft
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-09-27 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.3
+    version: 
+description: |-
+  Replacement for grep. Recursively scans directories to match a given
+  Ruby regular expression. Prints highlighted results.
+  
+  Based on the Perl tool 'ack' by Andy Lester.
+  
+  Examples with similar grep:
+   
+    $ rak pattern
+    $ grep pattern $(find . | grep -v .svn)
+  
+    $ rak --ruby pattern
+    $ grep pattern $(find . -name '*.rb' | grep -v .svn)
+email: dan@fluentradical.com
+executables: 
+- rak
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 files: 
 - History.txt
 - Manifest.txt
@@ -37,28 +53,34 @@ files:
 - lib/rak.rb
 - spec/rak_spec.rb
 - spec/help_spec.rb
-test_files: []
+has_rdoc: true
+homepage: http://rubyforge.org/projects/rak
+licenses: []
 
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-executables: 
-- rak
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.4.0
-    version: 
+rubyforge_project: rak
+rubygems_version: 1.3.4
+signing_key: 
+specification_version: 3
+summary: A grep replacement in Ruby, type "$rak pattern".
+test_files: []
+