arkrb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44676ce6403228c660cd6ebdd5041720a3e0a5623d255f4155f2439a4090455c
-  data.tar.gz: a20847149c5e0279fabd19303a5c4edc6c8a3ea04f20f2d814100e8935fddb55
+  metadata.gz: 30aec9fd508dde5c37a44eede01670a91f57d220624c53e5c8d1a5f57939c377
+  data.tar.gz: e3a7b74dfd865cb2528bb5f827dba21bb6f59507aedb87f30029b82b662d17ce
 SHA512:
-  metadata.gz: 23b63025cb6f29a51d9204189428eb724ad7a0c3367baf969689fbd6bf2578d989dffa152c192f47271b7875c50cb568d8744860326850ae7cd847e8ba7a9067
-  data.tar.gz: 4e3f12f9cc7d98d1c6013d5bf1617244444b972a2cbf49188944ac2028dc629a642ace82b5922e949023254d9d05e0d27150d77ddddf280e201bdd76b3682bfe
+  metadata.gz: f7484aa720ceeaf083a9580d59b7e07a92392ec2b828da29184c90d2d69fbd6676c60d26f4bdbd71075cbab09be958fe24af2ffbc8640654fe8386654ef282b1
+  data.tar.gz: 99073581202e48e51abe25e6905f3cae0f0e23d34261790477be2310fe93b4fd7935decbf2f5b58349a1cc396d46fca11c6bd831b8cf285516f11d74ddd6a676

data/.gitignore

@@ -6,7 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
-
+*.log
 
 
 # Created by https://www.gitignore.io/api/ruby,linux,rubymine+all

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    arkrb (0.1.0)
-      colorize
-      oga
+    arkrb (0.2.0)
+      colorize (~> 0.8.1)
+      oga (~> 2.14)
       thor (~> 0.20.0)
       yard (~> 0.9.12)
 

data/arkrb.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'yard', '~> 0.9.12'
-  spec.add_dependency 'oga', '~> 1.3', '>= 1.3.1'
+  spec.add_dependency 'oga', '~> 2.14'
   spec.add_runtime_dependency 'thor', '~> 0.20.0'
   spec.add_runtime_dependency 'colorize', '~> 0.8.1'
 

data/lib/arkrb.rb

@@ -28,12 +28,9 @@ module Arkrb
 
     Arkrb::ErrorParsing.new.sanitize!(command, errors) unless errors.strip.empty?
 
-    # todo: Remove the sanatize equals true line below.
-    sanitize = true
-
     if sanitize
       output_parsing = Arkrb::OutputParsing.new
-      pp output_parsing.sanitize!(command, output)
+      output_parsing.sanitize!(command, output)
     else
       puts output
       puts errors

data/lib/arkrb/error.rb

@@ -46,6 +46,12 @@ module Arkrb
     class ModAlreadyExists < CustomError
     end
 
+    class PlayerNotFound < CustomError
+    end
+
+    class PlayerAlreadyExists < CustomError
+    end
+
   end
 
 end

data/lib/arkrb/output_parsing.rb

@@ -50,8 +50,7 @@ module Arkrb
 
     # @return [True, Exception]
     def restart(output)
-      if output =~ /#{'server has been stopped'}/im &&
-          output =~ /#{'the server is now running'}/im
+      if output =~ /#{'the server is now running'}/im
         true
       else
         raise_unknown_error(__method__.to_sym, output)
@@ -60,16 +59,24 @@ module Arkrb
 
     def status(output)
       status_items = {}
+      defaults = {
+          running: nil, pid: nil, listening: nil, name: nil,
+          players: nil, active_players: nil, online: nil,
+          arkservers_link: nil, build_id: nil, version: nil
+      }
+
       status = output.gsub(/\e\[([;\d]+)?m/, '')
       if status =~ /Server running/im
-        status = status.split("\n").map {|s| s.strip }
+        status = status.split("\n").map {|s| s.strip}
         status.shift
         status.each do |item|
           item_info = item.split(':', 2)
-          status_items[item_info.first.gsub('Server', '').strip.downcase.tr(' ', '_').to_sym] = item_info[1].strip
+          status_items[item_info.first.gsub('Server ', '').strip.downcase.tr(' ', '_').to_sym] = item_info[1].strip
         end
-        status_items[:arkservers_link] = status_items.delete(:arks_link)
-        status_items
+        status_items[:running] = (status_items.fetch(:running, 'no') =~ /yes/im) ? true : false
+        status_items[:listening] = (status_items.fetch(:listening, 'no') =~ /yes/im) ? true : false
+        status_items[:online] = (status_items.fetch(:online, 'no') =~ /yes/im) ? true : false
+        defaults.merge(status_items)
       else
         raise_unknown_error(__method__.to_sym, output)
       end
@@ -163,9 +170,9 @@ module Arkrb
     end
 
     # @return [Object]
-    # def rcon_cmd(output)
-    #   arkmanager_exec(:rcon, command)
-    # end
+    def rconcmd(output)
+      output
+    end
 
     # @return [Boolean]
     # def update_available?(output)

data/lib/arkrb/server.rb

@@ -4,6 +4,7 @@ require 'open-uri'
 require 'arkrb'
 require 'arkrb/error'
 require 'arkrb/server/mods'
+require 'arkrb/server/player'
 module Arkrb
   class Server
 
@@ -85,7 +86,34 @@ module Arkrb
 
     # @return [Object]
     def rcon_cmd(command)
-      arkmanager_exec(:rcon, command)
+      arkmanager_exec(:rconcmd, command.to_s)
+    end
+
+    def get_player_list
+      sanitize_filter = @sanitize_output
+      @sanitize_output = true
+      users = []
+      player_list = rcon_cmd('ListPlayers')
+                        .split("\n")
+                        .map {|m| m.delete('\\"').strip}
+                        .reject(&:empty?)
+      player_list.delete_if {|x| x =~ /Running command/im}
+      if player_list.count == 1 && player_list.first =~ /no/im
+        users << Player.new(player_list.first, player_list.first, player_list.first)
+      else
+        player_list.map! {|p| %i(name steam_id).zip(p.gsub!(/^[0-9]+. /im, '').split(', ')).to_h}
+        player_list.each do |u|
+          player_id = rcon_cmd("GetPlayerIDForSteamID #{u[:steam_id].to_i}")
+                          .split("\n")
+                          .delete_if {|x| x =~ /Running command/im}
+                          .map! {|x| x.delete('\\"').strip}
+                          .reject(&:empty?)
+                          .first.split('PlayerID: ').last
+          users << Player.new(u[:name], u[:steam_id], player_id)
+        end
+      end
+      @sanitize_output = sanitize_filter
+      users
     end
 
     # @return [Boolean]
@@ -99,7 +127,7 @@ module Arkrb
     end
 
     def mod_list
-      @mod_list ||=  Arkrb::Mods.new
+      @mod_list ||= Arkrb::Mods.new
     end
 
     private
@@ -109,25 +137,4 @@ module Arkrb
     end
 
   end
-end
-
-# server = Arkrb::Server.new('main')
-# server.mod_list.add(731604991)
-#
-# pp server
-#
-# pp server.mod_list.to_h
-#
-#
-#
-#     mod_list = Arkrb::Mods.new
-#
-# pp mod_list
-# mod_a = 731604991
-# mod_b = 812655342
-#
-# mod_list.add(731604991)
-# mod_list.add(812655342)
-# pp mod_list.to_h
-# # mod_list.add(731604991)
-# # pp mod_list.find_by_id(mod_a).to_h
+end

data/lib/arkrb/server/player.rb

@@ -0,0 +1,20 @@
+class Player
+  def initialize(name, steam_id, player_id)
+    @name = name
+    @steam_id = steam_id
+    @player_id = player_id
+  end
+
+  attr :name, :steam_id, :player_id
+
+  def to_h
+    {
+        name: name,
+        steam_id: steam_id,
+        player_id: player_id
+    }
+  end
+
+  alias_method :to_hash, :to_h
+
+end

data/lib/arkrb/version.rb

@@ -1,3 +1,3 @@
 module Arkrb
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arkrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Bruno
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +167,7 @@ files:
 - lib/arkrb/server.rb
 - lib/arkrb/server/mod.rb
 - lib/arkrb/server/mods.rb
+- lib/arkrb/server/player.rb
 - lib/arkrb/version.rb
 homepage: https://github.com/mbround18/ark_rb
 licenses: