code-ruby 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f013740cc5bbbf2e3d0d364dc987ed62d34d85d38b4af848d4c74a7110e6ad16
-  data.tar.gz: adf22e7e5b35c2cda0e112797768af9f2840edd9425a2a4ea87d510698d27754
+  metadata.gz: bf105ec027258dabb4bca7a9b2246a1babc47f5557a47bc885fe9ddf1fea3bc7
+  data.tar.gz: 1976ef6aee479a4adfc402c58cbba49fbf175561a28d69784ccd7818ad13664d
 SHA512:
-  metadata.gz: fc543960e9c707f39753e9931c85f35508cc97196ddee418165bf632ceea29a2f48c076e080ad3dba0ea4080a92ce17c262f24e5686083b6051d57da157b7f96
-  data.tar.gz: 965a1ecebb0486ab5bca33b9c35d0303b2a9204d079675516d10a52ccd10c6104003336dedd0f5d82f8e35ef805dd749ea805a5b4890c43b76f99903e3aa9d1f
+  metadata.gz: 68677a0f868274367d97fa0692b6f289a3ed90533b7fa5c104be5c84275e241791111ad5191004ac7fa88de3faf4a0331a064fa6e403ad1b1d18e8283847f030
+  data.tar.gz: 17615b062f51e946d979b84da8e05d9c48d711a909c29bae426576a973336b8b3b7858b2d484692e33caf58be5d931dfde69a61b763cf39c5616141d60b6f71e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (0.6.7)
+    code-ruby (0.7.1)
       bigdecimal (~> 3)
       language-ruby (~> 0)
       zeitwerk (~> 2)
@@ -10,24 +10,24 @@ GEM
   remote: https://rubygems.org/
   specs:
     bigdecimal (3.1.6)
-    diff-lcs (1.5.0)
-    language-ruby (0.6.1)
+    diff-lcs (1.5.1)
+    language-ruby (0.6.2)
       zeitwerk (~> 2)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.0)
     ruby-prof (1.7.0)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   arm64-darwin-23

data/bin/code

@@ -4,11 +4,18 @@
 require 'optparse'
 require_relative '../lib/code-ruby'
 
-options = { timeout: 0, profile: false, profiler: 'text' }
+options = {
+  timeout: 0,
+  profile: false,
+  profiler: 'text',
+  input: "",
+  context: "",
+  parse: false
+}
 
 OptionParser
   .new do |opts|
-    opts.banner = 'Usage: template [options]'
+    opts.banner = 'Usage: code [options]'
 
     opts.on('-v', '--version', 'Version of template') do |_input|
       puts Code::Version
@@ -17,7 +24,7 @@ OptionParser
 
     opts.on(
       '-i INPUT',
-      '--input=INPUT',
+      '--input INPUT',
       'Input in the code language (String or File)'
     ) do |input|
       input = File.read(input) if File.exist?(input)
@@ -27,7 +34,7 @@ OptionParser
 
     opts.on(
       '-c CONTEXT',
-      '--context=CONTEXT',
+      '--context CONTEXT',
       'Context in the code language (String or File)'
     ) do |context|
       context = File.read(context) if File.exist?(context)
@@ -41,7 +48,7 @@ OptionParser
 
     opts.on(
       '-t TIMEOUT',
-      '--timeout=TIMEOUT',
+      '--timeout TIMEOUT',
       'Set timeout in seconds'
     ) { |timeout| options[:timeout] = timeout.to_f }
 
@@ -61,19 +68,23 @@ OptionParser
   end
   .parse!
 
-input = options.fetch(:input, '')
-context = options.fetch(:context, '')
-
 RubyProf.start if options[:profile]
 
 if options[:parse]
-  pp Code::Parser.parse(input).to_raw
+  pp Code::Parser.parse(options[:input]).to_raw
 else
-  print Code.evaluate(input, context, io: $stdout, timeout: options[:timeout])
+  print Code.evaluate(
+    options[:input],
+    options[:context],
+    output: $stdout,
+    error: $stderr,
+    timeout: options[:timeout]
+  )
 end
 
 if options[:profile]
   result = RubyProf.stop
+
   if options[:profiler] == 'text'
     printer = RubyProf::FlatPrinter.new(result)
     printer.print($stdout)

data/lib/code/parser/list.rb

@@ -4,6 +4,10 @@ class Code
   class Parser
     class List < Language
       def code
+        Code
+      end
+
+      def code_present
         Code.new.present
       end
 
@@ -28,13 +32,14 @@ class Code
       end
 
       def element
-        code
+        (whitespace? << code_present << (whitespace? << comma).maybe) |
+          (whitespace? << code << whitespace? << comma)
       end
 
       def root
         (
           opening_square_bracket.ignore << whitespace? <<
-            (whitespace? << element << (whitespace? << comma).maybe).repeat <<
+            element.repeat <<
             (whitespace? << closing_square_bracket.ignore).maybe
         ).aka(:list) | String
       end

data/lib/code/parser/name.rb

@@ -108,7 +108,7 @@ class Code
       end
 
       def separator
-        special_character
+        special_character | any.absent
       end
 
       def root

data/lib/code/parser/whitespace.rb

@@ -8,7 +8,7 @@ class Code
       end
 
       def newline
-        str("\n")
+        str("\n") | str("\r")
       end
 
       def hashtag

data/lib/code/version.rb

@@ -2,4 +2,4 @@
 
 require_relative "../code"
 
-Code::Version = Gem::Version.new("0.7.1")
+Code::Version = Gem::Version.new("0.7.3")

data/spec/code_spec.rb

@@ -4,6 +4,7 @@ require "spec_helper"
 
 RSpec.describe Code do
   [
+    ["\r\n", "nothing"],
     ["1 + 1", "2"],
     ["a = 1", "1"],
     ["a = 1 b = 2 c = a + b c", "3"],
@@ -67,6 +68,11 @@ RSpec.describe Code do
     ["[1, 2, 3]", "[1, 2, 3]"],
     ["[1, 2, 3].include?(2)", "true"],
     ["[1, 2, 3].include?(4)", "false"],
+    ["[1, 2, 3,].include?(4)", "false"],
+    ["[1, 2, 3,  \n  ].include?(4)", "false"],
+    ["[1].each do end", "[1]"],
+    ["[,].include?(4)", "false"],
+    ["[,,].include?(4)", "false"],
     ["[[true]]", "[[true]]"],
     ["2 * 3", "6"],
     ["2 * 3 + 2", "8"],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-11 00:00:00.000000000 Z
+date: 2024-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal