inkjet 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 233f3dfad49a1beb08760b9103772c2cc037e3f2
-  data.tar.gz: a317f8e4542d17291bd2d55087a0151bbcd93291
+  metadata.gz: 6e776686b44393fc5089001ea78be5a78b499387
+  data.tar.gz: ac9a4343d72fa1346fc3788029ca224b1b377eb0
 SHA512:
-  metadata.gz: 26d2474dd3e67c76bab42f16da93c2edb0b6cf6a57cee53700f54ed3f7939bc6dfd1604270e2b64574b0edb5be2a6bf9e216e93921bc623686ba61b4a6379c52
-  data.tar.gz: 0df47b052ec940a56960779b9a397519ce12066480111f603a40b5d4cac0a7714a422d3a98a714771187e0319793b18985db8c1331255e7caec42e91ead989a7
+  metadata.gz: 3ec3bca2479bff13da610174579b7cf046bb0d56fc992a9ff61348e0b09b25a3740955d555bb792aa451974655a518845ca258ce64f963f7fc02eeeb6aac76fd
+  data.tar.gz: 321c71f17aa648e3a92dd662b8de5e7a9d918b80f3a9f92496c2c0f72b85ef711eb547c314cd20345b802c3a46a0f8d9f0cd2b1bbb6ea64d406b6e424b089d54

data/lib/inkjet/indent.rb

@@ -16,9 +16,10 @@ module Inkjet
     end
 
     def self.add_bindings(block)
-      block.binding.eval("def puts(output); Inkjet::Indent.puts(output); end")
-      block.binding.eval("def print(output); Inkjet::Indent.print(output); end")
+      block.binding.eval("def puts(output=''); Inkjet::Indent.puts(output); end")
+      block.binding.eval("def print(output=''); Inkjet::Indent.print(output); end")
       block.binding.eval("def format_with(meth, *args); Inkjet::Indent.format_with(meth, *args); end")
+      block.binding.eval("def undent(&block); Inkjet::Indent.undent(&block); end")
       block
     end
 
@@ -34,7 +35,21 @@ module Inkjet
         @@spaces -= args[0] || TABSTOP
       else
         spaces = args[1] || TABSTOP
-        "#{padding(@@spaces + spaces.to_i)}#{args[0].to_s.split("\n").join("\n#{padding(@@spaces + spaces.to_i)}")}"
+        "#{padding(spaces.to_i)}#{args[0].to_s.split("\n").join("\n#{padding(spaces.to_i)}")}"
+      end
+    end
+
+    def self.undent(&block)
+      @@spaces ||= 0
+      if block_given?
+        scoped_spaces = @@spaces
+        @@spaces = 0
+        scoped_formatters = formatters.clone
+
+        add_bindings(block).call
+        
+        @@formatters = scoped_formatters
+        @@spaces = scoped_spaces
       end
     end
 
@@ -55,12 +70,12 @@ module Inkjet
       spaces.times.map {" "}.join
     end
 
-    def self.puts(output)
-      STDOUT.puts apply_formatters(indent(output, 0))
+    def self.puts(output='')
+      STDOUT.puts apply_formatters(indent(output, @@spaces))
     end
 
-    def self.print(output)
-      STDOUT.print apply_formatters(indent(output, 0))
+    def self.print(output='')
+      STDOUT.print apply_formatters(indent(output, @@spaces))
     end
 
     module String

data/lib/inkjet/version.rb

@@ -1,3 +1,3 @@
 module Inkjet
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inkjet
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport