seeing_is_believing 2.0.0.beta1 → 2.0.0.beta2

data/spec/binary/rewrite_comments_spec.rb

@@ -0,0 +1,54 @@
+require 'seeing_is_believing/binary/rewrite_comments'
+
+describe SeeingIsBelieving::Binary::RewriteComments do
+  def call(code, &block)
+    described_class.call code, &block
+  end
+
+  it 'ignores multiline comments' do
+    seen = []
+    call("123\n=begin\n456\n=end\n789") do |*args|
+      seen << args
+      args[-2..-1]
+    end
+    seen.should == []
+  end
+
+  it 'yields the line_number, line upto the whitespace, whitespace, and comment' do
+    seen = []
+    call("# c1\n"\
+         "123 #   c2 # x\n"\
+         "n456\n"\
+         " \t # c3\n"\
+         "%Q{\n"\
+         " 1}#c4\n"\
+         "# c5") do |*args|
+      seen << args
+      args[-2..-1]
+    end
+    seen.should == [
+      [1,  "",     "",      "# c1"],
+      [2,  "123",  " ",     "#   c2 # x"],
+      [4,  "",     " \t ",  "# c3"],
+      [6,  " 1}",  "",      "#c4"],
+      [7,  "",    "",      "# c5"],
+    ]
+  end
+
+  it 'rewrites the whitespace and comment with the whitespace and comment that are returned' do
+    rewritten = call("# c1\n"\
+                     "123 #c2\n"\
+                     "n456\n"\
+                     " \t # c3\n"\
+                     "%Q{\n"\
+                     " 1}#c4") do |line_number, *|
+      ["NEW_WHITESPACE#{line_number}", "--COMMENT-#{line_number}--"]
+    end
+    rewritten.should == "NEW_WHITESPACE1--COMMENT-1--\n"\
+                        "123NEW_WHITESPACE2--COMMENT-2--\n"\
+                        "n456\n"\
+                        "NEW_WHITESPACE4--COMMENT-4--\n"\
+                        "%Q{\n"\
+                        " 1}NEW_WHITESPACE6--COMMENT-6--"
+  end
+end

data/spec/seeing_is_believing_spec.rb

@@ -309,12 +309,11 @@ describe SeeingIsBelieving do
       debugger.to_s.should include "\nbegin;" # there is more, but we're just interested in showing that it wound up in the stream
     end
 
-    it 'prints the result', t:true do
+    it 'prints the result' do
       call
       debugger.to_s.should include "RESULT:"
       debugger.to_s.should include '1=>#<SIB:Line["1"] no exception>'
     end
     # should ProgramRewriter have some debug options?
   end
-
 end

data/spec/{program_rewriter_spec.rb → wrap_expressions_spec.rb}

@@ -1,33 +1,62 @@
-require 'seeing_is_believing/program_rewriter'
+require 'seeing_is_believing/wrap_expressions'
 
-# eventually make this not record BEGIN and END
+# eventually make this not wrap BEGIN and END
 # but for now, leave it b/c it's convenient to be able to make it blow up
 # Probably replace this with some macro like __INVALID_SYNTAX__ that blows it up :)
 
-describe SeeingIsBelieving::ProgramReWriter do
+describe SeeingIsBelieving::WrapExpressions do
   def wrap(code)
     described_class.call code,
       before_each: -> * { '<' },
       after_each:  -> * { '>' }
   end
 
-  # when we get to 2.0 syntax:
-  # example 'ah' do
-  # wrap '-> { }.()'
-  # end
-
   it 'raises a SyntaxError if the program is invalid' do
     expect { wrap '+' }.to raise_error SyntaxError
   end
 
-  it 'wraps the entire body, ignoring leading comments and the data segment' do
-    described_class.call("#comment\nA\n__END__\n1",
-                         before_all: "[",
-                         after_all:  "]",
-                         before_each: -> * { '<' },
-                         after_each:  -> * { '>' }
-                        )
-                   .should == "#comment\n[<A>]\n__END__\n1"
+  describe 'wrapping the body' do
+    let(:options) { { before_all: "[",
+                      after_all:  "]",
+                      before_each: -> * { '<' },
+                      after_each:  -> * { '>' } } }
+
+    it 'wraps the entire body, ignoring leading comments and the data segment' do
+      described_class.call("#comment\nA\n__END__\n1", options).should == "#comment\n[<A>]\n__END__\n1"
+    end
+
+    it 'does nothing when there are only comments' do
+      described_class.call("# abc", options).should == "# abc"
+    end
+
+    it 'comes in before trailing comments' do
+      described_class.call("1# abc", options).should == "[<1>]# abc"
+    end
+
+    context 'fucking heredocs' do
+      example 'single heredoc' do
+        described_class.call("<<A\nA", options).should == "[<<<A>]\nA"
+      end
+
+      example 'multiple heredocs' do
+        # a stupid implementatnio issue from hacking around heredocs
+        # causes the toplevel begin to wrap the whole file.
+        # It's fine b/c it is ultimately the same, but that's why it's
+        # "[<<<<A>\nA\n<<B>]\nB"
+        # instead of
+        # "[<<<A>\nA\n<<<B>]\nB"
+        described_class.call("<<A\nA\n<<B\nB", options).should == "[<<<<A>\nA\n<<B>]\nB"
+      end
+
+      example 'heredocs as targets and arguments to methods' do
+        described_class.call("<<A.size 1\nA", options).should == "[<<<A.size 1>]\nA"
+        described_class.call("<<A.size\nA", options).should == "[<<<A.size>]\nA"
+        described_class.call("<<A.size()\nA", options).should == "[<<<A.size()>]\nA"
+        described_class.call("a.size <<A\nA", options).should == "[<a.size <<A>]\nA"
+        described_class.call("<<A.size <<B\nA\nB", options).should == "[<<<A.size <<B>]\nA\nB"
+        described_class.call("<<A.size(<<B)\nA\nB", options).should == "[<<<A.size(<<B)>]\nA\nB"
+      end
+    end
   end
 
   it 'passes the current line number to the before_each and after_each wrappers' do
@@ -296,6 +325,7 @@ describe SeeingIsBelieving::ProgramReWriter do
       wrap("a=1").should == "<a=1>"
       wrap("a.b=1").should == "<a.b=1>"
       wrap("A=1").should == "<A=1>"
+      wrap("::A=1").should == "<::A=1>"
       wrap("A::B=1").should == "<A::B=1>"
       wrap("@a=1").should == "<@a=1>"
       wrap("@@a=1").should == "<@@a=1>"
@@ -303,6 +333,7 @@ describe SeeingIsBelieving::ProgramReWriter do
     end
 
     it 'wraps multiple assignments' do
+      wrap("a,b=c").should == "<a,b=c>"
       wrap("a,b=1,2").should == "<a,b=1,2>"
       wrap("a,b.c=1,2").should == "<a,b.c=1,2>"
       wrap("a,B=1,2").should == "<a,B=1,2>"
@@ -310,6 +341,8 @@ describe SeeingIsBelieving::ProgramReWriter do
       wrap("a,@b=1,2").should == "<a,@b=1,2>"
       wrap("a,@@b=1,2").should == "<a,@@b=1,2>"
       wrap("a,$b=1,2").should == "<a,$b=1,2>"
+      wrap("a, b = x.()").should == "<a, b = x.()>"
+      wrap("a, b = c\n.d,\ne\n.f").should == "<a, b = <<c>\n.d>,\n<e>\n.f>"
     end
 
     it 'wraps multiple assignment on each line' do
@@ -343,6 +376,15 @@ describe SeeingIsBelieving::ProgramReWriter do
       wrap("a &&= 1").should == "<a &&= 1>"
       wrap("a[1] = 2").should == "<a[1] = 2>"
       wrap("a[1] ||= 2").should == "<a[1] ||= 2>"
+      wrap("@a  ||= 123").should == "<@a  ||= 123>"
+      wrap("$a  ||= 123").should == "<$a  ||= 123>"
+      wrap("@@a ||= 123").should == "<@@a ||= 123>"
+      wrap("B   ||= 123").should == "<B   ||= 123>"
+      wrap("@a  ||= begin\n123\nend").should == "<@a  ||= begin\n<123>\nend>"
+      wrap("$a  ||= begin\n123\nend").should == "<$a  ||= begin\n<123>\nend>"
+      wrap("@@a ||= begin\n123\nend").should == "<@@a ||= begin\n<123>\nend>"
+      wrap("B   ||= begin\n123\nend").should == "<B   ||= begin\n<123>\nend>"
+      wrap("::B ||= begin\n123\nend").should == "<::B ||= begin\n<123>\nend>"
     end
 
     it 'wraps arguments in the assignment' do
@@ -399,7 +441,7 @@ describe SeeingIsBelieving::ProgramReWriter do
       wrap("case\nwhen 2, 3 then\n4\n5\nend").should == "<case\nwhen 2, 3 then\n<4>\n<5>\nend>"
     end
 
-    it 'does not record if the last value in any portion is a void value expression' do
+    it 'does not wrap if the last value in any portion is a void value expression' do
       wrap("def a\nif true\nreturn 1\nend\nend").should == "def a\nif <true>\nreturn <1>\nend\nend"
       wrap("def a\nif true\n1\nelse\nreturn 2\nend\nend").should == "def a\nif <true>\n<1>\nelse\nreturn <2>\nend\nend"
       wrap("def a\nif true\n1\nelsif true\n2\nelse\nreturn 3\nend\nend").should == "def a\nif <true>\n<1>\nelsif <true>\n<2>\nelse\nreturn <3>\nend\nend"
@@ -476,13 +518,17 @@ describe SeeingIsBelieving::ProgramReWriter do
   end
 
   describe 'array literals' do
-    it 'records the array and each element that is on its own line' do
+    it 'wraps the array and each element that is on its own line' do
       wrap("[1]").should == "<[1]>"
       wrap("[1,\n2,\n]").should == "<[<1>,\n<2>,\n]>"
       wrap("[1, 2,\n]").should == "<[1, <2>,\n]>"
     end
 
-    it 'does not record splat elements' do
+    it 'does not wrap magic arrays' do
+      wrap("%w[\n1\n]").should == "<%w[\n1\n]>"
+    end
+
+    it 'does not wrap splat elements' do
       wrap("[1,\n*2..3,\n4\n]").should == "<[<1>,\n*2..3,\n<4>\n]>"
     end
   end
@@ -498,14 +544,14 @@ describe SeeingIsBelieving::ProgramReWriter do
       wrap("%r'a'").should == "<%r'a'>"
     end
 
-    it 'records regexes that span mulitple lines' do
+    it 'wraps regexes that span mulitple lines' do
       wrap("/a\nb/").should == "</a\nb/>"
       wrap("/a\nb/i").should == "</a\nb/i>"
     end
 
-    # eventually it would be nice if it recorded the interpolated portion,
+    # eventually it would be nice if it wraped the interpolated portion,
     # when the end of the line was not back inside the regexp
-    it 'records regexes with interpolation, but not the interpolated portion' do
+    it 'wraps regexes with interpolation, but not the interpolated portion' do
       wrap("/a\#{1}/").should == "</a\#{1}/>"
       wrap("/a\n\#{1}\nb/").should == "</a\n\#{1}\nb/>"
       wrap("/a\n\#{1\n}b/").should == "</a\n\#{1\n}b/>"
@@ -513,31 +559,31 @@ describe SeeingIsBelieving::ProgramReWriter do
   end
 
   describe 'string literals (except heredocs)' do
-    it 'records single and double quoted strings' do
+    it 'wraps single and double quoted strings' do
       wrap("'a'").should == "<'a'>"
       wrap('"a"').should == '<"a">'
     end
 
-    it 'records strings with %, %Q, and %q' do
+    it 'wraps strings with %, %Q, and %q' do
       wrap("%'a'").should == "<%'a'>"
       wrap("%q'a'").should == "<%q'a'>"
       wrap("%Q'a'").should == "<%Q'a'>"
     end
 
-    it 'records strings that span mulitple lines' do
+    it 'wraps strings that span mulitple lines' do
       wrap("'a\nb'").should == "<'a\nb'>"
       wrap(%'"a\nb"').should == %'<"a\nb">'
     end
 
-    # eventually it would be nice if it recorded the interpolated portion,
+    # eventually it would be nice if it wraped the interpolated portion,
     # when the end of the line was not back inside the string
-    it 'records strings with interpolation, but not the interpolated portion' do
+    it 'wraps strings with interpolation, but not the interpolated portion' do
       wrap('"a#{1}"').should == '<"a#{1}">'
       wrap(%'"a\n\#{1}\nb"').should == %'<"a\n\#{1}\nb">'
       wrap(%'"a\n\#{1\n}b"').should == %'<"a\n\#{1\n}b">'
     end
 
-    it 'records %, %q, %Q' do
+    it 'wraps %, %q, %Q' do
       wrap('%(A)').should == '<%(A)>'
       wrap('%.A.').should == '<%.A.>'
       wrap('%q(A)').should == '<%q(A)>'
@@ -545,10 +591,16 @@ describe SeeingIsBelieving::ProgramReWriter do
       wrap('%Q(A)').should == '<%Q(A)>'
       wrap('%Q.A.').should == '<%Q.A.>'
     end
+
+    it 'wraps heredocs with call defined on them (edge cases on edge cases *sigh*)' do
+      pending "just don't care this much right now, hopefully it will magically be fixed when new parser is released" do
+        wrap("<<HERE.()\na\nHERE").should == "<<<HERE.()>\na\nHERE"
+      end
+    end
   end
 
   describe 'heredocs' do
-    it 'records heredocs on their first line' do
+    it 'wraps heredocs on their first line' do
       wrap("<<A\nA").should == "<<<A>\nA"
       wrap("<<A\n123\nA").should == "<<<A>\n123\nA"
       wrap("<<-A\nA").should == "<<<-A>\nA"
@@ -556,12 +608,10 @@ describe SeeingIsBelieving::ProgramReWriter do
       wrap("1\n<<A\nA").should == "<<1>\n<<A>\nA"
       wrap("<<A + <<B\n1\nA\n2\nB").should == "<<<A + <<B>\n1\nA\n2\nB"
       wrap("<<A\n1\nA\n<<B\n2\nB").should == "<<<<A>\n1\nA\n<<B>\n2\nB"
-      pending 'turtles all the way down :(' do
-        wrap("puts <<A\nA\nputs <<B\nB").should == "<<puts <<A>\nA\nputs <<B>\nB"
-      end
+      wrap("puts <<A\nA\nputs <<B\nB").should == "<puts <<A>\nA\n<puts <<B>\nB"
     end
 
-    it "records methods that wrap heredocs, even whent hey don't have parentheses" do
+    it "wraps methods that wrap heredocs, even whent hey don't have parentheses" do
       wrap("a(<<HERE)\nHERE").should == "<a(<<HERE)>\nHERE"
       wrap("a <<HERE\nHERE").should == "<a <<HERE>\nHERE"
       wrap("a 1, <<HERE\nHERE").should == "<a 1, <<HERE>\nHERE"
@@ -570,15 +620,16 @@ describe SeeingIsBelieving::ProgramReWriter do
       wrap("a.b 1,\n2,\n<<HERE\nHERE").should == "<a.b <1>,\n<2>,\n<<HERE>\nHERE"
     end
 
-    it "records assignments whose value is a heredoc" do
+    it "wraps assignments whose value is a heredoc" do
       wrap("a=<<A\nA").should == "<a=<<A>\nA"
       wrap("a,b=<<A,<<B\nA\nB").should == "<a,b=<<A,<<B>\nA\nB"
       wrap("a,b=1,<<B\nB").should == "<a,b=1,<<B>\nB"
       wrap("a,b=<<A,1\nA").should == "<a,b=<<A,1>\nA"
     end
 
-    it 'records methods tacked onto the end of heredocs' do
+    it 'wraps methods tacked onto the end of heredocs' do
       wrap("<<A.size\nA").should == "<<<A.size>\nA"
+      wrap("<<A.size 1\nA").should == "<<<A.size 1>\nA"
       wrap("<<A.whatever <<B\nA\nB").should == "<<<A.whatever <<B>\nA\nB"
       wrap("<<A.whatever(<<B)\nA\nB").should == "<<<A.whatever(<<B)>\nA\nB"
       wrap("<<A.size()\nA").should == "<<<A.size()>\nA"
@@ -609,15 +660,19 @@ describe SeeingIsBelieving::ProgramReWriter do
       wrap("begin\nend").should == "<begin\nend>"
       wrap("begin\n1\nensure\n2\nend").should == "<begin\n<1>\nensure\n<2>\nend>"
     end
-    it 'does not record retry' do
-      # in this case, it could record the retry
+    it 'does not wrap arguments to rescue' do
+      wrap("begin\nrescue\nrescue => a\nrescue SyntaxError\nrescue Exception => a\nelse\nensure\nend").should ==
+            "<begin\nrescue\nrescue => a\nrescue SyntaxError\nrescue Exception => a\nelse\nensure\nend>"
+    end
+    it 'does not wrap retry' do
+      # in this case, it could wrap the retry
       # but I don't know how to tell the difference between this and
       # "loop { begin; retry; end }" so w/e
       wrap("begin\nrescue\nretry\nend").should == "<begin\nrescue\nretry\nend>"
     end
   end
 
-  # eventually, don't wrap these b/c they're spammy, but can be annoying since they can be accidentally recorded
+  # eventually, don't wrap these b/c they're spammy, but can be annoying since they can be accidentally wraped
   # by e.g. a begin/end
   # ignoring public/private/protected for now, b/c they're just methods, not keywords
   describe 'class definitions' do
@@ -638,7 +693,7 @@ describe SeeingIsBelieving::ProgramReWriter do
     end
   end
 
-  # eventually, don't wrap these b/c they're spammy, but can be annoying since they can be accidentally recorded
+  # eventually, don't wrap these b/c they're spammy, but can be annoying since they can be accidentally wraped
   # by e.g. a begin/end
   # ignoring public/private/protected for now, b/c they're just methods, not keywords
   describe 'module definitions' do
@@ -660,7 +715,7 @@ describe SeeingIsBelieving::ProgramReWriter do
       wrap("def a()\n1\nend").should == "def a()\n<1>\nend"
     end
 
-    it 'does not try to record singleton method definitions' do
+    it 'does not try to wrap singleton method definitions' do
       wrap("def a.b\n1\nend").should == "def a.b\n<1>\nend"
       wrap("def a.b()\n1\nend").should == "def a.b()\n<1>\nend"
     end
@@ -684,4 +739,26 @@ describe SeeingIsBelieving::ProgramReWriter do
       wrap("def a\n1\nensure\n2\nend").should == "def a\n<1>\nensure\n<2>\nend"
     end
   end
+
+  describe 'lambdas' do
+    it 'wraps the lambda' do
+      wrap("lambda { }").should == "<lambda { }>"
+      wrap("-> { }").should == "<-> { }>"
+      wrap("-> a, b { }").should == "<-> a, b { }>"
+      wrap("-> {\n1\n}").should == "<-> {\n<1>\n}>"
+      pending "Parser doesn't parse this https://github.com/whitequark/parser/issues/103" do
+        wrap("-> * { }").should == "<-> * { }>"
+      end
+    end
+
+    it 'wraps the full invocation' do
+      wrap("lambda { }.()").should == "<lambda { }.()>"
+      wrap("-> { }.()").should == "<-> { }.()>"
+      wrap("-> a, b {\n1\n}.(1,\n2)").should == "<-> a, b {\n<1>\n}.(<1>,\n2)>"
+      wrap("-> a, b { }.call(1, 2)").should == "<-> a, b { }.call(1, 2)>"
+      pending "Parser doesn't parse this https://github.com/whitequark/parser/issues/103" do
+        wrap("-> * { }()").should == "<-> * { }.()>"
+      end
+    end
+  end
 end

metadata

@@ -1,112 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: seeing_is_believing
 version: !ruby/object:Gem::Version
