seeing_is_believing 2.2.0 → 3.0.0.beta.1

metadata

@@ -1,77 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: seeing_is_believing
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0.beta.1
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: parser
+  name: eval_in
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
-  name: psych
+  name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: haiti
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +146,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Changelog.md
 - Gemfile
 - Rakefile
 - Readme.md
@@ -151,40 +158,52 @@ files:
 - features/examples.feature
 - features/flags.feature
 - features/regression.feature
+- features/safe.feature
 - features/support/env.rb
+- features/xmpfilter-style.feature
 - lib/seeing_is_believing.rb
 - lib/seeing_is_believing/binary.rb
-- lib/seeing_is_believing/binary/add_annotations.rb
 - lib/seeing_is_believing/binary/align_chunk.rb
 - lib/seeing_is_believing/binary/align_file.rb
 - lib/seeing_is_believing/binary/align_line.rb
-- lib/seeing_is_believing/binary/clean_body.rb
+- lib/seeing_is_believing/binary/annotate_end_of_file.rb
+- lib/seeing_is_believing/binary/annotate_every_line.rb
+- lib/seeing_is_believing/binary/annotate_xmpfilter_style.rb
 - lib/seeing_is_believing/binary/comment_formatter.rb
 - lib/seeing_is_believing/binary/comment_lines.rb
 - lib/seeing_is_believing/binary/commentable_lines.rb
+- lib/seeing_is_believing/binary/interpret_flags.rb
 - lib/seeing_is_believing/binary/parse_args.rb
+- lib/seeing_is_believing/binary/remove_annotations.rb
 - lib/seeing_is_believing/binary/rewrite_comments.rb
+- lib/seeing_is_believing/code.rb
 - lib/seeing_is_believing/debugger.rb
 - lib/seeing_is_believing/error.rb
 - lib/seeing_is_believing/evaluate_by_moving_files.rb
+- lib/seeing_is_believing/evaluate_with_eval_in.rb
+- lib/seeing_is_believing/event_stream/consumer.rb
+- lib/seeing_is_believing/event_stream/events.rb
+- lib/seeing_is_believing/event_stream/producer.rb
+- lib/seeing_is_believing/event_stream/update_result.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/inspect_expressions.rb
 - lib/seeing_is_believing/parser_helpers.rb
 - lib/seeing_is_believing/result.rb
 - lib/seeing_is_believing/the_matrix.rb
 - lib/seeing_is_believing/version.rb
 - lib/seeing_is_believing/wrap_expressions.rb
 - seeing_is_believing.gemspec
-- spec/binary/clean_body_spec.rb
 - spec/binary/comment_formatter_spec.rb
 - spec/binary/comment_lines_spec.rb
+- spec/binary/interpret_flags_spec.rb
 - spec/binary/parse_args_spec.rb
+- spec/binary/remove_annotations_spec.rb
 - spec/binary/rewrite_comments_spec.rb
+- spec/code_spec.rb
 - spec/debugger_spec.rb
 - spec/evaluate_by_moving_files_spec.rb
+- spec/event_stream_spec.rb
 - spec/hard_core_ensure_spec.rb
-- spec/line_spec.rb
 - spec/seeing_is_believing_spec.rb
 - spec/spec_helper.rb
 - spec/wrap_expressions_spec.rb
@@ -243,9 +262,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: seeing_is_believing
 rubygems_version: 2.4.1
@@ -257,16 +276,20 @@ test_files:
 - features/examples.feature
 - features/flags.feature
 - features/regression.feature
+- features/safe.feature
 - features/support/env.rb
-- spec/binary/clean_body_spec.rb
+- features/xmpfilter-style.feature
 - spec/binary/comment_formatter_spec.rb
 - spec/binary/comment_lines_spec.rb
+- spec/binary/interpret_flags_spec.rb
 - spec/binary/parse_args_spec.rb
+- spec/binary/remove_annotations_spec.rb
 - spec/binary/rewrite_comments_spec.rb
+- spec/code_spec.rb
 - spec/debugger_spec.rb
 - spec/evaluate_by_moving_files_spec.rb
+- spec/event_stream_spec.rb
 - spec/hard_core_ensure_spec.rb
-- spec/line_spec.rb
 - spec/seeing_is_believing_spec.rb
 - spec/spec_helper.rb
 - spec/wrap_expressions_spec.rb

data/lib/seeing_is_believing/binary/add_annotations.rb

