shopify-cli 1.13.1 → 2.1.0

data/lib/project_types/node/commands/generate.rb

@@ -2,8 +2,10 @@
 require "shopify_cli"
 
 module Node
-  module Commands
-    class Generate < ShopifyCli::Command
+  class Command
+    class Generate < ShopifyCli::SubCommand
+      prerequisite_task ensure_project_type: :node
+
       def call(*)
         @ctx.puts(self.class.help)
       end

data/lib/project_types/node/commands/open.rb

@@ -1,8 +1,10 @@
 require "shopify_cli"
 
 module Node
-  module Commands
-    class Open < ShopifyCli::Command
+  class Command
+    class Open < ShopifyCli::SubCommand
+      prerequisite_task ensure_project_type: :node
+
       def call(*)
         project = ShopifyCli::Project.current
         @ctx.open_url!("#{project.env.host}/auth?shop=#{project.env.shop}")

data/lib/project_types/node/commands/serve.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 module Node
-  module Commands
-    class Serve < ShopifyCli::Command
+  class Command
+    class Serve < ShopifyCli::SubCommand
+      prerequisite_task ensure_project_type: :node
       prerequisite_task :ensure_env, :ensure_dev_store
 
       options do |parser, flags|

data/lib/project_types/node/commands/tunnel.rb

@@ -3,10 +3,12 @@
 require "shopify_cli"
 
 module Node
-  module Commands
-    class Tunnel < ShopifyCli::Command
+  class Command
+    class Tunnel < ShopifyCli::SubCommand
       # subcommands :auth, :start, :stop
 
+      prerequisite_task ensure_project_type: :node
+
       def call(args, _name)
         subcommand = args.shift
         case subcommand

data/lib/project_types/node/messages/messages.rb

@@ -4,26 +4,34 @@ module Node
   module Messages
     MESSAGES = {
       node: {
+        help: <<~HELP,
+          Suite of commands for developing Node.js apps. See {{command:%1$s node <command> --help}} for usage of each command.
+            Usage: {{command:%1$s node [ %2$s ]}}
+        HELP
+
         error: {
           generic: "Error",
         },
 
         connect: {
           connected: "Project now connected to {{green:%s}}",
+          help: <<~HELP,
+            {{command:%s node connect}}: Connects an existing Node.js app to Shopify CLI. Creates a config file.
+              Usage: {{command:%s node connect}}
+          HELP
           production_warning: <<~MESSAGE,
-          {{yellow:! Warning: if you have connected to an {{bold:app in production}}, running {{command:serve}} may update the app URL and cause an outage.
+            {{yellow:! Warning: if you have connected to an {{bold:app in production}}, running {{command:serve}} may update the app URL and cause an outage.
           MESSAGE
         },
 
         create: {
           help: <<~HELP,
-          {{command:%s create node}}: Creates an embedded nodejs app.
-            Usage: {{command:%s create node}}
-            Options:
-              {{command:--name=NAME}} App name. Any string.
-              {{command:--app-url=APPURL}} App URL. Must be a valid URL.
-              {{command:--organization-id=ID}} Partner organization ID. Must be an existing organization.
-              {{command:--shop-domain=MYSHOPIFYDOMAIN }} Development store URL. Must be an existing development store.
+            {{command:%s node create}}: Creates an embedded nodejs app.
+              Usage: {{command:%s node create}}
+              Options:
+                {{command:--name=NAME}} App name. Any string.
+                {{command:--organization-id=ID}} Partner organization ID. Must be an existing organization.
+                {{command:--store=MYSHOPIFYDOMAIN }} Development store URL. Must be an existing development store.
           HELP
           error: {
             node_required: "node is required to create an app project. Download at https://nodejs.org/en/download.",
@@ -39,18 +47,18 @@ module Node
 
         deploy: {
           help: <<~HELP,
-          Deploy the current Node project to a hosting service. Heroku ({{underline:https://www.heroku.com}}) is currently the only option, but more will be added in the future.
-            Usage: {{command:%s deploy [ heroku ]}}
+            Deploy the current Node project to a hosting service. Heroku ({{underline:https://www.heroku.com}}) is currently the only option, but more will be added in the future.
+              Usage: {{command:%s node deploy [ heroku ]}}
           HELP
           extended_help: <<~HELP,
-          {{bold:Subcommands:}}
-            {{cyan:heroku}}: Deploys the current Node project to Heroku.
-              Usage: {{command:%s deploy heroku}}
+            {{bold:Subcommands:}}
+              {{cyan:heroku}}: Deploys the current Node project to Heroku.
+                Usage: {{command:%s node deploy heroku}}
           HELP
           heroku: {
             help: <<~HELP,
-            Deploy the current Node project to Heroku
-              Usage: {{command:%s deploy heroku}}
+              Deploy the current Node project to Heroku
+                Usage: {{command:%s node deploy heroku}}
             HELP
             downloading: "Downloading Heroku CLI…",
             downloaded: "Downloaded Heroku CLI",
@@ -83,85 +91,34 @@ module Node
 
         generate: {
           help: <<~HELP,
-          {{red:The {{command:generate}} command is no longer supported.}}
-            You can complete any tasks previously supported by {{command:generate}} with these guides:
-            {{green:page}}
-              Create a page with Polaris design components: {{green:https://shopify.dev/tutorials/build-a-shopify-app-with-node-and-react/build-your-user-interface-with-polaris}}
+            {{red:The {{command:generate}} command is no longer supported.}}
+              You can complete any tasks previously supported by {{command:generate}} with these guides:
+              {{green:page}}
+                Create a page with Polaris design components: {{green:https://shopify.dev/tutorials/build-a-shopify-app-with-node-and-react/build-your-user-interface-with-polaris}}
 
-            {{green:webhook}}
-              Register and process webhooks: {{green:https://github.com/Shopify/shopify-node-api/blob/main/docs/usage/webhooks.md}}
+              {{green:webhook}}
+                Register and process webhooks: {{green:https://github.com/Shopify/shopify-node-api/blob/main/docs/usage/webhooks.md}}
 
-            {{green:billing}}
-              Create and manage app billing models: {{green:https://shopify.dev/tutorials/bill-for-your-app-using-graphql-admin-api}}
+              {{green:billing}}
+                Create and manage app billing models: {{green:https://shopify.dev/tutorials/bill-for-your-app-using-graphql-admin-api}}
           HELP
         },
 
         open: {
           help: <<~HELP,
-          Open your local development app in the default browser.
-            Usage: {{command:%s open}}
-          HELP
-        },
-
-        populate: {
-          help: <<~HELP,
-          Populate your Shopify development store with example customers, orders, or products.
-            Usage: {{command:%s populate [ customers | draftorders | products ]}}
+            Open your local development app in the default browser.
+              Usage: {{command:%s node open}}
           HELP
-          extended_help: <<~HELP,
-          {{bold:Subcommands:}}
-
-            {{cyan:customers [options]}}: Add dummy customers to the specified development store.
-              Usage: {{command:%1$s populate customers}}
-
-            {{cyan:draftorders [options]}}: Add dummy orders to the specified development store.
-              Usage: {{command:%1$s populate draftorders}}
-
-            {{cyan:products [options]}}: Add dummy products to the specified development store.
-              Usage: {{command:%1$s populate products}}
-
-          {{bold:Options:}}
-
-            {{cyan:--count [integer]}}: The number of dummy items to populate. Defaults to 5.
-            {{cyan:--silent}}: Silence the populate output.
-            {{cyan:--help}}: Display more options specific to each subcommand.
-
-          {{bold:Examples:}}
-
-            {{command:%1$s populate products}}
-              Populate your development store with 5 additional products.
-
-            {{command:%1$s populate customers --count 30}}
-              Populate your development store with 30 additional customers.
-
-            {{command:%1$s populate draftorders}}
-              Populate your development store with 5 additional orders.
-
-            {{command:%1$s populate products --help}}
-              Display the list of options available to customize the {{command:%1$s populate products}} command.
-          HELP
-
-          customer: {
-            added: "%s added to {{green:%s}} at {{underline:%scustomers/%d}}",
-          },
-
-          draft_order: {
-            added: "DraftOrder added to {{green:%s}} at {{underline:%sdraft_orders/%d}}",
-          },
-
-          product: {
-            added: "%s added to {{green:%s}} at {{underline:%sproducts/%d}}",
-          },
         },
 
         serve: {
           help: <<~HELP,
-          Start a local development node server for your project, as well as a public ngrok tunnel to your localhost.
-            Usage: {{command:%s serve}}
+            Start a local development node server for your project, as well as a public ngrok tunnel to your localhost.
+              Usage: {{command:%s node serve}}
           HELP
           extended_help: <<~HELP,
-          {{bold:Options:}}
-            {{cyan:--host=HOST}}: Bypass running tunnel and use custom host. HOST must be HTTPS url.
+            {{bold:Options:}}
+              {{cyan:--host=HOST}}: Bypass running tunnel and use custom host. HOST must be HTTPS url.
           HELP
 
           error: {
@@ -172,25 +129,25 @@ module Node
             {{*}} To install and start using your app, open this URL in your browser:
             {{green:%s}}
           MESSAGE
-          running_server: "Running server...",
+          running_server: "Running server…",
         },
 
         tunnel: {
           help: <<~HELP,
-          Start or stop an http tunnel to your local development app using ngrok.
-            Usage: {{command:%s tunnel [ auth | start | stop ]}}
+            Start or stop an http tunnel to your local development app using ngrok.
+              Usage: {{command:%s node tunnel [ auth | start | stop ]}}
           HELP
           extended_help: <<~HELP,
-          {{bold:Subcommands:}}
+            {{bold:Subcommands:}}
 
-            {{cyan:auth}}: Writes an ngrok auth token to ~/.ngrok2/ngrok.yml to connect with an ngrok account. Visit https://dashboard.ngrok.com/signup to sign up.
-              Usage: {{command:%1$s tunnel auth <token>}}
+              {{cyan:auth}}: Writes an ngrok auth token to ~/.ngrok2/ngrok.yml to connect with an ngrok account. Visit https://dashboard.ngrok.com/signup to sign up.
+                Usage: {{command:%1$s node tunnel auth <token>}}
 
-            {{cyan:start}}: Starts an ngrok tunnel, will print the URL for an existing tunnel if already running.
-              Usage: {{command:%1$s tunnel start}}
+              {{cyan:start}}: Starts an ngrok tunnel, will print the URL for an existing tunnel if already running.
+                Usage: {{command:%1$s node tunnel start}}
 
-            {{cyan:stop}}: Stops the ngrok tunnel.
-              Usage: {{command:%1$s tunnel stop}}
+              {{cyan:stop}}: Stops the ngrok tunnel.
+                Usage: {{command:%1$s node tunnel stop}}
 
           HELP
 

data/lib/project_types/rails/cli.rb

@@ -1,33 +1,21 @@
 # frozen_string_literal: true
 module Rails
   class Project < ShopifyCli::ProjectType
-    title("Ruby on Rails App")
-    creator("Rails::Commands::Create")
-    connector("Rails::Commands::Connect")
-
-    register_command("Rails::Commands::Deploy", "deploy")
-    register_command("Rails::Commands::Generate", "generate")
-    register_command("Rails::Commands::Open", "open")
-    register_command("Rails::Commands::Populate", "populate")
-    register_command("Rails::Commands::Serve", "serve")
-    register_command("Rails::Commands::Tunnel", "tunnel")
-    # register_task('Rails::Tasks::RailsTask', 'rails_task')
-
     require Project.project_filepath("messages/messages")
     register_messages(Rails::Messages::MESSAGES)
   end
 
   # define/autoload project specific Commands
-  module Commands
-    autoload :Connect, Project.project_filepath("commands/connect")
-    autoload :Create, Project.project_filepath("commands/create")
-    autoload :Deploy, Project.project_filepath("commands/deploy")
-    autoload :Generate, Project.project_filepath("commands/generate")
-    autoload :Open, Project.project_filepath("commands/open")
-    autoload :Populate, Project.project_filepath("commands/populate")
-    autoload :Serve, Project.project_filepath("commands/serve")
-    autoload :Tunnel, Project.project_filepath("commands/tunnel")
+  class Command < ShopifyCli::ProjectCommands
+    subcommand :Connect, "connect", Project.project_filepath("commands/connect")
+    subcommand :Create, "create", Project.project_filepath("commands/create")
+    subcommand :Deploy, "deploy", Project.project_filepath("commands/deploy")
+    subcommand :Generate, "generate", Project.project_filepath("commands/generate")
+    subcommand :Open, "open", Project.project_filepath("commands/open")
+    subcommand :Serve, "serve", Project.project_filepath("commands/serve")
+    subcommand :Tunnel, "tunnel", Project.project_filepath("commands/tunnel")
   end
+  ShopifyCli::Commands.register("Rails::Command", "rails")
 
   # define/autoload project specific Tasks
   module Tasks

data/lib/project_types/rails/commands/connect.rb

@@ -1,15 +1,21 @@
 # frozen_string_literal: true
 module Rails
-  module Commands
+  class Command
     class Connect < ShopifyCli::SubCommand
+      prerequisite_task ensure_project_type: :rails
+
       def call(*)
         if ShopifyCli::Project.has_current? && ShopifyCli::Project.current.env
           @ctx.puts(@ctx.message("rails.connect.production_warning"))
         end
 
-        app = ShopifyCli::Commands::Connect.new.default_connect("rails")
+        app = ShopifyCli::Connect.new(@ctx).default_connect("rails")
         @ctx.done(@ctx.message("rails.connect.connected", app))
       end
+
+      def self.help
+        ShopifyCli::Context.message("rails.connect.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+      end
     end
   end
 end

data/lib/project_types/rails/commands/create.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 module Rails
-  module Commands
+  class Command
     class Create < ShopifyCli::SubCommand
+      prerequisite_task :ensure_authenticated
+
       USER_AGENT_CODE = <<~USERAGENT
         module ShopifyAPI
           class Base < ActiveResource::Base
-            self.headers['User-Agent'] << " | ShopifyApp/\#{ShopifyApp::VERSION} | Shopify App CLI"
+            self.headers['User-Agent'] << " | ShopifyApp/\#{ShopifyApp::VERSION} | Shopify CLI"
           end
         end
       USERAGENT
@@ -16,11 +18,13 @@ module Rails
         # backwards compatibility allow 'title' for now
         parser.on("--title=TITLE") { |t| flags[:title] = t }
         parser.on("--name=NAME") { |t| flags[:title] = t }
-        parser.on("--organization_id=ID") { |url| flags[:organization_id] = url }
-        parser.on("--organization-id=ID") { |url| flags[:organization_id] = url }
+        parser.on("--organization_id=ID") { |id| flags[:organization_id] = id }
+        parser.on("--organization-id=ID") { |id| flags[:organization_id] = id }
+        parser.on("--store=MYSHOPIFYDOMAIN") { |url| flags[:shop_domain] = url }
+        # backwards compatibility allow 'shop domain' for now
         parser.on("--shop_domain=MYSHOPIFYDOMAIN") { |url| flags[:shop_domain] = url }
         parser.on("--shop-domain=MYSHOPIFYDOMAIN") { |url| flags[:shop_domain] = url }
-        parser.on("--type=APPTYPE") { |url| flags[:type] = url }
+        parser.on("--type=APPTYPE") { |type| flags[:type] = type }
         parser.on("--db=DB") { |db| flags[:db] = db }
         parser.on("--rails_opts=RAILSOPTS") { |opts| flags[:rails_opts] = opts }
         parser.on("--rails-opts=RAILSOPTS") { |opts| flags[:rails_opts] = opts }
@@ -62,7 +66,7 @@ module Rails
         partners_url = ShopifyCli::PartnersAPI.partners_url_for(form.organization_id, api_client["id"], local_debug?)
 
         @ctx.puts(@ctx.message("apps.create.info.created", form.title, partners_url))
-        @ctx.puts(@ctx.message("apps.create.info.serve", form.name, ShopifyCli::TOOL_NAME))
+        @ctx.puts(@ctx.message("apps.create.info.serve", form.name, ShopifyCli::TOOL_NAME, "rails"))
         unless ShopifyCli::Shopifolk.acting_as_shopify_organization?
           @ctx.puts(@ctx.message("apps.create.info.install", partners_url, form.title))
         end

data/lib/project_types/rails/commands/deploy.rb

@@ -2,12 +2,22 @@
 require "shopify_cli"
 
 module Rails
-  module Commands
-    class Deploy < ShopifyCli::Command
-      subcommand :Heroku, "heroku", Project.project_filepath("commands/deploy/heroku")
+  class Command
+    class Deploy < ShopifyCli::SubCommand
+      prerequisite_task ensure_project_type: :rails
 
-      def call(*)
-        @ctx.puts(self.class.help)
+      autoload :Heroku, Project.project_filepath("commands/deploy/heroku")
+
+      HEROKU = "heroku"
+
+      def call(args, _name)
+        subcommand = args.shift
+        case subcommand
+        when HEROKU
+          Rails::Command::Deploy::Heroku.start(@ctx)
+        else
+          @ctx.puts(self.class.help)
+        end
       end
 
       def self.help

data/lib/project_types/rails/commands/deploy/heroku.rb

@@ -2,109 +2,111 @@
 require "shopify_cli"
 
 module Rails
-  module Commands
+  class Command
     class Deploy
-      class Heroku < ShopifyCli::SubCommand
-        DB_CHECK_CMD = 'bundle exec rails runner "puts ActiveRecord::Base.connection.adapter_name.downcase"'
+      class Heroku
+        class << self
+          DB_CHECK_CMD = 'bundle exec rails runner "puts ActiveRecord::Base.connection.adapter_name.downcase"'
 
-        def self.help
-          ShopifyCli::Context.message("rails.deploy.heroku.help", ShopifyCli::TOOL_NAME)
-        end
-
-        def call(*)
-          CLI::UI::Frame.open(@ctx.message("rails.deploy.heroku.db_check.validating")) do
-            CLI::UI::Spinner.spin(@ctx.message("rails.deploy.heroku.db_check.checking")) do |spinner|
-              db_type, err = check_db(@ctx)
-              @ctx.abort(@ctx.message(err)) unless err.nil?
-              spinner.update_title(@ctx.message("rails.deploy.heroku.db_check.validated", db_type))
-            end
-            true
+          def help
+            ShopifyCli::Context.message("rails.deploy.heroku.help", ShopifyCli::TOOL_NAME)
           end
 
-          spin_group = CLI::UI::SpinGroup.new
-          heroku_service = ShopifyCli::Heroku.new(@ctx)
+          def start(ctx)
+            CLI::UI::Frame.open(ctx.message("rails.deploy.heroku.db_check.validating")) do
+              CLI::UI::Spinner.spin(ctx.message("rails.deploy.heroku.db_check.checking")) do |spinner|
+                db_type, err = check_db(ctx)
+                ctx.abort(ctx.message(err)) unless err.nil?
+                spinner.update_title(ctx.message("rails.deploy.heroku.db_check.validated", db_type))
+              end
+              true
+            end
 
-          spin_group.add(@ctx.message("rails.deploy.heroku.downloading")) do |spinner|
-            heroku_service.download
-            spinner.update_title(@ctx.message("rails.deploy.heroku.downloaded"))
-          end
-          spin_group.wait
+            spin_group = CLI::UI::SpinGroup.new
+            heroku_service = ShopifyCli::Heroku.new(ctx)
 
-          spin_group.add(@ctx.message("rails.deploy.heroku.installing")) do |spinner|
-            heroku_service.install
-            spinner.update_title(@ctx.message("rails.deploy.heroku.installed"))
-          end
-          spin_group.add(@ctx.message("rails.deploy.heroku.git.checking")) do |spinner|
-            ShopifyCli::Git.init(@ctx)
-            spinner.update_title(@ctx.message("rails.deploy.heroku.git.initialized"))
-          end
-          spin_group.wait
-
-          if (account = heroku_service.whoami)
-            @ctx.puts(@ctx.message("rails.deploy.heroku.authenticated_with_account", account))
-          else
-            CLI::UI::Frame.open(
-              @ctx.message("rails.deploy.heroku.authenticating"),
-              success_text: @ctx.message("rails.deploy.heroku.authenticated")
-            ) do
-              heroku_service.authenticate
+            spin_group.add(ctx.message("rails.deploy.heroku.downloading")) do |spinner|
+              heroku_service.download
+              spinner.update_title(ctx.message("rails.deploy.heroku.downloaded"))
             end
-          end
+            spin_group.wait
 
-          if (app_name = heroku_service.app)
-            @ctx.puts(@ctx.message("rails.deploy.heroku.app.selected", app_name))
-          else
-            app_type = CLI::UI::Prompt.ask(@ctx.message("rails.deploy.heroku.app.no_apps_found")) do |handler|
-              handler.option(@ctx.message("rails.deploy.heroku.app.create")) { :new }
-              handler.option(@ctx.message("rails.deploy.heroku.app.select")) { :existing }
+            spin_group.add(ctx.message("rails.deploy.heroku.installing")) do |spinner|
+              heroku_service.install
+              spinner.update_title(ctx.message("rails.deploy.heroku.installed"))
+            end
+            spin_group.add(ctx.message("rails.deploy.heroku.git.checking")) do |spinner|
+              ShopifyCli::Git.init(ctx)
+              spinner.update_title(ctx.message("rails.deploy.heroku.git.initialized"))
             end
+            spin_group.wait
 
-            if app_type == :existing
-              app_name = CLI::UI::Prompt.ask(@ctx.message("rails.deploy.heroku.app.name"))
+            if (account = heroku_service.whoami)
+              ctx.puts(ctx.message("rails.deploy.heroku.authenticated_with_account", account))
+            else
               CLI::UI::Frame.open(
-                @ctx.message("rails.deploy.heroku.app.selecting", app_name),
-                success_text: @ctx.message("rails.deploy.heroku.app.selected", app_name)
+                ctx.message("rails.deploy.heroku.authenticating"),
+                success_text: ctx.message("rails.deploy.heroku.authenticated")
               ) do
-                heroku_service.select_existing_app(app_name)
+                heroku_service.authenticate
               end
-            elsif app_type == :new
-              CLI::UI::Frame.open(
-                @ctx.message("rails.deploy.heroku.app.creating"),
-                success_text: @ctx.message("rails.deploy.heroku.app.created")
-              ) do
-                heroku_service.create_new_app
+            end
+
+            if (app_name = heroku_service.app)
+              ctx.puts(ctx.message("rails.deploy.heroku.app.selected", app_name))
+            else
+              app_type = CLI::UI::Prompt.ask(ctx.message("rails.deploy.heroku.app.no_apps_found")) do |handler|
+                handler.option(ctx.message("rails.deploy.heroku.app.create")) { :new }
+                handler.option(ctx.message("rails.deploy.heroku.app.select")) { :existing }
+              end
+
+              if app_type == :existing
+                app_name = CLI::UI::Prompt.ask(ctx.message("rails.deploy.heroku.app.name"))
+                CLI::UI::Frame.open(
+                  ctx.message("rails.deploy.heroku.app.selecting", app_name),
+                  success_text: ctx.message("rails.deploy.heroku.app.selected", app_name)
+                ) do
+                  heroku_service.select_existing_app(app_name)
+                end
+              elsif app_type == :new
+                CLI::UI::Frame.open(
+                  ctx.message("rails.deploy.heroku.app.creating"),
+                  success_text: ctx.message("rails.deploy.heroku.app.created")
+                ) do
+                  heroku_service.create_new_app
+                end
               end
             end
-          end
 
-          branches = ShopifyCli::Git.branches(@ctx)
-          if branches.length == 1
-            branch_to_deploy = branches[0]
-            @ctx.puts(@ctx.message("rails.deploy.heroku.git.branch_selected", branch_to_deploy))
-          else
-            branch_to_deploy = CLI::UI::Prompt.ask(@ctx.message("rails.deploy.heroku.git.what_branch")) do |handler|
-              branches.each do |branch|
-                handler.option(branch) { branch }
+            branches = ShopifyCli::Git.branches(ctx)
+            if branches.length == 1
+              branch_to_deploy = branches[0]
+              ctx.puts(ctx.message("rails.deploy.heroku.git.branch_selected", branch_to_deploy))
+            else
+              branch_to_deploy = CLI::UI::Prompt.ask(ctx.message("rails.deploy.heroku.git.what_branch")) do |handler|
+                branches.each do |branch|
+                  handler.option(branch) { branch }
+                end
               end
             end
-          end
 
-          CLI::UI::Frame.open(
-            @ctx.message("rails.deploy.heroku.deploying"),
-            success_text: @ctx.message("rails.deploy.heroku.deployed")
-          ) do
-            heroku_service.deploy(branch_to_deploy)
+            CLI::UI::Frame.open(
+              ctx.message("rails.deploy.heroku.deploying"),
+              success_text: ctx.message("rails.deploy.heroku.deployed")
+            ) do
+              heroku_service.deploy(branch_to_deploy)
+            end
           end
-        end
 
-        def check_db(ctx)
-          out, stat = ctx.capture2e(DB_CHECK_CMD)
-          if stat.success? && out.strip == "sqlite"
-            ["sqlite", "rails.deploy.heroku.db_check.sqlite"]
-          elsif !stat.success?
-            [nil, "rails.deploy.heroku.db_check.problem"]
-          else
-            [out.strip, nil]
+          def check_db(ctx)
+            out, stat = ctx.capture2e(DB_CHECK_CMD)
+            if stat.success? && out.strip == "sqlite"
+              ["sqlite", "rails.deploy.heroku.db_check.sqlite"]
+            elsif !stat.success?
+              [nil, "rails.deploy.heroku.db_check.problem"]
+            else
+              [out.strip, nil]
+            end
           end
         end
       end