seeing_is_believing 3.0.0.beta.3 → 3.0.0.beta.4

data/spec/seeing_is_believing_spec.rb

@@ -2,7 +2,6 @@
 require 'spec_helper'
 require 'stringio'
 require 'seeing_is_believing'
-require 'seeing_is_believing/evaluate_with_eval_in'
 
 RSpec.describe SeeingIsBelieving do
   def method_result(name)
@@ -30,10 +29,6 @@ RSpec.describe SeeingIsBelieving do
 
   let(:proving_grounds_dir) { File.expand_path '../../proving_grounds', __FILE__ }
 
-  it 'evaluates with EvaluateByMovingFiles by default' do
-    expect(values_for "`echo 1`").to eq [['"1\n"']] # shows we're not using the only other option (EvaluateWithEvalIn)
-  end
-
   it 'takes a string and returns a result of the line numbers (counting from 1) and each inspected result from that line' do
     input  = "10+10\n'2'+'2'"
     expect(invoke(input)[1]).to eq ["20"]
@@ -45,6 +40,23 @@ RSpec.describe SeeingIsBelieving do
     expect(invoke(input)[1]).to eq ['"NUM"']
   end
 
+  it 'makes the SiB version info available' do
+    expect(invoke('$SiB.ver')[1][0]).to eq SeeingIsBelieving::VERSION.inspect
+  end
+
+  it 'records various useful information on the result' do
+    result = invoke '', number_of_captures: 10, filename: 'abc.rb'
+    expect(result.sib_version).to eq SeeingIsBelieving::VERSION
+    expect(result.ruby_version).to eq RUBY_VERSION
+    expect(result.number_of_captures).to eq 10 # TODO: rename to max_captures_per_line ?? (also max_line_captures would prob get renamed if we do this)
+    expect(result.num_lines).to eq 1
+    expect(result.filename).to eq 'abc.rb'
+  end
+
+  it 'makes the Ruby versino info available' do
+    expect(invoke('').ruby_version).to eq RUBY_VERSION
+  end
+
   it 'allows uers to pass in their own inspection recorder' do
     wrapper = lambda { |program, filename, num_captures|
       SeeingIsBelieving::InspectExpressions.call \
@@ -145,7 +157,7 @@ RSpec.describe SeeingIsBelieving do
     expect(result.exception.backtrace).to be_a_kind_of Array
   end
 
-  context 'exceptions in exit blocks', t:true do
+  context 'exceptions in exit blocks' do
     # I'm punting on this because there is just no good way to stop that from happening without changing actual behaviour
     # see https://github.com/JoshCheek/seeing_is_believing/issues/24
     it 'does not include information about the_matrix in the exception backtraces' do
@@ -368,27 +380,6 @@ RSpec.describe SeeingIsBelieving do
           ['2']]
   end
 
-  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__}'
-
-        require 'seeing_is_believing/event_stream/producer'
-        sib = SeeingIsBelieving::EventStream::Producer.new($stdout)
-        sib.record_result(:inspect, 1, /omg/)
-        sib.finish!
-      "
-      File.chmod 0755, 'omg-ruby'
-      old_path = ENV['PATH']
-      ENV['PATH'] = "#{proving_grounds_dir}:#{old_path}"
-      begin
-        expect(values_for("1", ruby_executable: 'omg-ruby')).to eq [["/omg/"]]
-      ensure
-        ENV['PATH'] = old_path
-      end
-    end
-  end
-
   describe 'BEGIN and END' do
     it 'Executes in the appropriate order' do
       pending 'not implemented'
@@ -481,41 +472,16 @@ RSpec.describe SeeingIsBelieving do
     # should ProgramRewriter have some debug options?
   end
 
-  context 'when :evaluator option is set' do
-    require 'webmock'
-    WebMock.disable_net_connect!
-
-    include WebMock::API
-    before { WebMock.reset! }
-
-    it 'can use EvaluateByMovingFiles' do
-      # shows we're not using the only other option (EvaluateWithEvalIn)
-      expect(values_for "`echo 1`", evaluator: SeeingIsBelieving::EvaluateByMovingFiles).to eq [['"1\n"']]
-    end
-
-    it 'can use EvaluateWithEvalIn' do
-      require 'seeing_is_believing/event_stream/producer'
-      redirect_url     = 'https://example.com/whatever'
-      api_redirect_url = redirect_url + '.json'
-
-      stream   = StringIO.new
-      producer = SeeingIsBelieving::EventStream::Producer.new(stream)
-      producer.record_result :inspect, 1, "a"
-      producer.record_result :inspect, 1, "b"
-      producer.record_result :inspect, 2, "c"
-      producer.finish!
-
-      response = { 'lang'          => 'whatever',
-                   'lang_friendly' => 'whatever',
-                   'code'          => 'whatever',
-                   'output'        => stream.string,
-                   'status'        => 'OK (0.012 sec real, 0.013 sec wall, 7 MB, 22 syscalls)'}
-
-      stub_request(:post, 'https://eval.in/').to_return(status: 302, headers: {'Location' => redirect_url})
-      stub_request(:get,    api_redirect_url).to_return(status: 200, body: JSON.dump(response))
-
-      values = values_for "whatever", evaluator: SeeingIsBelieving::EvaluateWithEvalIn
-      expect(values).to eq [['"a"', '"b"'], ['"c"']]
-    end
+  it 'can deal with exec' do
+    result = invoke \
+      "1+1\n"\
+      "$stdout.puts *1..1000\n"\
+      "$stderr.puts *1..1000\n"\
+      "exec %(ruby -e '$stdout.puts %[out from exec];
+                       $stderr.puts %[err from exec]')"
+    expect(result[1]).to eq ['2']
+    nums = (1..1000).map { |n| "#{n}\n" }.join('')
+    expect(result.stdout).to eq "#{nums}out from exec\n"
+    expect(result.stderr).to eq "#{nums}err from exec\n"
   end
 end

metadata

@@ -1,63 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: seeing_is_believing
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.3
+  version: 3.0.0.beta.4
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: eval_in
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '2.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '2.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: haiti
   requirement: !ruby/object:Gem::Requirement
@@ -154,11 +126,11 @@ files:
 - docs/example.gif
 - docs/for-presentations
 - docs/frog-brown.png
+- features/deprecated-flags.feature
 - features/errors.feature
 - 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
@@ -180,7 +152,6 @@ files:
 - 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
@@ -272,11 +243,11 @@ signing_key:
 specification_version: 4
 summary: Records results of every line of code in your file
 test_files:
+- features/deprecated-flags.feature
 - features/errors.feature
 - features/examples.feature
 - features/flags.feature
 - features/regression.feature
-- features/safe.feature
 - features/support/env.rb
 - features/xmpfilter-style.feature
 - spec/binary/comment_formatter_spec.rb

data/features/safe.feature

@@ -1,33 +0,0 @@
-Feature: Running in safe-mode
-
-  It would be nice to be able to expose SiB via a bot like hubot.
-  To do this, though, you need to be able to trust the code that users submit.
-  I wrote https://github.com/JoshCheek/eval_in to use the https://eval.in
-  website to run code safely. SiB just needs to use it.
-
-  @wip
-  Scenario: Running normal code
-    Given the file 'safe-example1.rb' 'print "hello, #{gets}"'
-    And the stdin content "world"
-    When I run "seeing_is_believing --safe safe-example1.rb"
-    Then stderr is empty
-    And the exit status is 0
-    And stdout is:
-    """
-    print "hello, #{gets}"  # => nil
-
-    # >> hello, world
-    """
-
-  Scenario: Unsafe code
-  Scenario: With --xmpfilter
-  Scenario: With incompatible options
-  Scenario: With --timeout
-  Scenario: With --as
-  Scenario: With --debug
-  Scenario: Wpper-bound number of captures to prevent it from consuming too many resources
-    --program program         # Pass the program to execute as an argument
-    --load-path dir           # a dir that should be added to the $LOAD_PATH
-    --require file            # additional files to be required before running the program
-    --encoding encoding       # sets file encoding, equivalent to Ruby's -Kx (see `man ruby` for valid values)
-    --shebang ruby-executable # if you want SiB to use some ruby other than the one in the path

data/lib/seeing_is_believing/evaluate_with_eval_in.rb

@@ -1,27 +0,0 @@
-require 'eval_in'
-require 'stringio'
-
-class SeeingIsBelieving
-  class EvaluateWithEvalIn
-    def self.call(*args)
-      new(*args).call
-    end
-
-    attr_accessor :program, :filename, :input_stream, :matrix_filename, :require_flags, :load_path_flags, :encoding, :timeout, :ruby_executable, :debugger
-
-    def initialize(program, filename, options={})
-      self.program      = program
-      # self.input_stream = options.fetch :input_stream, StringIO.new('')
-      # self.timeout      = options[:timeout]
-      # self.debugger     = options.fetch :debugger, Debugger.new(stream: nil)
-    end
-
-    def call
-      eval_in_result = ::EvalIn.call(program, language: 'ruby/mri-2.1')
-      result = Result.new
-      EventStream::Consumer.new(StringIO.new eval_in_result.output)
-                           .each { |event| EventStream::UpdateResult.call result, event }
-      result
-    end
-  end
-end