@@ -1,144 +0,0 @@
-require 'stringio'
-require 'seeing_is_believing/has_exception'
-require 'seeing_is_believing/binary/comment_formatter'
-
-require 'seeing_is_believing/binary'
-require 'seeing_is_believing/binary/clean_body'
-require 'seeing_is_believing/binary/rewrite_comments'
-require 'seeing_is_believing/binary/comment_lines'
-
-class SeeingIsBelieving
-  class Binary
-    class AddAnnotations
-      include HasException
-
-      def self.method_from_options(*args)
-        define_method(args.first) { options.fetch *args }
-      end
-
-      method_from_options :filename, nil
-      method_from_options :start_line # rename: line_to_begin_recording
-      method_from_options :end_line   # rename: line_to_end_recording
-      method_from_options :xmpfilter_style
-      method_from_options :debugger
-
-      attr_accessor :results, :body
-      def initialize(uncleaned_body, options={}, &annotater)
-        self.options = options
-        self.body    = CleanBody.call uncleaned_body, !xmpfilter_style
-        self.results = SeeingIsBelieving.call body,
-                                              filename:           (options[:as] || options[:filename]),
-                                              require:            options[:require],
-                                              load_path:          options[:load_path],
-                                              encoding:           options[:encoding],
-                                              stdin:              options[:stdin],
-                                              timeout:            options[:timeout],
-                                              debugger:           debugger,
-                                              ruby_executable:    options[:shebang],
-                                              number_of_captures: options[:number_of_captures]
-      end
-
-      def call
-        @new_body ||= begin
-          new_body = if xmpfilter_style
-                       body_with_updated_annotations
-                     else
-                       body_with_everything_annotated
-                     end
-
-          add_stdout_stderr_and_exceptions_to new_body
-
-          debugger.context "OUTPUT"
-          new_body
-        end
-      end
-
-      private
-
-      attr_accessor :body, :options, :alignment_strategy
-
-      # doesn't currently realign output markers, do we want to do that?
-      def body_with_updated_annotations
-        RewriteComments.call body do |line_number, line_to_whitespace, whitespace, comment|
-          if !comment[VALUE_REGEX]
-            [whitespace, comment]
-          elsif line_to_whitespace.empty?
-            result = results[line_number-1].map { |result| result.gsub "\n", '\n' }.join(', ')
-            [whitespace, CommentFormatter.call(whitespace.size, VALUE_MARKER, result, options)]
-          else
-            result = results[line_number].map { |result| result.gsub "\n", '\n' }.join(', ')
-            [whitespace, CommentFormatter.call(line_to_whitespace.size + whitespace.size, VALUE_MARKER, result, options)]
-          end
-        end
-      end
-
-      def body_with_everything_annotated
-        alignment_strategy = options[:alignment_strategy].new body, start_line, end_line
-        CommentLines.call body do |line, line_number|
-          options = options().merge pad_to: alignment_strategy.line_length_for(line_number)
-          if line_number < start_line || end_line < line_number
-            ''
-          elsif results[line_number].has_exception?
-            exception = results[line_number].exception
-            result    = sprintf "%s: %s", exception.class_name, exception.message.gsub("\n", '\n')
-            CommentFormatter.call(line.size, EXCEPTION_MARKER, result, options)
-          elsif results[line_number].any?
-            result  = results[line_number].map { |result| result.gsub "\n", '\n' }.join(', ')
-            CommentFormatter.call(line.size, VALUE_MARKER, result, options)
-          else
-            ''
-          end
-        end
-      end
-
-      def add_stdout_stderr_and_exceptions_to(new_body)
-        output = stdout_ouptut_for(results)    <<
-                 stderr_ouptut_for(results)    <<
-                 exception_output_for(results)
-
-        # this technically could find an __END__ in a string or whatever
-        # going to just ignore that, though
-        if new_body[/^__END__$/]
-          new_body.sub! "\n__END__", "\n#{output}__END__"
-        else
-          new_body << "\n" unless new_body.end_with? "\n"
-          new_body << output
-        end
-      end
-
-      def stdout_ouptut_for(results)
-        return '' unless results.has_stdout?
-        output = "\n"
-        results.stdout.each_line do |line|
-          output << CommentFormatter.call(0, STDOUT_MARKER, line.chomp, options()) << "\n"
-        end
-        output
-      end
-
-      def stderr_ouptut_for(results)
-        return '' unless results.has_stderr?
-        output = "\n"
-        results.stderr.each_line do |line|
-          output << CommentFormatter.call(0, STDERR_MARKER, line.chomp, options()) << "\n"
-        end
-        output
-      end
-
-      def exception_output_for(results)
-        return '' unless results.has_exception?
-        exception = results.exception
-        output = "\n"
-        output << CommentFormatter.new(0, EXCEPTION_MARKER, exception.class_name, options).call << "\n"
-        exception.message.each_line do |line|
-          output << CommentFormatter.new(0, EXCEPTION_MARKER, line.chomp, options).call << "\n"
-        end
-        output << EXCEPTION_MARKER.sub(/\s+$/, '') << "\n"
-        exception.backtrace.each do |line|
-          output << CommentFormatter.new(0, EXCEPTION_MARKER, line.chomp, options).call << "\n"
-        end
-        output
-      end
-
-    end
-  end
-end

data/lib/seeing_is_believing/binary/clean_body.rb

@@ -1,95 +0,0 @@
-# CleanedBody
-#   takes a body
-#   removes annotations
-#   only removes "# =>" when should_clean_values is false
-
-require 'seeing_is_believing/binary'
-require 'seeing_is_believing/parser_helpers'
-
-class SeeingIsBelieving
-  class Binary
-    class CleanBody
-      def self.call(code, should_clean_values)
-        new(code, should_clean_values).call
-      end
-
-      def initialize(code, should_clean_values)
-        self.should_clean_values = should_clean_values
-        self.code                = code
-      end
-
-      def call
-        buffer, parser, rewriter = ParserHelpers.initialize_parser code, 'strip_comments'
-        comments                 = ParserHelpers.comments_from parser, buffer
-
-        removed_comments         = { result: [], exception: [], stdout: [], stderr: [] }
-
-        comments.each do |comment|
-          case comment.text
-          when VALUE_REGEX
-            if should_clean_values
-              removed_comments[:result] << comment
-              rewriter.remove comment.location.expression
-            end
-          when EXCEPTION_REGEX
-            removed_comments[:exception] << comment
-            rewriter.remove comment.location.expression
-          when STDOUT_REGEX
-            removed_comments[:stdout] << comment
-            rewriter.remove comment.location.expression
-          when STDERR_REGEX
-            removed_comments[:stderr] << comment
-            rewriter.remove comment.location.expression
-          end
-        end
-
-        remove_whitespace_preceeding_comments(buffer, rewriter, removed_comments)
-        rewriter.process
-      rescue Parser::SyntaxError => e
-        raise SyntaxError, e.message
-      end
-
-      private
-
-      attr_accessor :code, :should_clean_values, :buffer
-
-      def remove_whitespace_preceeding_comments(buffer, rewriter, removed_comments)
-        removed_comments[:result].each    { |comment| remove_whitespace_before comment.location.expression.begin_pos, buffer, rewriter, false }
-        removed_comments[:exception].each { |comment| remove_whitespace_before comment.location.expression.begin_pos, buffer, rewriter, true  }
-        removed_comments[:stdout].each    { |comment| remove_whitespace_before comment.location.expression.begin_pos, buffer, rewriter, true  }
-        removed_comments[:stderr].each    { |comment| remove_whitespace_before comment.location.expression.begin_pos, buffer, rewriter, true  }
-      end
-
-      # any whitespace before the index (on the same line) will be removed
-      # if the preceeding whitespace is at the beginning of the line, the newline will be removed
-      # if there is a newline before all of that, and remove_preceeding_newline is true, it will be removed as well
-      def remove_whitespace_before(index, buffer, rewriter, remove_preceeding_newline)
-        end_pos   = index
-        begin_pos = end_pos - 1
-        begin_pos -= 1 while code[begin_pos] =~ /\s/ && code[begin_pos] != "\n"
-        begin_pos -= 1 if code[begin_pos] == "\n"
-        begin_pos -= 1 if code[begin_pos] == "\n" && remove_preceeding_newline
-        return if begin_pos.next == end_pos
-        rewriter.remove Parser::Source::Range.new(buffer, begin_pos.next, end_pos)
-      end
-
-      # returns comments in groups that are on consecutive lines
-      def adjacent_comments(comments, buffer)
-        comments          = comments.sort_by { |comment| comment.location.begin_pos }
-        current_chunk     = 0
-        last_line_seen    = -100
-        chunks_to_comment = comments.chunk do |comment|
-          line = comment.location.begin_pos.line
-          if last_line_seen.next == line
-            last_line_seen = line
-            current_chunk
-          else
-            last_line_seen = line
-            current_chunk += 1
-          end
-        end
-        chunks_to_comment.map &:last
-      end
-    end
-  end
-end