R3EXS 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b432647374edef0c80c6479bf96826a0054032b39acbbd54bd23fe8e0d789e
-  data.tar.gz: 25b79302954098b202730e01e8ab1873ebd98ec205099677cf55948495ebdbf2
+  metadata.gz: 679d27fde197cdca0690085b758d371a1c674bb179158b7e038ad4ee84acd52f
+  data.tar.gz: 7d16137bfc341e517d5647e2fc7f5bbcdadce3b9c9b3c5a8916babe531ed8cc7
 SHA512:
-  metadata.gz: dc68f9e3f16e4b0ce56ff635b0819f5bc17add44112aca03b0c62d321051d349e5511903203516d1820be18a6b9272c9d4a847dff5a7a96d5d88f3210eba90d5
-  data.tar.gz: a2d93faf33f69efedb8399b98342c3ba3d0e6adbee2190e56575e70732e44717f8fe3b04dfc201bbc68222cf0b97f022484795745790215eb0b4644426f22c26
+  metadata.gz: 9ab14b85e764837386f10f3d7ab1f7211f94bdec643c6f1b091c231555dd594481b167ee51006cf2906f02000f9db83e45ca60a9c99360fd9b2713341cd97ed7
+  data.tar.gz: 36ac41b25026fe84d52f21c2ef408181575a00c4c607640858b8d8b11e6e129df532bfb9932013fbe83bbf42524d8f43f1437eb0e7ceec78561417deeaf4c37f

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # [R3EXS]
 
+## [1.0.4] - 2025-03-11
+
+-   修复 rvdata2_json 方法里处理 Scripts 的 BUG
+-   rb_ex_strings 方法里 Extract 单词拼写修正
+-   oj 版本更新到 3.16.10
+-   redcarpet 版本更新到 3.6.1
+
 ## [1.0.3] - 2025-02-15
 
 -   添加 RGSS3AFileError 类以处理加密格式不支持的问题

data/bin/R3EXS

@@ -61,7 +61,7 @@ class App
         c.action do |global_options, options, args|
             begin
                 R3EXS.rvdata2_json(args[0], options[:output_dir], options[:complete], options[:with_scripts], options[:with_notes])
-                $stderr.puts "#{R3EXS::Utils::GREEN_COLOR}All JSON files have been written to #{options[:output_dir]}#{R3EXS::Utils::RESET_COLOR}"
+                puts "#{R3EXS::Utils::GREEN_COLOR}All JSON files have been written to #{options[:output_dir]}#{R3EXS::Utils::RESET_COLOR}"
             rescue R3EXS::Rvdata2FileError => e
                 $stderr.puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
                 $stderr.puts 'Please make sure the rvdata2 files are not corrupted.'
@@ -93,7 +93,7 @@ class App
         c.action do |global_options, options, args|
             begin
                 R3EXS.json_rvdata2(args[0], options[:output_dir], options[:original_dir], options[:complete], options[:with_scripts])
-                $stderr.puts "#{R3EXS::Utils::GREEN_COLOR}All new rvdata2 files have been written to #{options[:output_dir]}#{R3EXS::Utils::RESET_COLOR}"
+                puts "#{R3EXS::Utils::GREEN_COLOR}All new rvdata2 files have been written to #{options[:output_dir]}#{R3EXS::Utils::RESET_COLOR}"
             rescue R3EXS::RPGJsonFileError => e
                 $stderr.puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
                 $stderr.puts 'Your JSON files are not in RPG module'
@@ -146,16 +146,20 @@ class App
         c.action do |global_options, options, args|
             begin
                 R3EXS.ex_strings(args[0], options[:output_dir], options[:with_scripts], options[:with_symbol], options[:with_scripts_separate])
-                puts "#{R3EXS::Utils::GREEN_COLOR}All strings have been extracted to #{File.join(options[:output_dir], 'ManualTransFile.json')}#{R3EXS::Utils::RESET_COLOR}"
+                if options[:with_scripts_separate]
+                    puts "#{R3EXS::Utils::GREEN_COLOR}All strings have been extracted to #{File.join(options[:output_dir], 'ManualTransFile.json')} and #{File.join(options[:output_dir], 'ManualTransFile_scripts.json')}#{R3EXS::Utils::RESET_COLOR}"
+                else
+                    puts "#{R3EXS::Utils::GREEN_COLOR}All strings have been extracted to #{File.join(options[:output_dir], 'ManualTransFile.json')}#{R3EXS::Utils::RESET_COLOR}"
+                end
             rescue R3EXS::R3EXSJsonFileError => e
-                puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
+                $stderr.puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
                 $stderr.puts 'Your JSON files are not in R3EXS module'
                 $stderr.puts "You are #{R3EXS::Utils::RED_COLOR}NOT#{R3EXS::Utils::RESET_COLOR} supposed to use '#{R3EXS::Utils::GREEN_COLOR}-c#{R3EXS::Utils::RESET_COLOR}' or '#{R3EXS::Utils::GREEN_COLOR}--complete#{R3EXS::Utils::RESET_COLOR}' to enable complete serialization in #{R3EXS::Utils::GREEN_COLOR}rvdata2_json#{R3EXS::Utils::RESET_COLOR} subcommand"
                 $stderr.puts "For more information, please enter '#{R3EXS::Utils::GREEN_COLOR}R3EXS help json_rvdata2#{R3EXS::Utils::RESET_COLOR}'"
             rescue R3EXS::JsonDirError => e
-                puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
+                $stderr.puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
             rescue R3EXS::ScriptsDirError => e
-                puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
+                $stderr.puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
                 $stderr.puts "You are supposed to use '#{R3EXS::Utils::GREEN_COLOR}-s#{R3EXS::Utils::RESET_COLOR}' or '#{R3EXS::Utils::GREEN_COLOR}--scripts#{R3EXS::Utils::RESET_COLOR}' to enable serialization of Scripts in #{R3EXS::Utils::GREEN_COLOR}rvdata2_json#{R3EXS::Utils::RESET_COLOR} subcommand"
                 $stderr.puts "For more information, please enter '#{R3EXS::Utils::GREEN_COLOR}R3EXS help rvdata2_json#{R3EXS::Utils::RESET_COLOR}'"
             end
@@ -183,18 +187,18 @@ class App
                 R3EXS.in_strings(args[0], options[:output_dir], options[:manualtransfile_path], options[:with_scripts])
                 puts "#{R3EXS::Utils::GREEN_COLOR}All new JSON files have been written to #{options[:output_dir]}#{R3EXS::Utils::RESET_COLOR}"
             rescue R3EXS::R3EXSJsonFileError => e
-                puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
+                $stderr.puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
                 $stderr.puts 'Your JSON files are not in R3EXS module'
                 $stderr.puts "You are #{R3EXS::Utils::RED_COLOR}NOT#{R3EXS::Utils::RESET_COLOR} supposed to use '#{R3EXS::Utils::GREEN_COLOR}-c#{R3EXS::Utils::RESET_COLOR}' or '#{R3EXS::Utils::GREEN_COLOR}--complete#{R3EXS::Utils::RESET_COLOR}' to enable complete serialization in #{R3EXS::Utils::GREEN_COLOR}rvdata2_json#{R3EXS::Utils::RESET_COLOR} subcommand"
                 $stderr.puts "For more information, please enter '#{R3EXS::Utils::GREEN_COLOR}R3EXS help json_rvdata2#{R3EXS::Utils::RESET_COLOR}'"
             rescue R3EXS::JsonDirError => e
-                puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
+                $stderr.puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
             rescue R3EXS::ScriptsDirError => e
-                puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
+                $stderr.puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
                 $stderr.puts "You are supposed to use '#{R3EXS::Utils::GREEN_COLOR}-s#{R3EXS::Utils::RESET_COLOR}' or '#{R3EXS::Utils::GREEN_COLOR}--scripts#{R3EXS::Utils::RESET_COLOR}' to enable serialization of Scripts in #{R3EXS::Utils::GREEN_COLOR}rvdata2_json#{R3EXS::Utils::RESET_COLOR} subcommand"
                 $stderr.puts "For more information, please enter '#{R3EXS::Utils::GREEN_COLOR}R3EXS help rvdata2_json#{R3EXS::Utils::RESET_COLOR}'"
             rescue R3EXS::ManualTransFilePathError => e
-                puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
+                $stderr.puts "#{R3EXS::Utils::RED_COLOR}#{e.message}#{R3EXS::Utils::RESET_COLOR}"
                 $stderr.puts "You are supposed to use #{R3EXS::Utils::GREEN_COLOR}ex_strings#{R3EXS::Utils::RESET_COLOR} subcommand to generate the ManualTransFile.json"
                 $stderr.puts "For more information, please enter '#{R3EXS::Utils::GREEN_COLOR}R3EXS help ex_strings#{R3EXS::Utils::RESET_COLOR}'"
             end

data/lib/R3EXS/extract_strings.rb

@@ -22,11 +22,11 @@ module R3EXS
         strings           = []
         strings_extractor = StringsExtractor.new(strings, with_symbol)
         Dir.glob(File.join(full_dir, '*.rb')).each do |script_file_path|
-            print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Exreacting from #{Utils::RESET_COLOR}#{script_file_path}...\r" if $global_options[:verbose]
+            print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Extracting from #{Utils::RESET_COLOR}#{script_file_path}...\r" if $global_options[:verbose]
 
             strings_extractor.visit(Prism.parse_file(script_file_path).value)
 
-            print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Exreacted #{Utils::RESET_COLOR}#{script_file_path}\n" if $global_options[:verbose]
+            print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Extracted #{Utils::RESET_COLOR}#{script_file_path}\n" if $global_options[:verbose]
         end
         strings
     end

data/lib/R3EXS/rvdata2_json.rb

@@ -45,21 +45,20 @@ module R3EXS
     def R3EXS.rvdata2_json(target_dir, output_dir, complete, with_scripts, with_notes)
         FileUtils.mkdir(output_dir) unless Dir.exist?(output_dir)
         Utils.all_rvdata2_files(target_dir) do |object, file_basename|
-
             if file_basename == 'Scripts'
-                scripts_rb(object, output_dir) if with_scripts
+                next unless with_scripts
+                scripts_rb(object, output_dir)
                 print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{file_basename}\n" if $global_options[:verbose]
-                next
-            end
-
-            file_path = File.join(output_dir, "#{file_basename}.json")
-            print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{file_path}...\r" if $global_options[:verbose]
-            if complete
-                Utils.object_json(object, file_path)
             else
-                Utils.object_json(Utils.rpg_r3exs(object, file_basename, with_notes), file_path)
+                file_path = File.join(output_dir, "#{file_basename}.json")
+                print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{file_path}...\r" if $global_options[:verbose]
+                if complete
+                    Utils.object_json(object, file_path)
+                else
+                    Utils.object_json(Utils.rpg_r3exs(object, file_basename, with_notes), file_path)
+                end
+                print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{file_basename}\n" if $global_options[:verbose]
             end
-            print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{file_basename}\n" if $global_options[:verbose]
         end
     end
 

data/lib/R3EXS/version.rb

@@ -3,5 +3,5 @@
 module R3EXS
 
     # 版本号
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: R3EXS
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - LuoTat
 bindir: bin
 cert_chain: []
-date: 2025-02-15 00:00:00.000000000 Z
+date: 2025-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.6.1
 - !ruby/object:Gem::Dependency
   name: ocran
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.16.9
+        version: 3.16.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.16.9
+        version: 3.16.10
 email: LuoTat.s@gmail.com
 executables:
 - R3EXS
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.5
 specification_version: 4
 summary: A tool for extracting and translating strings from the RGSS3 game engine
 test_files: []