code-ruby 0.15.15 → 0.15.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 381b6da2c705fe3f7f21f03ed74bb43029e0a93348b16372c7313c8f9998d90d
-  data.tar.gz: 3c37e2ce62f94eadb7575a53b6bb60ac61e1b1804eafba3bd90f792d7271523e
+  metadata.gz: 441325308911e5cba82286bbc9a4be1d33c03b25210dbaeb818bf78c97ce12e4
+  data.tar.gz: 3b56769984fc4ffa5a1e9a036bfbac8393462dc1e22033804627764aa3b7aabf
 SHA512:
-  metadata.gz: b23a3ac309cbab033d5212d9f79fdd7a8afc654ee586915459641db7b13b8bd6bd5dfc3b3f373379718b5c6185612d920ccd322572dfb8edbce30606473a7d66
-  data.tar.gz: 29cee7ad7781d50a3682611385a4fa8236d935fc6f26474019834e70f9e8f8518b065213a5fca1af8eb2cd41c4a766e7566d3621de7129f03bd69e92a99a93af
+  metadata.gz: c8d1677af87363f60d2a2321af4539b8912f6c36f3185b7c8bc142ec2470853ea6f5884df3712903ae45cef4da168603620b7f1c9398b99fcd091c90d6a92a82
+  data.tar.gz: 1ab4328234974b7bd6501af777b5be1e6f76d8398927dd21fc6dfd18d210b19791462793973e7ec3b11dce4941733c9dc60fd0d353da2a59dbca17d5c8a40dac

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    code-ruby (0.15.15)
+    code-ruby (0.15.16)
       activesupport
       bigdecimal
       did-you-mean
+      dorian-arguments
       json
       language-ruby
       zeitwerk
@@ -34,11 +35,16 @@ GEM
     did-you-mean (0.1.1)
       levenshtein (>= 0.2.0)
     diff-lcs (1.5.1)
+    dorian-arguments (0.3.0)
+      activesupport
+      bigdecimal
+      dorian-to_struct
+    dorian-to_struct (0.5.0)
     drb (2.2.1)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     json (2.7.2)
-    language-ruby (0.9.0)
+    language-ruby (0.9.2)
       zeitwerk
     language_server-protocol (3.17.0.3)
     levenshtein (0.2.2)
@@ -61,7 +67,7 @@ GEM
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)

data/VERSION

@@ -0,0 +1 @@
+0.15.16

data/bin/code

@@ -1,108 +1,71 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "optparse"
 require_relative "../lib/code-ruby"
-
-options = {
-  timeout: 0,
-  profile: false,
-  profiler: "text",
-  input: "",
-  parse: false
-}
-
-argv =
-  OptionParser
-    .new do |opts|
-      opts.banner = "Usage: code INPUT\n\n"
-
-      opts.on("-v", "--version", "Version of Code") do |_input|
-        puts Code::Version
-        exit
-      end
-
-      opts.on(
-        "-i INPUT",
-        "--input INPUT",
-        "Input in the Code language (String or File)"
-      ) do |input|
-        input = File.read(input) if File.exist?(input)
-
-        options[:input] = input
-      end
-
-      opts.on("-p", "--parse", "Parser tree for input") do |parse|
-        options[:parse] = parse
-      end
-
-      opts.on(
-        "-t TIMEOUT",
-        "--timeout TIMEOUT",
-        "Set timeout in seconds"
-      ) { |timeout| options[:timeout] = timeout.to_f }
-
-      opts.on(
-        "-z TIME_ZONE",
-        "--time-zone TIME_ZONE",
-        "Set time zone"
-      ) { |time_zone| Time.zone = time_zone }
-
-      opts.on("--profile", "Profile Ruby code") do |_timeout|
-        require "ruby-prof"
-        options[:profile] = true
-      end
-
-      opts.on(
-        "--profiler TYPE",
-        "Profiler output type (text (default) or html)"
-      ) do |profiler|
-        require "ruby-prof"
-        options[:profile] = true
-        options[:profiler] = profiler
-      end
-    end
-    .parse!
-
-if options[:input].empty?
-  options[:input] = argv.join(" ")
-  options[:input] = File.read(options[:input]) if File.exist?(options[:input])
-end
-
-abort <<~HELP if options[:input].empty?
-  Usage: code INPUT
-
-    -v, --version                    Version of Code
-    -i, --input INPUT                Input in the Code language (String or File)
-    -p, --parse                      Parser tree for input
-    -t, --timeout TIMEOUT            Set timeout in seconds
-        --profile                    Profile Ruby code
-        --profiler TYPE              Profiler output type (text (default) or html)
-HELP
-
-RubyProf.start if options[:profile]
-
-if options[:parse]
-  pp Code::Parser.parse(options[:input]).to_raw
+require "dorian/arguments"
+
+parsed =
+  Dorian::Arguments.parse(
+    input: {
+      type: :string,
+      alias: :i
+    },
+    parse: {
+      type: :boolean,
+      alias: :p
+    },
+    profile: :boolean,
+    profiler: :string,
+    timeout: {
+      type: :integer,
+      alias: :t
+    },
+    version: {
+      type: :boolean,
+      alias: :v
+    },
+    help: {
+      type: :boolean,
+      alias: :h
+    }
+  )
+
+abort Code::Version.to_s if parsed.options.version
+abort parsed.help if parsed.options.help
+
+input = parsed.options.input.to_s
+input = File.read(input) if File.exist?(input)
+input += parsed.arguments.join(" ")
+input += parsed.files.map { |file| File.read(file) }.join
+
+abort parsed.help if input.empty?
+
+profile = parsed.options.profile || parsed.options.profiler
+require "ruby-prof" if profile
+
+RubyProf.start if profile
+
+if parsed.options.parse
+  pp Code::Parser.parse(input).to_raw
 else
-  print Code.evaluate(
-          options[:input],
-          output: $stdout,
-          error: $stderr,
-          timeout: options[:timeout]
-        )
+  print(
+    Code.evaluate(
+      input,
+      output: $stdout,
+      error: $stderr,
+      timeout: parsed.options.timeout
+    )
+  )
 end
 
-if options[:profile]
+if profile
   result = RubyProf.stop
 
-  if options[:profiler] == "text"
-    printer = RubyProf::FlatPrinter.new(result)
-    printer.print($stdout)
-  elsif options[:profiler] == "html"
+  if parsed.options.profiler == "html"
     printer = RubyProf::GraphHtmlPrinter.new(result)
     printer.print($stdout)
   else
-    abort "#{options[:profiler]} not recognized"
+    printer = RubyProf::FlatPrinter.new(result)
+    printer.print($stdout)
   end
 end

data/code-ruby.gemspec

@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 
-require "English"
-require_relative "lib/code/version"
-
 Gem::Specification.new do |s|
   s.name = "code-ruby"
-  s.version = ::Code::Version
+  s.version = File.read("VERSION").strip
   s.summary = "a programming language for the internet"
   s.description = s.summary
   s.authors = ["Dorian Marié"]
@@ -22,4 +19,5 @@ Gem::Specification.new do |s|
   s.add_dependency "json"
   s.add_dependency "language-ruby"
   s.add_dependency "zeitwerk"
+  s.add_dependency "dorian-arguments"
 end

data/lib/code/version.rb

@@ -2,4 +2,5 @@
 
 require_relative "../code"
 
-Code::Version = Gem::Version.new("0.15.15")
+Code::Version =
+  Gem::Version.new(File.read(File.expand_path("../../../VERSION", __FILE__)))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.15.15
+  version: 0.15.16
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-18 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dorian-arguments
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: a programming language for the internet
 email: dorian@dorianmarie.fr
 executables:
@@ -114,6 +128,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- VERSION
 - bin/bundle-audit
 - bin/bundler-audit
 - bin/code