dorian-eval 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c8633bae8b5db55cbe5bc38d09e06f04f87618c6665b3a781cb6d284b50cea
-  data.tar.gz: 91b5dce1c22902b23aa196b8dc5200ea7712c211b49e7b2fca47ac32c4ebece1
+  metadata.gz: bcfc5e74c01f95c84c211b93c2d0a581ed989a5985d4e8432350073a6811777f
+  data.tar.gz: b6e28dff4e13d842b53997cb3b00931ebbe2272b2f0bab9ebd7fd91fcb43a18a
 SHA512:
-  metadata.gz: 73e30d2c70ec85b556b0f901129edf3d60ba5922e1973c8fb3c618ecbc1ecba945227bbb5f98fe38cea1618f72b2ae8a5063b9cace5ba5c9a35a8ba519a137d1
-  data.tar.gz: cd8f9f463821b3aeb0de6efd8d05de5942bab9fb968b6df117e42ab462ab129a159d8657960d3c35cecea98df382a776f06438c0a5664202db54bee8220489bf
+  metadata.gz: 41b97220af4b806ba42f40b54262d947d075367737392cc49b685748080fe12d7d0030307466a122adf2eafc1375bdd4b631672d181c6344858c99a00ed6961c
+  data.tar.gz: 8b9728add481168d18ad811780560def8c2b26cc8001b65a6472d46acfa69d6edaed8b5985d117632fee71ad4581786427a89a95bf52c0c4bb2ab29abde45b1a

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.1

data/bin/eval

@@ -4,19 +4,42 @@
 require "dorian/arguments"
 require_relative "../lib/dorian/eval"
 
-parsed = Dorian::Arguments.parse(
-  it: { type: :string, alias: :i },
-  debug: { alias: :d },
-  stdout: { aliases: [:out, :o], default: true },
-  stderr: { aliases: [:err, :e], default: true },
-  colorize: { aliases: [:color, :c], default: true },
-  version: { alias: :v }, help: { alias: :h }
-)
+parsed =
+  Dorian::Arguments.parse(
+    it: {
+      type: :string,
+      alias: :i
+    },
+    debug: {
+      alias: :d
+    },
+    stdout: {
+      aliases: %i[out o],
+      default: true
+    },
+    stderr: {
+      aliases: %i[err e],
+      default: true
+    },
+    colorize: {
+      aliases: %i[color c],
+      default: true
+    },
+    rails: {
+      alias: :r
+    },
+    version: {
+      alias: :v
+    },
+    help: {
+      alias: :h
+    }
+  )
 
 abort parsed.help if parsed.options.help
 
 if parsed.options.version
-  abort File.read(File.expand_path("../../VERSION", __FILE__))
+  abort File.read(File.expand_path("../VERSION", __dir__))
 end
 
 Dorian::Eval.eval(
@@ -25,5 +48,6 @@ Dorian::Eval.eval(
   debug: parsed.options.debug,
   stdout: parsed.options.stdout,
   stderr: parsed.options.stderr,
-  colorize: parsed.options.colorize
+  colorize: parsed.options.colorize,
+  rails: parsed.options.rails
 )

data/lib/dorian/eval.rb

@@ -1,12 +1,10 @@
+# frozen_string_literal: true
+
 class Dorian
   class Eval
-    attr_reader :ruby, :it, :debug, :stdout, :stderr, :colorize
+    attr_reader :ruby, :it, :debug, :stdout, :stderr, :colorize, :rails
 
-    COLORS = {
-      red: "\e[31m",
-      green: "\e[32m",
-      reset: "\e[0m"
-    }
+    COLORS = { red: "\e[31m", green: "\e[32m", reset: "\e[0m" }.freeze
 
     def initialize(
       *args,
@@ -15,7 +13,8 @@ class Dorian
       debug: false,
       stdout: true,
       stderr: true,
-      colorize: false
+      colorize: false,
+      rails: false
     )
       @ruby = ruby.empty? ? args.join(" ") : ruby
       @it = it
@@ -23,6 +22,7 @@ class Dorian
       @stdout = !!stdout
       @stderr = !!stderr
       @colorize = !!colorize
+      @rails = !!rails
     end
 
     def self.eval(...)
@@ -33,15 +33,7 @@ class Dorian
       read_out, write_out = IO.pipe
       read_err, write_err = IO.pipe
 
-      Process.spawn(
-        RbConfig.ruby,
-        "-e",
-        "it = #{it.inspect}",
-        "-e",
-        ruby,
-        out: write_out,
-        err: write_err
-      )
+      spawn(write_out:, write_err:)
 
       write_out.close
       write_err.close
@@ -50,8 +42,8 @@ class Dorian
       err = ""
 
       while !read_out.eof? || !read_err.eof?
-        out << gets(read_out, color: :green, print: stdout?).to_s
-        err << gets(read_err, color: :red, print: stderr?).to_s
+        out += gets(read_out, print: stdout?, method: :puts).to_s
+        err += gets(read_err, color: :red, print: stderr?, method: :warn).to_s
       end
 
       [out, err]
@@ -73,21 +65,58 @@ class Dorian
       !!colorize
     end
 
+    def rails?
+      !!rails
+    end
+
     def prefix
       debug? ? "[#{it}] " : ""
     end
 
-    def gets(read, color: nil, print: true)
+    def full_ruby
+      full_ruby = <<~RUBY
+        it = #{it.inspect}
+        #{ruby}
+      RUBY
+
+      full_ruby = <<~RUBY if rails?
+        require "#{Dir.pwd}/config/environment"
+        #{full_ruby}
+      RUBY
+
+      full_ruby
+    end
+
+    def spawn(write_out:, write_err:)
+      Process.spawn(
+        RbConfig.ruby,
+        "-e",
+        full_ruby,
+        out: write_out,
+        err: write_err
+      )
+    end
+
+    def gets(read, color: nil, print: true, method: :puts)
       original_string = read.gets
       return unless original_string
+
       string = original_string.rstrip
-      string = colorize? ? colorize_string(string, color) : string
-      puts([prefix, string].join) if print
+      string = colorize_string(string, color) if colorize? && color
+
+      if method == :puts && print
+        puts [prefix, string].join
+      elsif method == :warn && print
+        warn [prefix, string].join
+      end
+
       original_string
     end
 
     def colorize_string(string, color)
-      [COLORS.fetch(color), string, COLORS.fetch(:reset)]
+      return string unless color
+
+      [COLORS.fetch(color), string, COLORS.fetch(:reset)].join
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorian-eval
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-24 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies: []
 description: evaluates ruby
 email: dorian@dorianmarie.com
@@ -32,9 +32,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.3.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="