-  prerelease: 6
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0.pre6
-    none: false
-  name: parser
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0.pre6
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: haiti
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
-    none: false
-  name: haiti
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
-    none: false
-  name: rake
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
-    none: false
-  name: rspec
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-    none: false
-  name: cucumber
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: ichannel
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 5.1.1
-    none: false
-  name: ichannel
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 5.1.1
-    none: false
 description: Records the results of every line of code in your file (intended to be
   like xmpfilter), inspired by Bret Victor's JavaScript example in his talk "Inventing
   on Principle"
@@ -135,59 +122,57 @@ files:
 - lib/seeing_is_believing/binary/align_file.rb
 - lib/seeing_is_believing/binary/align_line.rb
 - lib/seeing_is_believing/binary/arg_parser.rb
-- lib/seeing_is_believing/binary/line_formatter.rb
-- lib/seeing_is_believing/binary/remove_previous_annotations.rb
+- lib/seeing_is_believing/binary/clean_body.rb
+- lib/seeing_is_believing/binary/comment_formatter.rb
+- lib/seeing_is_believing/binary/comment_lines.rb
+- lib/seeing_is_believing/binary/commentable_lines.rb
+- lib/seeing_is_believing/binary/rewrite_comments.rb
 - lib/seeing_is_believing/debugger.rb
 - lib/seeing_is_believing/error.rb
 - lib/seeing_is_believing/evaluate_by_moving_files.rb
 - lib/seeing_is_believing/hard_core_ensure.rb
 - lib/seeing_is_believing/has_exception.rb
 - lib/seeing_is_believing/line.rb
-- lib/seeing_is_believing/program_rewriter.rb
-- lib/seeing_is_believing/queue.rb
-- lib/seeing_is_believing/remove_inline_comments.rb
 - lib/seeing_is_believing/result.rb
-- lib/seeing_is_believing/syntax_analyzer.rb
 - lib/seeing_is_believing/the_matrix.rb
-- lib/seeing_is_believing/tracks_line_numbers_seen.rb
 - lib/seeing_is_believing/version.rb
+- lib/seeing_is_believing/wrap_expressions.rb
 - seeing_is_believing.gemspec
 - spec/binary/arg_parser_spec.rb
-- spec/binary/line_formatter_spec.rb
-- spec/binary/remove_previous_annotations_spec.rb
+- spec/binary/clean_body_spec.rb
+- spec/binary/comment_formatter_spec.rb
+- spec/binary/comment_lines_spec.rb
+- spec/binary/rewrite_comments_spec.rb
 - spec/debugger_spec.rb
 - spec/evaluate_by_moving_files_spec.rb
 - spec/hard_core_ensure_spec.rb
 - spec/line_spec.rb
-- spec/program_rewriter_spec.rb
-- spec/queue_spec.rb
 - spec/seeing_is_believing_spec.rb
-- spec/syntax_analyzer_spec.rb
+- spec/wrap_expressions_spec.rb
 - textmate-integration.png
 homepage: https://github.com/JoshCheek/seeing_is_believing
 licenses:
 - WTFPL
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
-  none: false
 requirements: []
 rubyforge_project: seeing_is_believing
-rubygems_version: 1.8.23
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Records results of every line of code in your file
 test_files:
 - features/errors.feature
@@ -196,14 +181,14 @@ test_files:
 - features/regression.feature
 - features/support/env.rb
 - spec/binary/arg_parser_spec.rb
-- spec/binary/line_formatter_spec.rb
-- spec/binary/remove_previous_annotations_spec.rb
+- spec/binary/clean_body_spec.rb
+- spec/binary/comment_formatter_spec.rb
+- spec/binary/comment_lines_spec.rb
+- spec/binary/rewrite_comments_spec.rb
 - spec/debugger_spec.rb
 - spec/evaluate_by_moving_files_spec.rb
 - spec/hard_core_ensure_spec.rb
 - spec/line_spec.rb
-- spec/program_rewriter_spec.rb
-- spec/queue_spec.rb
 - spec/seeing_is_believing_spec.rb
-- spec/syntax_analyzer_spec.rb
+- spec/wrap_expressions_spec.rb
 has_rdoc: