seeing_is_believing 3.0.0.beta.6 → 3.0.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8715640842e97ae16fececb478cf4356169e1fdc
-  data.tar.gz: a2bfb634547740e23c0a71710a953496350fb2b0
+  metadata.gz: 866178b03727394e7c24c5cfbaa48ea4edbca4e1
+  data.tar.gz: cfe4540e781ec9aa65b79a950d8760058136a85d
 SHA512:
-  metadata.gz: a4bbbaaa3640d0dd4b42051eb7416efb940af2b5b7a78df277c8047ec0a91e10b725e0c68a0d0ebf961d20583579ea231c1c2fd90504aded08ce81e20675b9e4
-  data.tar.gz: 319db0b7ee9047fa6c051659f8da8320f83828141e3e47e38448078f87720e7847c35e773ea50331684d644a70917129f0d2e91890aa535023472d797aa0a211
+  metadata.gz: 514947858dab6b669eeb25f8b729e330d9435b438f2821073a56a12226451710a54f775415591e56c8673d071e276c102ec7ca001f4f6f2ce03fe9d2f1282b7b
+  data.tar.gz: 341dea9e96e9e1c57565254830f5f22648bcd2b9363d492b1a8718dddc54e30861c449d5374f3822e7ef7c88ce89ea107c79e5049c7e216a35a88c3b8440f735

data/.rspec

@@ -1,4 +1,2 @@
 --colour
---fail-fast
---require error_to_communicate/rspec_formatter
---format WhatWeveGotHereIsAnErrorToCommunicate::RSpecFormatter
+--format documentation

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
-script: rake ci
+install: gem install bundler && bundle install --standalone --binstubs bundle/bin
+script: bundle exec rake ci
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.2
   - 2.2.0
-  - ruby-head
+  - 2.3.0

data/Gemfile

@@ -1,3 +1,2 @@
 source 'http://rubygems.org'
-
 gemspec

data/Rakefile

@@ -1,7 +1,7 @@
 require 'bundler'
 
 desc 'Have Bundler setup a standalone environment -- run tests in this, b/c its faster and safer'
-task :build do
+task :install do
   # Running without rubygems  # http://myronmars.to/n/dev-blog/2012/03/faster-test-boot-times-with-bundler-standalone
   sh 'bundle install --standalone --binstubs bundle/bin'
 end
@@ -17,14 +17,14 @@ task :clean do
   ]
 end
 
-file :bundle do
-  $stderr.puts "\e[31mLooks like the gems aren\'t installed, run `rake build` to install them\e[39m"
+directory 'bundle' do
+  $stderr.puts "\e[31mLooks like the gems aren\'t installed, run `rake install` to install them\e[39m"
   exit 1
 end
 
 desc 'Run specs'
 task spec: :bundle do
-  sh 'ruby', '--disable-gem', *Bundler.load.specs.flat_map(&:full_require_paths).flat_map { |p| ['-I', p ] }, '-S', 'bundle/bin/rspec'
+  sh 'ruby', '--disable-gem', *Bundler.load.specs.flat_map(&:full_require_paths).flat_map { |p| ['-I', p ] }, '-S', 'bundle/bin/mrspec'
 end
 
 desc 'Run cukes'
@@ -36,4 +36,4 @@ desc 'Run all specs and cukes'
 task default: [:spec, :cuke]
 
 desc 'Install dependencies and run tests (mainly for Travis CI)'
-task ci: [:build, :spec, :cuke]
+task ci: [:install, :spec, :cuke]

data/Readme.md

@@ -5,7 +5,7 @@ Seeing Is Believing
 ===================
 
 Evaluates Ruby code, recording the results of each line.
-Integrates with any extensible editor (I've integrated it with many already, see [the list](https://github.com/JoshCheek/seeing_is_believing#editor-integration).
+Integrates with any extensible editor (I've integrated it with many already, see [the list](https://github.com/JoshCheek/seeing_is_believing#editor-integration)).
 
 ![example](https://s3.amazonaws.com/josh.cheek/images/scratch/sib-example1.gif)
 
@@ -72,7 +72,7 @@ Editor Integration
 Vim
 ===
 
-I didn't write either of these, but they both support Seeing Is Beleiving. I've looked through the code, it works reasonably. One of them, I wound up having to edit the installed package, don't remember which.
+I didn't write either of these, but they both support Seeing Is Believing. I've looked through the code, it works reasonably. One of them, I wound up having to edit the installed package, don't remember which.
 
 * [vim-ruby-xmpfilter](https://github.com/t9md/vim-ruby-xmpfilter)
 * [vim-seeing-is-believing](https://github.com/hwartig/vim-seeing-is-believing)
@@ -80,7 +80,9 @@ I didn't write either of these, but they both support Seeing Is Beleiving. I've
 Emacs Integration
 =================
 
-Add this function to your Emacs configuration:
+You can use my friend's configuration [file](https://github.com/jcinnamond/seeing-is-believing).
+
+Or, adding this function to your Emacs configuration will get you pretty far:
 
 ```scheme
 (defun seeing-is-believing ()
@@ -88,8 +90,10 @@ Add this function to your Emacs configuration:
 of seeing_is_believing."
   (interactive)
   (let ((beg (if (region-active-p) (region-beginning) (point-min)))
-        (end (if (region-active-p) (region-end) (point-max))))
-    (shell-command-on-region beg end "seeing_is_believing" nil 'replace)))
+        (end (if (region-active-p) (region-end) (point-max)))
+        (origin (point)))
+    (shell-command-on-region beg end "seeing_is_believing" nil 'replace)
+    (goto-char origin)))
 ```
 
 You can now call `seeing-is-believing` to replace the current region

data/features/regression.feature

@@ -459,8 +459,7 @@ Feature:
     b"
 
     # ~> NoMethodError
-    # ~> undefined method `a
-    # ~> b' for 1:Fixnum
+    # ~> undefined method
     """
 
 

data/lib/seeing_is_believing/binary/annotate_end_of_file.rb

@@ -12,7 +12,7 @@ class SeeingIsBelieving
                  exception_output_for(results, options)
 
         code = Code.new(new_body)
-        code.rewriter.insert_after code.body_range, output
+        code.rewriter.insert_after_multi code.body_range, output
         new_body.replace code.rewriter.process
       end
 

data/lib/seeing_is_believing/binary/annotate_marked_lines.rb

@@ -27,19 +27,30 @@ class SeeingIsBelieving
           WrapExpressions.call \
             program,
             before_each: -> line_number {
+              # 74 b/c pretty print_defaults to 79 (guessing 80 chars with 1 reserved for newline), and
+              # 79 - "# => ".length # => 4
+              inspect        = "$SiB.record_result(:inspect, #{line_number}, ("
+              pp             = "$SiB.record_result(:pp, #{line_number}, ("
+
               should_inspect = inspect_linenos.include? line_number
               should_pp      = pp_linenos.include?      line_number
-              should_inspect || should_pp ?  '(' : ''
+
+              if    should_inspect && should_pp then "#{pp}#{inspect}"
+              elsif should_inspect              then inspect
+              elsif should_pp                   then pp
+              else                                   ""
+              end
             },
             after_each:  -> line_number {
-              # 74 b/c pretty print_defaults to 79 (guessing 80 chars with 1 reserved for newline), and
-              # 79 - "# => ".length # => 4
-              inspect        = "$SiB.record_result :inspect, #{line_number}, v"
-              pp             = "$SiB.record_result(:pp, #{line_number}, v) { PP.pp v, '', 74 }"
+              inspect = "))"
+              pp      = ")) { |v| PP.pp v, '', 74 }"
+
+              should_inspect = inspect_linenos.include? line_number
+              should_pp      = pp_linenos.include?      line_number
 
-              if    should_inspect && should_pp then ").tap { |v| #{inspect}; #{pp} }"
-              elsif should_inspect              then ").tap { |v| #{inspect} }"
-              elsif should_pp                   then ").tap { |v| #{pp} }"
+              if    should_inspect && should_pp then "#{inspect}#{pp}"
+              elsif should_inspect              then inspect
+              elsif should_pp                   then pp
               else                                   ""
               end
             }

data/lib/seeing_is_believing/binary/comment_lines.rb

@@ -22,7 +22,7 @@ class SeeingIsBelieving
             first_index -= 1 while first_index > 0 && raw_code[first_index-1] != "\n"
             comment_text = commenter.call raw_code[first_index...last_index], line_number
             range        = Parser::Source::Range.new(commentable_lines.buffer, first_index, last_index)
-            commentable_lines.rewriter.insert_after range, comment_text
+            commentable_lines.rewriter.insert_after_multi range, comment_text
           end
           commentable_lines.rewriter.process
         end

data/lib/seeing_is_believing/code.rb

@@ -24,20 +24,19 @@ class SeeingIsBelieving
       @raw             = raw_code
       @buffer          = Parser::Source::Buffer.new(name||"SeeingIsBelieving")
       @buffer.source   = raw
-      builder          = Parser::Builders::Default.new.tap { |b| b.emit_file_line_as_literals = false }
       @rewriter        = Parser::Source::Rewriter.new buffer
-      @raw_comments, tokens = comments_and_tokens(builder, buffer)
-      @body_range      = body_range_from_tokens(tokens)
+      builder          = Parser::Builders::Default.new.tap { |b| b.emit_file_line_as_literals = false }
       @parser          = Parser::CurrentRuby.new builder
-      @inline_comments = raw_comments.select(&:inline?).map { |c| wrap_comment c }
-      begin
-        @root          = @parser.parse(@buffer)
-        @syntax        = Syntax.new
-      rescue Parser::SyntaxError
-        @syntax        = Syntax.new error_message: $!.message, line_number: index_to_linenum($!.diagnostic.location.begin_pos)
-      ensure
-        @root        ||= null_node
+      @syntax          = Syntax.new
+      parser.diagnostics.consumer = lambda do |diagnostic|
+        if :fatal == diagnostic.level || :error == diagnostic.level
+          @syntax = Syntax.new error_message: diagnostic.message, line_number: index_to_linenum(diagnostic.location.begin_pos)
+        end
       end
+      @root, @raw_comments, @tokens = parser.tokenize(@buffer, true)
+      @body_range                   = body_range_from_tokens(@tokens)
+      @inline_comments              = raw_comments.select(&:inline?).map { |c| wrap_comment c }
+      @root                       ||= null_node
     end
 
     def range_for(start_index, end_index)
@@ -91,32 +90,8 @@ class SeeingIsBelieving
     private
 
     def comments_and_tokens(builder, buffer)
-      # THIS IS SO WE CAN EXTRACT COMMENTS FROM INVALID FILES.
-      # We do it by telling Parser's diagnostic to not blow up.
-      #   https://github.com/whitequark/parser/blob/2d69a1b5f34ef15b3a8330beb036ac4bf4775e29/lib/parser/diagnostic/engine.rb
-      # However, this probably implies SiB won't work on Rbx/JRuby
-      #   https://github.com/whitequark/parser/blob/2d69a1b5f34ef15b3a8330beb036ac4bf4775e29/lib/parser/base.rb#L129-134
-      # Ideally we could just do this
-      #   parser.diagnostics.all_errors_are_fatal = false
-      #   parser.diagnostics.ignore_warnings      = false
-      # But, the parser will still blow up on "fatal" errors (e.g. unterminated string) So we need to actually change it.
-      #   https://github.com/whitequark/parser/blob/2d69a1b5f34ef15b3a8330beb036ac4bf4775e29/lib/parser/diagnostic/engine.rb#L99
-      # We could make a NullDiagnostics like this:
-      #   class NullDiagnostics < Parser::Diagnostic::Engine
-      #     def process(*)
-      #       # no op
-      #     end
-      #   end
-      # But we don't control initialization of the variable, and the value gets passed around, at least into the lexer.
-      #   https://github.com/whitequark/parser/blob/2d69a1b5f34ef15b3a8330beb036ac4bf4775e29/lib/parser/base.rb#L139
-      #   and since it's all private, it could change at any time (Parser is very state based),
-      #   so I think it's just generally safer to mutate that one object, as we do now.
       parser = Parser::CurrentRuby.new builder
-      diagnostics = parser.diagnostics
-      def diagnostics.process(*)
-        self
-      end
-      _, all_comments, tokens = parser.tokenize(@buffer)
+      _, all_comments, tokens = parser.tokenize(@buffer, true)
       [all_comments, tokens]
     end
 

data/lib/seeing_is_believing/the_matrix.rb

@@ -24,6 +24,10 @@ real_exit_bang = method :exit!
 Kernel.module_eval do
   private
 
+  define_method :warn do |*args, &block|
+    $stderr.puts *args
+  end
+
   define_method :exec do |*args, &block|
     $SiB.record_exec(args)
     finish.call

data/lib/seeing_is_believing/version.rb

@@ -1,3 +1,3 @@
 class SeeingIsBelieving
-  VERSION = '3.0.0.beta.6'
+  VERSION = '3.0.0.beta.7'
 end

data/lib/seeing_is_believing/wrap_expressions.rb

@@ -23,20 +23,27 @@ class SeeingIsBelieving
       @called ||= begin
         wrap_recursive code.root
 
-        rewriter.insert_before root_range, before_all.call
+        wrappings = wrappings().sort_by(&:first)
 
         wrappings.each do |line_num, (range, last_col, meta)|
-          rewriter.insert_before range, before_each.call(line_num)
           case meta
           when :total_fucking_failure
             rewriter.replace range,  '.....TOTAL FUCKING FAILURE!.....'
           when :match_current_line
-            rewriter.insert_before range, '~' # Regexp#~
+            rewriter.insert_before_multi range, '~' # Regexp#~
           end
-          rewriter.insert_after range, after_each.call(line_num)
         end
 
-        rewriter.insert_after root_range, after_all_text
+        wrappings.each do |line_num, (range, last_col, meta)|
+          rewriter.insert_before_multi range, before_each.call(line_num)
+        end
+
+        wrappings.each do |line_num, (range, last_col, meta)|
+          rewriter.insert_after_multi range, after_each.call(line_num)
+        end
+
+        rewriter.insert_before_multi root_range, before_all.call
+        rewriter.insert_after_multi  root_range, after_all_text
         rewriter.process
       end
     end

data/lib/seeing_is_believing/wrap_expressions_with_inspect.rb

@@ -2,12 +2,14 @@ require 'seeing_is_believing/wrap_expressions'
 class SeeingIsBelieving
   module WrapExpressionsWithInspect
     def self.call(program)
+      # NOTE: if it received the AST, it could figure out if it needs
+      # to always wrap the expression in parentheses
       WrapExpressions.call program,
         before_each: -> line_number {
-          "("
+          "$SiB.record_result(:inspect, #{line_number}, ("
         },
         after_each:  -> line_number {
-          ").tap { |v| $SiB.record_result :inspect, #{line_number}, v }"
+          "))"
         }
     end
   end

data/seeing_is_believing.gemspec

@@ -19,11 +19,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency             "parser",   ">= 2.2.0.3", "< 3.0"
+  s.add_dependency             "parser",   ">= 2.3.0.7", "< 3.0"
 
   s.add_development_dependency "what_weve_got_here_is_an_error_to_communicate"
   s.add_development_dependency "haiti",    ">= 0.1", "< 0.3"
   s.add_development_dependency "rake",     "~> 10.0"
+  s.add_development_dependency "mrspec",   "~>  0.3.0"
   s.add_development_dependency "rspec",    "~>  3.2"
   s.add_development_dependency "cucumber", "~>  1.2"
   s.add_development_dependency "ichannel", "~>  5.1"

data/spec/event_stream_spec.rb

@@ -394,7 +394,7 @@ module SeeingIsBelieving::EventStream
                          backtrace_filename: __FILE__
       end
 
-      example 'Example: Common edge case: name error', t:true do
+      example 'Example: Common edge case: name error' do
         backtrace_line  = record_exception(99) { BasicObject.new.instance_eval { not_a_local_or_meth } }
         backtrace_frame = 0
         backtrace_frame += 1 if defined? Rubinius # their method missing goes into the kernel

data/spec/seeing_is_believing_spec.rb

@@ -503,6 +503,10 @@ RSpec.describe SeeingIsBelieving do
     expect(values_for "File.read(__FILE__).lines.count").to eq [['1']]
   end
 
+  it 'records instances of BasicObject' do
+    expect(values_for 'o = BasicObject.new; def o.inspect; "some obj"; end; o').to eq [['some obj']]
+  end
+
   context 'when given a debugger' do
     let(:stream)   { StringIO.new }
     let(:debugger) { SeeingIsBelieving::Debugger.new stream: stream }
@@ -551,6 +555,10 @@ RSpec.describe SeeingIsBelieving do
     it 'gets the exit status off of the child process' do
       expect(invoke('exec "ruby", "-e", "exit 5"').exitstatus).to eq 5
     end
+
+    it 'emits otuput on expicit invocations to warn' do
+      expect(invoke('warn "hello"').stderr).to eq "hello\n"
+    end
   end
 
   # Looked through the implementation of event_stream/producer to find a list of core behaviour it depends on

data/spec/wrap_expressions_spec.rb

@@ -104,13 +104,11 @@ RSpec.describe SeeingIsBelieving::WrapExpressions do
   end
 
   it 'passes the current line number to the before_each and after_each wrappers' do
-    pre_line_num = post_line_num = nil
-    described_class.call("\na\n",
-                         before_each: -> _pre_line_num  { pre_line_num  = _pre_line_num;  '<' },
-                         after_each:  -> _post_line_num { post_line_num = _post_line_num; '>' }
-                        )
-    expect(pre_line_num).to eq 2
-    expect(post_line_num).to eq 2
+    result = described_class.call("a.each { |b|\n}\n",
+      before_each: -> n { "(#{n})" },
+      after_each:  -> n { "<#{n}>" }
+    )
+    expect(result).to eq "(2)(1)a<1>.each { |b|\n}<2>\n"
   end
 
   it 'does nothing for an empty program' do
@@ -168,9 +166,7 @@ RSpec.describe SeeingIsBelieving::WrapExpressions do
          0b001_001
 
          ?a
-         ?\C-a
-         ?\M-a
-         ?\M-\C-a
+         ?\\C-a
 
          1..2
          1...2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seeing_is_believing
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.6
+  version: 3.0.0.beta.7
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0.3
+        version: 2.3.0.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0.3
+        version: 2.3.0.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -78,6 +78,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: mrspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement