marked 1.0.0 → 1.1.0

data/Gemfile

@@ -1,6 +1,8 @@
 source 'http://rubygems.org'
 
 group :test do
+  gem 'rake'
+  gem 'jeweler'
   gem 'test-unit'
   gem 'shoulda'
   gem 'mocha'

data/README.markdown

@@ -1,7 +1,16 @@
 Marked
 =
 
-[http://github.com/JackDanger/marked](http://github.com/JackDanger/marked)
+<pre>
+    "You stroll with this intelligence
+    in and out of fields of knowledge, getting always
+    more marks on your preserving tablets.
+    There is another kind of tablet, one
+    already completed and preserved inside you.
+    This second knowing is a fountainhead
+    from within you, moving out"
+        -- Rumi
+</pre>
 
 DESCRIPTION
 ==
@@ -58,4 +67,4 @@ INSTALL
     * gem install marked
 
 
-Copyright 2011 Jack Danger Canty. Patches welcome, forks celebrated
+Copyright 2011 [Jack Danger Canty](http://jackcanty.com). Patches welcome, forks celebrated

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/marked.rb

@@ -3,34 +3,33 @@ module Marked
 
     returnable = block_given? ? yield : objects.last
 
-    Marked.log "<MARK>"
+    Marked.log "MARKED #{caller.first.split(':in ').first}"
 
     if block_given?
-      Marked.print returnable
-      Marked.log   returnable
+      Marked.log Marked.pad returnable
     end
 
     objects.each do |object|
-      Marked.print object
-      Marked.log   object
+      Marked.log Marked.pad object
     end
 
-    Marked.log "</MARK>"
-
     returnable
   end
 
   def self.log object
-    if defined?(Rails)
-      Rails.logger.debug object.is_a?(String) ? object : object.inspect
-    end
+    Rails.logger.debug object if defined?(Rails)
+    print object
   end
 
   def self.print object
-    STDOUT.puts object.is_a?(String) ? object : object.inspect
+    STDOUT.puts object
+  end
+
+  def self.pad object
+    "       " + (object.is_a?(String) ? object : object.inspect)
   end
 end
 
 class Object
   include Marked
-end
+end

data/marked.gemspec

@@ -0,0 +1,44 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{marked}
+  s.version = "1.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jack Danger Canty"]
+  s.date = %q{2011-09-09}
+  s.description = %q{Quick Ruby debugger. Easily print any object or string to the console and to your logs while you're working.}
+  s.email = %q{rubygems@6brand.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.markdown"
+  ]
+  s.files = [
+    "Gemfile",
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "lib/marked.rb",
+    "marked.gemspec",
+    "test/marked_test.rb",
+    "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/JackDanger/marked}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{Fast debugging for Ruby. Output any objects or blocks to both Rails log and console output simultaneously}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/test/marked_test.rb

@@ -1,12 +1,31 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class MarkedTest < Test::Unit::TestCase
+
+  def expect_log string
+    Marked.expects(:log).with Marked.pad string
+  end
+
+  def expect_unpadded_log string
+    Marked.expects(:log).with string
+  end
+
+
+  context "logging" do
+    setup {
+      Rails.logger.expects(:debug).with("MARKED ./test/marked_test.rb:22")
+      Marked.expects(:print).with(      "MARKED ./test/marked_test.rb:22")
+      Rails.logger.expects(:debug).with("       this should be printed")
+      Marked.expects(:print).with(      "       this should be printed")
+    }
+    should "goes to two outputs" do
+      mark "this should be printed"
+    end
+  end
   context "printing and logging a single argument" do
     setup {
-      Rails.logger.expects(:debug).with("<MARK>")
-      Rails.logger.expects(:debug).with("this should be printed")
-      Rails.logger.expects(:debug).with("</MARK>")
-      Marked.expects(:print).with("this should be printed")
+      expect_unpadded_log "MARKED ./test/marked_test.rb:31"
+      expect_log "this should be printed"
     }
     should "return its argument" do
       assert_equal "this should be printed", mark("this should be printed")
@@ -14,12 +33,9 @@ class MarkedTest < Test::Unit::TestCase
   end
   context "printing and logging multiple arguments" do
     setup {
-      Rails.logger.expects(:debug).with("<MARK>")
-      Rails.logger.expects(:debug).with("this should be printed")
-      Rails.logger.expects(:debug).with("this too")
-      Rails.logger.expects(:debug).with("</MARK>")
-      Marked.expects(:print).with("this should be printed")
-      Marked.expects(:print).with("this too")
+      expect_unpadded_log "MARKED ./test/marked_test.rb:41"
+      expect_log "this should be printed"
+      expect_log "this too"
     }
     should "return its last argument" do
       assert_equal "this too", mark("this should be printed", "this too")
@@ -27,12 +43,9 @@ class MarkedTest < Test::Unit::TestCase
   end
   context "printing and logging non-strings" do
     setup {
-      Marked.expects(:log).with("<MARK>")
-      Marked.expects(:log).with({:a =>'a'})
-      Marked.expects(:log).with([1, 2, 3])
-      Marked.expects(:log).with("</MARK>")
-      Marked.expects(:print).with({:a => 'a'})
-      Marked.expects(:print).with([1, 2, 3])
+      expect_unpadded_log "MARKED ./test/marked_test.rb:51"
+      expect_log({:a =>'a'})
+      expect_log [1, 2, 3]
     }
     should "return its last argument as object" do
       assert_equal [1,2,3], mark({:a => 'a'}, [1,2,3])
@@ -42,15 +55,18 @@ class MarkedTest < Test::Unit::TestCase
     setup {
       @obj = {}
       @obj.expects(:called!).returns('returned!').once
-      Rails.logger.expects(:debug).with("<MARK>")
-      Rails.logger.expects(:debug).with("first arg")
-      Rails.logger.expects(:debug).with("returned!")
-      Rails.logger.expects(:debug).with("</MARK>")
-      Marked.expects(:print).with("first arg")
-      Marked.expects(:print).with("returned!")
+      expect_unpadded_log "MARKED ./test/marked_test.rb:63"
+      expect_log "first arg"
+      expect_log "returned!"
     }
     should "return its last argument as object" do
       assert_equal 'returned!', mark('first arg') { @obj.called! }
     end
   end
+  context "#pad" do
+    should "prepend 7 spaces" do
+      assert_equal (" "*7)+'padme',
+                   Marked.pad('padme')
+    end
+  end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marked
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
-  version: 1.0.0
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jack Danger Canty
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 -07:00
+date: 2011-09-09 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +35,7 @@ files:
 - Rakefile
 - VERSION
 - lib/marked.rb
+- marked.gemspec
 - test/marked_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -46,12 +52,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []