seeing_is_believing 0.0.13 → 0.0.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c99b16d96b21e8940fcb38b3aabecfd237c59d09
+  data.tar.gz: 3b871ae98e98cc26ac8cb123a09b31fe8cc3bcea
+SHA512:
+  metadata.gz: c68fece19b501e2ce1decdc23a128a010e500a1ddcd1fdf2eedd3047ae8c6807e51c7fc61f04ec40bbdbb0687e12c4d29338a31f5d779255213b1361245fd6e2
+  data.tar.gz: bc28374e2d99a03abf05c17e63de56c3388f78afe699644736744d1173f475088c883fa2f2e5f828b683e0e2733716121d841dfc777e3c1b7a8bc4167517e714

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 script: rake
 rvm:
   - 1.9.3
+  - 2.0.0

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    seeing_is_believing (0.0.10)
+    seeing_is_believing (0.0.14)
 
 GEM
   remote: http://rubygems.org/

data/features/support/env.rb

@@ -21,8 +21,9 @@ module CommandLineHelpers
   def execute(command, stdin_data=nil)
     stdin_data ||= ''
     in_proving_grounds do
-      bin_in_path = {'PATH' => "#{bin_dir}:#{ENV['PATH']}"}
-      Invocation.new *Open3.capture3(bin_in_path, command, stdin_data: stdin_data)
+      with_bin_in_path do
+        Invocation.new *Open3.capture3(command, stdin_data: stdin_data)
+      end
     end
   end
 
@@ -53,6 +54,16 @@ module CommandLineHelpers
   def path_to(filename)
     in_proving_grounds { File.join proving_grounds_dir, filename }
   end
+
+  # workaround for Ruby 2.0 bug where passing the new path as the first arg wasn't working
+  # bug report submitted here: http://bugs.ruby-lang.org/issues/8004
+  def with_bin_in_path
+    original_path = ENV['PATH']
+    ENV['PATH'] = "#{bin_dir}:#{ENV['PATH']}"
+    yield
+  ensure
+    ENV['PATH'] = original_path
+  end
 end
 
 CommandLineHelpers.make_proving_grounds

data/lib/seeing_is_believing/binary/arg_parser.rb

@@ -47,7 +47,7 @@ class SeeingIsBelieving
         if 1 < filenames.size
           options[:errors] << "Can only have one filename, but had: #{filenames.map(&:inspect).join ', '}"
         elsif filenames.any? && options[:program]
-          options[:errors] << "You passed the program in an argument, but have also specified the filename #{filenames.first}"
+          options[:errors] << "You passed the program in an argument, but have also specified the filename #{filenames.first.inspect}"
         end
 
         if options[:end_line] < options[:start_line]

data/lib/seeing_is_believing/expression_list.rb

@@ -66,7 +66,8 @@ class SeeingIsBelieving
 
     def reduce(expressions, offset)
       expressions.size.times do |i|
-        expression = expressions[i..-1].map(&:expression) # uhm, should this expression we are checking for validity consider the children?
+        expression = expressions[i..-1].map { |e| [e.expression, *e.children] }
+                                       .flatten
                                        .join("\n")        # must use newline otherwise can get expressions like `a\\+b` that should be `a\\\n+b`, former is invalid
         return if children_will_never_be_valid? expression
         next unless valid_ruby? expression
@@ -83,7 +84,7 @@ class SeeingIsBelieving
 
     def valid_ruby?(expression)
       valid = SyntaxAnalyzer.valid_ruby? expression
