md-ruby-eval 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4259a200d3e6d493c265df47644cec7b5aaac025
-  data.tar.gz: 1d4d41bf98e170c8fdf59792e81fdb92eebb3ea7
+  metadata.gz: 976f3b3c85f20c71f00ccdbaee4fb6ccb47c5da7
+  data.tar.gz: ae934cd01a7893ebc779df854bedb76d8b01ed56
 SHA512:
-  metadata.gz: 89bf1a78298b9d998a3045ad12d0fadd21a841ff2f92a19a56efe47cbad8c9a8116dcf0aa29e4472aceda46015e6d26373f897a5e02ca8855e8632b73ddc8f1e
-  data.tar.gz: 886963c1bf80d68ed996554d16f23bfb6db5fc95467e3e18f4cdbaa01357cf3e5bc4194d3fd3e9f31615240c6fd79c61a9ea7e581bc0590bf393bafbd8bcf56b
+  metadata.gz: d242cec222b5c3cdda8ccca28f86a8dee722c90c37130ea829892232a0c2ed1140654bf859c0d6daa9cf4f3be1122c530ae307647aeaddadd5ced88065158a7b
+  data.tar.gz: 4697d9a800916ab71a16e777515e97666cdfa441b86eb8b6be5e275811c990f77b30780ab6c5e4b6a517cc5cb37ce9b5186c5c4e53d7c0522c387a4f0ac30e21

data/README.md

@@ -1,7 +1,8 @@
 # md-ruby-eval
 
-    Usage: #{$0} [options] --auto
-           #{$0} [options] INPUT_FILE OUTPUT_FILE
+    Usage: md-ruby-eval [options] --auto
+           md-ruby-eval [options] INPUT_FILE OUTPUT_FILE
+           md-ruby-eval --help           
 
 Evaluates Ruby examples in MD files.
 
@@ -45,7 +46,7 @@ becomes
     a                 # => 3
     ```
 
-A parseable piece of code ended with '#' will be evaluated but it's result is not
+A parseable piece of code ended with '#' will be evaluated but its result is not
 added to the output as a comment, which is useful for method and class definitions.
 
 ## Example usage of `--auto`
@@ -59,6 +60,7 @@ added to the output as a comment, which is useful for method and class definitio
         c.md
 
 -   `md-ruby-eval --auto` call the tool
-    -   Creates files `a.out.md` and `b.out.md` evaluating each in isolated environments, before
-        `a.out.md` is evaluated `a.init.md` is required to setup its environment. `c.md` is ignored
-        since it does not have `in` marker.
+    
+    Creates files `a.out.md` and `b.out.md` evaluating each in isolated environments, before
+    `a.out.md` is evaluated `a.init.md` is required to setup its environment. `c.md` is ignored
+    since it does not have `in` marker.

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/bin/md-ruby-eval

@@ -5,6 +5,7 @@ require 'md_ruby_eval'
 # this will only run if the script was the main, not load'd or require'd
 to_require  = []
 indentation = 40
+line_length = 79
 auto        = false
 
 OptionParser.new do |opts|
@@ -22,6 +23,10 @@ OptionParser.new do |opts|
     indentation = v
   end
 
+  opts.on('-l', '--line NUMBER', Integer, 'Default maximum line length') do |v|
+    line_length = v
+  end
+
   opts.on('--[no-]auto',
           'Automatic mode. Finds `*.in.md` files outputting `*.out.md` files') do |v|
     auto = true
@@ -39,7 +44,7 @@ if auto
         puts "using: #{init_path}"
         load init_path
       end
-      MDRubyEval.new input_path, input_path.gsub(/(\.in)?\.md$/, '.out.md'), binding, indentation
+      MDRubyEval.new input_path, input_path.gsub(/(\.in)?\.md$/, '.out.md'), binding, indentation, line_length
     end
 
     Process.wait pid
@@ -47,6 +52,6 @@ if auto
 else
   input_path, output_path = ARGV.map { |p| File.expand_path p }
   raise 'no input path' unless input_path && File.exist?(input_path)
-  MDRubyEval.new input_path, output_path, binding, indentation
+  MDRubyEval.new input_path, output_path, binding, indentation, line_length
 end
 

data/lib/md_ruby_eval.rb

@@ -4,12 +4,16 @@ require 'optparse'
 
 class MDRubyEval
 
-  def initialize(input_path, output_path, environment, indentation)
+  def initialize(input_path, output_path, environment, indentation, line_length)
     @input_path  = input_path
     @output_path = output_path
     @environment = environment
     @output      = ''
     @indentation = indentation
+    @line_length = line_length
+
+    @last_id   = 1
+    @known_ids = Hash.new { |h, k| h[k] = format('%016x', @last_id += 1) }
 
     process_file input_path
   end
@@ -39,7 +43,7 @@ class MDRubyEval
     chunk_lines.each do |chunk, lines|
       result = evaluate(chunk, line_count)
       if chunk.strip.empty? || chunk.include?('#')
-        output << (chunk.end_with?("#\n") ? chunk[0..-3]+"\n" : chunk)
+        output << (chunk.end_with?("#\n") ? chunk[0..-3] + "\n" : chunk)
       else
         pre_lines = chunk.lines.to_a
         last_line = pre_lines.pop
@@ -48,10 +52,13 @@ class MDRubyEval
         if last_line =~ /\#$/
           output << last_line.gsub(/\#$/, '')
         else
-          if last_line.size < @indentation && result.inspect.size < @indentation
-            output << "%-#{@indentation}s %s" % [last_line.chomp, "# => #{result.inspect}\n"]
+          inspected_result = stabilize_object_ids result.inspect
+          if last_line.size < @indentation && inspected_result.size < @indentation
+            output << "%-#{@indentation}s %s" % [last_line.chomp, "# => #{inspected_result}\n"]
           else
-            inspect_lines = result.pretty_inspect.lines
+            PP.pp result, (buf = ''), @line_length
+            buf           = stabilize_object_ids buf
+            inspect_lines = buf.lines
             output << last_line << "# => #{inspect_lines[0]}" << inspect_lines[1..-1].map { |l| format '#    %s', l }.join
           end
         end
@@ -61,11 +68,16 @@ class MDRubyEval
     output
   end
 
+
+  def stabilize_object_ids(output)
+    output.gsub(/(#<[\w:_]+0x)([0-9a-f]{16})/) { $1 + @known_ids[$2] }
+  end
+
   def process_file(input_path)
     puts "evaluating: #{input_path}"
 
-    input      = File.read(input_path)
-    parts      = input.split(/^(```\w*\n)/)
+    input = File.read(input_path)
+    parts = input.split(/^(```\w*\n)/)
 
     # pp parts.map(&:lines)
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: md-ruby-eval
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Petr Chalupa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-26 00:00:00.000000000 Z
-dependencies: []
+date: 2018-08-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 description: 
 email: git+md-ruby-eval@pitr.ch
 executables:
@@ -45,9 +59,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Evaluator of Ruby examples in Markdown files.
 test_files: []
-has_rdoc: