vault_coh 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b761236eb71771fd8c489d2867ae4ec1b77361e0834ae8636ea86e492994ea1c
-  data.tar.gz: b600e4662c61af2a3ccbe1104de63ad506909de5daaff9d0171ecbe397862ce2
+  metadata.gz: e6d08a9b4c0f1c856decec2b338a3a0c9005a9506d409d0c9d0a17b1212cc765
+  data.tar.gz: b689b813dff0074520ad2a8b993b01374c369e0e07aed4ba3373d64631a962b1
 SHA512:
-  metadata.gz: 033d7db015b8ff4cfc49c93b71d47d625790766844c2b3693faf17dcf1ece45bde53772622f9a4e223845166327cdbbc87891cdfd79ff6b9b6eba5a5962e9da6
-  data.tar.gz: 5c61de1481d40eaf667a9b70cc67ab1e93fe50a7b8f6853e79e58aacda8d48a21d4daa1540de150899d4fd359b1805eabc6273882f8fdefeae1cc00b68ca2d07
+  metadata.gz: 6de6915d99020add56d5e1212af98bf060a06a22f26e919bae1d43024466f31e745fc4953c34d18044f31abaa8e393353d51a5786d6572d2d2af01504855ad6e
+  data.tar.gz: ed0bda5b6c5f1298db6c49bd5b7903294ef7598c4fb6968ddbac0c9df8936815a974037c766815899082f160547868ba870087a250c6982b236c454b7e1a20b4

data/.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.4

data/Cargo.lock

@@ -13,16 +13,16 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.66.1"
+version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
  "bitflags",
  "cexpr",
  "clang-sys",
+ "itertools",
  "lazy_static",
  "lazycell",
- "peeking_take_while",
  "proc-macro2",
  "quote",
  "regex",
@@ -75,12 +75,27 @@ dependencies = [
  "libloading",
 ]
 
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
 [[package]]
 name = "glob"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -111,9 +126,9 @@ dependencies = [
 
 [[package]]
 name = "magnus"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4778544796676e8428e9c622460ebf284bea52d8b10db3aeb449d8b5e61b3a13"
+checksum = "3d87ae53030f3a22e83879e666cb94e58a7bdf31706878a0ba48752994146dab"
 dependencies = [
  "magnus-macros",
  "rb-sys",
@@ -186,12 +201,6 @@ dependencies = [
  "nom",
 ]
 
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.69"
@@ -212,18 +221,18 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.81"
+version = "0.9.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a57240b308b155b09dce81e32829966a99f52d1088b45957e4283e526c5317a1"
+checksum = "1ba2704ccfa7875c91792c57a9aa7c3caac524d3036c122e36eeddad6f6e7c6f"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.81"
+version = "0.9.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f24ce877a4c5d07f06f6aa6fec3ac95e4b357b9f73b0f5445d8cbb7266d410e8"
+checksum = "c73585ec80c217b7a81257ca9bb89b191b5e452ec4b9106dc4c2e4e96a822242"
 dependencies = [
  "bindgen",
  "lazy_static",
@@ -303,13 +312,10 @@ dependencies = [
 
 [[package]]
 name = "serde_magnus"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9a56602c902d792aac8f369117c4490616b6772aaa85fad88cc8cc35edd192"
+version = "0.8.1"
+source = "git+https://github.com/ryantaylor/serde-magnus.git?branch=update-magnus#cb4ee4e76ec08f21a58651d70c28aab265870599"
 dependencies = [
  "magnus",
- "rb-sys",
- "rb-sys-build",
  "serde",
  "tap",
 ]
@@ -371,9 +377,9 @@ dependencies = [
 
 [[package]]
 name = "vault"
-version = "9.0.0"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771f7db565a750b784bea91fc8cf5190fca40a1f77c791e05d5a5e4168bfff59"
+checksum = "1fb1df47725f2569f794e8998c080cc4cbb803059050dbe464c25c815e704eb1"
 dependencies = [
  "byteorder",
  "magnus",

data/Gemfile

@@ -12,4 +12,4 @@ gem 'rb_sys'
 
 gem 'rspec', '~> 3.13'
 
-gem 'rubocop', '~> 1.64'
+gem 'rubocop', '~> 1.65'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vault_coh (6.0.0)
+    vault_coh (6.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -10,44 +10,44 @@ GEM
     diff-lcs (1.5.1)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    parallel (1.24.0)
-    parser (3.3.2.0)
+    parallel (1.26.2)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
-    racc (1.8.0)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     rake-compiler (1.2.7)
       rake
-    rb_sys (0.9.97)
+    rb_sys (0.9.100)
     regexp_parser (2.9.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.5)
+      strscan
     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)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.64.1)
+    rubocop (1.65.1)
       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 (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.0)
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
     strscan (3.1.0)
@@ -55,6 +55,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
@@ -62,8 +63,8 @@ DEPENDENCIES
   rake-compiler
   rb_sys
   rspec (~> 3.13)
-  rubocop (~> 1.64)
+  rubocop (~> 1.65)
   vault_coh!
 
 BUNDLED WITH
-   2.4.7
+   2.5.17

data/README.md

@@ -1,6 +1,6 @@
 # Vault
 
-[![Gem Version](https://badge.fury.io/rb/vault_coh.svg)](https://badge.fury.io/rb/vault_coh) [![Documentation](https://img.shields.io/badge/View-Documentation-blue.svg)](https://rubydoc.info/github/ryantaylor/vault-rb/v6.0.0)
+[![Gem Version](https://badge.fury.io/rb/vault_coh.svg)](https://badge.fury.io/rb/vault_coh) [![Documentation](https://img.shields.io/badge/View-Documentation-blue.svg)](https://rubydoc.info/github/ryantaylor/vault-rb/v6.1.0)
 
 A native Ruby client wrapper for the [vault](https://github.com/ryantaylor/vault) Company of Heroes replay parser, integrated via a Rust native extension.
 
@@ -24,7 +24,7 @@ bytes = File.read('/path/to/replay.rec').unpack('C*')
 replay = VaultCoh::Replay.from_bytes(bytes)
 puts replay.version
 ```
-All information available from parsing can be found in the [documentation](https://rubydoc.info/github/ryantaylor/vault-rb/v6.0.0).
+All information available from parsing can be found in the [documentation](https://rubydoc.info/github/ryantaylor/vault-rb/v6.1.0).
 
 ## Contributing
 

data/ext/vault_coh/Cargo.toml

@@ -10,6 +10,6 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-magnus = { version = "0.6" }
-serde_magnus = { version = "0.8" }
-vault = { version = "9", features = ["magnus", "serde"] }
+magnus = { version = "0.7" }
+serde_magnus = { git = "https://github.com/ryantaylor/serde-magnus.git", branch = "update-magnus" }
+vault = { version = "10", features = ["magnus", "serde"] }

data/ext/vault_coh/src/hash.rs

@@ -1,4 +1,4 @@
-use magnus::{value::ReprValue, RHash, RString, Value};
+use magnus::{value::ReprValue, RHash, RString, Symbol, Value};
 use vault::{Command, Map, Message, Player, Replay};
 
 pub trait HashExt {
@@ -34,67 +34,97 @@ impl HashExt for Command {
         match self {
             Command::BuildGlobalUpgrade(data) => {
                 let hash: RHash = serde_magnus::serialize(data).unwrap();
-                hash.aset("type", RString::new("BuildGlobalUpgrade"))
+                hash.aset(Symbol::new("type"), RString::new("BuildGlobalUpgrade"))
                     .unwrap();
-                hash.aset("action_type", RString::new("CMD_Upgrade"))
+                hash.aset(Symbol::new("action_type"), RString::new("CMD_Upgrade"))
                     .unwrap();
                 hash.as_value()
             }
             Command::BuildSquad(data) => {
                 let hash: RHash = serde_magnus::serialize(data).unwrap();
-                hash.aset("type", RString::new("BuildSquad")).unwrap();
-                hash.aset("action_type", RString::new("CMD_BuildSquad"))
+                hash.aset(Symbol::new("type"), RString::new("BuildSquad"))
+                    .unwrap();
+                hash.aset(Symbol::new("action_type"), RString::new("CMD_BuildSquad"))
                     .unwrap();
                 hash.as_value()
             }
             Command::CancelConstruction(data) => {
                 let hash: RHash = serde_magnus::serialize(data).unwrap();
-                hash.aset("type", RString::new("CancelConstruction"))
-                    .unwrap();
-                hash.aset("action_type", RString::new("CMD_CancelConstruction"))
+                hash.aset(Symbol::new("type"), RString::new("CancelConstruction"))
                     .unwrap();
+                hash.aset(
+                    Symbol::new("action_type"),
+                    RString::new("CMD_CancelConstruction"),
+                )
+                .unwrap();
                 hash.as_value()
             }
             Command::CancelProduction(data) => {
                 let hash: RHash = serde_magnus::serialize(data).unwrap();
-                hash.aset("type", RString::new("CancelProduction")).unwrap();
-                hash.aset("action_type", RString::new("CMD_CancelProduction"))
+                hash.aset(Symbol::new("type"), RString::new("CancelProduction"))
                     .unwrap();
+                hash.aset(
+                    Symbol::new("action_type"),
+                    RString::new("CMD_CancelProduction"),
+                )
+                .unwrap();
                 hash.as_value()
             }
-            Command::SelectBattlegroup(data) => {
+            Command::ConstructEntity(data) => {
                 let hash: RHash = serde_magnus::serialize(data).unwrap();
-                hash.aset("type", RString::new("SelectBattlegroup"))
+                hash.aset(Symbol::new("type"), RString::new("ConstructEntity"))
                     .unwrap();
-                hash.aset("action_type", RString::new("PCMD_InstantUpgrade"))
+                hash.aset(
+                    Symbol::new("action_type"),
+                    RString::new("PCMD_PlaceAndConstructEntities"),
+                )
+                .unwrap();
+                hash.as_value()
+            }
+            Command::SelectBattlegroup(data) => {
+                let hash: RHash = serde_magnus::serialize(data).unwrap();
+                hash.aset(Symbol::new("type"), RString::new("SelectBattlegroup"))
                     .unwrap();
+                hash.aset(
+                    Symbol::new("action_type"),
+                    RString::new("PCMD_InstantUpgrade"),
+                )
+                .unwrap();
                 hash.as_value()
             }
             Command::SelectBattlegroupAbility(data) => {
                 let hash: RHash = serde_magnus::serialize(data).unwrap();
-                hash.aset("type", RString::new("SelectBattlegroupAbility"))
-                    .unwrap();
-                hash.aset("action_type", RString::new("PCMD_TentativeUpgrade"))
-                    .unwrap();
+                hash.aset(
+                    Symbol::new("type"),
+                    RString::new("SelectBattlegroupAbility"),
+                )
+                .unwrap();
+                hash.aset(
+                    Symbol::new("action_type"),
+                    RString::new("PCMD_TentativeUpgrade"),
+                )
+                .unwrap();
                 hash.as_value()
             }
             Command::Unknown(data) => {
                 let hash: RHash = serde_magnus::serialize(data).unwrap();
-                hash.aset("type", RString::new("Unknown")).unwrap();
+                hash.aset(Symbol::new("type"), RString::new("Unknown"))
+                    .unwrap();
                 hash.as_value()
             }
             Command::UseAbility(data) => {
                 let hash: RHash = serde_magnus::serialize(data).unwrap();
-                hash.aset("type", RString::new("UseAbility")).unwrap();
-                hash.aset("action_type", RString::new("CMD_Ability"))
+                hash.aset(Symbol::new("type"), RString::new("UseAbility"))
+                    .unwrap();
+                hash.aset(Symbol::new("action_type"), RString::new("CMD_Ability"))
                     .unwrap();
                 hash.as_value()
             }
             Command::UseBattlegroupAbility(data) => {
                 let hash: RHash = serde_magnus::serialize(data).unwrap();
-                hash.aset("type", RString::new("UseBattlegroupAbility"))
+                hash.aset(Symbol::new("type"), RString::new("UseBattlegroupAbility"))
                     .unwrap();
-                hash.aset("action_type", RString::new("PCMD_Ability"))
+                hash.aset(Symbol::new("action_type"), RString::new("PCMD_Ability"))
                     .unwrap();
                 hash.as_value()
             }

data/lib/vault_coh/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VaultCoh
-  VERSION = '6.0.0'
+  VERSION = '6.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vault_coh
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - ryantaylor
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-08-16 00:00:00.000000000 Z
 dependencies: []
 description: Company of Heroes replay parsing in Ruby using the vault parsing library
   via a Rust native extension.