overlook-csgo 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c589e51df4df33aa3df5fd0567e68f3523d3fa2
-  data.tar.gz: 42af28212e75f9dd36803373850d30ac978ae64b
+  metadata.gz: 657c4187f2479e74f779d4b27fe5a9d5ea1e655b
+  data.tar.gz: 68afc5c4f2b6bf19c78d577e00638046bc4ec35f
 SHA512:
-  metadata.gz: feb1c94c5bad6ea0394c3af67271dc99c82c7083413aac67eba859ad9d00182bc33e7f7fffd4faaee9db73d64186ca0dceb631c3efe33a00061a1f318f93a31b
-  data.tar.gz: ff4e2db1be562e5ed52e5eb10c661b25db4c79e70f1964b128bf7fa586fc725903003f4dd34a5bc8d6db172e5c671edd2fcb8d57e10fbd0cb4f3abd9b39be76d
+  metadata.gz: 39075a1b4d4aa8f615d2f3774131714827d64d7775eb9e2115832175ef3dcc3dbc7e74770ecfda175d45ecaf525cc42c434333ab5a93a8cfc48b52b3a117b7a7
+  data.tar.gz: f5cde04548a0131510274749bd4a814568a8b51d5c2da7678781b6ad2054b601114d966aa3be1d2990446787b92f85bd9464b8a047f5d56f0455347f86df8f24

data/.travis.yml

@@ -0,0 +1,20 @@
+language: ruby
+rvm:
+ - 2.2.3
+ - 2.3.0
+before_install:
+  - ls -a
+  - pwd
+  - git clone https://github.com/github/git-lfs.git
+  - cd git-lfs
+  - git checkout 05666983c2e19664b8fc47c30b767ec160e3fea5
+  - script/bootstrap
+  - cd ..
+  - ls -a
+  - pwd
+  - git-lfs/bin/git-lfs init
+  - git-lfs/bin/git-lfs env
+  - git-lfs/bin/git-lfs pull
+install:
+  - bundle
+script: rake spec:all

data/README.md

@@ -7,7 +7,7 @@ Ruby access to CS:GO demo files.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'overlook'
+gem 'overlook-csgo'
 ```
 
 And then execute:
@@ -16,7 +16,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install overlook
+    $ gem install overlook-csgo
 
 ## Usage
 

data/Rakefile

@@ -1,44 +1,9 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec
-
-namespace :proto do
-  desc 'Update the generated proto'
-  task :update do
-    proto_version = '2.6.0'
-
-    FileUtils.mkdir_p('./lib/proto/proto')
-    FileUtils.mkdir_p('./lib/proto/compiled')
-
-    base_url = "https://raw.githubusercontent.com/SteamRE/SteamKit/master/Resources/Protobufs/csgo/"
-    protos   = %w(cstrike15_gcmessages.proto cstrike15_usermessages.proto netmessages.proto steammessages.proto)
-
-    Dir.chdir('./lib/proto/proto') do
-      protos.each do |file|
-        `curl -O #{base_url}/#{file}`
-      end
-
-      `curl -L https://github.com/google/protobuf/archive/v#{proto_version}.tar.gz -o protobuf.tar.gz`
-      `rm -f protobuf.tar`
-      `gunzip protobuf.tar.gz`
-      `tar -xvzf protobuf.tar`
-
-      protos.each do |file|
-        `protoc --beefcake_out ../compiled -I . -I protobuf-#{proto_version}/src #{file}`
-
-        %w(key_t class_t sendprop_t descriptor_t sounddata_t).each do |broken|
-          fixed = broken
-          fixed[0] = fixed[0].capitalize
-
-          `sed 's/#{broken}/#{fixed}/g' #{file}`
-        end
-      end
-    end
+load './lib/tasks/proto.rake'
+load './lib/tasks/spec.rake'
 
+RSpec::Core::RakeTask.new(:spec)
 
-    puts "**** Beefcake generates some invalid Ruby, the generated files may need small hand corrections ****"
-  end
-end
+task default: 'spec:fast'

data/lib/overlook.rb

@@ -1,3 +1,5 @@
+require 'steamidlib'
+
 require 'overlook/version'
 require 'overlook/csgo'
 
@@ -10,8 +12,6 @@ require 'proto/compiled/netmessages.pb'
 require 'proto/compiled/cstrike15_gcmessages.pb'
 require 'proto/compiled/cstrike15_usermessages.pb'
 
-require 'steamidlib'
-
 module Overlook
   def self.decode_share_code(code)
     decoder = Csgo::SharecodeDecoder.new(code)

data/lib/overlook/csgo/demo.rb

@@ -15,7 +15,6 @@ require 'overlook/csgo/demo/game_event_list_message_handler'
 require 'overlook/csgo/demo/game_event_message_handler'
 require 'overlook/csgo/demo/encrypted_data_handler'
 
-require 'overlook/csgo/demo/command_factory'
 require 'overlook/csgo/demo/packet_factory'
 
 module Overlook

data/lib/overlook/csgo/demo/command.rb

@@ -27,6 +27,14 @@ module Overlook
           @tick = 0 unless packet?
         end
 
+        def self.from_io(reader)
+          cmd         = reader.byte
+          tick        = reader.signed_int32
+          slot        = reader.byte
+
+          new(cmd, tick, slot)
+        end
+
         def type
           case @type
           when Command::TYPE::PACKET, Command::TYPE::SIGNON
@@ -43,7 +51,7 @@ module Overlook
         end
 
         def unknown?
-          type == :stop
+          type == :unknown
         end
 
         def stop?

data/lib/overlook/csgo/demo/header.rb

@@ -3,14 +3,16 @@ module Overlook
   module Csgo
     module Demo
       class Header
+        InvalidHeader = Class.new(StandardError)
+
         MAX_STRING_LENGTH = 260.freeze
 
-        attr_accessor :map_name
+        attr_reader :map_name, :ticks
 
-        def initialize(map_name)
+        def initialize(map_name, ticks)
           raise ArgumentError 'map_name can\'t be nil' if map_name.nil?
-
-          @map_name       = map_name
+          @map_name = map_name
+          @ticks = ticks
         end
 
         def to_hash
@@ -34,10 +36,10 @@ module Overlook
           frames           = reader.signed_int32
           signon_length    = reader.signed_int32
 
-          raise InvalidDemo, "#{self.class.name} only supports HL2DEMO, got #{stamp}" if stamp !~ /hl2demo/i
-          raise InvalidDemo, "#{self.class.name} only supports Valve demo files." if server_name !~ /valve/i
+          raise InvalidHeader, "#{self.class.name} only supports HL2DEMO, got #{stamp}" if stamp !~ /hl2demo/i
+          raise InvalidHeader, "#{self.class.name} only supports Valve demo files." if server_name !~ /valve/i
 
-          new(map_name)
+          new(map_name, ticks)
         end
       end
     end

data/lib/overlook/csgo/demo/parser.rb

@@ -44,7 +44,7 @@ module Overlook
           packet_handler = PacketHandler.new(self)
 
           loop do
-            command = CommandFactory.from_io(reader)
+            command = Command.from_io(reader)
 
             next if command.sync?
             break if command.stop?

data/lib/overlook/csgo/match_info_decoder.rb

@@ -1,5 +1,4 @@
 require 'stringio'
-require 'steamidlib'
 
 module Overlook
   module Csgo

data/lib/overlook/version.rb

@@ -1,3 +1,3 @@
 module Overlook
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/lib/proto/compiled/netmessages.pb.rb

@@ -69,6 +69,7 @@ module SVC_Messages
   svc_CmdKeyValues = 34
   svc_EncryptedData = 35
   svc_HltvReplay = 36
+  svc_Broadcast_Command = 38
 end
 
 module ReplayEventType_t
@@ -318,6 +319,10 @@ class CCLCMsg_HltvReplay
   include Beefcake::Message
 end
 
+class CSVCMsg_Broadcast_Command
+  include Beefcake::Message
+end
+
 class CMsgVector
   optional :x, :float, 1
   optional :y, :float, 2
@@ -723,3 +728,7 @@ class CCLCMsg_HltvReplay
   optional :primary_target_ent_index, :int32, 4
   optional :event_time, :float, 5
 end
+
+class CSVCMsg_Broadcast_Command
+  optional :cmd, :string, 1
+end

data/lib/tasks/proto.rake

@@ -0,0 +1,27 @@
+namespace :proto do
+  desc 'Update the generated proto'
+  task :update do
+    proto_version = '2.6.0'
+
+    FileUtils.mkdir_p('./lib/proto/proto')
+    FileUtils.mkdir_p('./lib/proto/compiled')
+
+    base_url = "https://raw.githubusercontent.com/SteamRE/SteamKit/master/Resources/Protobufs/csgo/"
+    protos   = %w(cstrike15_gcmessages.proto cstrike15_usermessages.proto netmessages.proto steammessages.proto)
+
+    Dir.chdir('./lib/proto/proto') do
+      protos.each do |file|
+        `curl -O #{base_url}/#{file}`
+      end
+
+      `curl -L https://github.com/google/protobuf/archive/v#{proto_version}.tar.gz -o protobuf.tar.gz`
+      `rm -f protobuf.tar`
+      `gunzip protobuf.tar.gz`
+      `tar -xvzf protobuf.tar`
+
+      protos.each do |file|
+        `protoc --beefcake_out ../compiled -I . -I protobuf-#{proto_version}/src #{file}`
+      end
+    end
+  end
+end

data/lib/tasks/spec.rake

@@ -0,0 +1,11 @@
+namespace :spec do
+  desc 'Run all the tests'
+  task :all do
+    exec("rspec .")
+  end
+
+  desc 'Run only the fast tests'
+  task :fast do
+    exec("rspec . --tag ~slow")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overlook-csgo
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Taylor Finnell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -146,7 +146,7 @@ files:
 - ".gitattributes"
 - ".gitignore"
 - ".rspec"
-- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -161,7 +161,6 @@ files:
 - lib/overlook/csgo/demo.rb
 - lib/overlook/csgo/demo/base.rb
 - lib/overlook/csgo/demo/command.rb
-- lib/overlook/csgo/demo/command_factory.rb
 - lib/overlook/csgo/demo/encrypted_data_handler.rb
 - lib/overlook/csgo/demo/game_event_list_message_handler.rb
 - lib/overlook/csgo/demo/game_event_message_handler.rb
@@ -181,6 +180,8 @@ files:
 - lib/proto/compiled/descriptor.pb.rb
 - lib/proto/compiled/netmessages.pb.rb
 - lib/proto/compiled/steammessages.pb.rb
+- lib/tasks/proto.rake
+- lib/tasks/spec.rake
 - overlook-csgo.gemspec
 homepage: http://github.com/taylorfinnell/overlook
 licenses: []
@@ -201,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby access to CS:GO demo files.

data/.ruby-version

@@ -1 +0,0 @@
-2.2.3

data/lib/overlook/csgo/demo/command_factory.rb

@@ -1,15 +0,0 @@
-module Overlook
-  module Csgo
-    module Demo
-      class CommandFactory
-        def self.from_io(reader)
-          cmd         = reader.byte
-          tick        = reader.signed_int32
-          slot        = reader.byte
-
-          Command.new(cmd, tick, slot)
-        end
-      end
-    end
-  end
-end