selective-ruby-core 0.1.8-arm64-darwin → 0.2.0-arm64-darwin

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
2
  SHA256:
3
- metadata.gz: e952eb63c5251c16e0923e82ad0650e0a983afb0b4c01e100567778a4df9ccbc
4
- data.tar.gz: bc3d75e86bfe37bc21722bbc7afbf6429e5ee27f149b77bf9fa22f34734b36ab
3
+ metadata.gz: 0a1834d0cad8044c524a62aa1aefad3cb7708e7393b1d5f92142801ff95bf2c5
4
+ data.tar.gz: 3f09d5d3467e2a175184cb80b7fdec2cbbbb926328af80328f18a4138fb4f59e
5
5
  SHA512:
6
- metadata.gz: bab488e14df432f6947e7b0583fb591fe9e1333c2882cfba5df80fd3ac401bea6f00c069e5b2cc31ada65a8a091fe73443490a342d642ae844f1934c98b9a89d
7
- data.tar.gz: e0e37bc55905a66786991988bd14694071c1ae114d4913151db2f4831184ed8cb5f7b5f71942cb8eb516cc1965d0a6e8d78dc4c5c0601628b05c5c89ad06d173
6
+ metadata.gz: 47418ce6ca81db5afe4afdcc6328a5b26aa6f24a3040809a70dc341b82eb87413ad29b195eb8be4a0cb695ca0beb838f8257604510d43d02070afa6d54e9b2bc
7
+ data.tar.gz: ee062146688a71ea8e62202efe2a5b46c071fc437d13c47f7336ded9ace5c8e2a591a73f0bc5248f85487acffc76a2a73e657cc128a1365ded71ad9a8ff7ff33
data/lib/bin/build_env.sh CHANGED
@@ -33,6 +33,8 @@ fi
33
33
  # Output the JSON
34
34
  cat <<EOF
35
35
  {
36
+ "api_key": "$SELECTIVE_API_KEY",
37
+ "host": "${SELECTIVE_HOST:-wss://app.selective.ci}",
36
38
  "platform": "$platform",
37
39
  "branch": "$branch",
38
40
  "pr_title": "$SELECTIVE_PR_TITLE",
@@ -42,6 +44,8 @@ cat <<EOF
42
44
  "run_id": "$run_id",
43
45
  "run_attempt": "$run_attempt",
44
46
  "commit_message": "$(git log --format=%s -n 1 $sha)",
45
- "runner_id": "$runner_id"
47
+ "runner_id": "$runner_id",
48
+ "committer_name": "$(git show -s --format='%an' -n 1 $sha)",
49
+ "committer_email": "$(git show -s --format='%ae' -n 1 $sha)"
46
50
  }
47
51
  EOF
@@ -9,6 +9,14 @@ module Selective
9
9
  include Helper
10
10
  @@selective_suppress_reporting = false
11
11
 
12
+ REQUIRED_CONFIGURATION = {
13
+ "host" => "SELECTIVE_HOST",
14
+ "api_key" => "SELECTIVE_API_KEY",
15
+ "platform" => "SELECTIVE_PLATFORM",
16
+ "run_id" => "SELECTIVE_RUN_ID",
17
+ "branch" => "SELECTIVE_BRANCH"
18
+ }.freeze
19
+
12
20
  def initialize(runner, debug: false, log: false)
13
21
  @debug = debug
14
22
  @runner = runner
@@ -101,12 +109,8 @@ module Selective
101
109
 
102
110
  def transport_url(reconnect: false)
103
111
  @transport_url ||= begin
104
- api_key = ENV.fetch("SELECTIVE_API_KEY")
105
- host = ENV.fetch("SELECTIVE_HOST", "wss://app.selective.ci")
106
-
107
- # Validate that host is a valid websocket url(starts with ws:// or wss://)
108
- raise "Invalid host: #{host}" unless host.match?(/^wss?:\/\//)
109
-
112
+ api_key = build_env.delete("api_key")
113
+ host = build_env.delete("host")
110
114
  run_id = build_env.delete("run_id")
111
115
  run_attempt = build_env.delete("run_attempt")
112
116
  run_attempt = SecureRandom.uuid if run_attempt.nil? || run_attempt.empty?
@@ -134,7 +138,20 @@ module Selective
134
138
  def build_env
135
139
  @build_env ||= begin
136
140
  result = `#{File.join(ROOT_GEM_PATH, "lib", "bin", "build_env.sh")}`
137
- JSON.parse(result)
141
+ JSON.parse(result).tap do |env|
142
+ validate_build_env(env)
143
+ end
144
+ end
145
+ end
146
+
147
+ def validate_build_env(env)
148
+ missing = REQUIRED_CONFIGURATION.each_with_object([]) do |(key, env_var), arry|
149
+ arry << env_var if env[key].nil? || env[key].empty?
150
+ end
151
+
152
+ with_error_handling do
153
+ raise "Missing required environment variables: #{missing.join(", ")}" unless missing.empty?
154
+ raise "Invalid host: #{env['host']}" unless env['host'].match?(/^wss?:\/\//)
138
155
  end
139
156
  end
140
157
 
@@ -220,9 +237,11 @@ module Selective
220
237
  end
221
238
 
222
239
  def handle_command(data)
223
- send("handle_#{data[:command]}", data)
224
- rescue NoMethodError
225
- raise "Unknown command received: #{data[:command]}" if debug?
240
+ if respond_to? "handle_#{data[:command]}", true
241
+ send("handle_#{data[:command]}", data)
242
+ else
243
+ raise "Unknown command received: #{data[:command]}" if debug?
244
+ end
226
245
  end
227
246
 
228
247
  def handle_print_notice(data)
@@ -262,7 +281,7 @@ module Selective
262
281
  def handle_close(data)
263
282
  exit_status = data[:exit_status]
264
283
  self.class.restore_reporting!
265
- runner.finish unless exit_status.is_a?(Integer)
284
+ with_error_handling { runner.finish } unless exit_status.is_a?(Integer)
266
285
 
267
286
  kill_transport
268
287
  pipe.delete_pipes
@@ -3,7 +3,7 @@
3
3
  module Selective
4
4
  module Ruby
5
5
  module Core
6
- VERSION = "0.1.8"
6
+ VERSION = "0.2.0"
7
7
  end
8
8
  end
9
9
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: selective-ruby-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8
4
+ version: 0.2.0
5
5
  platform: arm64-darwin
6
6
  authors:
7
7
  - Benjamin Wood
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2024-01-05 00:00:00.000000000 Z
12
+ date: 2024-01-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: zeitwerk