seeing_is_believing 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6adfee9e8967b84be59e45a401f01f143d458ffb
-  data.tar.gz: 014dc1b1d8af353f5bef6dd3f46f0ee4d97cb859
+  metadata.gz: abbcb4fd5db54b1a8b6158b07cb9b4705a1d7bc5
+  data.tar.gz: 1201fcec0c2768dae5769a6aca6aa06463992a27
 SHA512:
-  metadata.gz: 7a3f04bacf9afc8d2e032582140890e24c000b0433be694f1dbd5a3a8029fcc724fa6c4efdc6de71426f9cde5aee033e53f9b562e48db9d75a4d6ee50b432d81
-  data.tar.gz: dad2c178e03dcfee0f28aea9ed62edf4d8e44ba3456b7880ad4a6134ab4a3e866a1dedcb28c9ea763d42b1fe5137a97c436af62324adf3885e19faa06b1ddbb8
+  metadata.gz: 63eb02d6a89e340a6f29cb1a49ed31d7ab5153550be46bba89309b193154faab7894dca268bbb9f367be8d3a0ba713d4b30d94a71b70fef7e7bc51e63498c001
+  data.tar.gz: 98fefbaaef519b2e61489c47ce7b9b0425572bd326d9a2d93e6b36b2e1f73349d52fa91f454b15775356d66e615faf32678523664ea31a65e41188114eb862f1

data/Gemfile

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

data/Readme.md

@@ -121,3 +121,4 @@ License
      0. You just DO WHAT THE FUCK YOU WANT TO.
 
 
+

data/features/support/env.rb

@@ -12,6 +12,7 @@ Then 'stdout is exactly:' do |code|
 end
 
 Then 'stdout is the JSON:' do |json|
+  require 'json'
   expected = JSON.parse(json)
   actual   = JSON.parse(@last_executed.stdout)
   actual.should == expected

data/lib/seeing_is_believing.rb

@@ -73,8 +73,7 @@ class SeeingIsBelieving
                                  encoding:           @encoding,
                                  timeout:            @timeout,
                                  ruby_executable:    @ruby_executable,
-                                 debugger:           @debugger,
-                                 number_of_captures: @number_of_captures
+                                 debugger:           @debugger
     end
   end
 

data/lib/seeing_is_believing/binary/clean_body.rb

@@ -3,6 +3,7 @@
 #   removes annotations
 #   only removes "# =>" when should_clean_values is false
 
+require 'seeing_is_believing/binary'
 require 'seeing_is_believing/parser_helpers'
 
 class SeeingIsBelieving
@@ -25,18 +26,18 @@ class SeeingIsBelieving
 
         comments.each do |comment|
           case comment.text
-          when /\A#\s*=>/
+          when VALUE_REGEX
             if should_clean_values
               removed_comments[:result] << comment
               rewriter.remove comment.location.expression
             end
-          when /\A#\s*~>/
+          when EXCEPTION_REGEX
             removed_comments[:exception] << comment
             rewriter.remove comment.location.expression
-          when /\A#\s*>>/ then
+          when STDOUT_REGEX
             removed_comments[:stdout] << comment
             rewriter.remove comment.location.expression
-          when /\A#\s*!>/ then
+          when STDERR_REGEX
             removed_comments[:stderr] << comment
             rewriter.remove comment.location.expression
           end

data/lib/seeing_is_believing/binary/commentable_lines.rb

@@ -81,9 +81,8 @@ class SeeingIsBelieving
       def ranges_of_atomic_expressions(ast, found_ranges)
         return found_ranges unless ast.kind_of? ::AST::Node
         if no_comment_zone?(ast) && heredoc?(ast)
-          begin_pos  = ast.location.expression.begin.begin_pos
-          begin_pos += (ast.location.expression.source =~ /\n/).next
-          end_pos    = ast.location.expression.end.end_pos.next
+          begin_pos = ast.location.heredoc_body.begin_pos
+          end_pos   = ast.location.heredoc_end.end_pos.next
           found_ranges << (begin_pos...end_pos)
         elsif no_comment_zone? ast
           begin_pos = ast.location.expression.begin.begin_pos

data/lib/seeing_is_believing/binary/parse_args.rb

@@ -43,7 +43,7 @@ class SeeingIsBelieving
             when '-I',  '--load-path'           then next_arg("#{arg} expected a directory as the following argument but did not see one")      { |dir|        options[:load_path] << dir }
             when '-e',  '--program'             then next_arg("#{arg} expected a program as the following argument but did not see one")        { |program|    options[:program]   =  program }
             when '-a',  '--as'                  then next_arg("#{arg} expected a filename as the following argument but did not see one")       { |filename|   options[:as]        =  filename }
-            when        '--shebang'             then next_arg("#{arg} expects a ruby executable as the following argument but did not see one") { |executable| options[:shebang]   = executable }
+            when        '--shebang'             then next_arg("#{arg} expects a ruby executable as the following argument but did not see one") { |executable| options[:shebang]   =  executable }
             when '-s',  '--alignment-strategy'  then extract_alignment_strategy
             when /\A-K(.+)/                    then options[:encoding] = $1
             when '-K', '--encoding'            then next_arg("#{arg} expects an encoding, see `man ruby` for possibile values") { |encoding| options[:encoding] = encoding }

data/lib/seeing_is_believing/debugger.rb

@@ -17,7 +17,7 @@ class SeeingIsBelieving
     alias enabled? stream
 
     def context(name, &block)
-      if stream
+      if enabled?
         stream << CONTEXT_COLOUR          if coloured?
         stream << "#{name}:"
         stream << RESET_COLOUR            if coloured?

data/lib/seeing_is_believing/evaluate_by_moving_files.rb

@@ -4,12 +4,12 @@
 #
 # Another option is to replace __FILE__ macros ourselves
 # and then write to a temp file but evaluate in the context
-# of the expected directory. I'm not doing that just because
-# I don't think the __FILE__ macro can be replaced correctly
-# without parsing the code, changing the AST, and then
-# regenerating it, which I'm not good enough to do. Though
-# I did look at Ripper, and it will invoke on_kw("__FILE__")
-# when it sees this.
+# of the expected directory. Some issues could arise with this,
+# though: if you required the file again, it wouldn't already
+# be in the loaded features (might be able to just add it)
+# if you  did something like File.read(__FILE__) it would
+# read the wrong file... of course, since we rewrite the file,
+# its body will be incorrect, anyway.
 
 require 'yaml'
 require 'open3'
@@ -52,8 +52,6 @@ class SeeingIsBelieving
           begin
             evaluate_file
             deserialize_result.tap { |result| fail if result.bug_in_sib? }
-          # Okay, really, I should wrap this in another exception and raise it on up,
-          # but for now, I'm feeling a little lazy and am not going to do it
           rescue Exception => error
             error = wrap_error error if error_implies_bug_in_sib? error
             raise error

data/lib/seeing_is_believing/line.rb

@@ -28,7 +28,12 @@ class SeeingIsBelieving
     end
 
     def record_result(value)
-      inspected = value.inspect # only invoke inspect once, b/c the inspection may be recorded
+      begin
+        inspected = value.inspect.to_str # only invoke inspect once, b/c the inspection may be recorded
+      rescue NoMethodError
+        inspected = "#<no inspect available>"
+      end
+
       if    size <  @max_number_of_captures then @array << inspected
       elsif size == @max_number_of_captures then @array << '...'
       end

data/lib/seeing_is_believing/parser_helpers.rb

@@ -4,7 +4,7 @@ class SeeingIsBelieving
 
     # override #process so it does not raise an error on
     # fatal parsings (we want to keep going if possible,
-    # this allows us to find comments in syntactically invalid files
+    # this allows us to find comments in syntactically invalid files)
     class NullDiagnostics < Parser::Diagnostic::Engine
       def process(*)
         # no op
@@ -38,12 +38,12 @@ class SeeingIsBelieving
     def heredoc?(ast)
       # some strings are fucking weird.
       # e.g. the "1" in `%w[1]` returns nil for ast.location.begin
-      # and `__FILE__` is a string whose location is a Parser::Source::Map instead of a Parser::Source::Map::Collection, so it has no #begin
+      # and `__FILE__` is a string whose location is a Parser::Source::Map instead of a Parser::Source::Map::Collection,
+      # so it has no #begin
       ast.kind_of?(Parser::AST::Node)           &&
         (ast.type == :dstr || ast.type == :str) &&
         (location  = ast.location)              &&
-        (the_begin = location.begin)            &&
-        (the_begin.source =~ /^\<\<-?/)
+        (ast.location.kind_of? Parser::Source::Map::Heredoc)
     end
 
     def void_value?(ast)
@@ -62,6 +62,7 @@ class SeeingIsBelieving
     end
 
     def heredoc_hack(ast)
+      return ast
       return ast unless heredoc? ast
       Parser::AST::Node.new :str,
                             [],

data/lib/seeing_is_believing/version.rb

@@ -1,3 +1,3 @@
 class SeeingIsBelieving
-  VERSION = '2.0.4'
+  VERSION = '2.1.0'
 end

data/seeing_is_believing.gemspec

@@ -19,7 +19,7 @@ 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.0.0"
+  s.add_dependency             "parser",   "~> 2.1.4"
 
   s.add_development_dependency "haiti",    "~> 0.0.3"
   s.add_development_dependency "rake",     "~> 10.0.3"

data/spec/line_spec.rb

@@ -19,6 +19,19 @@ describe SeeingIsBelieving::Line, t:true do
     line.inspect.should == '#<SIB:Line[] (0, 0) RuntimeError:"omg">'
   end
 
+  it "doesn't blow up when there is no #inspect available e.g. BasicObject" do
+    obj = BasicObject.new
+    line_for(obj).inspect.should == '#<SIB:Line["#<no inspect available>"] (1, 23) no exception>'
+  end
+
+  it "doesn't blow up when #inspect returns a not-String (e.g. pathalogical libraries like FactoryGirl)" do
+    obj = BasicObject.new
+    def obj.inspect
+      nil
+    end
+    line_for(obj).inspect.should == '#<SIB:Line["#<no inspect available>"] (1, 23) no exception>'
+  end
+
   it 'knows when it has an exception' do
     exception = RuntimeError.new 'omg'
     line = Line.new

data/spec/seeing_is_believing_spec.rb

@@ -314,7 +314,7 @@ describe SeeingIsBelieving do
   it 'can evaluate under a different ruby executable' do
     Dir.chdir proving_grounds_dir do
       File.write 'omg-ruby', "#!/usr/bin/env ruby
-        $LOAD_PATH.unshift '#{File.expand_path '../lib', __FILE__}'
+        $LOAD_PATH.unshift '#{File.expand_path '../../lib', __FILE__}'
 
         require 'seeing_is_believing'
         result = SeeingIsBelieving::Result.new

data/spec/wrap_expressions_spec.rb

@@ -39,7 +39,7 @@ describe SeeingIsBelieving::WrapExpressions do
       end
 
       example 'multiple heredocs' do
-        # a stupid implementatnio issue from hacking around heredocs
+        # a stupid implementation 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"
@@ -598,9 +598,7 @@ describe SeeingIsBelieving::WrapExpressions do
     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
+      wrap("<<HERE.()\na\nHERE").should == "<<<HERE.()>\na\nHERE"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seeing_is_believing
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: haiti
   requirement: !ruby/object:Gem::Requirement