jatai 1.1.1 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 85dd80d5c12ea959ac8d685f7b8bc2a596faed4ba0c9f5a07f01293f99d90137
4
- data.tar.gz: 818d739c662c5f9b7688ec043811b28c46f603d8946f77835ca3c031485aed76
3
+ metadata.gz: 85122c82b155efd22ee855b4d8e538be1013e93cccbde96c19b695bbf2fbff96
4
+ data.tar.gz: 0bc52ba21340fc3c77f775373397d97a7f9ff194f17559817a34fb7e14045355
5
5
  SHA512:
6
- metadata.gz: 537ffd3a1bdf4b72aca0b220b02018dbac604fb2ebc3ad875bd4b2bdc27e7d616e1a5410e2b1ae7e01fe2a793d6c283b1fa78bd11561ae3531cc60cb38fe47e4
7
- data.tar.gz: a879c7f5503a474b9bf7f3ac654e83c0b9ed195558445a112aa4e86665e56e81eea9a0e46e307f36a0eaabc80204bd30b9638ead5f3548b9e204f32f212af4e4
6
+ metadata.gz: b9194f0bf98aedc96cf0357260ebc531c2ba82edc2e58ef36f42888fc9e7f8b330c5f86367a48cde2408c183ea12cd751e499c8c578c0f96d48c1531b3e1ecd0
7
+ data.tar.gz: 07bde3b740fcb1a5fedea4c0d5f0da6122000fbbbd1cb27fe4e8b0a9543f45279410eb335bc3564b9f13ad405f406e97bc11cae83f0396d93570815bd9e5460a
@@ -6,10 +6,10 @@ module Jatai
6
6
  module Commands
7
7
  class Up < Base
8
8
  POLL_INTERVAL = 5
9
- PROVISION_TIMEOUT = 1200
10
- DEPLOY_TIMEOUT = 1800
11
- PROVISION_MAX_POLLS = 240
12
- DEPLOY_MAX_POLLS = 360
9
+ PROVISION_TIMEOUT = 180
10
+ DEPLOY_TIMEOUT = 900
11
+ PROVISION_MAX_POLLS = 36
12
+ DEPLOY_MAX_POLLS = 180
13
13
 
14
14
  def execute(options = {})
15
15
  require_auth!
@@ -34,8 +34,9 @@ module Jatai
34
34
  info(" Na fila...")
35
35
 
36
36
  if wait_for_deploy_complete(slug, deploy["id"])
37
- subdomain = @app["subdomain"] || slug
38
- success("Deploy concluído! App disponível em https://#{subdomain}.usebrasa.com.br")
37
+ # URL canônica vem do servidor (marca nova). Fallback só p/ servidor antigo.
38
+ url = @app["url"] || "https://#{@app["subdomain"] || slug}.jataiapp.com.br"
39
+ success("Deploy concluído! App disponível em #{url}")
39
40
  end
40
41
  rescue Api::Client::ValidationError => e
41
42
  error("Erro ao criar app: #{e.message}")
@@ -188,6 +189,8 @@ module Jatai
188
189
  print "."
189
190
  show_elapsed(started) if (i % 12).zero? && i > 0
190
191
  sleep(POLL_INTERVAL)
192
+ rescue Api::Client::AuthenticationError
193
+ return session_expired
191
194
  rescue Faraday::Error, Errno::ECONNREFUSED, IO::TimeoutError
192
195
  print "!"
193
196
  sleep(POLL_INTERVAL)
@@ -213,6 +216,8 @@ module Jatai
213
216
  print "."
214
217
  show_elapsed(started) if (i % 12).zero? && i > 0
215
218
  sleep(POLL_INTERVAL)
219
+ rescue Api::Client::AuthenticationError
220
+ return session_expired
216
221
  rescue Faraday::Error, Errno::ECONNREFUSED, IO::TimeoutError
217
222
  print "!"
218
223
  sleep(POLL_INTERVAL)
@@ -221,6 +226,14 @@ module Jatai
221
226
  false
222
227
  end
223
228
 
229
+ # 401 no meio do acompanhamento: o token expirou, mas o deploy segue no
230
+ # servidor. Orienta o usuário em vez de estourar um erro seco.
231
+ def session_expired
232
+ error("\nSua sessão expirou durante o acompanhamento. O deploy continua no servidor.")
233
+ info("Rode `jatai login` e acompanhe com `jatai status`.")
234
+ false
235
+ end
236
+
224
237
  def status_label(status)
225
238
  { "pending" => "Aguardando...", "provisioning" => "Provisionando...",
226
239
  "queued" => "Na fila...", "building" => "Construindo imagem...",
data/lib/jatai/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Jatai
2
- VERSION = "1.1.1"
2
+ VERSION = "1.2.0"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jatai
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jataí Cloud