seeing_is_believing 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da28e937d89552e6cfb5ceeaff5d2d8908d8e0de
-  data.tar.gz: 2c7f3eb3c304c4eb206893b24ee3f77cf60d4c41
+  metadata.gz: 924b2f9837ef55a65692edd1552bb4e28c497e04
+  data.tar.gz: c527cc92aea505196789779036ff2b9fb3265056
 SHA512:
-  metadata.gz: 75826e4eabec47dfdd07feb60f29893010ed569ff53b8e1edcbcd86f8a05077fff9646975af7019582bda3bf098dfc864789803dcf52c78e402758dae0b46e95
-  data.tar.gz: 7233ccadb27cc4fe3cc436f51b2576cb2aeb9cfb6d75252f5c89eaa164dd61bbb3291c0ff6077c90916b91e7498a32ef0135168faee7d9acd6ae5c88fbbf60c3
+  metadata.gz: a327a0865eb016d325158d9eb17fb34803634e37b2a0c31037df8385f076b3dbb23627c04498b5c9f5d6f4128efa544afe8c90b802536cb194f0b01bed3e53ad
+  data.tar.gz: fb8f88092ae5e16ea2ff1ca5f9ee22f7b993062ab8c67f93a4ec02b6ca3a7b0c8876998ee28e6994cbe6affd2af4ac96f6bcdba0fdefa6c2396df3a252542776

data/.travis.yml

@@ -3,3 +3,4 @@ script: rake
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.2

data/Gemfile

@@ -1,4 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'pry'
 gemspec

data/Readme.md

@@ -100,7 +100,6 @@ Shit that will probably never get done (or if it does, won't be until after 2.0)
 
 * How about if begin/rescue/end was able to record the result on the rescue section
 * What about recording the result of a line inside of a string interpolation, e.g. "a#{\n1\n}b" could record line 2 is 1 and line 3 is "a\n1\nb"
-* Be able to clean an invalid file (used to be able to do this, but parser can't identify comments in an invalid file the way that I'm currently using it, cuke is still there, marked as @not-implemented)
 * If given a file with a Unicode character, but not set Unicode, inform the user
 
 License

data/lib/seeing_is_believing/binary/commentable_lines.rb

@@ -20,12 +20,12 @@ class SeeingIsBelieving
 
       def call
         @call ||= begin
-          line_num_to_indexes = line_nums_to_last_index_and_col(buffer)
-          remove_lines_after_data_segment           line_num_to_indexes
-          remove_lines_whose_newline_is_escaped     line_num_to_indexes
-          remove_lines_ending_in_comments           line_num_to_indexes, comments
-          remove_lines_inside_of_strings_and_things line_num_to_indexes, root
-          line_num_to_indexes
+          line_num_to_location = line_nums_to_last_index_and_col(buffer)
+          remove_lines_after_data_segment           line_num_to_location
+          remove_lines_whose_newline_is_escaped     line_num_to_location
+          remove_lines_ending_in_comments           line_num_to_location, comments
+          remove_lines_inside_of_strings_and_things line_num_to_location, root
+          line_num_to_location
         end
       end
 
@@ -37,44 +37,44 @@ class SeeingIsBelieving
       attr_accessor :code, :parser, :root, :comments
 
       def line_nums_to_last_index_and_col(buffer)
-        line_num_to_indexes = code.each_char
-                                  .with_index
-                                  .select { |char, index| char == "\n" } # <-- is this okay? what about other OSes?
-                                  .each_with_object(Hash.new) do |(_, index), hash|
-                                    line, col = buffer.decompose_position index
-                                    hash[line] = [index, col]
-                                  end
+        line_num_to_location = code.each_char
+                                   .with_index
+                                   .select { |char, index| char == "\n" } # <-- is this okay? what about other OSes?
+                                   .each_with_object(Hash.new) do |(_, index), hash|
+                                     line, col = buffer.decompose_position index
+                                     hash[line] = [index, col]
+                                   end
         if code[code.size-1] != "\n" # account for the fact that the last line wouldn't have been found above if it doesn't end in a newline
           line, col = buffer.decompose_position code.size
-          line_num_to_indexes[line] = [code.size, col]
+          line_num_to_location[line] = [code.size, col]
         end
-        line_num_to_indexes
+        line_num_to_location
       end
 
-      def remove_lines_whose_newline_is_escaped(line_num_to_indexes)
-        line_num_to_indexes.select { |line_number, (index_of_newline, col)| code[index_of_newline-1] == '\\' }
-                           .each   { |line_number, (index_of_newline, col)| line_num_to_indexes.delete line_number }
+      def remove_lines_whose_newline_is_escaped(line_num_to_location)
+        line_num_to_location.select { |line_number, (index_of_newline, col)| code[index_of_newline-1] == '\\' }
+                            .each   { |line_number, (index_of_newline, col)| line_num_to_location.delete line_number }
       end
 
-      def remove_lines_ending_in_comments(line_num_to_indexes, comments)
+      def remove_lines_ending_in_comments(line_num_to_location, comments)
         comments.each do |comment|
           if comment.type == :inline
-            line_num_to_indexes.delete comment.location.line
+            line_num_to_location.delete comment.location.line
           else
             begin_pos = comment.location.expression.begin_pos
             end_pos   = comment.location.expression.end_pos
             range     = begin_pos...end_pos
-            line_num_to_indexes.select { |line_number, (index_of_newline, col)| range.include? index_of_newline }
-                               .each   { |line_number, (index_of_newline, col)| line_num_to_indexes.delete line_number }
+            line_num_to_location.select { |line_number, (index_of_newline, col)| range.include? index_of_newline }
+                                .each   { |line_number, (index_of_newline, col)| line_num_to_location.delete line_number }
           end
         end
       end
 
-      def remove_lines_inside_of_strings_and_things(line_num_to_indexes, ast)
+      def remove_lines_inside_of_strings_and_things(line_num_to_location, ast)
         invalid_boundaries = ranges_of_atomic_expressions ast, []
         invalid_boundaries.each do |invalid_boundary|
-          line_num_to_indexes.select { |line_number, (index_of_newline, col)| invalid_boundary.include? index_of_newline }
-                             .each   { |line_number, (index_of_newline, col)| line_num_to_indexes.delete line_number }
+          line_num_to_location.select { |line_number, (index_of_newline, col)| invalid_boundary.include? index_of_newline }
+                              .each   { |line_number, (index_of_newline, col)| line_num_to_location.delete line_number }
         end
       end
 
@@ -106,8 +106,8 @@ class SeeingIsBelieving
         end
       end
 
-      def remove_lines_after_data_segment(line_num_to_indexes)
-        data_segment_line, _ = line_num_to_indexes.find do |line_number, (end_index, col)|
+      def remove_lines_after_data_segment(line_num_to_location)
+        data_segment_line, _ = line_num_to_location.find do |line_number, (end_index, col)|
           if end_index == 7
             code.start_with? '__END__'
           elsif end_index < 7
@@ -117,8 +117,8 @@ class SeeingIsBelieving
           end
         end
         return unless data_segment_line
-        max_line = line_num_to_indexes.keys.max
-        data_segment_line.upto(max_line) { |line_number| line_num_to_indexes.delete line_number }
+        max_line = line_num_to_location.keys.max
+        data_segment_line.upto(max_line) { |line_number| line_num_to_location.delete line_number }
       end
     end
   end

data/lib/seeing_is_believing/binary.rb

@@ -186,21 +186,21 @@ class SeeingIsBelieving
       { stdout:      results.stdout,
         stderr:      results.stderr,
         exit_status: results.exitstatus,
-        exception:   if results.has_exception?
+        exception:   (if results.has_exception?
                        { line_number_in_this_file: results.each_with_line_number.find { |line_number, result| result.has_exception? }.first,
                          class_name:               results.exception.class_name,
                          message:                  results.exception.message,
                          backtrace:                results.exception.backtrace,
                        }
-                     end,
+                     end),
         lines:       results.each_with_line_number.each_with_object(Hash.new) { |(line_number, result), hash|
                        hash[line_number] = { results:   result.to_a,
-                                             exception: if result.has_exception?
+                                             exception: (if result.has_exception?
                                                           { class_name:               results.exception.class_name,
                                                             message:                  results.exception.message,
                                                             backtrace:                results.exception.backtrace,
                                                           }
-                                                        end
+                                                        end)
                        }
                      },
       }

data/lib/seeing_is_believing/version.rb

@@ -1,3 +1,3 @@
 class SeeingIsBelieving
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

data/lib/seeing_is_believing/wrap_expressions.rb

@@ -213,14 +213,18 @@ class SeeingIsBelieving
         add_to_wrappings range, meta
         add_children ast
       when :begin
-        last_child = ast.children.last
-        if heredoc? last_child
-          range = Parser::Source::Range.new buffer,
-                                            ast.location.expression.begin_pos,
-                                            heredoc_hack(last_child).location.expression.end_pos
-          add_to_wrappings range unless void_value? ast.children.last
+        if ast.location.expression.source.start_with?("(") && # e.g. `(1)` we want `<(1)>`
+           !void_value?(ast)                                  # e.g. `(return 1)` we want `(return <1>)`
+          add_to_wrappings ast
+        else # e.g. `A\nB` we want `<A>\n<B>`
+          last_child = ast.children.last
+          if heredoc? last_child
+            range = Parser::Source::Range.new buffer,
+                                              ast.location.expression.begin_pos,
+                                              heredoc_hack(last_child).location.expression.end_pos
+            add_to_wrappings range unless void_value? ast.children.last
+          end
         end
-
         add_children ast
       when :str, :dstr, :xstr, :regexp
         add_to_wrappings heredoc_hack ast

data/spec/binary/comment_lines_spec.rb

@@ -1,9 +1,5 @@
 require 'seeing_is_believing/binary/comment_lines'
 
-# FIXME: For now ignoring heredocs
-#        because we know the user of this class won't have output on them
-#        and it's a PITA to deal with.
-#        Eventually, though, Parser should take this into account
 describe SeeingIsBelieving::Binary::CommentLines, 'passes in the each commentable line and the line number, and adds the returned text (whitespace+comment) to the end' do
   def call(code, &block)
     described_class.call code, &block

data/spec/debugger_spec.rb

@@ -15,7 +15,7 @@ describe SeeingIsBelieving::Debugger do
     described_class.new(colour:  true).should be_coloured
   end
 
-  context 'when given a steram' do
+  context 'when given a stream' do
     it 'prints the the context and the value of the block' do
       described_class.new(stream: stream).context('C') { 'V' }
       stream.string.should == "C:\nV\n"

data/spec/hard_core_ensure_spec.rb

@@ -56,18 +56,26 @@ describe SeeingIsBelieving::HardCoreEnsure do
   end
 
   it 'invokes the code even if an interrupt is sent and interrupts are set to ignore' do
-    channel = IChannel.new Marshal
-    pid = fork do
-      old_handler = trap 'INT', 'IGNORE'
-      result = call code: -> { sleep 0.1; 'code result' }, ensure: -> { channel.put "ensure invoked" }
-      channel.put result
-      trap 'INT', old_handler
+    test = lambda do
+      channel = IChannel.new Marshal
+      pid = fork do
+        old_handler = trap 'INT', 'IGNORE'
+        result = call code: -> { sleep 0.1; 'code result' }, ensure: -> { channel.put "ensure invoked" }
+        channel.put result
+        trap 'INT', old_handler
+      end
+      sleep 0.05
+      Process.kill 'INT', pid
+      Process.wait pid
+      channel.get.should == "ensure invoked"
+      channel.get.should == 'code result'
+      channel.should_not be_readable
+    end
+
+    if RUBY_VERSION == '2.1.1' || RUBY_VERSION == '2.1.2'
+      pending 'This test can\'t run on 2.1.1 or 2.1.2'
+    else
+      test.call
     end
-    sleep 0.05
-    Process.kill 'INT', pid
-    Process.wait pid
-    channel.get.should == "ensure invoked"
-    channel.get.should == 'code result'
-    channel.should_not be_readable
   end
 end

data/spec/wrap_expressions_spec.rb

@@ -33,6 +33,11 @@ describe SeeingIsBelieving::WrapExpressions do
       described_class.call("1# abc", options).should == "[<1>]# abc"
     end
 
+    it 'wraps bodies that are wrapped in parentheses' do
+      wrap('(1)').should == '<(1)>'
+      wrap("(\n<<doc\ndoc\n)").should == "<(\n<<<doc>\ndoc\n)>"
+    end
+
     context 'fucking heredocs' do
       example 'single heredoc' do
         described_class.call("<<A\nA", options).should == "[<<<A>]\nA"
@@ -161,8 +166,8 @@ describe SeeingIsBelieving::WrapExpressions do
 
     it 'wraps multiple expressions' do
       wrap("A\nB").should == "<A>\n<B>"
-      wrap("(1\n2)").should == "(<1>\n<2>)"
-      # wrap("(1\n2\n)").should == "<(<1>\n<2>\n)>" # just not worth the effort of identifying it, really
+      wrap("(1\n2)").should == "<(<1>\n2)>"
+      wrap("(1\n2\n)").should == "<(<1>\n<2>\n)>"
       wrap("begin\n1\n2\nend").should == "<begin\n<1>\n<2>\nend>"
     end
 

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: seeing_is_believing
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: haiti
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: ichannel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.1.1
 description: Records the results of every line of code in your file (intended to be
@@ -104,8 +104,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Rakefile
 - Readme.md
@@ -202,17 +202,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: seeing_is_believing
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Records results of every line of code in your file
@@ -233,4 +233,3 @@ test_files:
 - spec/line_spec.rb
 - spec/seeing_is_believing_spec.rb
 - spec/wrap_expressions_spec.rb
-has_rdoc: