rak 0.8.0 → 0.9

data/History.txt

@@ -1,3 +1,14 @@
+
+== 0.9 / 2008-02-03
+
+* Added .rake to ruby files
+* Colouring works on Win32 if win32console gem is installed.
+* Checks that file is readable by the current user.
+* Ignores socket files.
+* Added .erb and .haml to Ruby filetypes.
+* Added search at end-of/start-of line options
+* Fixed searching up the directory tree when passed '.'
+
 == 0.8.0 / 2007-10-30
 
 * Initial release.

data/bin/rak

@@ -1,9 +1,18 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
+
+if RUBY_PLATFORM =~ /mswin/
+  begin
+    require 'win32console'
+  rescue LoadError
+    ARGV << "--nocolour"
+  end
+end
+
 require 'getoptlong'
 
 begin
-  require 'rubygems'
   require 'oniguruma'
   require 'inline'
   $use_onig = true
@@ -14,7 +23,7 @@ end
 $use_onig = false
 
 class Rak
-  VERSION = "0.0.1"
+  VERSION = "0.9"
   
   FILE_COLOUR = "\033[1;31m"
   MATCH_COLOUR = "\033[1;37m\033[41m"
@@ -23,7 +32,7 @@ class Rak
   VERSION_INFO=<<END
 rak #{VERSION}
 
-Copyright 2007 Daniel Lucraft, all rights reserved. 
+Copyright 2008 Daniel Lucraft, all rights reserved. 
 Based on the perl tool 'ack' by Andy Lester.
 
 This program is free software; you can redistribute it and/or modify it
@@ -32,7 +41,6 @@ END
   
   FILE_TYPES = {
     :asm         => %w( .s .S ),
-    #     :binary      => q{Binary files, as defined by Perl's -B op (default: off)},
     :cc          => %w( .c .h .xs ),
     :cpp         => %w( .cpp .m .h .C .H ),
     :csharp      => %w( .cs ),
@@ -41,7 +49,6 @@ END
     :haskell     => %w( .hs .lhs ),
     :hh          => %w( .h ),
     :html        => %w( .htm .html .shtml ),
-    #   :skipped     => q{Files, but not directories, normally skipped by ack (default: off)},
     :lisp        => %w( .lisp ),
     :java        => %w( .java properties ),
     :js          => %w( .js ),
@@ -54,7 +61,7 @@ END
     :php         => %w( .php .phpt .php3 .php4 .php5 ),
     :prolog      => %w( .pl .ecl ),
     :python      => %w( .py ),
-    :ruby        => %w( .rb .rhtml .rjs .rxml Rakefile ),
+    :ruby        => %w( .rb .rhtml .rjs .rxml Rakefile .rake .erb .haml),
     :scheme      => %w( .scm ),
     :shell       => %w( .sh .bash .csh .ksh .zsh ),
     :sql         => %w( .sql .ctl ),
@@ -127,7 +134,9 @@ END
                             [ '--before-context', '-B', GetoptLong::REQUIRED_ARGUMENT ],
                             [ '--context', '-C', GetoptLong::OPTIONAL_ARGUMENT ],
                             [ '-g', GetoptLong::REQUIRED_ARGUMENT ],
-                            [ '-x', '--line-regexp', GetoptLong::NO_ARGUMENT ]
+                            [ '-x', '--line-regexp', GetoptLong::NO_ARGUMENT ],
+                            [ '-s', '--line-start', GetoptLong::NO_ARGUMENT ],
+                            [ '-e', '--line-end', GetoptLong::NO_ARGUMENT ]
                             )
 
     dir = nil
@@ -147,6 +156,8 @@ END
     opt[:print_match] = false
     opt[:match_whole_words] = false
     opt[:match_whole_lines] = false
+    opt[:match_line_starts] = false
+    opt[:match_line_ends] = false
     opt[:print_file_each_line] = false
     opt[:print_file_if_match] = false
     opt[:print_file_if_no_match] = false
@@ -175,7 +186,7 @@ END
         when '--help'
           if arg == ""
             puts USAGE_HELP
-          elsif arg == "types"
+          elsif arg == "types" or arg == "type"
             puts TYPES_HELP
           end
           exit
@@ -282,6 +293,10 @@ END
           opt[:filename_regex] = arg
         when '-x'
           opt[:match_whole_lines] = true
+        when '-s'
+          opt[:match_line_starts] = true
+        when '-e'
+          opt[:match_line_ends] = true
         end
       end
     rescue GetoptLong::InvalidOption => ex
@@ -318,6 +333,7 @@ END
   
   def self.get_all_files(files=[], dir="./")
     Dir[dir+"*"].each do |fn|
+      next if fn == ".."
       if File.directory? fn
         if opt[:descend] 
           if File.symlink? fn
@@ -329,12 +345,14 @@ END
           end
         end
       else
