template-ruby 0.7.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd82e44d1e415aa4708f5753a6e0fa406e215829b6941fcc9c21a8be47320e7
-  data.tar.gz: 8e9fb00f26e997eeb65c825b755c98b622b2b4e08b642893bc1284700aea6814
+  metadata.gz: db311323ca45e9d60dcaaed36860dd5279d1d058a0335d237360218bf2bbd11e
+  data.tar.gz: 79f2b4493839c39eb10796d440275aebf59ad96f78317e640019bf04ebfb200a
 SHA512:
-  metadata.gz: ecbc7d50c0279ddaf4bb5a1c3af02a73966390a0189a1fd875c8894fa7191e4a6f27033c234a744e20af71e20800e666320c14056c6aaa2a2f6e6168ecb6bba5
-  data.tar.gz: 63c70c8b11129002a29c91948d3da27d70888c4e67053b433f5e535b4a3c4c7d0931f38c7e47ff16e73a93931d293818dad92049974070d620d8aa2566656b73
+  metadata.gz: ccdd1827656e53089211967d9db8cea06cab30b7606d4cbb50052353071af3bdfbd6e9a568a7b55d16160407f549cfad05fb219c3c5a6945e173b03eb38fe23d
+  data.tar.gz: 19982e2ebfb0d70d0125484bcc7f3532e35099dfaffee0a12c2a3d643ec58b9ab7e53a3fb848d6f7cca43150554339b99e0a0479ddeebe68ab411ea5ec5885ef

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    template-ruby (0.7.2)
+    template-ruby (1.0.0)
       code-ruby
+      dorian-arguments
       language-ruby
       zeitwerk
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.0)
+    activesupport (7.2.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -23,10 +24,11 @@ GEM
     ast (2.4.2)
     base64 (0.2.0)
     bigdecimal (3.1.8)
-    code-ruby (0.15.14)
+    code-ruby (0.15.16)
       activesupport
       bigdecimal
       did-you-mean
+      dorian-arguments
       json
       language-ruby
       zeitwerk
@@ -35,11 +37,17 @@ GEM
     did-you-mean (0.1.1)
       levenshtein (>= 0.2.0)
     diff-lcs (1.5.1)
+    dorian-arguments (0.4.1)
+      activesupport
+      bigdecimal
+      dorian-to_struct
+    dorian-to_struct (0.6.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.3)
+      dorian-arguments
       zeitwerk
     language_server-protocol (3.17.0.3)
     levenshtein (0.2.2)
@@ -53,7 +61,7 @@ GEM
     rack (3.1.7)
     rainbow (3.1.1)
     regexp_parser (2.9.2)
-    rexml (3.3.5)
+    rexml (3.3.6)
       strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -61,7 +69,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)
@@ -87,10 +95,10 @@ GEM
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.1)
+    rubocop-rails (2.26.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rails-omakase (1.0.0)
       rubocop

data/VERSION

@@ -0,0 +1 @@
+1.0.0

data/bin/template

@@ -1,105 +1,71 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "optparse"
 require_relative "../lib/template-ruby"
-
-options = {
-  timeout: 0,
-  profile: false,
-  profiler: "text",
-  input: "",
-  parse: false
-}
-
-argv =
-  OptionParser
-    .new do |opts|
-      opts.banner = "Usage: template INPUT\n\n"
-
-      opts.on("-v", "--version", "Version of Template") do |_input|
-        puts Code::Version
-        exit
-      end
-
-      opts.on(
-        "-i INPUT",
-        "--input INPUT",
-        "Input in the Template 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!
-
-options[:input] = argv.join(" ") if options[:input].empty?
-
-abort <<~HELP if options[:input].empty?
-  Usage: template INPUT
-
-    -v, --version                    Version of Template
-    -i, --input INPUT                Input in the Template 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 Template::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 Template::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.empty?
+require "ruby-prof" if profile
+
+RubyProf.start if profile
+
+if parsed.options.parse
+  pp Template::Parser.parse(input).to_raw
 else
-  print Template.evaluate(
-          options[:input],
-          output: $stdout,
-          error: $stderr,
-          timeout: options[:timeout]
-        )
+  print(
+    Template.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/lib/template/version.rb

@@ -2,4 +2,5 @@
 
 require_relative "../template"
 
-Template::Version = Gem::Version.new("0.7.2")
+Template::Version =
+  Gem::Version.new(File.read(File.expand_path("../../../VERSION", __FILE__)))

data/template-ruby.gemspec

@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 
-require "English"
-require_relative "lib/template/version"
-
 Gem::Specification.new do |s|
   s.name = "template-ruby"
-  s.version = ::Template::Version
+  s.version = File.read("VERSION").strip
   s.summary = "templating language"
   s.description = s.summary
   s.authors = ["Dorian Marié"]
@@ -18,4 +15,5 @@ Gem::Specification.new do |s|
   s.add_dependency "code-ruby"
   s.add_dependency "language-ruby"
   s.add_dependency "zeitwerk"
+  s.add_dependency "dorian-arguments"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: template-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-18 00:00:00.000000000 Z
+date: 2024-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code-ruby
@@ -52,6 +52,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: templating language
 email: dorian@dorianmarie.fr
 executables:
@@ -71,6 +85,7 @@ files:
 - Gemfile.lock
 - LICENSE
 - README.md
+- VERSION
 - bin/rspec
 - bin/template
 - bin/test