Bump Ruby to 3.4.1

foobara · Jan 6, 2025 · 2b59566 · 2b59566
1 parent d4ffb0f
commit 2b59566
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 37 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.4.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [0.0.7] - 2025-01-06
+
+- Bump Ruby to 3.4.1
+
 ## [0.0.6] - 2024-08-22
 
 - Fix remaining naming bug in model templates

diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,12 @@
+require_relative "version"
+
 source "https://rubygems.org"
-ruby File.read("#{__dir__}/.ruby-version")
+ruby Foobara::TypescriptRemoteCommandGenerator::Version::MINIMUM_RUBY_VERSION
 
-# Specify your gem's dependencies in typescript-remote-command-generator.gemspec
 gemspec
 
+# gem "foobara-files-generator", path: "../files-generator"
+
 # Development dependencies go here
 gem "foobara-rubocop-rules"
 gem "foobara-spec-helpers"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,36 +1,40 @@
 PATH
   remote: .
   specs:
-    foobara-typescript-remote-command-generator (0.0.6)
+    foobara-typescript-remote-command-generator (0.0.7)
       foobara
       foobara-files-generator
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    bigdecimal (3.1.9)
     byebug (11.1.3)
     coderay (1.1.3)
     diff-lcs (1.5.1)
     docile (1.4.1)
-    ffi (1.17.0-x86_64-linux-gnu)
-    foobara (0.0.7)
+    ffi (1.17.1-x86_64-linux-gnu)
+    foobara (0.0.47)
+      bigdecimal
       foobara-util
-    foobara-files-generator (0.0.3)
+    foobara-files-generator (0.0.5)
       foobara
-    foobara-rubocop-rules (0.0.4)
+    foobara-rubocop-rules (0.0.5)
       rubocop
       rubocop-rspec
-    foobara-spec-helpers (0.0.3)
+    foobara-spec-helpers (0.0.4)
       foobara-util
-    foobara-util (0.0.4)
+    foobara-util (0.0.8)
     formatador (1.1.0)
-    guard (2.18.1)
+    guard (2.19.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
+      logger (~> 1.6)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
+      ostruct (~> 0.6)
       pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
@@ -39,19 +43,21 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    json (2.7.2)
+    json (2.9.1)
     language_server-protocol (3.17.0.3)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.4)
     lumberjack (1.2.10)
     method_source (1.1.0)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    ostruct (0.6.1)
     parallel (1.26.3)
-    parser (3.3.4.2)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -66,53 +72,51 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    regexp_parser (2.9.2)
-    rexml (3.3.6)
-      strscan
+    regexp_parser (2.10.0)
     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-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.2)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.13.1)
+    rspec-its (2.0.0)
+      rspec-core (>= 3.13.0)
+      rspec-expectations (>= 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.65.1)
+    rspec-support (3.13.2)
+    rubocop (1.69.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
       parser (>= 3.3.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (3.0.4)
+    rubocop-rspec (3.3.0)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     shellany (0.0.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.0)
-    thor (1.3.1)
-    unicode-display_width (2.5.0)
+    thor (1.3.2)
+    unicode-display_width (3.1.3)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
 
 PLATFORMS
   x86_64-linux
@@ -133,7 +137,7 @@ DEPENDENCIES
   simplecov
 
 RUBY VERSION
-   ruby 3.2.2p53
+   ruby 3.4.1p0
 
 BUNDLED WITH
    2.4.14
diff --git a/src/remote_generator/services/aggregate_model_generator.rb b/src/remote_generator/services/aggregate_model_generator.rb
@@ -26,6 +26,8 @@ def template_path
 
         def model_generators
           types_depended_on.select(&:model?).map do |model|
+            # TODO: what about detached_entity? What is the difference in this context between entity and model and
+            # which is detached_entity more like?
             if model.entity?
               Services::AggregateEntityGenerator.new(model)
             else

diff --git a/src/remote_generator/services/error_generator.rb b/src/remote_generator/services/error_generator.rb
@@ -51,6 +51,7 @@ def context_ts_type
 
         def dependencies
           # Why don't we need models and custom types?
+          # what about detached_entity types?
           types_depended_on.select(&:entity?)
         end
 

diff --git a/typescript-remote-command-generator.gemspec b/typescript-remote-command-generator.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.license = "Apache-2.0 OR MIT"
   spec.licenses = ["Apache-2.0", "MIT"]
 
-  spec.required_ruby_version = ">= #{File.read("#{__dir__}/.ruby-version")}"
+  spec.required_ruby_version = Foobara::TypescriptRemoteCommandGenerator::Version::MINIMUM_RUBY_VERSION
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

diff --git a/version.rb b/version.rb
@@ -1,7 +1,11 @@
 module Foobara
   module TypescriptRemoteCommandGenerator
     module Version
-      VERSION = "0.0.6".freeze
+      VERSION = "0.0.7".freeze
+
+      local_ruby_version = File.read("#{__dir__}/.ruby-version").chomp
+      local_ruby_version_minor = local_ruby_version[/\A(\d+\.\d+)\.\d+\z/, 1]
+      MINIMUM_RUBY_VERSION = ">= #{local_ruby_version_minor}.0".freeze
     end
   end
 end