-        if File.symlink? fn
-          if opt[:follow_symlinks]
+        if !File.socket? fn and File.readable? fn
+          if File.symlink? fn
+            if opt[:follow_symlinks]
+              files << fn
+            end
+          else
             files << fn
           end
-        else
-          files << fn
         end
       end
     end
@@ -476,6 +494,12 @@ END
     if opt[:match_whole_lines]
       str = "^" + str + "$"
     end
+    if opt[:match_line_starts]
+      str = "^" + str
+    end
+    if opt[:match_line_ends]
+      str = str + "$"
+    end
     if $use_onig
       if opt[:ignore_case]
         re = Oniguruma::ORegexp.new(str, :options => Oniguruma::OPTION_IGNORECASE)
@@ -519,7 +543,7 @@ END
     code << %{  elsif fn.is_a? IO               }
     code << %{    f = fn                        }
     code << %{  end                             }
-    
+
     code << %{  f.each_line do |line|                                          }
     code << %{    i += 1                                                         }
     code << %{    rest = line                                                      }
@@ -642,9 +666,6 @@ END
     code << %{    end                                                                      }
                 end 
     code << %{end }
-#    if ENV['RACK_TEST'] == "true"
-#      File.open("compiled_method.rb", "w") {|f| f.puts code}
-#    end
     module_eval code
   end
   
@@ -692,6 +713,8 @@ Searching:
   -w, --word-regexp     Force PATTERN to match only whole words
   -x, --line-regexp     Force PATTERN to match only whole lines
   -Q, --literal         Quote all metacharacters; expr is literal
+  -s, --line-start      Match only at the start of a line
+  -e, --line-start      Match only at the end of a line
 
 Search output:
   -l, --files-with-matches
@@ -780,7 +803,7 @@ Note that some extensions may appear in multiple types.  For example,
     --[no]php       .php .phpt .php3 .php4 .php5
     --[no]prolog    .pl .ecl
     --[no]python    .py
-    --[no]ruby      .rb .rhtml .rjs .rxml Rakefile
+    --[no]ruby      .rb .rhtml .rjs .rxml Rakefile .rake .erb .haml
     --[no]scheme    .scm
     --[no]shell     .sh .bash .csh .ksh .zsh
     --[no]sql       .sql .ctl

data/lib/rak.rb

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

data/spec/help_spec.rb

@@ -12,9 +12,9 @@ describe "Rak", "help and errors" do
   
   it "--version prints version information" do
     strip_ansi(%x{rak --version}).should == t=<<END
-rak 0.0.1
+rak 0.9
 
-Copyright 2007 Daniel Lucraft, all rights reserved. 
+Copyright 2008 Daniel Lucraft, all rights reserved. 
 Based on the perl tool 'ack' by Andy Lester.
 
 This program is free software; you can redistribute it and/or modify it

data/spec/rak_spec.rb

@@ -1,4 +1,5 @@
 
+require 'fileutils'
 
 require File.dirname(__FILE__) + "/spec_helpers"
 
@@ -6,6 +7,9 @@ describe "Rak", "with no options" do
   before(:all) do
     ENV['RAK_TEST'] = "true"
   end
+  before(:each)do
+    FileUtils.cd(HERE+"/example/")
+  end
   after(:all) do
     ENV['RAK_TEST'] = "false"
   end
@@ -459,6 +463,28 @@ END
    3|*foo foo foo Caprica foo foo foo*
    4|*foo Capsicum foo foo foo foo foo*
 
+END
+  end
+
+  it "-s means match only at the start of a line" do
+    asterize_ansi(%x{rak -s "foo Cap"}).should == t=<<END
+*foo.rb*
+   4|*foo Cap*sicum foo foo foo foo foo
+
+END
+  end
+
+  it "-e means match only at the end of a line" do
+    asterize_ansi(%x{rak -e "kon foo foo"}).should == t=<<END
+*foo.rb*
+   6|foo foo foo foo foo Pi*kon foo foo*
+
+END
+  end
+  
+  it "should not recurse down '..' when used with . " do
+    FileUtils.cd(HERE+"/example/dir1/")
+    asterize_ansi(%x{rak foo .}).should == t=<<END
 END
   end
 end
@@ -467,6 +493,9 @@ describe "Rak", "with combinations of options" do
   before(:all) do
     ENV['RAK_TEST'] = "true"
   end
+  before(:each)do 
+    FileUtils.cd(HERE+"/example/")
+  end
   after(:all) do
     ENV['RAK_TEST'] = "false"
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rak
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
-date: 2007-11-02 00:00:00 +00:00
+  version: "0.9"
+date: 2008-02-03 00:00:00 +00:00
 summary: A grep replacement in Ruby, type "$rak pattern".
 require_paths: 
 - lib
@@ -60,5 +60,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.4.0
     version: