dorian-eval 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10646b3b875591f349e5b45416f4a96705d23b948fe9b2ee065d7ceed5bb5619
-  data.tar.gz: 542b45a942b3fc281385163ae9f158d8f3227a73547d04c6686b76622b768273
+  metadata.gz: 9d7a272daa6fb5f6fb24e3befe68aeb8d998f98c04ec2e836123000eb64451bd
+  data.tar.gz: '0955b048336373365f83d14a5b9e9ac7ba5e4feb46ae9fe3af1f26cbd7df4e5a'
 SHA512:
-  metadata.gz: 3879cb847be21d2d6aaaebc2c92a998be47fa61fec48b573609c03ac680202487e39631447e88f712716c902dae69d19bce4e71c39ac51397c193fa67abdd3b2
-  data.tar.gz: ab6dd6ba4f37f0106c8f0a6a8ddad40eef87bbccaa6d6e813538cc99f04e652436e3d6b45004171db00917e97f80782d42a9c3ade3828499c9f1d043021f3bd2
+  metadata.gz: 6dfb7752e53f551933c41e7ca4957701f1d68378100487b1bf8257896212d7d2fbe9d645e3606ac3ad0fad1f6a529a72a6f2b7915e0d4bf992987aa88691c541
+  data.tar.gz: 83f1f5e00173244d0f08922d963ba84cb563b8bf9e6524b855af001b7bee6059ef56c6da46e6ca0f3ad6083b4fd22dbc1cdf721bdba8427390bf9043fc5c625d

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.2

data/bin/eval

@@ -28,6 +28,12 @@ parsed =
     rails: {
       alias: :r
     },
+    returns: {
+      alias: :return
+    },
+    fast: {
+      alias: :f
+    },
     version: {
       alias: :v
     },
@@ -42,12 +48,14 @@ if parsed.options.version
   abort File.read(File.expand_path("../VERSION", __dir__))
 end
 
-Dorian::Eval.eval(
-  ruby: parsed.arguments.join(" "),
-  it: parsed.options.it,
-  debug: parsed.options.debug,
-  stdout: parsed.options.stdout,
-  stderr: parsed.options.stderr,
-  colorize: parsed.options.colorize,
-  rails: parsed.options.rails
-)
+p Dorian::Eval.eval(
+    ruby: parsed.arguments.join(" "),
+    it: parsed.options.it,
+    debug: parsed.options.debug,
+    stdout: parsed.options.stdout,
+    stderr: parsed.options.stderr,
+    colorize: parsed.options.colorize,
+    rails: parsed.options.rails,
+    returns: parsed.options.returns,
+    fast: parsed.options.fast
+  )

data/lib/dorian/eval.rb

@@ -4,7 +4,12 @@ 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
+        end
+      end
 
     attr_reader :ruby,
                 :it,
@@ -13,7 +18,8 @@ class Dorian
                 :stderr,
                 :colorize,
                 :rails,
-                :returns
+                :returns,
+                :fast
 
     COLORS = { red: "\e[31m", green: "\e[32m", reset: "\e[0m" }.freeze
 
@@ -25,7 +31,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
@@ -35,6 +42,7 @@ class Dorian
       @colorize = !!colorize
       @rails = !!rails
       @returns = !!returns
+      @fast = !!fast
     end
 
     def self.eval(...)
@@ -42,6 +50,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
 
@@ -61,10 +77,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
@@ -94,27 +114,30 @@ class Dorian
     end
 
     def to_ruby(ruby)
-      if ruby.is_a?(Struct)
+      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(", ")})"
-      elsif ruby.is_a?(String) || ruby.is_a?(Symbol) || ruby.is_a?(NilClass) ||
-        ruby.is_a?(TrueClass) || ruby.is_a?(FalseClass) || ruby.is_a?(Float) ||
-        ruby.is_a?(Integer)
+      when String, Symbol, NilClass, TrueClass, FalseClass, Float, Integer
         ruby.inspect
-      elsif ruby.is_a?(Array)
+      when Array
         "[#{ruby.map { |element| to_ruby(element) }.join(", ")}]"
-      elsif ruby.is_a?(Hash)
+      when Hash
         "{#{ruby.map { |key, value| "#{to_ruby(key)} => #{to_ruby(value)}" }}}"
       else
         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?
+        if returns? && slow?
           <<~RUBY
             require "yaml"
             puts (#{ruby}).to_yaml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorian-eval
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-31 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -46,16 +46,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 3.3.4
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: evaluates ruby