brasa 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f58d1ef47800a723afab0a3b260562f7704a4b72e0ac364471a0dcc2b0445078
-  data.tar.gz: c1c9063b7c415605ab60e4bf2deb7274e6780c4bcf7ed7ad755b609c24d2c845
+  metadata.gz: a728c8d3747051635cf62354d9e1be55a04e3d677a5f5df9f6c3b7bc45578a02
+  data.tar.gz: 79cbc855852b1dfcd5bb9d08aa2be22a8de867e5ef687b232abc741e719194b8
 SHA512:
-  metadata.gz: 60d66b1edd7299319e0ae56964e9b1595a18f7c49879aca09bdf02f5d023d256a31d3ce0d75719964fef60dfcbc55517497fb715ee2c778feacf3648b118742b
-  data.tar.gz: 10b6eed8ee2bf1236e28c83ab98d0d4151da0d3a59bb6efcfb01af585f92a24339a1a53bd7f7e01f5dfc24d7ef9a718e84b19211afda4e3425d5cd39c3ae7b9a
+  metadata.gz: 8288ced4e3c745f096703aa9bf7184c0508a7131e259615e8ad0393b5c8ad3ffe6f95a872e9fba14c377afa6fdde950293dafa8c167245e03cefd38441eec259
+  data.tar.gz: 65c522b9ab984069496ead760d8f8a476c07c82304972a03afca86beee84fe2aed0ce994b455e2dca82c986532327fb6b5a257cb375ba8ace19fdef1a082d5cf

data/lib/brasa/commands/deploy.rb

@@ -1,5 +1,6 @@
 require "brasa/commands/base"
 require "brasa/source_packer"
+require "tty-spinner"
 
 module Brasa
   module Commands
@@ -15,11 +16,13 @@ module Brasa
         info("Empacotando código...")
         archive_path = SourcePacker.pack
         size_kb = File.size(archive_path) / 1024
-        info("Enviando #{size_kb}KB para o servidor...")
 
+        spinner = TTY::Spinner.new("#{pastel.cyan("       Enviando #{size_kb}KB...")} :spinner", format: :dots)
+        spinner.auto_spin
         deploy = api.upload("/api/v1/apps/#{slug}/deploys",
           file_path: archive_path,
           params: { branch: options["branch"] || project_config[:branch] || "main" })
+        spinner.success(pastel.green("enviado!"))
         info("Deploy ##{deploy["id"]} criado.")
         info("       Na fila...")
 
@@ -36,7 +39,7 @@ module Brasa
         ws = connect_websocket
         started = Time.now
 
-        ws.on_log { |msg| print msg["line"] + "\n" if msg["line"] }
+        ws.on_log { |msg| print msg["line"] + "\n" if msg.is_a?(Hash) && msg["line"] }
         ws.subscribe("DeployLogChannel", deploy_id: deploy_id)
 
         status = ws.wait_for("DeployStatusChannel",

data/lib/brasa/commands/init.rb

@@ -6,11 +6,11 @@ module Brasa
   module Commands
     class Init < Base
       PRESETS = {
-        "nano" => "Nano — 1 vCPU, 1GB RAM, DB embedded (R$ 19/mês)",
-        "micro" => "Micro — 1 vCPU, 1GB RAM, DB embedded (R$ 29/mês)",
-        "hobby" => "Hobby — 1 vCPU, 1GB RAM, DB managed (R$ 99/mês)",
-        "production" => "Production — 4 vCPU, 4GB RAM, DB managed + storage (R$ 299/mês)",
-        "scale" => "Scale — 8 vCPU, 8GB RAM, DB managed + storage (R$ 599/mês)"
+        "nano" => "Nano — 1 vCPU, 1GB RAM, 10GB disco, DB embedded (R$ 19/mês) [Node.js/Docker]",
+        "micro" => "Micro — 1 vCPU, 2GB RAM, 20GB disco, DB embedded (R$ 29/mês)",
+        "hobby" => "Hobby — 1 vCPU, 2GB RAM, 40GB disco, DB managed (R$ 99/mês)",
+        "production" => "Production — 2 vCPU, 4GB RAM, 40GB disco, DB managed + storage (R$ 299/mês)",
+        "scale" => "Scale — 4 vCPU, 8GB RAM, 100GB disco, DB managed + storage (R$ 599/mês)"
       }.freeze
 
       REGIONS = { "br-se1" => "São Paulo", "br-ne1" => "Nordeste" }.freeze

data/lib/brasa/commands/up.rb

@@ -1,5 +1,6 @@
 require "brasa/commands/base"
 require "brasa/source_packer"
+require "tty-spinner"
 
 module Brasa
   module Commands
@@ -79,9 +80,13 @@ module Brasa
         info("Empacotando código...")
         archive_path = SourcePacker.pack
         size_kb = File.size(archive_path) / 1024
-        info("Enviando #{size_kb}KB para o servidor...")
-        api.upload("/api/v1/apps/#{slug}/deploys", file_path: archive_path,
-                   params: { branch: project_config[:branch] || "main" })
+
+        spinner = TTY::Spinner.new("#{pastel.cyan("       Enviando #{size_kb}KB...")} :spinner", format: :dots)
+        spinner.auto_spin
+        result = api.upload("/api/v1/apps/#{slug}/deploys", file_path: archive_path,
+                            params: { branch: project_config[:branch] || "main" })
+        spinner.success(pastel.green("enviado!"))
+        result
       ensure
         FileUtils.rm_f(archive_path) if archive_path
       end
@@ -117,7 +122,7 @@ module Brasa
         ws = connect_websocket
         started = Time.now
 
-        ws.on_log { |msg| print msg["line"] + "\n" if msg["line"] }
+        ws.on_log { |msg| print msg["line"] + "\n" if msg.is_a?(Hash) && msg["line"] }
         ws.subscribe("DeployLogChannel", deploy_id: deploy_id)
 
         status = ws.wait_for("DeployStatusChannel",
@@ -155,7 +160,10 @@ module Brasa
         PROVISION_MAX_POLLS.times do |i|
           app = api.get("/api/v1/apps/#{slug}")
           return true if app["status"] == "active"
-          return (error("\nErro no provisionamento."); false) if app["status"] == "error"
+          if app["status"] == "error"
+            error("\nErro no provisionamento.")
+            return false
+          end
           if app["status"] != last_status
             print "\n       #{status_label(app["status"])}"
             last_status = app["status"]
@@ -177,7 +185,10 @@ module Brasa
         DEPLOY_MAX_POLLS.times do |i|
           deploy = api.get("/api/v1/apps/#{slug}/deploys/#{deploy_id}")
           return true if deploy["status"] == "live"
-          return (error("\nDeploy falhou."); false) if deploy["status"] == "failed"
+          if deploy["status"] == "failed"
+            error("\nDeploy falhou.")
+            return false
+          end
           if deploy["status"] != last_status
             print "\n       #{status_label(deploy["status"])}"
             last_status = deploy["status"]

data/lib/brasa/version.rb

@@ -1,3 +1,3 @@
 module Brasa
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/lib/brasa/websocket/cable_client.rb

@@ -80,7 +80,7 @@ module Brasa
             data = JSON.parse(msg.data)
             client.send(:handle_message, data)
           rescue JSON::ParserError
-            $stderr.puts "[WS] Mensagem malformada ignorada: #{msg.data.to_s.truncate(100)}" if ENV["BRASA_DEBUG"]
+            $stderr.puts "[WS] Mensagem malformada ignorada: #{msg.data.to_s[0..100]}" if ENV["BRASA_DEBUG"]
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brasa
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Brasa