openra 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f8e899e24d7c1a64648be5f39fb249439f7ff008
-  data.tar.gz: 6efadd30042d44cfd54bcaecf9594b09d5aed992
+SHA256:
+  metadata.gz: 345905d788dbaf8a6ffad6e70be070553de601d3e0b5a56b3c2e3840ba6ff490
+  data.tar.gz: c1ac04f3de64aba8bb52206308c8b9cf92730e4ef00c236729449f131a3b8a64
 SHA512:
-  metadata.gz: b15a3518af884311eac8fda0ea5323f30af197c1e2b4e00fdf86ae2103094d666ec2ba133a8c96ad7ad6e0f3af1fd27b3008aa5f539dbce03d9c13d9da63cf79
-  data.tar.gz: 1631bcefa11178ba60eb37d4a71019e4e4383b3e33290c29f2ccde99aae410e2e51b98bf9acce0282172f15105bf1405d711d14ebea9a2f487f7b03ed0b8f7d9
+  metadata.gz: ea61c392895a2cec57e9e64e085219752f6dbca7c1eafada4b2a6d78f7f5706f6838c0d3a1d4d91796e726f1b5cd82d61bf69a09c2daa1d4f08399aea4f8234b
+  data.tar.gz: bbb8382e3c7d991c9e68e5c3e31e84b81cddd1480d671a700bf1f3295b9c56772802969dc93de510e3ac5ac575b41ff0bba4899e1625f6108892f3be8611dc63

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Unreleased
 
+[Compare v1.6.0...HEAD](https://github.com/AMHOL/openra-ruby/compare/v1.6.0...HEAD)
+
+## v1.6.0
+
+### Fixed
+
+* Updated to work with release-20200202 (current release) ([AMHOL](https://github.com/AMHOL))
+
+[Compare v1.5.0...HEAD](https://github.com/AMHOL/openra-ruby/compare/v1.5.0...v1.6.0)
+
+## v1.5.0
+
 ### Added
 
 * [detect-production-macros] A new command to detect production macros ([AMHOL](https://github.com/AMHOL))
@@ -8,7 +20,7 @@
 
 * [core] Fix error when sync info does not exactly precede the start game order ([AMHOL](https://github.com/AMHOL))
 
-[Compare v1.4.0...HEAD](https://github.com/AMHOL/openra-ruby/compare/v1.4.0...HEAD)
+[Compare v1.4.0...v1.5.0](https://github.com/AMHOL/openra-ruby/compare/v1.4.0...v1.5.0)
 
 ## v1.4.0
 

data/lib/openra/cli.rb

@@ -1,7 +1,7 @@
 require 'securerandom'
 require 'yaml'
 require 'json'
-require 'hanami/cli'
+require 'dry/cli'
 require 'openra/version'
 require 'openra/replays'
 require 'openra/cli/commands/formatters'
@@ -13,7 +13,7 @@ require 'openra/cli/command_registry'
 module Openra
   class CLI
     def call(*args)
-      Hanami::CLI.new(CommandRegistry).call(*args)
+      Dry::CLI.new(CommandRegistry).call(*args)
     end
   end
 end

data/lib/openra/cli/command_registry.rb

@@ -1,7 +1,7 @@
 module Openra
   class CLI
     class CommandRegistry
-      extend Hanami::CLI::Registry
+      extend Dry::CLI::Registry
 
       register 'replay-data', Commands::ReplayData
       register 'detect-production-macros', Commands::DetectProductionMacros

data/lib/openra/cli/commands/detect_production_macros.rb

@@ -1,7 +1,7 @@
 module Openra
   class CLI
     module Commands
-      class DetectProductionMacros < Hanami::CLI::Command
+      class DetectProductionMacros < Dry::CLI::Command
         ARRAY_HASH = ->(hash, key) { hash[key] = [] }
 
         desc 'Detect whether players are using production macros'
@@ -17,7 +17,7 @@ module Openra
             case order.command
             when 'StartProduction'
               commands[order.client_index.to_s] << {
-                target: order.target_string.to_s,
+                target: order.target,
                 msec: order.frame * replay.frametime_multiplier
               }
             end

data/lib/openra/cli/commands/replay_data.rb

@@ -1,7 +1,7 @@
 module Openra
   class CLI
     module Commands
-      class ReplayData < Hanami::CLI::Command
+      class ReplayData < Dry::CLI::Command
         desc 'Output replay data to stdout'
 
         argument :replay, required: true, desc: 'Path of the replay file to read data from'
@@ -13,9 +13,9 @@ module Openra
           data = {
             mod: replay.metadata.mod,
             version: replay.metadata.version,
-            server_name: utf8(replay.global_settings.server_name),
+            server_name: replay.global_settings.server_name,
             map: {
-              name: utf8(replay.metadata.map_name),
+              name: replay.metadata.map_name,
               hash: replay.metadata.map_hash
             },
             game: {
@@ -50,7 +50,7 @@ module Openra
 
               {
                 index: client.index,
-                name: utf8(client.name),
+                name: client.name,
                 preferred_color: client.preferred_color,
                 color: client.preferred_color,
                 spawn: {
@@ -91,12 +91,9 @@ module Openra
               end
 
               client_hash[:build] << {
-                structure: utf8(order.target_string),
+                structure: utf8(order.target),
                 game_time: time(order.frame * replay.frametime_multiplier),
-                placement: {
-                  x: order.target_x.to_i,
-                  y: order.target_y.to_i
-                }
+                placement: order.target_pos.to_i
               }
             when 'Message'
               data[:chat] << {
@@ -107,13 +104,13 @@ module Openra
             when 'Chat'
               data[:chat] << {
                 channel: 'global',
-                name: utf8(client.name),
+                name: client.name,
                 message: utf8(order.target)
               }
             when 'TeamChat'
               data[:chat] << {
                 channel: client.team,
-                name: utf8(client.name),
+                name: client.name,
                 message: utf8(order.target)
               }
             end

data/lib/openra/cli/commands/version.rb

@@ -1,7 +1,7 @@
 module Openra
   class CLI
     module Commands
-      class Version < Hanami::CLI::Command
+      class Version < Dry::CLI::Command
         desc 'Print current version number'
 
         def call(*)

data/lib/openra/replays/order.rb

@@ -12,6 +12,7 @@ module Openra
       TARGET_IS_FROZEN_ACTOR = -> { instance_exec(&HAS_TARGET) && target_type == 3 }
       TARGET_IS_CELL = -> { instance_exec(&TARGET_IS_TERRAIN) && (flags & 64) == 64 }
       TARGET_NOT_CELL = -> { instance_exec(&TARGET_IS_TERRAIN) && (flags & 64) != 64 }
+      HAS_SUBJECT = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 128) == 128 }
       HAS_TARGET_STRING = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 4) == 4 }
       HAS_EXTRA_LOCATION = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 16) == 16 }
       HAS_EXTRA_DATA = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 32) == 32 }
@@ -19,29 +20,31 @@ module Openra
       endian :little
       # Common
       string :order_type, read_length: 1
-      pascal_string :command
+      pascal_string :command # order in protocol
       # Immediate Order Data
-      pascal_string :target, onlyif: IS_IMMEDIATE_ORDER
+      pascal_string :immediate_order_target, onlyif: IS_IMMEDIATE_ORDER
       # Standard Order Data
-      uint32 :subject_id, onlyif: IS_STANDARD_ORDER
       uint8 :flags, onlyif: IS_STANDARD_ORDER
+      uint32 :subject_id, onlyif: HAS_SUBJECT
       uint8 :target_type, onlyif: HAS_TARGET
       uint32 :actor_id, onlyif: TARGET_IS_ACTOR
       uint32 :player_actor_id, onlyif: TARGET_IS_FROZEN_ACTOR
       uint32 :frozen_actor_id, onlyif: TARGET_IS_FROZEN_ACTOR
-      int32 :target_x, onlyif: TARGET_IS_CELL
-      int32 :target_y, onlyif: TARGET_IS_CELL
-      string :target_layer, read_length: 1, onlyif: TARGET_IS_CELL
-      int32 :target_sub_cell, onlyif: TARGET_IS_CELL
+      int32 :target_pos, onlyif: TARGET_IS_CELL
+      uint8 :target_sub_cell, onlyif: TARGET_IS_CELL
       int32 :pos_x, onlyif: TARGET_NOT_CELL
       int32 :pos_y, onlyif: TARGET_NOT_CELL
       int32 :pos_z, onlyif: TARGET_NOT_CELL
-      pascal_string :target_string, onlyif: HAS_TARGET_STRING
-      int32 :extra_pos_x, onlyif: HAS_EXTRA_LOCATION
-      int32 :extra_pos_y, onlyif: HAS_EXTRA_LOCATION
-      string :extra_pos_layer, read_length: 1, onlyif: HAS_EXTRA_LOCATION
+      pascal_string :standard_order_target, onlyif: HAS_TARGET_STRING
+      int32 :extra_pos, onlyif: HAS_EXTRA_LOCATION
       uint32 :extra_data, onlyif: HAS_EXTRA_DATA
 
+      def target
+        target = standard? ? standard_order_target : immediate_order_target
+
+        Types::UTF8String.(target)
+      end
+
       def type
         case order_type
         when HEX_FF

data/lib/openra/struct.rb

@@ -1,4 +1,4 @@
-require 'transproc'
+require 'dry/transformer/all'
 require 'dry-struct'
 require 'openra/types'
 require 'openra/struct/functions'
@@ -26,7 +26,7 @@ module Openra
       def define(&block)
         instance_eval(&block)
 
-        preprocessor(preprocessor.with(schema: schema))
+        preprocessor(preprocessor.with(**{ schema: schema }))
 
         preprocessor.finalize!
       end

data/lib/openra/struct/client.rb

@@ -1,17 +1,19 @@
 module Openra
   class Struct < Dry::Struct
     class Client < Openra::Struct
+      transform_types(&:omittable)
+
       define do
         attribute :index, Types::Strict::String.meta(from: 'Index')
         attribute :preferred_color, Types::Strict::String.meta(from: 'PreferredColor')
         attribute :color, Types::Strict::String.meta(from: 'Color')
         attribute :faction_name, Types::Strict::String.meta(from: 'Faction')
         attribute :spawn_point, Types::Strict::String.meta(from: 'SpawnPoint')
-        attribute :name, Types::Strict::String.meta(from: 'Name')
-        attribute :ip, Types::Strict::String.meta(from: 'IpAddress', omittable: true)
+        attribute :name, Types::UTF8String.meta(from: 'Name')
+        attribute :ip, Types::Strict::String.meta(from: 'IpAddress')
         attribute :state, Types::Strict::String.meta(from: 'State')
         attribute :team, Types::Strict::String.meta(from: 'Team')
-        attribute :slot, Types::Strict::String.meta(from: 'Slot', omittable: true)
+        attribute :slot, Types::Strict::String.meta(from: 'Slot')
         attribute :bot_controller_index, Types::Strict::String.meta(
           from: 'BotControllerClientIndex'
         )

data/lib/openra/struct/functions.rb

@@ -1,9 +1,9 @@
 module Openra
   class Struct < Dry::Struct
     module Functions
-      extend Transproc::Registry
+      extend Dry::Transformer::Registry
 
-      import Transproc::HashTransformations
+      import Dry::Transformer::HashTransformations
 
       def self.sequence(hash, prefix, into)
         keys = hash.keys.select { |key| key.start_with?(prefix + '@') }

data/lib/openra/struct/game_options.rb

@@ -1,20 +1,24 @@
 module Openra
   class Struct < Dry::Struct
     class GameOptions < Openra::Struct
+      transform_types(&:omittable)
+
       define do
         attribute :starting_cash, IntegerOption.meta(from: 'startingcash')
         attribute :cheats_enabled, BooleanOption.meta(from: 'cheats')
         attribute :explored_map_enabled, BooleanOption.meta(from: 'explored')
         attribute :fog_enabled, BooleanOption.meta(from: 'fog')
-        attribute :bounties_enabled, BooleanOption.meta(from: 'bounty', omittable: true)
-        attribute :conyard_undeploy_enabled, BooleanOption.meta(from: 'factundeploy', omittable: true)
+        attribute :bounties_enabled, BooleanOption.meta(from: 'bounty')
+        attribute :conyard_undeploy_enabled, BooleanOption.meta(from: 'factundeploy')
         attribute :crates_enabled, BooleanOption.meta(from: 'crates')
         attribute :build_off_allies_enabled, BooleanOption.meta(from: 'allybuild')
-        attribute :restricted_build_radius_enabled, BooleanOption.meta(from: 'buildradius', omittable: true)
+        attribute :restricted_build_radius_enabled, BooleanOption.meta(from: 'buildradius')
         attribute :short_game_enabled, BooleanOption.meta(from: 'shortgame')
+        attribute :reusable_engineers, BooleanOption.meta(from: 'reusable-engineers')
         attribute :tech_level, StringOption.meta(from: 'techlevel')
         attribute :game_speed, StringOption.meta(from: 'gamespeed')
         attribute :starting_units, StringOption.meta(from: 'startingunits')
+        attribute :separate_team_spawns, StringOption.meta(from: 'separateteamspawns')
       end
 
       def bounties_enabled

data/lib/openra/struct/global_settings.rb

@@ -1,16 +1,33 @@
 module Openra
   class Struct < Dry::Struct
     class GlobalSettings < Openra::Struct
+      transform_types(&:omittable)
+
       define do
-        attribute :server_name, Types::Strict::String.meta(from: 'ServerName')
+        attribute :server_name, Types::UTF8String.meta(from: 'ServerName')
         attribute :map_hash, Types::Strict::String.meta(from: 'Map')
         attribute :timestep, Types::Params::Integer.meta(from: 'Timestep')
-        attribute :order_latency, Types::Params::Integer.meta(from: 'OrderLatency')
+        attribute :order_latency, Types::Params::Integer.meta(
+          from: 'OrderLatency'
+        )
         attribute :random_seed, Types::Strict::String.meta(from: 'RandomSeed')
-        attribute :allow_spectators, Types::Params::Bool.meta(from: 'AllowSpectators')
-        attribute :allow_version_mismatch, Types::Params::Bool.meta(from: 'AllowVersionMismatch')
-        attribute :allow_singleplayer, Types::Params::Bool.meta(from: 'EnableSingleplayer')
-        attribute :game_id, Types::Strict::String.meta(from: 'GameUid')
+        attribute :allow_spectators, Types::Params::Bool.meta(
+          from: 'AllowSpectators'
+        )
+        attribute :allow_version_mismatch, Types::Params::Bool.meta(
+          from: 'AllowVersionMismatch')
+        attribute :game_id, Types::Strict::String.meta(from: 'GameUid'
+        )
+        attribute :allow_singleplayer, Types::Params::Bool.meta(
+          from: 'EnableSingleplayer'
+        )
+        attribute :enable_sync_reports, Types::Params::Bool.meta(
+          from: 'EnableSyncReports'
+        )
+        attribute :dedicated, Types::Params::Bool.meta(from: 'Dedicated')
+        attribute :save_enabled, Types::Params::Bool.meta(
+          from: 'GameSavesEnabled'
+        )
         attribute :game_options, GameOptions.meta(from: 'Options')
       end
 

data/lib/openra/struct/metadata.rb

@@ -1,13 +1,13 @@
 module Openra
   class Struct < Dry::Struct
     class Metadata < Openra::Struct
-      preprocessor(preprocessor.with(root: 'Root'))
+      preprocessor(preprocessor.with(**{ root: 'Root' }))
 
       define do
         attribute :mod, Types::Strict::String.meta(from: 'Mod')
         attribute :version, Types::Strict::String.meta(from: 'Version')
         attribute :map_hash, Types::Strict::String.meta(from: 'MapUid')
-        attribute :map_name, Types::Strict::String.meta(from: 'MapTitle')
+        attribute :map_name, Types::UTF8String.meta(from: 'MapTitle')
         attribute :start_time, Types::Timestamp.meta(from: 'StartTimeUtc')
         attribute :end_time, Types::Timestamp.meta(from: 'EndTimeUtc')
         attribute :players, Types::Strict::Array.of(Player).meta(sequence: 'Player')

data/lib/openra/struct/player.rb

@@ -3,7 +3,7 @@ module Openra
     class Player < Openra::Struct
       define do
         attribute :index, Types::Strict::String.meta(from: 'ClientIndex')
-        attribute :name, Types::Strict::String.meta(from: 'Name')
+        attribute :name, Types::UTF8String.meta(from: 'Name')
         attribute :is_human, Types::Params::Bool.meta(from: 'IsHuman')
         attribute :is_bot, Types::Params::Bool.meta(from: 'IsBot')
         attribute :faction_name, Types::Strict::String.meta(from: 'FactionName')

data/lib/openra/struct/pre_processor.rb

@@ -16,29 +16,31 @@ module Openra
 
       def with(**new_config)
         raise AlreadyFinalizedError, 'transformer already finalized' if finalized?
-        self.class.new(config.merge(new_config))
+        self.class.new(**config.merge(new_config))
       end
 
       def finalize!
         config = self.config
 
-        transformer_klass = Class.new(Transproc::Transformer[Functions])
+        transformer_klass = Class.new(Dry::Transformer::Pipe[Functions])
         transformer_klass.instance_eval do
-          unwrap(config[:root]) if config[:root]
+          define! do
+            unwrap(config[:root]) if config[:root]
 
-          if (schema = config[:schema])
-            schema.each_pair do |key, type|
-              if (sequence = type.meta[:sequence])
-                sequence(sequence, sequence)
-                rename_keys(sequence => key)
+            if (schema = config[:schema])
+              schema.keys.each do |key|
+                if (sequence = key.type.meta[:sequence])
+                  sequence(sequence, sequence)
+                  rename_keys(sequence => key.name)
+                end
               end
-            end
 
-            mapping = schema.each_with_object({}) do |(key, type), mapping|
-              mapping[type.meta[:from]] = key if type.meta[:from]
-            end
+              mapping = schema.keys.each_with_object({}) do |key, mapping|
+                mapping[key.type.meta[:from]] = key.name if key.type.meta[:from]
+              end
 
-            rename_keys(mapping)
+              rename_keys(mapping)
+            end
           end
         end
 

data/lib/openra/types.rb

@@ -2,10 +2,14 @@ require 'dry-types'
 
 module Openra
   module Types
-    include Dry::Types.module
+    include Dry.Types()
 
     Timestamp = Constructor(Time) do |input|
       ::DateTime.strptime(input, '%Y-%m-%d %H-%M-%S').to_time
     end
+
+    UTF8String = Types::String.constructor do |input|
+      input.force_encoding('UTF-8').to_s
+    end
   end
 end

data/lib/openra/version.rb

@@ -1,3 +1,3 @@
 module Openra
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.6.0'.freeze
 end

data/openra.gemspec

@@ -16,11 +16,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'bundler'
-  spec.add_dependency 'bindata', '2.4.3'
-  spec.add_dependency 'transproc', '1.0.2'
-  spec.add_dependency 'dry-types', '0.13.2'
-  spec.add_dependency 'dry-struct', '0.5.0'
-  spec.add_dependency 'hanami-cli', '0.2.0'
+  spec.add_dependency 'bindata'
+  spec.add_dependency 'dry-transformer'
+  spec.add_dependency 'dry-types'
+  spec.add_dependency 'dry-struct'
+  spec.add_dependency 'dry-cli'
 
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openra
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,72 +28,72 @@ dependencies:
   name: bindata
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: transproc
+  name: dry-transformer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hanami-cli
+  name: dry-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - andyholland1991@aol.com
@@ -183,8 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Openra Rubygem