hive-stalker 0.1.2 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: dbb396653951a206bca6b8e264ab0b01a3ba2fb9
4
- data.tar.gz: 72e9a8e985965ca686ce62253efa42212cdb502c
2
+ SHA256:
3
+ metadata.gz: 680174946cee915b68f32d6e6963e7634eee6d4ff233ce168fea839c2ce42f38
4
+ data.tar.gz: 62211fd3df968d77089d0c9f5ab6d0c42fa32312679b980b3978139e9dd09db9
5
5
  SHA512:
6
- metadata.gz: f311d7d466dd2496ba2aba89f40abf5901e42719c5d8b10606b24ed236d8d6a4ff23a5c9db02067d2b2cb609a36c09272690dee7459b460258f706af39919c95
7
- data.tar.gz: eac2cdf74f31757acae31e029a29fbd94bd3438e8271269a0ca1c60ed3e70dbb1fb29d90b4f9926ffa653cfd31cc20073d10e9a3aac4619f99c95477e27d5a78
6
+ metadata.gz: a8c520b55a9ca8b062ef38d2cf4e11c078927573f40bc15bb7651da3be6f73d9372c56639f358238adba54580f43c4b46e845b1a8b2a4c27dc6402454d180f52
7
+ data.tar.gz: 96eb5d47d0be3c0a5f8ba8b3ba83ea54c18fcb9d76de1deda87233f7bf6a88344e49341fc35a700e56a486da2cac913fea50686f14e5fa91a793d2994a17e903
@@ -0,0 +1,43 @@
1
+ # Ruby CircleCI 2.0 configuration file
2
+ #
3
+ # Check https://circleci.com/docs/2.0/language-ruby/ for more details
4
+ #
5
+ version: 2
6
+ jobs:
7
+ build:
8
+ docker:
9
+ - image: circleci/ruby:2.4.1
10
+
11
+ steps:
12
+ - checkout
13
+
14
+ - restore_cache:
15
+ keys:
16
+ - v1-dependencies-{{ checksum "hive-stalker.gemspec" }}
17
+ # fallback to using the latest cache if no exact match is found
18
+ - v1-dependencies-
19
+
20
+ - run:
21
+ name: Install Dependencies
22
+ command: |
23
+ bundle install --jobs=4 --retry=3 --path vendor/bundle
24
+
25
+ - save_cache:
26
+ paths:
27
+ - ./vendor/bundle
28
+ key: v1-dependencies-{{ checksum "hive-stalker.gemspec" }}
29
+
30
+ - run:
31
+ name: Run Tests
32
+ command: |
33
+ mkdir /tmp/test-results
34
+ bundle exec rspec --format RspecJunitFormatter \
35
+ --out /tmp/test-results/rspec.xml \
36
+ --format progress
37
+
38
+ - store_test_results:
39
+ path: /tmp/test-results
40
+
41
+ - store_artifacts:
42
+ path: /tmp/test-results
43
+ destination: test-results
@@ -19,6 +19,50 @@ glance - what to expact from upgrading to a new version.
19
19
  ### Removed
20
20
 
21
21
 
22
+ ## [0.3.0] - 2020-11-01
23
+
24
+ ### Added
25
+
26
+ - Support for per-team and per-position (field & commander) skill values
27
+ - Support for skill tiers
28
+ - `PlayerData#specific_skills` which returns a struct with such-computed values
29
+ - `PlayerData#specific_skill_tiers` which returns a struct with such-computed skill tiers
30
+
31
+
32
+ ## [0.2.0] - 2019-03-04
33
+
34
+ ### Added
35
+
36
+ - Support for latitude / longitude / country fields.
37
+
38
+ ### Removed
39
+
40
+ - Support for now-removed `badges_enabled` field.
41
+
42
+
43
+ ## [0.1.5] - 2016-01-15
44
+
45
+ ### Fixed
46
+
47
+ - Fixed account IDs starting with 765 being treated as a Steam ID 64.
48
+
49
+
50
+ ## [0.1.4] - 2016-12-31
51
+
52
+ ### Fixed
53
+
54
+ - Fixed case-sensitivity of Steam ID resolving.
55
+ - Fixed resolving of Steam IDs of the form STEAM_1:..., as opposed to STEAM_0:...
56
+
57
+
58
+ ## [0.1.3] - 2016-12-26
59
+
60
+ ### Fixed
61
+
62
+ - HiveStalker::SteamID.from_string did not support account IDs with less than
63
+ eight digits.
64
+
65
+
22
66
  ## [0.1.2] - 2016-12-25
23
67
 
24
68
  ### Changed
data/LICENSE ADDED
@@ -0,0 +1,201 @@
1
+ Apache License
2
+ Version 2.0, January 2004
3
+ http://www.apache.org/licenses/
4
+
5
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
+
7
+ 1. Definitions.
8
+
9
+ "License" shall mean the terms and conditions for use, reproduction,
10
+ and distribution as defined by Sections 1 through 9 of this document.
11
+
12
+ "Licensor" shall mean the copyright owner or entity authorized by
13
+ the copyright owner that is granting the License.
14
+
15
+ "Legal Entity" shall mean the union of the acting entity and all
16
+ other entities that control, are controlled by, or are under common
17
+ control with that entity. For the purposes of this definition,
18
+ "control" means (i) the power, direct or indirect, to cause the
19
+ direction or management of such entity, whether by contract or
20
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+ outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+ "You" (or "Your") shall mean an individual or Legal Entity
24
+ exercising permissions granted by this License.
25
+
26
+ "Source" form shall mean the preferred form for making modifications,
27
+ including but not limited to software source code, documentation
28
+ source, and configuration files.
29
+
30
+ "Object" form shall mean any form resulting from mechanical
31
+ transformation or translation of a Source form, including but
32
+ not limited to compiled object code, generated documentation,
33
+ and conversions to other media types.
34
+
35
+ "Work" shall mean the work of authorship, whether in Source or
36
+ Object form, made available under the License, as indicated by a
37
+ copyright notice that is included in or attached to the work
38
+ (an example is provided in the Appendix below).
39
+
40
+ "Derivative Works" shall mean any work, whether in Source or Object
41
+ form, that is based on (or derived from) the Work and for which the
42
+ editorial revisions, annotations, elaborations, or other modifications
43
+ represent, as a whole, an original work of authorship. For the purposes
44
+ of this License, Derivative Works shall not include works that remain
45
+ separable from, or merely link (or bind by name) to the interfaces of,
46
+ the Work and Derivative Works thereof.
47
+
48
+ "Contribution" shall mean any work of authorship, including
49
+ the original version of the Work and any modifications or additions
50
+ to that Work or Derivative Works thereof, that is intentionally
51
+ submitted to Licensor for inclusion in the Work by the copyright owner
52
+ or by an individual or Legal Entity authorized to submit on behalf of
53
+ the copyright owner. For the purposes of this definition, "submitted"
54
+ means any form of electronic, verbal, or written communication sent
55
+ to the Licensor or its representatives, including but not limited to
56
+ communication on electronic mailing lists, source code control systems,
57
+ and issue tracking systems that are managed by, or on behalf of, the
58
+ Licensor for the purpose of discussing and improving the Work, but
59
+ excluding communication that is conspicuously marked or otherwise
60
+ designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+ "Contributor" shall mean Licensor and any individual or Legal Entity
63
+ on behalf of whom a Contribution has been received by Licensor and
64
+ subsequently incorporated within the Work.
65
+
66
+ 2. Grant of Copyright License. Subject to the terms and conditions of
67
+ this License, each Contributor hereby grants to You a perpetual,
68
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+ copyright license to reproduce, prepare Derivative Works of,
70
+ publicly display, publicly perform, sublicense, and distribute the
71
+ Work and such Derivative Works in Source or Object form.
72
+
73
+ 3. Grant of Patent License. Subject to the terms and conditions of
74
+ this License, each Contributor hereby grants to You a perpetual,
75
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+ (except as stated in this section) patent license to make, have made,
77
+ use, offer to sell, sell, import, and otherwise transfer the Work,
78
+ where such license applies only to those patent claims licensable
79
+ by such Contributor that are necessarily infringed by their
80
+ Contribution(s) alone or by combination of their Contribution(s)
81
+ with the Work to which such Contribution(s) was submitted. If You
82
+ institute patent litigation against any entity (including a
83
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+ or a Contribution incorporated within the Work constitutes direct
85
+ or contributory patent infringement, then any patent licenses
86
+ granted to You under this License for that Work shall terminate
87
+ as of the date such litigation is filed.
88
+
89
+ 4. Redistribution. You may reproduce and distribute copies of the
90
+ Work or Derivative Works thereof in any medium, with or without
91
+ modifications, and in Source or Object form, provided that You
92
+ meet the following conditions:
93
+
94
+ (a) You must give any other recipients of the Work or
95
+ Derivative Works a copy of this License; and
96
+
97
+ (b) You must cause any modified files to carry prominent notices
98
+ stating that You changed the files; and
99
+
100
+ (c) You must retain, in the Source form of any Derivative Works
101
+ that You distribute, all copyright, patent, trademark, and
102
+ attribution notices from the Source form of the Work,
103
+ excluding those notices that do not pertain to any part of
104
+ the Derivative Works; and
105
+
106
+ (d) If the Work includes a "NOTICE" text file as part of its
107
+ distribution, then any Derivative Works that You distribute must
108
+ include a readable copy of the attribution notices contained
109
+ within such NOTICE file, excluding those notices that do not
110
+ pertain to any part of the Derivative Works, in at least one
111
+ of the following places: within a NOTICE text file distributed
112
+ as part of the Derivative Works; within the Source form or
113
+ documentation, if provided along with the Derivative Works; or,
114
+ within a display generated by the Derivative Works, if and
115
+ wherever such third-party notices normally appear. The contents
116
+ of the NOTICE file are for informational purposes only and
117
+ do not modify the License. You may add Your own attribution
118
+ notices within Derivative Works that You distribute, alongside
119
+ or as an addendum to the NOTICE text from the Work, provided
120
+ that such additional attribution notices cannot be construed
121
+ as modifying the License.
122
+
123
+ You may add Your own copyright statement to Your modifications and
124
+ may provide additional or different license terms and conditions
125
+ for use, reproduction, or distribution of Your modifications, or
126
+ for any such Derivative Works as a whole, provided Your use,
127
+ reproduction, and distribution of the Work otherwise complies with
128
+ the conditions stated in this License.
129
+
130
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
131
+ any Contribution intentionally submitted for inclusion in the Work
132
+ by You to the Licensor shall be under the terms and conditions of
133
+ this License, without any additional terms or conditions.
134
+ Notwithstanding the above, nothing herein shall supersede or modify
135
+ the terms of any separate license agreement you may have executed
136
+ with Licensor regarding such Contributions.
137
+
138
+ 6. Trademarks. This License does not grant permission to use the trade
139
+ names, trademarks, service marks, or product names of the Licensor,
140
+ except as required for reasonable and customary use in describing the
141
+ origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+ 7. Disclaimer of Warranty. Unless required by applicable law or
144
+ agreed to in writing, Licensor provides the Work (and each
145
+ Contributor provides its Contributions) on an "AS IS" BASIS,
146
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+ implied, including, without limitation, any warranties or conditions
148
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+ PARTICULAR PURPOSE. You are solely responsible for determining the
150
+ appropriateness of using or redistributing the Work and assume any
151
+ risks associated with Your exercise of permissions under this License.
152
+
153
+ 8. Limitation of Liability. In no event and under no legal theory,
154
+ whether in tort (including negligence), contract, or otherwise,
155
+ unless required by applicable law (such as deliberate and grossly
156
+ negligent acts) or agreed to in writing, shall any Contributor be
157
+ liable to You for damages, including any direct, indirect, special,
158
+ incidental, or consequential damages of any character arising as a
159
+ result of this License or out of the use or inability to use the
160
+ Work (including but not limited to damages for loss of goodwill,
161
+ work stoppage, computer failure or malfunction, or any and all
162
+ other commercial damages or losses), even if such Contributor
163
+ has been advised of the possibility of such damages.
164
+
165
+ 9. Accepting Warranty or Additional Liability. While redistributing
166
+ the Work or Derivative Works thereof, You may choose to offer,
167
+ and charge a fee for, acceptance of support, warranty, indemnity,
168
+ or other liability obligations and/or rights consistent with this
169
+ License. However, in accepting such obligations, You may act only
170
+ on Your own behalf and on Your sole responsibility, not on behalf
171
+ of any other Contributor, and only if You agree to indemnify,
172
+ defend, and hold each Contributor harmless for any liability
173
+ incurred by, or claims asserted against, such Contributor by reason
174
+ of your accepting any such warranty or additional liability.
175
+
176
+ END OF TERMS AND CONDITIONS
177
+
178
+ APPENDIX: How to apply the Apache License to your work.
179
+
180
+ To apply the Apache License to your work, attach the following
181
+ boilerplate notice, with the fields enclosed by brackets "[]"
182
+ replaced with your own identifying information. (Don't include
183
+ the brackets!) The text should be enclosed in the appropriate
184
+ comment syntax for the file format. We also recommend that a
185
+ file or class name and description of purpose be included on the
186
+ same "printed page" as the copyright notice for easier
187
+ identification within third-party archives.
188
+
189
+ Copyright 2017 Michael Senn
190
+
191
+ Licensed under the Apache License, Version 2.0 (the "License");
192
+ you may not use this file except in compliance with the License.
193
+ You may obtain a copy of the License at
194
+
195
+ http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+ Unless required by applicable law or agreed to in writing, software
198
+ distributed under the License is distributed on an "AS IS" BASIS,
199
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+ See the License for the specific language governing permissions and
201
+ limitations under the License.
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |spec|
6
6
  spec.name = "hive-stalker"
7
- spec.version = '0.1.2'
7
+ spec.version = '0.3.0'
8
8
  spec.authors = ["Michael Senn"]
9
9
  spec.email = ["michael@morrolan.ch"]
10
10
 
@@ -21,8 +21,9 @@ Gem::Specification.new do |spec|
21
21
  spec.add_dependency "typhoeus"
22
22
 
23
23
  spec.add_development_dependency "bundler", "~> 1.12"
24
- spec.add_development_dependency "rake", "~> 10.0"
24
+ spec.add_development_dependency "rake", "~> 12"
25
25
  spec.add_development_dependency "rspec", "~> 3.0"
26
- spec.add_development_dependency "yard"
26
+ spec.add_development_dependency "rspec_junit_formatter", "~> 0.3"
27
+ spec.add_development_dependency "yard", "~> 0.9"
27
28
  end
28
29
 
@@ -56,19 +56,27 @@ module HiveStalker
56
56
  score: raw_data.fetch('score'),
57
57
  level: raw_data.fetch('level'),
58
58
  experience: raw_data.fetch('xp'),
59
- badges_enabled: raw_data.fetch('badges_enabled'),
60
59
  badges: raw_data.fetch('badges') || [],
61
60
  # With legacy users (who have not played since introduction of
62
61
  # Hive2), skill can be a float value. Likely due to the
63
62
  # normalization of skills, which happened shortly after Hive2 went
64
63
  # live.
65
64
  skill: raw_data.fetch('skill').to_i,
65
+ skill_offset: raw_data.fetch('skill_offset').to_i,
66
+ comm_skill: raw_data.fetch('comm_skill').to_i,
67
+ comm_skill_offset: raw_data.fetch('comm_skill_offset').to_i,
66
68
  time_total: raw_data.fetch('time_played'),
67
69
  time_marine: raw_data.fetch('marine_playtime'),
68
70
  time_alien: raw_data.fetch('alien_playtime'),
69
71
  time_commander: raw_data.fetch('commander_time'),
70
72
  reinforced_tier: raw_data.fetch('reinforced_tier'),
71
- adagrad_sum: raw_data.fetch('adagrad_sum')
73
+ # For accounts with no Hive2 rounds on record, the adagrad sum will be null.
74
+ adagrad_sum: raw_data.fetch('adagrad_sum') || 0,
75
+ # For people without a single comm round on record since Hive3, the comm adagrad sum might be null.
76
+ comm_adagrad_sum: raw_data.fetch('comm_adagrad_sum') || 0,
77
+ latitude: raw_data.fetch('lat', 0).to_f,
78
+ longitude: raw_data.fetch('long', 0).to_f,
79
+ continent: raw_data.fetch('cont', ''),
72
80
  }
73
81
  rescue KeyError => e
74
82
  raise APIError, "Incomplete JSON received from API: #{ e.message }"
@@ -1,4 +1,11 @@
1
1
  module HiveStalker
2
+ SpecificSkill = Struct.new(:alien, :marine)
3
+ TeamSkill = Struct.new(:field, :field_estimate, :commander, :commander_estimate)
4
+
5
+ SkillTier = Struct.new(:name, :rank)
6
+ SpecificSkillTier = Struct.new(:alien, :marine)
7
+ TeamSkillTier = Struct.new(:field, :commander)
8
+
2
9
  # Container for various player statistics. Essentially a glorified struct.
3
10
  class PlayerData
4
11
  # Player ID, probably NS2/Hive2-internal.
@@ -25,20 +32,26 @@ module HiveStalker
25
32
  # @return [Fixnum]
26
33
  attr_reader :experience
27
34
 
28
- # Whether badges are enabled.
29
- #
30
- # Not sure where this comes from.
31
- # @return [TrueClass, FalseClass]
32
- attr_reader :badges_enabled
33
-
34
35
  # Array of badges. Always empty so far.
35
36
  # @return [Array]
36
37
  attr_reader :badges
37
38
 
38
- # Skill / ELO
39
+ # Field skill / ELO base value
39
40
  # @return [Fixnum]
40
41
  attr_reader :skill
41
42
 
43
+ # Field skill / ELO offset
44
+ # @return [Fixnum]
45
+ attr_reader :skill_offset
46
+
47
+ # Comm skill / ELO base value
48
+ # @return [Fixnum]
49
+ attr_reader :commander_skill
50
+
51
+ # Comm skill / ELO offset
52
+ # @return [Fixnum]
53
+ attr_reader :commander_skill_offset
54
+
42
55
  # Total time played in seconds.
43
56
  #
44
57
  # This equals {#time_marine} + {#time_alien}
@@ -61,31 +74,139 @@ module HiveStalker
61
74
  # @return [NilClass]
62
75
  attr_reader :reinforced_tier
63
76
 
64
- # AdaGrad sum (https://en.wikipedia.org/wiki/Stochastic_gradient_descent#AdaGrad).
77
+ # Field AdaGrad sum (https://en.wikipedia.org/wiki/Stochastic_gradient_descent#AdaGrad).
65
78
  # @return [Float]
66
79
  attr_reader :adagrad_sum
67
80
 
81
+ # Comm AdaGrad sum (https://en.wikipedia.org/wiki/Stochastic_gradient_descent#AdaGrad).
82
+ # @return [Float]
83
+ attr_reader :commander_adagrad_sum
84
+
85
+ # Geographical latitude
86
+ # @return [Float]
87
+ attr_reader :latitude
88
+
89
+ # Geographical longitude
90
+ # @return [Float]
91
+ attr_reader :longitude
92
+
93
+ # Continent
94
+ # @return [String]
95
+ attr_reader :continent
68
96
 
69
97
  # Initialize a new instance of the class.
70
98
  #
71
99
  # @param kwargs [Hash<Symbol, Object>] data with which to initialize the
72
100
  # instance's attributes.
73
101
  def initialize(**kwargs)
74
- @player_id = kwargs[:player_id]
75
- @steam_id = kwargs[:steam_id]
76
- @alias = kwargs[:alias]
77
- @score = kwargs[:score]
78
- @level = kwargs[:level]
79
- @experience = kwargs[:experience]
80
- @badges_enabled = kwargs[:badges_enabled]
81
- @badges = kwargs[:badges]
82
- @skill = kwargs[:skill]
83
- @time_total = kwargs[:time_total]
84
- @time_marine = kwargs[:time_marine]
85
- @time_alien = kwargs[:time_alien]
86
- @time_commander = kwargs[:time_commander]
87
- @reinforced_tier = kwargs[:reinforced_tier]
88
- @adagrad_sum = kwargs[:adagrad_sum]
102
+ @player_id = kwargs[:player_id]
103
+ @steam_id = kwargs[:steam_id]
104
+ @alias = kwargs[:alias]
105
+ @score = kwargs[:score]
106
+ @level = kwargs[:level]
107
+ @experience = kwargs[:experience]
108
+ @badges = kwargs[:badges]
109
+ @skill = kwargs[:skill]
110
+ @skill_offset = kwargs[:skill_offset]
111
+ @commander_skill = kwargs[:comm_skill]
112
+ @commander_skill_offset = kwargs[:comm_skill_offset]
113
+ @time_total = kwargs[:time_total]
114
+ @time_marine = kwargs[:time_marine]
115
+ @time_alien = kwargs[:time_alien]
116
+ @time_commander = kwargs[:time_commander]
117
+ @reinforced_tier = kwargs[:reinforced_tier]
118
+ @adagrad_sum = kwargs[:adagrad_sum]
119
+ @commander_adagrad_sum = kwargs[:comm_adagrad_sum]
120
+ @latitude = kwargs[:latitude]
121
+ @longitude = kwargs[:longitude]
122
+ @continent = kwargs[:continent]
123
+ end
124
+
125
+ # Returns per-team and per-position (field / commander) skills, including
126
+ # lower bounds for each.
127
+ def specific_skills
128
+ return SpecificSkill.new(
129
+ # Alien
130
+ TeamSkill.new(
131
+ # Field
132
+ [skill - skill_offset, 0].max,
133
+ skill_estimate(skill - skill_offset, adagrad_sum),
134
+
135
+ # Commander
136
+ [commander_skill - commander_skill_offset, 0].max,
137
+ skill_estimate(commander_skill - commander_skill_offset, commander_adagrad_sum),
138
+ ),
139
+
140
+ # Marine
141
+ TeamSkill.new(
142
+ # Field
143
+ skill + skill_offset,
144
+ skill_estimate(skill + skill_offset, adagrad_sum),
145
+
146
+ # Commander
147
+ commander_skill + commander_skill_offset,
148
+ skill_estimate(commander_skill + commander_skill_offset, commander_adagrad_sum),
149
+ ),
150
+ )
151
+ end
152
+
153
+ def specific_skill_tiers
154
+ skills = specific_skills
155
+
156
+ return SpecificSkillTier.new(
157
+ # Alien
158
+ TeamSkillTier.new(
159
+ # Field
160
+ skill_tier(skills.alien.field_estimate, level),
161
+ # Commander
162
+ skill_tier(skills.alien.commander_estimate, level),
163
+ ),
164
+
165
+ # Marine
166
+ TeamSkillTier.new(
167
+ # Field
168
+ skill_tier(skills.marine.field_estimate, level),
169
+ # Commander
170
+ skill_tier(skills.marine.commander_estimate, level),
171
+ ),
172
+ )
173
+ end
174
+
175
+ private
176
+ # Conservative estimate of a player's skill, using the sum of adagrad
177
+ # gradients. Works somewhat like a lower one-sided bound with indeterminate
178
+ # confidence.
179
+ def skill_estimate(skill_value, adagrad_sum_value)
180
+ # Use adagrad sum to get a lower bound for a player's skill.
181
+ [0, skill_value - 25 / Math.sqrt(adagrad_sum_value)].max
182
+ end
183
+
184
+ # Skill tier assignment based on skill estimate and level.
185
+ def skill_tier(skill_estimate, level)
186
+ if level < 20
187
+ SkillTier.new('Rookie', 0)
188
+
189
+ elsif skill_estimate < 301
190
+ SkillTier.new('Recruit', 1)
191
+
192
+ elsif skill_estimate < 751
193
+ SkillTier.new('Frontiersman', 2)
194
+
195
+ elsif skill_estimate < 1401
196
+ SkillTier.new('Squad Leader', 3)
197
+
198
+ elsif skill_estimate < 2101
199
+ SkillTier.new('Veteran', 4)
200
+
201
+ elsif skill_estimate < 2901
202
+ SkillTier.new('Commandant', 5)
203
+
204
+ elsif skill_estimate < 4101
205
+ SkillTier.new('Special Ops', 6)
206
+
207
+ else
208
+ SkillTier.new('Sanji Survivor', 7)
209
+ end
89
210
  end
90
211
  end
91
212
  end
@@ -3,10 +3,12 @@ module HiveStalker
3
3
  module SteamID
4
4
  STEAM_ID_64_OFFSET = 61197960265728
5
5
 
6
- PATTERN_STEAM_ID = /^STEAM_0:([0-9]):([0-9]+)$/
7
- PATTERN_STEAM_ID_3 = /^U:([0-9]{1,2}):([0-9]+)$/
8
- PATTERN_STEAM_ID_64 = /^765([0-9]+)$/
9
- PATTERN_ACCOUNT_ID = /^[0-9]{8}$/
6
+ PATTERN_STEAM_ID = /^STEAM_[0-9]:([0-9]):([0-9]+)$/i
7
+ PATTERN_STEAM_ID_3 = /^U:([0-9]{1,2}):([0-9]+)$/i
8
+ # Must have at least 14 chars, else ID_64 - OFFSET would be < 0.
9
+ PATTERN_STEAM_ID_64 = /^765([0-9]{11,})$/
10
+ # Not sure what its valid range is - exists with at least 7 and 8 numbers.
11
+ PATTERN_ACCOUNT_ID = /^[0-9]+$/
10
12
 
11
13
  # Convert Steam ID into account ID suitable for API calls.
12
14
  # @param s [String] Steam ID, either of:
@@ -22,10 +24,6 @@ module HiveStalker
22
24
  s = s.to_s
23
25
 
24
26
  # https://developer.valvesoftware.com/wiki/SteamID#Format
25
- PATTERN_ACCOUNT_ID.match(s) do |m|
26
- return s.to_i
27
- end
28
-
29
27
  PATTERN_STEAM_ID.match(s) do |m|
30
28
  return m[1].to_i + m[2].to_i * 2
31
29
  end
@@ -38,6 +36,11 @@ module HiveStalker
38
36
  return m[1].to_i - STEAM_ID_64_OFFSET
39
37
  end
40
38
 
39
+ # Matching this one last, as not to catch an ID 64 on accident.
40
+ PATTERN_ACCOUNT_ID.match(s) do |m|
41
+ return s.to_i
42
+ end
43
+
41
44
  # If we get until here, we did not match any regex.
42
45
  raise ArgumentError, "#{ s.inspect } is not a supported SteamID."
43
46
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hive-stalker
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Senn
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-12-24 00:00:00.000000000 Z
11
+ date: 2020-11-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: typhoeus
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '10.0'
47
+ version: '12'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '10.0'
54
+ version: '12'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rspec
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -66,38 +66,53 @@ dependencies:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '3.0'
69
+ - !ruby/object:Gem::Dependency
70
+ name: rspec_junit_formatter
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - "~>"
74
+ - !ruby/object:Gem::Version
75
+ version: '0.3'
76
+ type: :development
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - "~>"
81
+ - !ruby/object:Gem::Version
82
+ version: '0.3'
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: yard
71
85
  requirement: !ruby/object:Gem::Requirement
72
86
  requirements:
73
- - - ">="
87
+ - - "~>"
74
88
  - !ruby/object:Gem::Version
75
- version: '0'
89
+ version: '0.9'
76
90
  type: :development
77
91
  prerelease: false
78
92
  version_requirements: !ruby/object:Gem::Requirement
79
93
  requirements:
80
- - - ">="
94
+ - - "~>"
81
95
  - !ruby/object:Gem::Version
82
- version: '0'
83
- description:
96
+ version: '0.9'
97
+ description:
84
98
  email:
85
99
  - michael@morrolan.ch
86
100
  executables: []
87
101
  extensions: []
88
102
  extra_rdoc_files: []
89
103
  files:
104
+ - ".circleci/config.yml"
90
105
  - ".gitignore"
91
106
  - ".rspec"
92
107
  - CHANGELOG.md
93
108
  - Gemfile
109
+ - LICENSE
94
110
  - LICENSE.txt
95
111
  - README.md
96
112
  - Rakefile
97
113
  - TODO.md
98
114
  - bin/console
99
115
  - bin/setup
100
- - hive-stalker-0.1.0.gem
101
116
  - hive-stalker.gemspec
102
117
  - lib/hive_stalker.rb
103
118
  - lib/hive_stalker/api_error.rb
@@ -109,7 +124,7 @@ homepage: https://bitbucket.org/Lavode/hivestalker
109
124
  licenses:
110
125
  - Apache-2.0
111
126
  metadata: {}
112
- post_install_message:
127
+ post_install_message:
113
128
  rdoc_options: []
114
129
  require_paths:
115
130
  - lib
@@ -124,9 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
124
139
  - !ruby/object:Gem::Version
125
140
  version: '0'
126
141
  requirements: []
127
- rubyforge_project:
128
- rubygems_version: 2.5.2
129
- signing_key:
142
+ rubygems_version: 3.1.4
143
+ signing_key:
130
144
  specification_version: 4
131
145
  summary: Binding to Natural Selection 2's Hive2 ELO system
132
146
  test_files: []
Binary file