fif 0.4.3 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd3fd5c57346ca1f61c3385a69efa439be68c336
-  data.tar.gz: cf4173f168f098cd53dec02c17c3f024a6833307
+  metadata.gz: 6392ab6e3a51332c3ab2bfb306b1f2cffd692f13
+  data.tar.gz: 911fab3a6f71f4dd3434cabd716b92b7fe2cf6ac
 SHA512:
-  metadata.gz: d464fefadefa342f6706528668ab91a8cd7b3e452c5a99fb6cf4ef19e6889b34adb52dc472aeeea9139b9e727c4aa143a0db2560004c5b786fac2d67493e7c33
-  data.tar.gz: f64c93f92c39084d2b3b3dc9ba96712f0e149221477a7b48a96d5463c8c13346f3ea8e292689cfa92de03ee6f7951c685994e0525e75be01d87772f20391556a
+  metadata.gz: 45404cba95e761476fcf9f9f2164adf0151d762d1a6ddb9da338da7976278a748afa68568395b02708915743b40e3977d8a0d9551f12b7a6a1445afbdc464a93
+  data.tar.gz: 38f87079b73aa595ada3abe3dfdcd19e1d59f65a180fd8d754727be35f8f9909497fcfe1ba40dde0a6096341015d9836a5fd601b21a2abc7b801ce366a3a7842

data/bin/fif

@@ -9,6 +9,7 @@ options = {
   :dumb => false,
   :regex_opts => 0,
   :fregex_opts => 0,
+  :folder => '.'
 }
 
 banner = <<-eos
@@ -24,6 +25,10 @@ begin
   OptionParser.new do |o|
     o.banner = banner
 
+    o.on('-f', '--folder [FOLDER]', 'Run in FOLDER, instead of the current directory.') do |f|
+      options[:folder] = f
+    end
+
     o.on('-c', '--colour', 'Disable coloured output.') do |c|
       options[:colour] = false
     end
@@ -65,11 +70,10 @@ rescue OptionParser::InvalidOption
   exit
 end
 
+trap("SIGINT") { exit! }
+
 if ARGV.empty?
   puts "Missing argument(s), see `fif --help`."
-elsif options[:dumb]
-  Fif.dumb_search(ARGV, options) { |result| puts result }
 else
-  p options
   Fif.search(ARGV, options) { |result| puts result }
 end

data/lib/fif.rb

@@ -1,45 +1,30 @@
 require 'fif/utils'
+require 'fif/search'
+require 'fif/dumb_search'
 
 require 'pathname'
 
 class Fif
   def self.search(arguments, options)
-    regex = Regexp.new("(#{arguments[0]})", options[:regex_opts])
-    fregex = Regexp.new("#{arguments[1]}", options[:fregex_opts])
-    Dir.recurse('.') do |file|
-      if arguments[1] == nil || fregex.match(file)
-        if not File.binary?(file)
-          f = File.new(file)
-          f.each do |line|
-            begin
-              if regex.match(line)
-                line.gsub!(regex, '\1'.green) if options[:colour]
-                yield "#{file}:#{f.lineno}:\t#{line}"
-              end
-            rescue ArgumentError
-              puts "Ignoring unreadable file: #{file}"
-            end
-          end
-        end
-      end
-    end
-  end
+    klass = options[:dumb] ? DumbSearch : Search
+    s = klass.new(arguments, options)
 
-  def self.dumb_search(arguments, options)
-    Dir.recurse('.') do |file|
-      if arguments[1] == nil || file[arguments[1]]
-        if not File.binary?(file)
-          f = File.new(file)
-          f.each do |line|
-            if line[arguments[0]]
-              line[arguments[0]] = arguments[0].green if options[:colour]
-              yield "#{file}:#{f.lineno}:\t#{line}"
+    Dir.recurse(options[:folder]) do |file|
+      if s.file_match(file) && !File.binary?(file)
+        f = File.new(file)
+        f.each do |line|
+          begin
+            if s.line_match(line)
+              yield "#{file}:#{f.lineno}:\t#{s.line_format(line)}"
             end
+          rescue ArgumentError
+            puts "Ignoring unreadable file: #{file}"
           end
         end
       end
     end
+
   end
 end
 
-class OptionCombinationError < Exception; end
+class OptionCombinationError < StandardError; end

data/lib/fif/dumb_search.rb

@@ -0,0 +1,30 @@
+class Fif
+  class DumbSearch
+    def initialize(arguments, options)
+      @options = options
+
+      @file = arguments[1]
+      @line = arguments[0]
+    end
+
+    def file_match(file)
+      if @file
+        file[@file]
+      else
+        true
+      end
+    end
+
+    def line_match(line)
+      line[@line]
+    end
+
+    def line_format(line)
+      if @options[:colour]
+        line[@line] = @line.green
+      end
+
+      line
+    end
+  end
+end

data/lib/fif/search.rb

@@ -0,0 +1,30 @@
+class Fif
+  class Search
+    def initialize(arguments, options)
+      @options = options
+
+      @file = Regexp.new(arguments[1], options[:fregex_opts]) if arguments[1]
+      @line = Regexp.new("(#{arguments[0]})", options[:regex_opts])
+    end
+
+    def file_match(file)
+      if @file
+        @file.match(file)
+      else
+        true
+      end
+    end
+
+    def line_match(line)
+      @line.match(line)
+    end
+
+    def line_format(line)
+      if @options[:colour]
+        line.gsub!(@line, '\1'.green)
+      else
+        line
+      end
+    end
+  end
+end

data/lib/fif/version.rb

@@ -0,0 +1,3 @@
+class Fif
+  VERSION = '0.5.1'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fif
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.1
 platform: ruby
 authors:
 - Elliott Hillary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby gem for finding stuff in files.
 email: elliotthillary@googlemail.com
@@ -17,9 +17,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/fif.rb
+- lib/fif/dumb_search.rb
+- lib/fif/search.rb
 - lib/fif/utils.rb
-- test/test_fif.rb
+- lib/fif/version.rb
+- lib/fif.rb
 - bin/fif
 homepage: http://github.com/ElliottH/fif
 licenses: []
@@ -40,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Find in files

data/test/test_fif.rb

@@ -1,84 +0,0 @@
-require 'test/unit'
-require 'fif'
-
-class FifTest < Test::Unit::TestCase
-  def test_search
-    results_a, results_b = 0, 0
-
-    options = {
-      :colour => false,
-      :regex_opts => 0,
-      :fregex_opts => 0,
-    }
-    arguments = [
-      "f[aeiou]f"
-    ]
-    regex = Regexp.new(arguments[0])
-
-    Fif.search(arguments, options) do |result|
-      results_a += 1
-      assert regex.match result
-    end
-
-
-    arguments[1] = ".rb"
-
-    Fif.search(arguments, options) do |result|
-      results_b += 1
-      assert regex.match result
-    end
-
-
-    assert_not_equal results_a, results_b
-
-
-    arguments[0] = "F[aeiou]F"
-    arguments[1] = nil
-    options[:regex_opts] |= Regexp::IGNORECASE
-    regex = Regexp.new(arguments[0], Regexp::IGNORECASE)
-    results_a, results_b = 0, 0
-
-    Fif.search(arguments, options) do |result|
-      results_a += 1
-      assert regex.match result
-    end
-
-    arguments[1] = ".rB"
-    options[:fregex_opts] |= Regexp::IGNORECASE
-
-    Fif.search(arguments, options) do |result|
-      results_b += 1
-      assert regex.match result
-    end
-
-
-    assert_not_equal results_a, results_b
-  end
-
-  def test_dumb
-    results_a, results_b = 0, 0
-
-    options = {
-      :colour => false
-    }
-    arguments = [
-      "fif"
-    ]
-
-    Fif.dumb_search(arguments, options) do |result|
-      results_a += 1
-      assert result.include? arguments[0]
-    end
-
-
-    arguments[1] = ".rb"
-
-    Fif.dumb_search(arguments, options) do |result|
-      results_b += 1
-      assert result.include? arguments[0]
-    end
-
-
-    assert_not_equal results_a, results_b
-  end
-end