-      debug { "#{valid ? "\e[31mIS NOT VALID:" : "\e[32mIS VALID:"}: #{expression.inspect}\e[0m" }
+      debug { "#{valid ? "\e[32mIS VALID:" : "\e[31mIS NOT VALID:"}: #{expression.inspect}\e[0m" }
       valid
     end
 

data/lib/seeing_is_believing/line.rb

@@ -0,0 +1,39 @@
+require 'seeing_is_believing/has_exception'
+class SeeingIsBelieving
+  # thin wrapper over an array, used by the result
+  class Line
+    def self.[](*elements)
+      new(elements)
+    end
+
+    include HasException
+    include Enumerable
+
+    # delegate all methods to the array, but return self where the array would be returned
+    Array.instance_methods(false).sort.each do |method_name|
+      define_method method_name do |*args, &block|
+        result = @array.__send__ method_name, *args, &block
+        result.equal?(@array) ? self : result
+      end
+    end
+
+    def to_a
+      @array.dup
+    end
+    alias to_ary to_a
+
+    def initialize(array = [])
+      @array = array.dup
+    end
+
+    def ==(ary_or_line)
+      return @array == ary_or_line if Array === ary_or_line
+      ary_or_line == @array && exception == ary_or_line.exception
+    end
+
+    def inspect
+      inspected_exception = has_exception? ? "#{exception.class}:#{exception.message.inspect}" : "no exception"
+      "#<SIB:Line#{@array.inspect} #{inspected_exception}>"
+    end
+  end
+end

data/lib/seeing_is_believing/result.rb

@@ -1,30 +1,9 @@
-require 'forwardable'
+require 'seeing_is_believing/line'
 require 'seeing_is_believing/has_exception'
 require 'seeing_is_believing/tracks_line_numbers_seen'
 
 class SeeingIsBelieving
   class Result
-
-    class Line
-      include HasException
-
-      extend Forwardable
-      def_delegators :@array, :[], :<<, :any?, :join, :to_ary, :to_a, :empty?
-
-      def initialize
-        @array ||= []
-      end
-
-      def ==(ary_or_line)
-        if Array === ary_or_line
-          @array == ary_or_line
-        else
-          ary_or_line == @array &&
-            has_exception? == ary_or_line.has_exception?
-        end
-      end
-    end
-
     include HasException
     include TracksLineNumbersSeen
     include Enumerable

data/lib/seeing_is_believing/syntax_analyzer.rb

@@ -135,7 +135,7 @@ class SeeingIsBelieving
     # this is conspicuosuly inferior, but I can't figure out how to actually parse it
     # see: http://www.ruby-forum.com/topic/4409633
     def self.will_return?(code)
-      /(^|\s)return.*?\Z$/ =~ code
+      /(^|\s)return.*?\n?\z$/ =~ code
     end
 
     # HERE DOCS

data/lib/seeing_is_believing/version.rb

@@ -1,3 +1,3 @@
 class SeeingIsBelieving
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

data/spec/arg_parser_spec.rb

@@ -175,8 +175,8 @@ describe SeeingIsBelieving::Binary::ArgParser do
     end
 
     it 'sets an error if a filename is also give' do
-      # parse(['abc']).should_not have_error /abc/
-      parse(['-e', '1', 'abc']).should have_error /abc/
+      parse(['-e', '1']).should_not have_error /-e/
+      parse(['-e', '1', 'abc']).should have_error /"abc"/
     end
   end
 
@@ -212,6 +212,9 @@ describe SeeingIsBelieving::Binary::ArgParser do
     end
 
     it 'sets an error if not provided with an encoding' do
+      parse(['-Ku']).should_not have_error /-K/
+      parse(['-K u']).should_not have_error /-K/
+      parse(['--encoding', 'u']).should_not have_error /--encoding/
       parse(['-K']).should have_error /-K/
       parse(['--encoding']).should have_error /--encoding/
     end
@@ -228,8 +231,10 @@ describe SeeingIsBelieving::Binary::ArgParser do
     end
 
     it 'sets an error if not provided with a filename' do
-      parse(%w[-a]).should have_error /-a/
-      parse(%w[--as]).should have_error /--as/
+      parse(%w[-a  f]).should_not have_error /-a/
+      parse(%w[-as f]).should_not have_error /--as/
+      parse(%w[-a   ]).should have_error /-a/
+      parse(%w[--as ]).should have_error /--as/
     end
   end
 

data/spec/expression_list_spec.rb

@@ -16,7 +16,7 @@ describe SeeingIsBelieving::ExpressionList do
 
   example 'example: multiple children' do
     block_invocations = 0
-    result, size = call %w[a( b+ c x\\ + y )] do |line, children, completions, offset|
+    result, size = call %w[begin b+ c x\\ + y end] do |line, children, completions, offset|
       case offset
       when 2
         line.should == 'b+'
@@ -29,11 +29,11 @@ describe SeeingIsBelieving::ExpressionList do
         children.should == []
         completions.should == ['+', 'y']
         block_invocations += 10
-        'x\\+y'
+        "x+y"
       when 6
-        line.should == 'a('
-        children.should == ['b+c', 'x\\+y']
-        completions.should == [')']
+        line.should == 'begin'
+        children.should == ['b+c', 'x+y']
+        completions.should == ['end']
         block_invocations += 100
         'ALL DONE!'
       else
@@ -115,6 +115,27 @@ describe SeeingIsBelieving::ExpressionList do
     size.should == 4
   end
 
+  example 'example: completions who requires its children to be considered for the expression to be valid' do
+    block_invocations = 0
+    result, size = call ["if true &&", "true", "1", "end"] do |line, children, completions, offset|
+      case offset
+      when 1
+        [line, children, completions].should == ['true', [], []]
+        block_invocations += 1
+      when 2
+        [line, children, completions].should == ['1', [], []]
+        block_invocations += 10
+      when 3
+        [line, children, completions].should == ['if true &&', ['true', '1'], ['end']]
+        block_invocations += 100
+      end
+      [line, *children, *completions].join("\n")
+    end
+    block_invocations.should == 111
+    result.should == "if true &&\ntrue\n1\nend"
+    size.should == 4
+  end
+
   example 'example: multiline strings with valid code in them' do
     block_invocations = 0
     call ["'", "1", "'"] do |*expressions, offset|

data/spec/line_spec.rb

@@ -0,0 +1,65 @@
+require 'seeing_is_believing/result'
+
+describe SeeingIsBelieving::Line do
+  Line = described_class
+
+  it 'inspects prettily' do
+    Line[].inspect.should == '#<SIB:Line[] no exception>'
+    Line["a"].inspect.should == '#<SIB:Line["a"] no exception>'
+    Line["a", 1].inspect.should == '#<SIB:Line["a", 1] no exception>'
+    line = Line[]
+    line.exception = RuntimeError.new("omg")
+    line.inspect.should == '#<SIB:Line[] RuntimeError:"omg">'
+  end
+
+  it 'knows when it has an exception' do
+    exception = RuntimeError.new 'omg'
+    line = Line.new
+    line.should_not have_exception
+    line.exception = exception
+    line.should have_exception
+    line.exception.should equal exception
+  end
+
+  it 'delegates its other methods to array, but returns itself where the array would be returned' do
+    line = Line.new
+    line.should be_empty
+    (line << 1).should equal line
+    line.should_not be_empty
+    line.map { |i| i * 2 }.should == [2]
+    line << 10 << 100
+    line.take(2).should == [1, 10]
+  end
+
+  it 'returns its array for #to_a and #to_ary' do
+    line = Line[1,2]
+    line.to_a.should be_a_kind_of Array
+    line.to_a.should == [1, 2]
+    line.to_ary.should be_a_kind_of Array
+    line.to_ary.should == [1, 2]
+  end
+
+  it 'is equal to arrays with the same elements as its array' do
+    Line[1, 2].should == [1, 2]
+    Line[1, 2].should_not == [2, 1]
+  end
+
+  # Exception equality seems to be based off of the message, and be indifferent to the class, I don't think it's that important to fix it
+  it "is equal to lines with the same elements and the same exception" do
+    exception = RuntimeError.new 'omg'
+
+    Line[1, 2].should == Line[1, 2]
+    Line[1, 2].should_not == Line[2, 1]
+
+    line1 = Line[1, 2]
+    line1.exception = exception
+    line1.should_not == Line[1, 2]
+
+    line2 = Line[1, 2]
+    line2.exception = exception
+    line1.should == line2
+
+    line2.exception = RuntimeError.new 'wrong message'
+    line1.should_not == line2
+  end
+end

data/spec/seeing_is_believing_spec.rb

@@ -46,7 +46,16 @@ describe SeeingIsBelieving do
   end
 
   it 'evalutes to an empty array for lines that it cannot understand' do
+    vs = values_for('if true &&
+                          if true &&
+                                    true
+                            1
+                          end
+                  2
+                end').should == [[], [], ['true'], ['1'], ['1'], ['2'], ['2']]
+
     values_for("[3].map do |n|\n n*2\n end").should == [[], ['6'], ['[6]']]
+
     values_for("[1].map do |n1|
                   [2].map do |n2|
                     n1 + n2

metadata

@@ -1,60 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: seeing_is_believing
 version: !ruby/object:Gem::Version
-  version: 0.0.13
-  prerelease: 
+  version: 0.0.14
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70333554807460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
   type: :development
   prerelease: false
-  version_requirements: *70333554807460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70333554806960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
-  version_requirements: *70333554806960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70333554806500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *70333554806500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: ichannel
-  requirement: &70333554806040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 5.1.1
   type: :development
   prerelease: false
-  version_requirements: *70333554806040
+  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
   like xmpfilter), inspired by Bret Victor's JavaScript example in his talk "Inventing
   on Principle"
@@ -87,6 +98,7 @@ files:
 - lib/seeing_is_believing/expression_list.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/queue.rb
 - lib/seeing_is_believing/result.rb
 - lib/seeing_is_believing/syntax_analyzer.rb
@@ -99,6 +111,7 @@ files:
 - spec/expression_list_spec.rb
 - spec/hard_core_ensure_spec.rb
 - spec/line_formatter_spec.rb
+- spec/line_spec.rb
 - spec/queue_spec.rb
 - spec/seeing_is_believing_spec.rb
 - spec/syntax_analyzer_spec.rb
@@ -106,27 +119,26 @@ files:
 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
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: seeing_is_believing
-rubygems_version: 1.8.11
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Records results of every line of code in your file
 test_files:
 - features/errors.feature
@@ -139,7 +151,7 @@ test_files:
 - spec/expression_list_spec.rb
 - spec/hard_core_ensure_spec.rb
 - spec/line_formatter_spec.rb
+- spec/line_spec.rb
 - spec/queue_spec.rb
 - spec/seeing_is_believing_spec.rb
 - spec/syntax_analyzer_spec.rb
-has_rdoc: