spit 0.1.2 → 0.1.3

data/README.rdoc

@@ -2,15 +2,23 @@
 
 Spit variables out to your log in a noticeable color.  It adds a sensible label automatically.
 
-== Usage Example
+== Usage Examples
 
 You use it by doing something like this:
 
   Spit account
 
-And it puts something like this in the log output:
+And it puts something like this in the log output (but with color):
 
-  *account:* <#Account @name="Steve">
+  account: <#Account @name="Steve">
+
+To show the source of the line (filename, method, and line number) do something like this:
+
+  Spit.s account
+
+And it puts something like this in the log output (but with color):
+
+  foo_controller.index(38) account: <#Account @name="Steve">
 
 == The Point
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/spit.rb

@@ -1,22 +1,46 @@
 def Spit txt
-  line = caller[0]
+  Spit.print txt, caller[0]
+end
+
+module Spit
+  def self.s txt
+    self.print txt, caller[0], :source=>true
+  end
+
+  def self.print txt, line, options={}
+
+    txt = txt.inspect rescue txt
+
+    path, number = line.match(/(.+):(\d+)/)[1..2]
+
+    label = IO.readlines("/projects/homerun/homerun/app/controllers/web/dev_controller.rb")[number.to_i - 1]
+    label.strip!.sub!(/Spit\S+ /, '')
+
+    label = "#{Spit.extract_label(Spit.parse_line line)} #{label}" if options[:source]
 
-  txt = txt.inspect rescue txt
+    clear, green, red, yellow, blue, pink, italic, bold, highlight = "\e[0m", "\e[32m", "\e[31m", "\e[33m", "\e[36m", "\e[35m", "\e[3m", "\e[1m", "\e[7m"
+    puts "#{green}#{italic}#{label}:#{clear}#{bold}#{yellow}  #{txt}#{clear}"
 
-  path, number = line.match(/(.+):(\d+)/)[1..2]
+    #   clear, green, red, yellow, blue, pink, gray, italic, bold = "\e[0m", "\e[32m", "\e[31m", "\e[33m", "\e[36m", "\e[35m", "\e[164m", "\e[3m", "\e[1m"
+    #   puts "#{red}#{txt}#{clear}"
+    #   puts "#{green}#{label}:#{clear}  #{green}#{highlight}#{txt}#{clear}"
+    #   puts "#{green}#{label}:#{clear}#{highlight}#{green}  #{txt}#{clear}"
+    #   puts "#{gray}#{txt}:#{clear}#{yellow} #{txt}#{clear}"
+    #   puts "#{red}#{txt}:#{clear}#{yellow} #{txt}#{clear}"
+    #   puts "#{red}#{txt} #{clear} aa"
+    #   puts "#{green}#{label}:#{clear} #{txt}\naaa"
 
-  label = IO.readlines("/projects/homerun/homerun/app/controllers/web/dev_controller.rb")[number.to_i - 1]
-  label.strip!.sub!(/Ol /, '')
+  end
 
-  clear, green, red, yellow, blue, pink, italic, bold, highlight = "\e[0m", "\e[32m", "\e[31m", "\e[33m", "\e[36m", "\e[35m", "\e[3m", "\e[1m", "\e[7m"
-  puts "#{green}#{italic}#{label}:#{clear}#{bold}#{yellow}  #{txt}#{clear}"
+  def self.parse_line path
+    method = path[/`(.+)'/, 1]   # `
+    path, l = path.match(/(.+):(\d+)/)[1..2]
+    path = File.expand_path path
+    clazz = path[/.+\/(.+)\.rb/, 1]
+    {:path=>path, :line=>l, :method=>method, :clazz=>clazz}
+  end
 
-  #   clear, green, red, yellow, blue, pink, gray, italic, bold = "\e[0m", "\e[32m", "\e[31m", "\e[33m", "\e[36m", "\e[35m", "\e[164m", "\e[3m", "\e[1m"
-  #   puts "#{red}#{txt}#{clear}"
-  #   puts "#{green}#{label}:#{clear}  #{green}#{highlight}#{txt}#{clear}"
-  #   puts "#{green}#{label}:#{clear}#{highlight}#{green}  #{txt}#{clear}"
-  #   puts "#{gray}#{txt}:#{clear}#{yellow} #{txt}#{clear}"
-  #   puts "#{red}#{txt}:#{clear}#{yellow} #{txt}#{clear}"
-  #   puts "#{red}#{txt} #{clear} aa"
-  #   puts "#{green}#{label}:#{clear} #{txt}\naaa"
+  def self.extract_label h
+    "#{h[:clazz]}.#{h[:method]}(#{h[:line]})"
+  end
 end

data/spit.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spit}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["trogdoro"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spit
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - trogdoro