prak 1.3 → 1.3.1

data/Manifest.txt

@@ -7,6 +7,7 @@ lib/prak.rb
 lib/prak/bootstrap.rb
 lib/prak/command_line.rb
 lib/prak/compile_match_file.rb
+lib/prak/help.rb
 lib/prak/file.rb
 lib/prak/search.rb
 prak.gemspec

data/Rakefile

@@ -7,8 +7,9 @@ $:.unshift 'lib'
 require 'prak'
 
 Hoe.spec('prak') do |p|
-  p.author = 'Sven Winkler'
-  p.email = 'sven@q-logix.de'
+  p.author = 'Sven Winkler (originally Daniel Lucraft)'
+  p.email = 'svenwn@gmail.com'
+  p.url = %q{http://github.com/sven-q/prak}
   p.version = Prak::VERSION
   p.summary = 'A grep replacement in Ruby, type "$prak pattern".'
   p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")

data/lib/prak/command_line.rb

@@ -66,14 +66,12 @@ class Prak
 
     FILE_TYPES.each do |type, exts|
       if ARGV.delete('--'+type.to_s)
-        exts.each do |ext|
-          opt[:includes] << ext
-        end
+        ARGV << '--type'
+        ARGV << type.to_s
       end
       if ARGV.delete('--no'+type.to_s)
-        exts.each do |ext|
-          opt[:excludes] << ext
-        end
+        ARGV << '--type'
+        ARGV << 'no'+type.to_s
       end
     end
 
@@ -114,7 +112,7 @@ class Prak
       [ '-x', '--line-regexp', GetoptLong::NO_ARGUMENT ],
       [ '-s', '--line-start', GetoptLong::NO_ARGUMENT ],
       [ '-e', '--line-end', GetoptLong::NO_ARGUMENT ],
-      [ '-E', '--encoding', GetoptLong::REQUIRED_ARGUMENT ],
+      [ '-E', '--encoding', GetoptLong::REQUIRED_ARGUMENT ]
     )
 
     self.standard_options
@@ -133,10 +131,12 @@ class Prak
         case option
         when '--help'
           if arg == ""
-            # TODO: USAGE_HELP
             puts USAGE_HELP
           elsif arg == "types" or arg == "type"
             puts TYPES_HELP
+            FILE_TYPES.sort_by{|type,exts| type.to_s}.each do |type, exts|
+              puts "    --[no]%-13s %s\n" % [type, exts.join(" ")]
+            end
           end
           exit
         when '--max-count'

data/lib/prak/compile_match_file.rb

@@ -115,7 +115,8 @@ class Prak
     c << %{            prefix = "\#{i.to_s.rjust(4) }|" }
                         else
                           if opt[:print_file_each_line]
-    c << %{              fn_str = (fn.is_a?(String) ? FILE_COLOUR + fn + CLEAR_COLOURS + ":" : "") }
+    c << %{              fn_str = (fn.is_a?(String) ? FILE_COLOUR + fn +
+                         CLEAR_COLOURS + ":" : "") }
     c << %{              prefix = fn_str + "\#{i.to_s }:" }
                           else
     c << %{              prefix = "" }

data/lib/prak/file.rb

@@ -94,7 +94,13 @@ class Prak
 
   def self.shebang_matches(fn)
     begin
-      line = File.open(fn, :encoding => opt[:standard_encoding]).readline
+      if ruby_1_9?
+        line = File.open(fn, :encoding => opt[:standard_encoding])
+      else
+        line = File.open(fn)
+      end
+      line = line.readline
+
       if line =~ /^#!/
         if line =~ /\b(ruby|perl|php|python|make)[0-9.]*\b/i
           FILE_TYPES[$1.downcase.intern].first

data/lib/prak/help.rb

@@ -0,0 +1,88 @@
+class Prak
+
+USAGE_HELP=<<END
+Usage: rak [OPTION]... PATTERN [FILES]
+
+Search for PATTERN in each source file in the tree from cwd on down.
+If [FILES] is specified, then only those files/directories are checked.
+rak will search STDIN only if no FILES are specified.
+
+Example: rak -i select
+
+Searching:
+  -i, --ignore-case     Ignore case distinctions
+  -v, --invert-match    Invert match: select non-matching lines
+  -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
+                        Only print filenames containing matches
+  -L, --files-without-match
+                        Only print filenames with no match
+  -o                    Show only the part of a line matching PATTERN
+                        (turns off text highlighting)
+  --passthru            Print all lines, whether matching or not
+  --output=expr         Output the evaluation of expr for each line
+                        (turns off text highlighting)
+  -m, --max-count=NUM   Stop searching in a file after NUM matches
+  -H, --with-filename   Print the filename for each match
+  -h, --no-filename     Suppress the prefixing filename on output
+  -c, --count           Show number of lines matching per file
+
+  --group               Group matches by file name.
+                        (default: on when used interactively)
+  --nogroup             One result per line, including filename, like grep
+                        (default: on when the output is redirected)
+
+  --[no]colour          Highlight the matching text (default: on unless
+                        output is redirected, or on Windows)
+
+  -A NUM, --after-context=NUM
+                        Print NUM lines of trailing context after matching
+                        lines.
+  -B NUM, --before-context=NUM
+                        Print NUM lines of leading context before matching
+                        lines.
+  -C [NUM], --context[=NUM]
+                        Print NUM lines (default 2) of output context.
+
+File finding:
+  -f                    Only print the files found, without searching.
+                        The PATTERN must not be specified.
+  --sort-files          Sort the found files lexically.
+
+File inclusion/exclusion:
+  -n                    No descending into subdirectories
+  -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.
+  --type=ruby           Include only Ruby files.
+  --noruby              Exclude Ruby files.
+  --type=noruby         Exclude Ruby files.
+                        See "rak --help type" for supported filetypes.
+  --[no]follow          Follow symlinks.  Default is off.
+
+Miscellaneous:
+  --help                This help
+  --version             Display version & copyright
+END
+
+TYPES_HELP=<<END
+Usage: rak [OPTION]... PATTERN [FILES]
+
+The following is the list of filetypes supported by rak.  You can
+specify a file type with the --type=TYPE format, or the --TYPE
+format.  For example, both --type=ruby and --ruby work.
+
+Note that some extensions may appear in multiple types.  For example,
+.pod files are both Perl and Parrot.
+
+END
+
+end

data/lib/prak/search.rb

@@ -1,8 +1,9 @@
 class Prak
 
-  def self.search
+  def self.search run_opts = {}
 
-    parse_command_line_options
+    # command_line_options and sets some standards
+    parse_command_line_options if run_opts.empty?
 
     unless opt[:colour]
       FILE_COLOUR.replace ""
@@ -15,7 +16,6 @@ class Prak
         puts fn
       end
     elsif ARGV.empty?
-      # TODO USAGE_HELP
       puts USAGE_HELP
       exit
     else
@@ -23,7 +23,8 @@ class Prak
       compiled = false
       file_separator = ""
       each_file(ARGV) do |fn|
-        # each_file might turn off printing file name, but only before first yield
+        # each_file might turn off printing file name,
+        # but only before first yield
         unless compiled
           compile_match_file
           compiled = true

data/lib/prak.rb

@@ -1,5 +1,5 @@
 class Prak
-  VERSION = "1.3"
+  VERSION = "1.3.1"
 end
 
 require "prak/bootstrap"

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: prak
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
-- Sven Winkler
+- Sven Winkler (originally Daniel Lucraft)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-23 00:00:00.000000000Z
+date: 2011-08-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2156887920 !ruby/object:Gem::Requirement
+  requirement: &2161105640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *2156887920
+  version_requirements: *2161105640
 description: ! 'Modifications by Sven Winkler
 
 
@@ -34,7 +34,7 @@ description: ! 'Modifications by Sven Winkler
 
 
   Based on the Perl tool ''ack'' by Andy Lester.'
-email: sven@q-logix.de
+email: svenwn@gmail.com
 executables:
 - prak
 extensions: []
@@ -52,6 +52,7 @@ files:
 - lib/prak/bootstrap.rb
 - lib/prak/command_line.rb
 - lib/prak/compile_match_file.rb
+- lib/prak/help.rb
 - lib/prak/file.rb
 - lib/prak/search.rb
 - prak.gemspec