letters 0.3.0 → 0.3.1

data/README.md

@@ -193,10 +193,10 @@ The `o` method takes options, too, so you can add a prefix message to the output
       Kill
     </td>
     <td>
-      :max
+      :on
     </td>
     <td>
-      raises Letters::KillError after a maximum number of calls
+      raises Letters::KillError at a specified number of calls
     </td>
   </tr>
 
@@ -311,7 +311,7 @@ See the [full documentation](http://lettersrb.com/api) for examples and more det
 
 ### Configuration ###
 
-Lastly, you can tune and tweak each Letters method to default to your own tastes. Want to name put files somewhere else? No problem. Don't like YAML? Default `f` to use Pretty Print instead! The world of defaults is your oyster.
+For maximum productivity, you can tune and tweak each Letters method to fit your own tastes. Want to name put files somewhere else? No problem. Don't like YAML? Default `f` to use Pretty Print instead! The world of defaults is your oyster.
 
 ```ruby
 Letters.config do

data/lib/letters/config.rb

@@ -7,7 +7,7 @@ module Letters
       d1: { dup: false },
       d2: { format: "ap" },
       f: { format: "yaml", name: "log" },
-      k: { max: 0 },
+      k: { on: 0 },
       l: { level: "info", format: "yaml" },
       o: { format: "ap", stream: $stdout },
       t: { time_format: "millis" }

data/lib/letters/core_ext.rb

@@ -1,6 +1,7 @@
 require "letters/config"
 require "letters/helpers"
 require "letters/diff"
+require "letters/kill"
 require "letters/time_formats"
 require "letters/empty_error"
 require "letters/kill_error"
@@ -96,13 +97,20 @@ module Letters
     # Kill
     def k(opts={})
       opts = Letters.defaults_with(:k, opts)
+
+      # Support :max option until I can deprecate it
+      opts[:on] ||= opts[:max]
+      
       opts.merge! :error_class => KillError
       tap do |o|
-        @letters_kill_count ||= 0
-        if @letters_kill_count >= opts[:max]
-          raise opts[:error_class]
+        Letters.kill_count ||= 0
+
+        if Letters.kill_count >= opts[:on]
+          Letters.kill_count = 0
+          o.a(opts) { false }
         end
-        @letters_kill_count += 1
+
+        Letters.kill_count += 1
       end
     end
 

data/lib/letters/kill.rb

@@ -0,0 +1,9 @@
+module Letters
+  def self.kill_count=(count)
+    @@kill_count = count
+  end
+
+  def self.kill_count
+    @@kill_count if defined?(@@kill_count)
+  end
+end

data/lib/letters/version.rb

@@ -1,3 +1,3 @@
 module Letters
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/letters/core_ext_spec.rb

@@ -147,29 +147,26 @@ module Letters
     end
 
     describe "#k (kill)" do
-      it 'raises a KillError immediately by default' do
+      it "raises a KillError immediately by default" do
         lambda { hash.k }.should raise_error(KillError)
       end
 
-      it 'does not raises if number of calls are below max' do
-        lambda { hash.k(max: 1) }.should_not raise_error
+      it "does not raises if number of calls are below the specified number" do
+        lambda { hash.k(:on => 1) }.should_not raise_error
       end
 
-      it 'raises a KillError if number of calls is above max' do
+      it "raises a KillError if number of calls has reached the specified number" do
         count = 0
+        hash.k(:on => 2)
         lambda do
-          10.times do
-            hash.k(max: 5)
-            count += 1
-          end
+          hash.k(:on => 2)
         end.should raise_error(KillError)
-        count.should eq(5)
       end
     end
 
     describe "#l (log)" do
       it "logs the object if a logger is present and then returns the object" do
-        logger = double 'logger'
+        logger = double "logger"
         logger.should_receive(:info).with(hash.to_yaml)
         hash.should_receive(:logger).and_return(logger)
         hash.l

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letters
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70172816319040 !ruby/object:Gem::Requirement
+  requirement: &70186112051180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172816319040
+  version_requirements: *70186112051180
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70172816318600 !ruby/object:Gem::Requirement
+  requirement: &70186112050660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172816318600
+  version_requirements: *70186112050660
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &70172816318180 !ruby/object:Gem::Requirement
+  requirement: &70186112050040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172816318180
+  version_requirements: *70186112050040
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70172816317760 !ruby/object:Gem::Requirement
+  requirement: &70186112049280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172816317760
+  version_requirements: *70186112049280
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70172816317340 !ruby/object:Gem::Requirement
+  requirement: &70186112048660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172816317340
+  version_requirements: *70186112048660
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70172816316920 !ruby/object:Gem::Requirement
+  requirement: &70186112048240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172816316920
+  version_requirements: *70186112048240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70172816316500 !ruby/object:Gem::Requirement
+  requirement: &70186112047760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172816316500
+  version_requirements: *70186112047760
 description: Letters brings Ruby debugging into the 21st century. It leverages print,
   the debugger, control transfer, even computer beeps to let you see into your code's
   state.
@@ -102,6 +102,7 @@ files:
 - lib/letters/diff.rb
 - lib/letters/empty_error.rb
 - lib/letters/helpers.rb
+- lib/letters/kill.rb
 - lib/letters/kill_error.rb
 - lib/letters/nil_error.rb
 - lib/letters/patch/core.rb