brasa 0.5.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b01ebcbc4eb417f8b1dac15e9e4b3ecdeb95ae7a7a470097023c1392db688cef
-  data.tar.gz: 0bc8d7b38a3f71469c7d396b260a54f646c0003cb19efa8d39c4afbf80a369f0
+  metadata.gz: c43a2e611cb76f921a9c2066be2fe84a4da611eb81aff758d47bb481a09f3710
+  data.tar.gz: 78108a8be50018a5ff96ad2c4026e20b2942d74234d335e0aad065360976ef00
 SHA512:
-  metadata.gz: 4fba676de313e7587c4138475991a88e9b470aca71f938ee70e2fb3cc7271b81f7fa5929e78ab13512d93ad1c2f236a9ff64bcca91ff71401715a81bebc975ba
-  data.tar.gz: dc5b3b1d3eb17cc4e69d2d614b2817c334a9c17af8ae44eb3d18aaddf4961a2b07f9df6724e714802c39ea731d5e8b41d390491e5954528abe3bf39124371397
+  metadata.gz: 7cf9cf1b338037c816efadd34cc79a395b0d24a6edb045d9d3cce197a678274b8ddafcc7a925c35480fd2b37ed579fba5014c8da5525bad67bfadc0ddeeda4d3
+  data.tar.gz: 8766f38b9203e02dd9f92f8fa0c21fd4c94c4ace3362c1b9c28925cfcd36833873665ffb4d80e0621f42b1f24cf546eef787e12b2b24be2b9aa402c3b6cad78e

data/lib/brasa/cli.rb

@@ -79,8 +79,8 @@ module Brasa
     subcommand "redis", Commands::Redis
 
     desc "scale", "Escalar a aplicação"
-    option :web, type: :numeric, desc: "Número de instâncias web"
-    option :preset, type: :string, desc: "Preset (hobby, production, scale)"
+    option :replicas, type: :numeric, desc: "Número de réplicas"
+    option :preset, type: :string, desc: "Preset (micro, hobby, pro)"
     def scale
       Commands::Scale.new.execute(options)
     end

data/lib/brasa/commands/database.rb

@@ -14,13 +14,11 @@ module Brasa
         db = helper.api.get("/api/v1/apps/#{slug}/database")
 
         puts helper.pastel.bold("Banco de dados de #{slug}")
-        puts "  Engine:   #{db["engine"]} #{db["engine_version"]}"
-        puts "  Modo:     #{db["mode"]}"
+        puts "  Tier:     #{db["database_tier"] || db["mode"]}"
         puts "  Host:     #{db["host"]}"
         puts "  Porta:    #{db["port"]}"
         puts "  Nome:     #{db["name"]}"
         puts "  Status:   #{db["status"]}"
-        puts "  Machine:  #{db["machine_type"]}" if db["machine_type"] && db["machine_type"] != "embedded"
       rescue Api::Client::ApiError => e
         helper.error("Erro: #{e.message}")
       end

data/lib/brasa/commands/deploy.rb

@@ -39,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,16 +6,18 @@ 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)"
+        "micro" => "Micro — 256MB RAM, 1 réplica (Grátis)",
+        "hobby" => "Hobby — 1GB RAM, réplicas ilimitadas (R$ 19/mês)",
+        "pro" => "Pro — 2GB RAM, réplicas ilimitadas (R$ 69/mês)"
       }.freeze
 
       REGIONS = { "br-se1" => "São Paulo", "br-ne1" => "Nordeste" }.freeze
       STACKS = { "rails" => "Rails", "node" => "Node.js", "docker" => "Docker (custom Dockerfile)" }.freeze
-      DATABASE_ENGINES = { "postgresql" => "PostgreSQL", "mysql" => "MySQL" }.freeze
+      DATABASE_TIERS = {
+        "mini" => "Mini — 512MB, 20 conexões (Grátis)",
+        "essencial" => "Essencial — 1GB, 50 conexões (R$ 19/mês)",
+        "padrao" => "Padrão — 5GB, 100 conexões (R$ 49/mês)"
+      }.freeze
 
       def execute(options = {})
         prompt = TTY::Prompt.new
@@ -39,7 +41,7 @@ module Brasa
         name = prompt.ask("Nome do app:") { |q| q.required true }
         preset = prompt.select("Preset:", PRESETS.map { |k, v| { name: v, value: k } })
         region = prompt.select("Região:", REGIONS.map { |k, v| { name: "#{v} (#{k})", value: k } })
-        engine = prompt.select("Banco de dados:", DATABASE_ENGINES.map { |k, v| { name: v, value: k } })
+        db_tier = prompt.select("Banco de dados:", DATABASE_TIERS.map { |k, v| { name: v, value: k } })
         branch = detect_git_branch || "main"
 
         config = {
@@ -48,7 +50,7 @@ module Brasa
           "preset" => preset,
           "region" => region,
           "branch" => branch,
-          "database_engine" => engine
+          "database_tier" => db_tier
         }
 
         File.write(config_path, YAML.dump(config))

data/lib/brasa/commands/logs.rb

@@ -24,11 +24,11 @@ module Brasa
           message = entry["message"]
 
           level_str = case level
-                      when "error" then pastel.red(level)
-                      when "warn" then pastel.yellow(level)
-                      when "info" then pastel.green(level)
-                      else pastel.dim(level || "log")
-                      end
+          when "error" then pastel.red(level)
+          when "warn" then pastel.yellow(level)
+          when "info" then pastel.green(level)
+          else pastel.dim(level || "log")
+          end
 
           puts "#{pastel.dim(timestamp)} #{pastel.cyan(source)} [#{level_str}] #{message}"
         end

data/lib/brasa/commands/logs_export.rb

@@ -23,7 +23,7 @@ module Brasa
         when String
           puts result
         else
-          puts result.to_s
+          puts result
         end
       rescue Api::Client::ApiError => e
         error("Erro: #{e.message}")

data/lib/brasa/commands/scale.rb

@@ -9,15 +9,18 @@ module Brasa
         slug = app_slug
 
         body = {}
-        body[:web] = options["web"].to_i if options["web"]
+        body[:replicas] = options["replicas"].to_i if options["replicas"]
         body[:preset] = options["preset"] if options["preset"]
 
         if body.empty?
-          error("Informe ao menos --web ou --preset. Ex: brasa scale --web 3")
+          error("Informe ao menos --replicas ou --preset. Ex: brasa scale --replicas 3")
           return
         end
 
         estimate = api.post("/api/v1/apps/#{slug}/scale/estimate", body: body)
+        info("Preset: #{estimate["preset"]}")
+        info("Réplicas: #{estimate["replicas"]}") if estimate["replicas"]
+        info("CPU: #{estimate["cpu_limit"]}  |  RAM: #{estimate["memory_limit"]}") if estimate["cpu_limit"]
         info("Custo estimado: R$ #{estimate["monthly_cost"]}/mês")
 
         prompt = TTY::Prompt.new

data/lib/brasa/commands/status.rb

@@ -15,8 +15,9 @@ module Brasa
         puts "  Status:  #{colorize_status(app["status"])}"
         puts "  Região:  #{app["region"]}"
         puts "  Preset:  #{app["preset"]}"
-        puts "  DB:      #{app["database_engine"]}"
-        puts "  URL:     https://#{app["subdomain"]}.usebrasa.com.br"
+        puts "  DB:      #{app["database_tier"]}"
+        subdomain = app["subdomain"] || app["slug"]
+        puts "  URL:     https://#{subdomain}.usebrasa.com.br"
 
         if app["last_deploy"]
           deploy = app["last_deploy"]
@@ -37,6 +38,8 @@ module Brasa
         case status
         when "active", "live"
           pastel.green(status)
+        when "sleeping"
+          pastel.blue(status)
         when "failed", "error"
           pastel.red(status)
         when "building", "deploying", "provisioning"

data/lib/brasa/commands/up.rb

@@ -18,7 +18,7 @@ module Brasa
         @app = find_or_create_app(config)
         slug = @app["slug"]
 
-        if @app["status"] == "active"
+        if %w[active sleeping].include?(@app["status"])
           info("Iniciando deploy...")
         else
           info("Provisionando infraestrutura...")
@@ -72,7 +72,7 @@ module Brasa
           name: config[:app], stack: config[:stack], preset: config[:preset],
           region: config[:region], repo_url: detect_git_remote, repo_branch: config[:branch]
         }
-        app_params[:database_engine] = config[:database_engine] if config[:database_engine]
+        app_params[:database_tier] = config[:database_tier] if config[:database_tier]
         api.post("/api/v1/apps", body: { app: app_params })
       end
 
@@ -122,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",
@@ -160,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"]
@@ -182,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"]
@@ -199,9 +205,9 @@ module Brasa
       end
 
       def status_label(status)
-        { "pending" => "Aguardando...", "provisioning" => "Provisionando VM...",
+        { "pending" => "Aguardando...", "provisioning" => "Provisionando...",
           "queued" => "Na fila...", "building" => "Construindo imagem...",
-          "deploying" => "Deployando..." }[status] || status
+          "deploying" => "Implantando..." }[status] || status
       end
 
       def show_elapsed(started)

data/lib/brasa/version.rb

@@ -1,3 +1,3 @@
 module Brasa
-  VERSION = "0.5.2"
+  VERSION = "0.7.0"
 end

data/lib/brasa/websocket/cable_client.rb

@@ -6,7 +6,7 @@ module Brasa
     class CableClient
       class ConnectionError < StandardError; end
 
-      RECONNECT_DELAYS = [1, 3, 10].freeze
+      RECONNECT_DELAYS = [ 1, 3, 10 ].freeze
 
       def initialize(api_url: nil, token: nil)
         @api_url = api_url || Brasa::Config.api_url
@@ -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.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Brasa