pointme 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
-# pointme 0.1.0 (11-09-2011)
+# pointme 1.0.1 (28 Dec 2011)
+
++ Make it look in files with proper MIME type (not extension like before).
+
+# pointme 1.0.0 (28 Dec 2011)
+
++ It's basicly working.
+
+# pointme 0.1.0 (11 Sep 2011)
 
 + Birthday!

data/README.md

@@ -37,11 +37,23 @@ Pointme can handle several language comments like:
 + ; TODO: content
 + <!-- TODO: content -->
 
+## Supported MIME types
+
++ text/plain
++ text/x-ruby
++ text/x-python
++ text/x-c
++ text/x-c++
++ text/x-shellscript
++ text/x-java
++ text/x-php
++ text/html
+
 ## Dependencies
 
 + ruby (working just great on 1.9.2, haven't tried it on other versions yet)
 + rubygems (the newest the better [for sure works under 1.8.5])
-+ a UNIX tool called `cat` (but you probably have it, right?)
++ a UNIX tools called `cat` and `file` (but you have them, right?)
 
 ## Beware, beware! A bug!
 

data/lib/pointme/cli.rb

@@ -1,36 +1,36 @@
 require "trollop"
 
 module Pointme
-	
-	# Command Line Interface class
-	# 
-	# === Usage
-	# 
-	#     module Pointme
-	#        Cli.new.run!
-	#     end
-	# 
-	# or
-	# 
-	#     Pointme::Cli.new.run!
-	# 
-	# === Exit statuses
-	# 
-	# - *0* Everything went just fine :)
-	# - *1* User said ^C :]
-	# - *2* User wanted to look for UnknownToken
-	# 
-	class Cli
-		
-		# run! the Cli!
-		def run!
-			
-			# Nice, cool 'n' AWESOME --options parsing with Trollop[http://trollop.rubyforge.org/]!
-			# 
-			# @return [Hash] array full of options
-			$opts = Trollop::options do
-				version "pointme version #{Version::STRING}"
-				banner <<-EOB
+  
+  # Command Line Interface class
+  # 
+  # === Usage
+  # 
+  #     module Pointme
+  #        Cli.new.run!
+  #     end
+  # 
+  # or
+  # 
+  #     Pointme::Cli.new.run!
+  # 
+  # === Exit statuses
+  # 
+  # - *0* Everything went just fine :)
+  # - *1* User said ^C :]
+  # - *2* User wanted to look for UnknownToken
+  # 
+  class Cli
+    
+    # run! the Cli!
+    def run!
+      
+      # Nice, cool 'n' AWESOME --options parsing with Trollop[http://trollop.rubyforge.org/]!
+      # 
+      # @return [Hash] array full of options
+      $opts = Trollop::options do
+        version "pointme version #{Version::STRING}"
+        banner <<-EOB
 usage: pointme <token> [options]
 
 tokens are:
@@ -40,30 +40,30 @@ tokens are:
 options are:
 EOB
         # TODO: Looking in directories with no recursion.
-				# opt :no_recurse, "don't look in directories recursively"
-				opt :in, "specify where to look for", :default => Dir.pwd
-				opt :version, "show version and exit"
-				opt :help, "show help and exit"
-			end
-			
-			# Let's see what to look for
-			token = ARGV.shift.downcase
+        # opt :no_recurse, "don't look in directories recursively"
+        opt :in, "specify where to look for", :default => Dir.pwd
+        opt :version, "show version and exit"
+        opt :help, "show help and exit"
+      end
+      
+      # Let's see what to look for
+      token = ARGV.shift.downcase
       unless token == "todos" || token == "fixmes"
         raise Look::UnknownToken, "Unknown token: '#{token}'"
       end
-			# Let's see where to look for
-			where = $opts[:in] || Dir.pwd
-			
-			begin
-				Look.for_the token, where
-				exit 0
-			rescue Interrupt
-				puts "\n\n!# interrupted"
-				exit 1
-			rescue Look::UnknownToken => e
-				puts e.message
-				exit 2
-			end
-		end
-	end
+      # Let's see where to look for
+      where = $opts[:in] || Dir.pwd
+      
+      begin
+        Look.for_the token, where
+        exit 0
+      rescue Interrupt
+        puts "\n\n!# interrupted"
+        exit 1
+      rescue Look::UnknownToken => e
+        puts e.message
+        exit 2
+      end
+    end
+  end
 end

data/lib/pointme/look.rb

@@ -1,91 +1,91 @@
 require "find"
 
 module Pointme
-	module Look
-		
-		# Kinda self explanatory
-		class UnknownToken < RuntimeError; end
-		
-		# @files holds all the specified files that Look should search in.
-		# @lines keeps all the found TODO, FIXME and so-on lines.
-		attr_accessor :files, :lines
-		
-		def self.get_file_list
-			@where.split(":").each do |e|
+  module Look
+    
+    # Kinda self explanatory
+    class UnknownToken < RuntimeError; end
+    
+    # @files holds all the specified files that Look should search in.
+    # @lines keeps all the found TODO, FIXME and so-on lines.
+    attr_accessor :files, :lines
+    
+    def self.get_file_list
+      @where.split(":").each do |e|
         if e == '.' then e = Dir.pwd end
-				@dirs << e unless @dirs.include? e
-				Find.find(e) do |path|
-					if File.directory? path
-						if File.basename(path)[0] == ?.
-							Find.prune # don't look any further into this directory.
-						else
-							next
-						end
-					else
-            ext = File.extname(path)[1..-1]
-            # TODO: Make it look in files with proper MIME type not extension.
-            # Don't look into files with that extensions
-            unless (ext == "class" ||
-                    ext == "jar"
-                    ext == "rar"
-                    ext == "bz"
-                    ext == "bz2"
-                    ext == "gz"
-                    ext == "tgz"
-                    ext == "zip")
-						  @files << path
+        @dirs << e unless @dirs.include? e
+        Find.find(e) do |path|
+          if File.directory? path
+            if File.basename(path)[0] == ?.
+              Find.prune # don't look any further into this directory.
+            else
+              next
             end
-					end
-				end
-			end
-		end
-		
-		def self.search_for_tokens
-			@files.each do |file|
-				@lines[file] = []
-				`cat -n #{file}`.split("\n").each do |line|
-					if /\s*(?<n>[0-9]+)\s+(.*)?(#|\/\/|;|<!--)\s(?<token>TODO|FIXME):?\s(?<content>.*)(-->)?/ =~ line
-						@lines[file] << [n, token, content] if @token == token
-					end
-				end
-				
-				if @lines[file].empty?
-					@lines.delete file
-				end
-			end
-		end
-		 
-		def self.print_output
-			if @lines.empty?
-				puts "[pointme] there are no #{@token}s in a specified path/s"
-			else
-				@lines.each do |e|
-					name = nil
-					if @dirs.size == 1
-						name = e[0].sub @where, ""
-					else
-						name = e[0]
-					end
-					puts "\e[1;34m" + name + ":\e[0;0m"
-					e[1].each do |i|
-						@count += 1
-						puts "  at \e[1;32m#{i[0]}\e[0;0m: #{i[1]} -> #{i[2]}"
-					end
-					puts
-				end
-				puts "\n  \e[1;33mtotal:\e[0;0m #{@count}\n\n"
-			end
-		end
-		
-		def self.for_the token, where
-			@files   = []
-			@lines   = {}
-			@token   = token.upcase[0..-2]
-			@where   = where
-			@count   = 0
-			@dirs    = []
-			
-			get_file_list and search_for_tokens and print_output
-		end
-	end
+          else
+            mime = `file --mime -b #{path}`.chomp!.split(";")[0]
+            # Get into files only with that MIME types.
+            if (mime == "text/plain" ||
+                mime == "text/x-ruby" ||
+                mime == "text/x-python" ||
+                mime == "text/x-c" ||
+                mime == "text/x-c++" ||
+                mime == "text/x-shellscript" ||
+                mime == "text/x-java" ||
+                mime == "text/x-php" ||
+                mime == "text/html")
+              @files << path
+            end
+          end
+        end
+      end
+    end
+    
+    def self.search_for_tokens
+      @files.each do |file|
+        @lines[file] = []
+        `cat -n #{file}`.split("\n").each do |line|
+          if /\s*(?<n>[0-9]+)\s+(.*)?(#|\/\/|;|<!--)\s(?<token>TODO|FIXME):?\s(?<content>.*)(-->)?/ =~ line
+            @lines[file] << [n, token, content] if @token == token
+          end
+        end
+        
+        if @lines[file].empty?
+          @lines.delete file
+        end
+      end
+    end
+     
+    def self.print_output
+      if @lines.empty?
+        puts "[pointme] there are no #{@token}s in a specified path/s"
+      else
+        @lines.each do |e|
+          name = nil
+          if @dirs.size == 1
+            name = e[0].sub @where, ""
+          else
+            name = e[0]
+          end
+          puts "\e[1;34m" + name + ":\e[0;0m"
+          e[1].each do |i|
+            @count += 1
+            puts "  at \e[1;32m#{i[0]}\e[0;0m: #{i[1]} -> #{i[2]}"
+          end
+          puts
+        end
+        puts "\n  \e[1;33mtotal:\e[0;0m #{@count}\n\n"
+      end
+    end
+    
+    def self.for_the token, where
+      @files   = []
+      @lines   = {}
+      @token   = token.upcase[0..-2]
+      @where   = where
+      @count   = 0
+      @dirs    = []
+      
+      get_file_list and search_for_tokens and print_output
+    end
+  end
 end

data/lib/pointme/version.rb

@@ -1,10 +1,10 @@
 module Pointme
-	module Version
-		MAJOR = 1
-		MINOR = 0
-		PATCH = 0
-		BUILD = nil
-		
-		STRING = [MAJOR, MINOR, PATCH, BUILD].	compact.join "."
-	end
+  module Version
+    MAJOR = 1
+    MINOR = 0
+    PATCH = 1
+    BUILD = nil
+    
+    STRING = [MAJOR, MINOR, PATCH, BUILD].  compact.join "."
+  end
 end

data/lib/pointme.rb

@@ -1,6 +1,6 @@
 module Pointme
-	ROOT = File.expand_path(File.dirname(__FILE__))
-	
-	autoload :Look,       "#{ROOT}/pointme/look"
-	autoload :Version,    "#{ROOT}/pointme/version"
+  ROOT = File.expand_path(File.dirname(__FILE__))
+  
+  autoload :Look,       "#{ROOT}/pointme/look"
+  autoload :Version,    "#{ROOT}/pointme/version"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pointme
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors: