dorian-eval 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e3397d795e44365e644442920fa42a4e0059b9ae6c973c6229789022b717ea0
-  data.tar.gz: 1e273dea96c18ea6b2e29f8bd8be8acbaa534d9c9c062caa617ba80943e86ddb
+  metadata.gz: 6703e36e324b4d2bfb01ea10df40e58cc6e9d71361a360e96046ecf7cd63b1ec
+  data.tar.gz: 87724996f3b92701a0804331ba24d539ec2ebba7400221582214394228c8aa6f
 SHA512:
-  metadata.gz: 4c74e41390380d59c9a9d3689a319662e688e109aa85b226e18c4dfd37bbbc2dc04e976ce68f09512a3f711345768ab1261f9fe9fe1d0a294cdd12d34546e7a4
-  data.tar.gz: 3432b27087c160ebb42d5640c65489705e5a99891ed7d09340cb3fdc208dc21b2fb59d57b923a8c5f1de15a6c8864a0589b9aea9534284d4c132f73c29de6484
+  metadata.gz: 48749012f9b6a5c9312a6390588565d519abab6efd462de2d0bbc8879efe8d0e69e6d48d8b7378ac5dc43b642c352edbb3397a9c580dc92395a4b9b70d1f7949
+  data.tar.gz: 9af9ad5cd930bf83101b7960fc6dbd18686002bc6109377733403fe28897bd29c1c83eb5fe9a552d73003592f09deeda338d0cc8b57dcb8a792d7d46685f1b14

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.1

data/bin/eval

@@ -28,6 +28,8 @@ parsed =
     rails: {
       alias: :r
     },
+    returns: { alias: :return },
+    fast: { alias: :f },
     version: {
       alias: :v
     },
@@ -49,5 +51,7 @@ Dorian::Eval.eval(
   stdout: parsed.options.stdout,
   stderr: parsed.options.stderr,
   colorize: parsed.options.colorize,
-  rails: parsed.options.rails
+  rails: parsed.options.rails,
+  returns: parsed.options.returns,
+  fast: parsed.options.fast
 )

data/lib/dorian/eval.rb

@@ -4,9 +4,21 @@ require "yaml"
 
 class Dorian
   class Eval
-    Return = Data.define(:stdout, :stderr, :returned)
+    Return = Data.define(:stdout, :stderr, :returned) do
+      def initialize(stdout: "", stderr: "", returned: nil)
+        super(stdout:, stderr:, returned:)
+      end
+    end
 
-    attr_reader :ruby, :it, :debug, :stdout, :stderr, :colorize, :rails, :returns
+    attr_reader :ruby,
+                :it,
+                :debug,
+                :stdout,
+                :stderr,
+                :colorize,
+                :rails,
+                :returns,
+                :fast
 
     COLORS = { red: "\e[31m", green: "\e[32m", reset: "\e[0m" }.freeze
 
@@ -18,7 +30,8 @@ class Dorian
       stderr: true,
       colorize: false,
       rails: false,
-      returns: false
+      returns: false,
+      fast: false
     )
       @ruby = ruby.to_s.empty? ? "nil" : ruby
       @it = it.to_s.empty? ? nil : it
@@ -28,6 +41,7 @@ class Dorian
       @colorize = !!colorize
       @rails = !!rails
       @returns = !!returns
+      @fast = !!fast
     end
 
     def self.eval(...)
@@ -35,6 +49,14 @@ class Dorian
     end
 
     def eval
+      fast? ? eval_fast : eval_slow
+    end
+
+    def eval_fast
+      Return.new(returned: Kernel.eval(full_ruby))
+    end
+
+    def eval_slow
       read_out, write_out = IO.pipe
       read_err, write_err = IO.pipe
 
@@ -54,10 +76,14 @@ class Dorian
       if returns?
         Return.new(stdout: out, stderr: err, returned: YAML.safe_load(out))
       else
-        Return.new(stdout: out, stderr: err, returned: nil)
+        Return.new(stdout: out, stderr: err)
       end
     end
 
+    def fast?
+      !!fast
+    end
+
     def debug?
       !!debug
     end
@@ -86,20 +112,40 @@ class Dorian
       debug? && !returns? && it ? "[#{it}] " : ""
     end
 
-    def full_ruby
-      if returns?
-        full_ruby = <<~RUBY
-          require "yaml"
-
-          it = #{it.inspect}
-          puts (#{ruby}).to_yaml
-        RUBY
+    def to_ruby(ruby)
+      case ruby
+      when Struct
+        keys = ruby.to_h.keys.map { |key| to_ruby(key) }
+        values = ruby.to_h.values.map { |value| to_ruby(value) }
+        "Struct.new(#{keys.join(", ")}).new(#{values.join(", ")})"
+      when String, Symbol, NilClass, TrueClass, FalseClass, Float, Integer
+        ruby.inspect
+      when Array
+        "[#{ruby.map { |element| to_ruby(element) }.join(", ")}]"
+      when Hash
+        "{#{ruby.map { |key, value| "#{to_ruby(key)} => #{to_ruby(value)}" }}}"
       else
-        full_ruby = <<~RUBY
-          it = #{it.inspect}
-          #{ruby}
-        RUBY
+        raise "#{ruby.class} not supported"
       end
+    end
+
+    def slow?
+      !fast?
+    end
+
+    def full_ruby
+      full_ruby = "it = #{to_ruby(it)}\n"
+      full_ruby +=
+        if returns? && slow?
+          <<~RUBY
+            require "yaml"
+            puts (#{ruby}).to_yaml
+          RUBY
+        else
+          <<~RUBY
+            #{ruby}
+          RUBY
+        end
 
       full_ruby = <<~RUBY if rails?
         require "#{Dir.pwd}/config/environment"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dorian-eval
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Dorian Marié