seeing_is_believing 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd4c625530426d55efef82e47755e16b6178a677
-  data.tar.gz: 72bd371886e9f902eaf9cb4989c9ff3dc322ede6
+  metadata.gz: 0c1356fef9747e418a57e2f151e4bc2f7625d6d8
+  data.tar.gz: 27c33822870a7f0bf0f25172ed626d581b1b4906
 SHA512:
-  metadata.gz: 94ff5a19f0e9292bc25400263d1772aaef661768fc0a922e0f7b9b65577d8bb6227a03b90a35e6cfa1ebe315292969bf7aaf2cc19084e9dee0cc4c2a07de8c18
-  data.tar.gz: 975e4ef13344fb4f96eacccddb6f2f862304c73a77552cb5c54b6788ea7326ce55dd5525fd6ec5c61c29e85a963ed8aee147efdff9ebc596bc4adb8682da8b10
+  metadata.gz: b4ba3ac50ac5ac732c097e7dcffebdcd58c7345f8f40df8b1086b33c9d9ef69b5e030ebf139401edc57e89622475eeab1c0cf2a92b966bd0671c9bad6181e144
+  data.tar.gz: 8bc5907b40214aa58377aec602033e08e47837239bed71d028e3833c4d9a75f28b59e88c55ec04f6c751e4a577695fb9175407b22340bfa3e41fcf7a5d8eb282

data/.travis.yml

@@ -7,4 +7,4 @@ rvm:
   - 2.1.2
   - 2.2.0
   - 2.3.1
-  - 2.4.0
+  - 2.4.1

data/Rakefile

@@ -51,11 +51,13 @@ desc 'Run cukes'
 task cuke: :bundle do
   require 'bundler'
   platform_filter = Gem.win_platform? ? %W[--tags ~@not-windows] : []
+  ruby_version_without_patchlevel = RUBY_VERSION[/^\d+\.\d+/]
   sh 'ruby', '--disable-gem',
      *require_paths,
      '-S', 'bundle/bin/cucumber',
      '--tags', '~@not-implemented',
      '--tags', "~@not-#{RUBY_VERSION}",
+     '--tags', "~@not-#{ruby_version_without_patchlevel}",
       *platform_filter
 end
 

data/Readme.md

@@ -1,4 +1,5 @@
-Unix/Mac: [![Unix Build Status](https://secure.travis-ci.org/JoshCheek/seeing_is_believing.png?branch=master)](http://travis-ci.org/JoshCheek/seeing_is_believing)    Windows: [![Windows Build Status](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva?svg=true)](https://ci.appveyor.com/project/JoshCheek/seeing-is-believing)
+Unix/Mac: [![Unix Build Status](https://secure.travis-ci.org/JoshCheek/seeing_is_believing.svg?branch=master)](http://travis-ci.org/JoshCheek/seeing_is_believing)   
+Windows:  [![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/JoshCheek/seeing_is_believing?branch=master&svg=true)](https://ci.appveyor.com/project/JoshCheek/seeing-is-believing)
 
 Seeing Is Believing
 ===================
@@ -28,7 +29,7 @@ Examples
 
 * Watch a [longer video](http://vimeo.com/73866851).
 * Watch John Cinnamond use it in a [presentation](http://brightonruby.com/2016/the-point-of-objects-john-cinnamond/)
-  at the 10 minute mark.
+  at the 10:22 minute mark.
 * [Avdi](https://github.com/avdi) uses it in [Ruby Tapas](https://www.rubytapas.com/),
   an amazing resource for developers in general and Ruby Developers in particular!
 

data/features/regression.feature

@@ -470,7 +470,7 @@ Feature:
   #
   # Not going to get too detailed on what it prints, b/c that message seems pretty fragile,
   # but just generally that it doesn't fkn blow up
-  @not-2.4.0
+  @not-2.4
   Scenario: Old JSON bug
     Given the file "json_and_encodings.rb":
     """

data/lib/seeing_is_believing/binary/commentable_lines.rb

@@ -52,8 +52,17 @@ class SeeingIsBelieving
       end
 
       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 }
+        ors_indexes = code_obj.indexes_of_ors_at_eol
+        line_num_to_location
+          .select { |line_number, (index_of_newline, col)|
+            code[index_of_newline-1] == '\\'
+          }
+          .reject { |line_number, (index_of_newline, col)|
+            ors_indexes.include? index_of_newline
+          }
+          .each { |line_number, (index_of_newline, col)|
+            line_num_to_location.delete line_number
+          }
       end
 
       def remove_lines_ending_in_comments(line_num_to_location, comments)

data/lib/seeing_is_believing/code.rb

@@ -7,6 +7,7 @@ class << (Parser ||= Module.new)
   remove_method :warn
 end
 
+require 'set'
 require 'seeing_is_believing/hash_struct'
 
 class SeeingIsBelieving
@@ -87,6 +88,14 @@ class SeeingIsBelieving
                         ].freeze
     end
 
+    def indexes_of_ors_at_eol
+      Set.new(
+        @tokens.select { |type, *| type == :tGVAR }
+               .select { |_, (var, range)| var == '$\\'.freeze }
+               .map    { |_, (var, range)| range.end_pos }
+      )
+    end
+
     private
 
     def comments_and_tokens(builder, buffer)

data/lib/seeing_is_believing/event_stream/producer.rb

@@ -60,7 +60,11 @@ class SeeingIsBelieving
             # otherwise it looks like the bug is in SiB and not the user's program, see https://github.com/JoshCheek/seeing_is_believing/issues/37
             raise SystemStackError, "Calling inspect blew the stack (is it recursive w/o a base case?)"
           rescue Exception
-            inspected = "#<no inspect available>"
+            begin
+              inspected = Kernel.instance_method(:inspect).bind(value).call
+            rescue Exception
+              inspected = "#<no inspect available>"
+            end
           end
           queue << "result #{line_number.to_s} #{type.to_s} #{to_string_token inspected}"
         elsif count == max_line_captures

data/lib/seeing_is_believing/safe.rb

@@ -5,6 +5,15 @@ class SeeingIsBelieving
       alias === ===
     end
 
+    begin
+      refine Kernel do
+        alias inspect inspect
+      end
+    rescue TypeError
+      # Ruby < 2.4 can't refine a module,
+      # so this optimization is only available on >= 2.4
+    end
+
     refine Queue do
       alias <<    <<
       alias shift shift

data/lib/seeing_is_believing/version.rb

@@ -1,3 +1,3 @@
 class SeeingIsBelieving
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 end

data/seeing_is_believing.gemspec

@@ -19,13 +19,14 @@ 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.3.0.7", "< 3.0"
-  s.add_dependency             "childprocess","~> 0.5.9"
+  s.add_dependency             "parser",      "~> 2.4.0"
+  s.add_dependency             "childprocess","~> 0.7.1"
 
+  s.add_development_dependency "pry"
   s.add_development_dependency "haiti",       ">= 0.1", "< 0.3"
-  s.add_development_dependency "rake",        "~> 11.2.2"
+  s.add_development_dependency "rake",        "~> 12.0.0"
   s.add_development_dependency "mrspec",      "~>  0.3.1"
-  s.add_development_dependency "rspec",       "~>  3.5"
+  s.add_development_dependency "rspec",       "~>  3.6.0"
   s.add_development_dependency "cucumber",    "~>  2.4"
   s.add_development_dependency "ripper-tags", "~>  0.3"
 

data/spec/binary/comment_lines_spec.rb

@@ -17,6 +17,13 @@ RSpec.describe SeeingIsBelieving::Binary::CommentLines, 'passes in the each comm
     expect(call("1 +\\\n2") { |_, line_number| "--#{line_number}--" }).to eq "1 +\\\n2--2--"
   end
 
+  it "doesn\'t confuse OUTPUT_RECORD_SEPARATOR with an escaped line" do
+    expect(call("$\\") { ';' }).to eq "$\\;"
+    expect(call("$\\\\\n1") { ';' }).to eq "$\\\\\n1;"
+    expect(call("1\n$\\") { ';' }).to eq "1;\n$\\;"
+    expect(call("1\n$var\\\n2") { ';' }).to eq "1;\n$var\\\n2;"
+  end
+
   it "doesn't comment lines inside of strings" do
     expect(call(<<-INPUT) { |_, line_number| "--#{line_number}--" }).to eq <<-OUTPUT
     "a\#{1+1

data/spec/event_stream_spec.rb

@@ -23,6 +23,11 @@ module SeeingIsBelieving::EventStream
       consumer.join
     end
 
+    def inspected(obj)
+      Kernel.instance_method(:inspect).bind(obj).call
+    end
+
+
     before do
       self.eventstream_consumer, self.eventstream_producer = IO.pipe("utf-8")
       self.stdout_consumer,      self.stdout_producer      = IO.pipe("utf-8")
@@ -272,20 +277,23 @@ module SeeingIsBelieving::EventStream
       end
 
       context 'calls #inspect when no block is given' do
-        it "doesn't blow up when there is no #inspect available e.g. BasicObject" do
+        it 'uses Kernel\'s inspect if there is no #inspect available e.g. BasicObject' do
           obj = BasicObject.new
           producer.record_result :type, 1, obj
-          expect(consumer.call).to eq Events::LineResult.new(type: :type, line_number: 1, inspected: "#<no inspect available>")
+          expect(consumer.call).to eq Events::LineResult.new(type: :type, line_number: 1, inspected: inspected(obj))
         end
 
-
-        it "doesn't blow up when #inspect returns a not-String (e.g. pathalogical libraries like FactoryGirl)" do
+        it "uses Kernel's #inspect when the object\'s #inspect returns a not-String (e.g. pathalogical libraries like FactoryGirl)" do
           obj = BasicObject.new
           def obj.inspect
             nil
           end
           producer.record_result :type, 1, obj
-          expect(consumer.call).to eq Events::LineResult.new(type: :type, line_number: 1, inspected: "#<no inspect available>")
+          expect(consumer.call).to eq Events::LineResult.new(type: :type, line_number: 1, inspected: inspected(obj))
+        end
+
+        it "uses a null-inspect string when even Kernel's inspect doesn't work" do
+          skip 'uhm, no idea how to get it into such a state'
         end
 
         it 'only calls inspect once' do
@@ -311,13 +319,13 @@ module SeeingIsBelieving::EventStream
         it 'doesn\'t blow up if the block raises' do
           o = Object.new
           producer.record_result(:type, 1, o) { raise Exception, "zomg" }
-          expect(consumer.call).to eq Events::LineResult.new(type: :type, line_number: 1, inspected: '#<no inspect available>')
+          expect(consumer.call).to eq Events::LineResult.new(type: :type, line_number: 1, inspected: inspected(o))
         end
 
         it 'doesn\'t blow up if the block returns a non-string' do
           o = Object.new
           producer.record_result(:type, 1, o) { nil }
-          expect(consumer.call).to eq Events::LineResult.new(type: :type, line_number: 1, inspected: '#<no inspect available>')
+          expect(consumer.call).to eq Events::LineResult.new(type: :type, line_number: 1, inspected: inspected(o))
 
           stringish = Object.new
           def stringish.to_str() 'actual string' end

data/spec/seeing_is_believing_spec.rb

@@ -844,11 +844,12 @@ RSpec.describe SeeingIsBelieving do
     end
 
     # defined? is a macro, not a method, otherwise I'd test that here
-    specify 'when Kernel does not have kind_of?' do
+    specify 'when Kernel does not have kind_of?, inspect' do
       expect(invoke('module Kernel
                        undef kind_of?
+                       undef inspect
                      end
-                     1').to_a).to eq [[], [], ['nil'], ['1']]
+                     1').to_a).to eq [[], [], [], ['nil'], ['1']]
     end
 
     specify 'when Enumerable does not have map' do

data/spec/wrap_expressions_spec.rb

@@ -425,6 +425,12 @@ RSpec.describe SeeingIsBelieving::WrapExpressions do
       expect(wrap("a[1\n]=2")).to eq "<a[<1>\n]=2>"
       expect(wrap("a[1,\n2\n]=3")).to eq "<a[<1>,\n<2>\n]=3>"
     end
+
+    it 'wraps 2.4 style multiple assignment' do
+      next if ruby_version < '2.4'
+      expect(wrap("if (a,b=1,2)\nend")).to eq "<if <(a,b=1,2)>\nend>"
+      expect(wrap("if (a,b=1)\nend")).to eq "<if <(a,b=1)>\nend>"
+    end
   end
 
   describe 'conditionals' do
@@ -924,6 +930,36 @@ RSpec.describe SeeingIsBelieving::WrapExpressions do
     end
   end
 
+  describe 'Perl style globals' do
+    # from English.rb
+    specify('$ERROR_INFO              $!')  { expect(wrap('$!')).to  eq '<$!>' }
+    specify('$ERROR_POSITION          $@')  { expect(wrap('$@')).to  eq '<$@>' }
+    specify('$FS                      $;')  { expect(wrap('$;')).to  eq '<$;>' }
+    specify('$FIELD_SEPARATOR         $;')  { expect(wrap('$;')).to  eq '<$;>' }
+    specify('$OFS                     $,')  { expect(wrap('$,')).to  eq '<$,>' }
+    specify('$OUTPUT_FIELD_SEPARATOR  $,')  { expect(wrap('$,')).to  eq '<$,>' }
+    specify('$RS                      $/')  { expect(wrap('$/')).to  eq '<$/>' }
+    specify('$INPUT_RECORD_SEPARATOR  $/')  { expect(wrap('$/')).to  eq '<$/>' }
+    specify('$ORS                     $\\') { expect(wrap('$\\')).to eq '<$\\>' }
+    specify('$OUTPUT_RECORD_SEPARATOR $\\') { expect(wrap('$\\')).to eq '<$\\>' }
+    specify('$INPUT_LINE_NUMBER       $.')  { expect(wrap('$.')).to  eq '<$.>' }
+    specify('$NR                      $.')  { expect(wrap('$.')).to  eq '<$.>' }
+    specify('$LAST_READ_LINE          $_')  { expect(wrap('$_')).to  eq '<$_>' }
+    specify('$DEFAULT_OUTPUT          $>')  { expect(wrap('$>')).to  eq '<$>>' }
+    specify('$DEFAULT_INPUT           $<')  { expect(wrap('$<')).to  eq '<$<>' }
+    specify('$PID                     $$')  { expect(wrap('$$')).to  eq '<$$>' }
+    specify('$PROCESS_ID              $$')  { expect(wrap('$$')).to  eq '<$$>' }
+    specify('$CHILD_STATUS            $?')  { expect(wrap('$?')).to  eq '<$?>' }
+    specify('$LAST_MATCH_INFO         $~')  { expect(wrap('$~')).to  eq '<$~>' }
+    specify('$IGNORECASE              $=')  { expect(wrap('$=')).to  eq '<$=>' }
+    specify('$ARGV                    $*')  { expect(wrap('$*')).to  eq '<$*>' }
+    specify('$MATCH                   $&')  { expect(wrap('$&')).to  eq '<$&>' }
+    specify('$PREMATCH                $`')  { expect(wrap('$`')).to  eq '<$`>' }
+    specify('$POSTMATCH               $\'') { expect(wrap("$'")).to  eq "<$'>" }
+    specify('$LAST_PAREN_MATCH        $+')  { expect(wrap('$+')).to  eq '<$+>' }
+  end
+
+
   # only checking on 2.2 b/c its hard to figure out when different pieces were introduced
   # we'll assume that if it passes on 2.2, it will pass on 2.0 or 2.1, if the feature is available on that Ruby
   major, minor, * = RUBY_VERSION.split(".").map(&:to_i)

metadata

@@ -1,49 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: seeing_is_believing
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.0.7
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.0.7
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haiti
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: mrspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -279,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: seeing_is_believing
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Records results of every line of code in your file