shopify-cli 1.5.0 → 1.9.0

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

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Node
   module Commands
     class Deploy < ShopifyCli::Command
-      subcommand :Heroku, 'heroku', Project.project_filepath('commands/deploy/heroku')
+      subcommand :Heroku, "heroku", Project.project_filepath("commands/deploy/heroku")
 
       def call(*)
         @ctx.puts(self.class.help)
       end
 
       def self.help
-        ShopifyCli::Context.message('node.deploy.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.deploy.help", ShopifyCli::TOOL_NAME)
       end
 
       def self.extended_help
-        ShopifyCli::Context.message('node.deploy.extended_help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.deploy.extended_help", ShopifyCli::TOOL_NAME)
       end
     end
   end

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

@@ -1,70 +1,70 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Node
   module Commands
     class Deploy
       class Heroku < ShopifyCli::SubCommand
         def self.help
-          ShopifyCli::Context.message('node.deploy.heroku.help', ShopifyCli::TOOL_NAME)
+          ShopifyCli::Context.message("node.deploy.heroku.help", ShopifyCli::TOOL_NAME)
         end
 
         def call(*)
           spin_group = CLI::UI::SpinGroup.new
           heroku_service = ShopifyCli::Heroku.new(@ctx)
 
-          spin_group.add(@ctx.message('node.deploy.heroku.downloading')) do |spinner|
+          spin_group.add(@ctx.message("node.deploy.heroku.downloading")) do |spinner|
             heroku_service.download
-            spinner.update_title(@ctx.message('node.deploy.heroku.downloaded'))
+            spinner.update_title(@ctx.message("node.deploy.heroku.downloaded"))
           end
           spin_group.wait
 
           install_message = @ctx.message(
-            @ctx.windows? ? 'node.deploy.heroku.installing_windows' : 'node.deploy.heroku.installing'
+            @ctx.windows? ? "node.deploy.heroku.installing_windows" : "node.deploy.heroku.installing"
           )
           spin_group.add(install_message) do |spinner|
             heroku_service.install
-            spinner.update_title(@ctx.message('node.deploy.heroku.installed'))
+            spinner.update_title(@ctx.message("node.deploy.heroku.installed"))
           end
           spin_group.wait
 
-          spin_group.add(@ctx.message('node.deploy.heroku.git.checking')) do |spinner|
+          spin_group.add(@ctx.message("node.deploy.heroku.git.checking")) do |spinner|
             ShopifyCli::Git.init(@ctx)
-            spinner.update_title(@ctx.message('node.deploy.heroku.git.initialized'))
+            spinner.update_title(@ctx.message("node.deploy.heroku.git.initialized"))
           end
           spin_group.wait
 
           if (account = heroku_service.whoami)
-            @ctx.puts(@ctx.message('node.deploy.heroku.authenticated_with_account', account))
+            @ctx.puts(@ctx.message("node.deploy.heroku.authenticated_with_account", account))
           else
             CLI::UI::Frame.open(
-              @ctx.message('node.deploy.heroku.authenticating'),
-              success_text: @ctx.message('node.deploy.heroku.authenticated')
+              @ctx.message("node.deploy.heroku.authenticating"),
+              success_text: @ctx.message("node.deploy.heroku.authenticated")
             ) do
               heroku_service.authenticate
             end
           end
 
           if (app_name = heroku_service.app)
-            @ctx.puts(@ctx.message('node.deploy.heroku.app.selected', app_name))
+            @ctx.puts(@ctx.message("node.deploy.heroku.app.selected", app_name))
           else
-            app_type = CLI::UI::Prompt.ask(@ctx.message('node.deploy.heroku.app.no_apps_found')) do |handler|
-              handler.option(@ctx.message('node.deploy.heroku.app.create')) { :new }
-              handler.option(@ctx.message('node.deploy.heroku.app.select')) { :existing }
+            app_type = CLI::UI::Prompt.ask(@ctx.message("node.deploy.heroku.app.no_apps_found")) do |handler|
+              handler.option(@ctx.message("node.deploy.heroku.app.create")) { :new }
+              handler.option(@ctx.message("node.deploy.heroku.app.select")) { :existing }
             end
 
             if app_type == :existing
-              app_name = CLI::UI::Prompt.ask(@ctx.message('node.deploy.heroku.app.name'))
+              app_name = CLI::UI::Prompt.ask(@ctx.message("node.deploy.heroku.app.name"))
               CLI::UI::Frame.open(
-                @ctx.message('node.deploy.heroku.app.selecting', app_name),
-                success_text: @ctx.message('node.deploy.heroku.app.selected', app_name)
+                @ctx.message("node.deploy.heroku.app.selecting", app_name),
+                success_text: @ctx.message("node.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('node.deploy.heroku.app.creating'),
-                success_text: @ctx.message('node.deploy.heroku.app.created')
+                @ctx.message("node.deploy.heroku.app.creating"),
+                success_text: @ctx.message("node.deploy.heroku.app.created")
               ) do
                 heroku_service.create_new_app
               end
@@ -74,9 +74,9 @@ module Node
           branches = ShopifyCli::Git.branches(@ctx)
           if branches.length == 1
             branch_to_deploy = branches[0]
-            @ctx.puts(@ctx.message('node.deploy.heroku.git.branch_selected', branch_to_deploy))
+            @ctx.puts(@ctx.message("node.deploy.heroku.git.branch_selected", branch_to_deploy))
           else
-            branch_to_deploy = CLI::UI::Prompt.ask(@ctx.message('node.deploy.heroku.git.what_branch')) do |handler|
+            branch_to_deploy = CLI::UI::Prompt.ask(@ctx.message("node.deploy.heroku.git.what_branch")) do |handler|
               branches.each do |branch|
                 handler.option(branch) { branch }
               end
@@ -84,8 +84,8 @@ module Node
           end
 
           CLI::UI::Frame.open(
-            @ctx.message('node.deploy.heroku.deploying'),
-            success_text: @ctx.message('node.deploy.heroku.deployed')
+            @ctx.message("node.deploy.heroku.deploying"),
+            success_text: @ctx.message("node.deploy.heroku.deployed")
           ) do
             heroku_service.deploy(branch_to_deploy)
           end

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

@@ -1,50 +1,19 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Node
   module Commands
     class Generate < ShopifyCli::Command
-      subcommand :Page, 'page', Project.project_filepath('commands/generate/page')
-      subcommand :Billing, 'billing', Project.project_filepath('commands/generate/billing')
-      subcommand :Webhook, 'webhook', Project.project_filepath('commands/generate/webhook')
-
       def call(*)
         @ctx.puts(self.class.help)
       end
 
       def self.help
-        ShopifyCli::Context.message('node.generate.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.generate.help")
       end
 
       def self.extended_help
-        extended_help = "{{bold:Subcommands:}}\n"
-        subcommand_registry.resolved_commands.sort.each do |name, klass|
-          extended_help += "  {{cyan:#{name}}}: "
-
-          if (subcmd_help = klass.help)
-            extended_help += subcmd_help.gsub("\n  ", "\n    ")
-          end
-          extended_help += "\n"
-        end
-        extended_help += ShopifyCli::Context.message('node.generate.extended_help', ShopifyCli::TOOL_NAME)
-      end
-
-      def self.run_generate(script, name, ctx)
-        stat = ctx.system(script)
-        unless stat.success?
-          ctx.abort(response(stat.exitstatus, name, ctx))
-        end
-      end
-
-      def self.response(code, name, ctx)
-        case code
-        when 1
-          ctx.message('node.generate.error.generic', name)
-        when 2
-          ctx.message('node.generate.error.name_exists', name)
-        else
-          ctx.message('node.error.generic')
-        end
+        help
       end
     end
   end

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

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module Node
   module Commands
@@ -9,7 +9,7 @@ module Node
       end
 
       def self.help
-        ShopifyCli::Context.message('node.open.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.open.help", ShopifyCli::TOOL_NAME)
       end
     end
   end

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

@@ -1,22 +1,22 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module Node
   module Commands
     class Populate < ShopifyCli::Command
-      subcommand :Customer, 'customers', Project.project_filepath('commands/populate/customer')
-      subcommand :DraftOrder, 'draftorders', Project.project_filepath('commands/populate/draft_order')
-      subcommand :Product, 'products', Project.project_filepath('commands/populate/product')
+      subcommand :Customer, "customers", Project.project_filepath("commands/populate/customer")
+      subcommand :DraftOrder, "draftorders", Project.project_filepath("commands/populate/draft_order")
+      subcommand :Product, "products", Project.project_filepath("commands/populate/product")
 
       def call(_args, _name)
         @ctx.puts(self.class.help)
       end
 
       def self.help
-        ShopifyCli::Context.message('node.populate.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.populate.help", ShopifyCli::TOOL_NAME)
       end
 
       def self.extended_help
-        ShopifyCli::Context.message('node.populate.extended_help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.populate.extended_help", ShopifyCli::TOOL_NAME)
       end
     end
   end

data/lib/project_types/node/commands/populate/customer.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module Node
   module Commands
@@ -15,11 +15,11 @@ module Node
         end
 
         def message(data)
-          ret = data['customerCreate']['customer']
-          id = ShopifyCli::API.gid_to_id(ret['id'])
+          ret = data["customerCreate"]["customer"]
+          id = ShopifyCli::API.gid_to_id(ret["id"])
           @ctx.message(
-            'node.populate.customer.added',
-            ret['displayName'],
+            "node.populate.customer.added",
+            ret["displayName"],
             ShopifyCli::Project.current.env.shop,
             admin_url,
             id

data/lib/project_types/node/commands/populate/draft_order.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module Node
   module Commands
@@ -11,16 +11,16 @@ module Node
             lineItems: [{
               originalUnitPrice: price,
               quantity: 1,
-              weight: { value: 10, unit: 'GRAMS' },
+              weight: { value: 10, unit: "GRAMS" },
               title: ShopifyCli::Helpers::Haikunator.title,
             }],
           }
         end
 
         def message(data)
-          ret = data['draftOrderCreate']['draftOrder']
-          id = ShopifyCli::API.gid_to_id(ret['id'])
-          @ctx.message('node.populate.draft_order.added', ShopifyCli::Project.current.env.shop, admin_url, id)
+          ret = data["draftOrderCreate"]["draftOrder"]
+          id = ShopifyCli::API.gid_to_id(ret["id"])
+          @ctx.message("node.populate.draft_order.added", ShopifyCli::Project.current.env.shop, admin_url, id)
         end
       end
     end

data/lib/project_types/node/commands/populate/product.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module Node
   module Commands
@@ -14,11 +14,11 @@ module Node
         end
 
         def message(data)
-          ret = data['productCreate']['product']
-          id = ShopifyCli::API.gid_to_id(ret['id'])
+          ret = data["productCreate"]["product"]
+          id = ShopifyCli::API.gid_to_id(ret["id"])
           @ctx.message(
-            'node.populate.product.added',
-            ret['title'],
+            "node.populate.product.added",
+            ret["title"],
             ShopifyCli::Project.current.env.shop,
             admin_url,
             id

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

@@ -5,15 +5,15 @@ module Node
       prerequisite_task :ensure_env, :ensure_dev_store
 
       options do |parser, flags|
-        parser.on('--host=HOST') do |h|
-          flags[:host] = h.gsub('"', '')
+        parser.on("--host=HOST") do |h|
+          flags[:host] = h.gsub('"', "")
         end
       end
 
       def call(*)
         project = ShopifyCli::Project.current
         url = options.flags[:host] || ShopifyCli::Tunnel.start(@ctx)
-        @ctx.abort(@ctx.message('node.serve.error.host_must_be_https')) if url.match(/^https/i).nil?
+        @ctx.abort(@ctx.message("node.serve.error.host_must_be_https")) if url.match(/^https/i).nil?
         project.env.update(@ctx, :host, url)
         ShopifyCli::Tasks::UpdateDashboardURLS.call(
           @ctx,
@@ -23,22 +23,22 @@ module Node
 
         if project.env.shop
           project_url = "#{project.env.host}/auth?shop=#{project.env.shop}"
-          @ctx.puts("\n" + @ctx.message('node.serve.open_info', project_url) + "\n")
+          @ctx.puts("\n" + @ctx.message("node.serve.open_info", project_url) + "\n")
         end
 
-        CLI::UI::Frame.open(@ctx.message('node.serve.running_server')) do
+        CLI::UI::Frame.open(@ctx.message("node.serve.running_server")) do
           env = project.env.to_h
-          env['PORT'] = ShopifyCli::Tunnel::PORT.to_s
-          @ctx.system('npm run dev', env: env)
+          env["PORT"] = ShopifyCli::Tunnel::PORT.to_s
+          @ctx.system("npm run dev", env: env)
         end
       end
 
       def self.help
-        ShopifyCli::Context.message('node.serve.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.serve.help", ShopifyCli::TOOL_NAME)
       end
 
       def self.extended_help
-        ShopifyCli::Context.message('node.serve.extended_help')
+        ShopifyCli::Context.message("node.serve.extended_help")
       end
     end
   end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'shopify_cli'
+require "shopify_cli"
 
 module Node
   module Commands
@@ -10,17 +10,17 @@ module Node
       def call(args, _name)
         subcommand = args.shift
         case subcommand
-        when 'auth'
+        when "auth"
           token = args.shift
           if token.nil?
-            @ctx.puts(@ctx.message('node.tunnel.error.token_argument_missing'))
+            @ctx.puts(@ctx.message("node.tunnel.error.token_argument_missing"))
             @ctx.puts("#{self.class.help}\n#{self.class.extended_help}")
           else
             ShopifyCli::Tunnel.auth(@ctx, token)
           end
-        when 'start'
+        when "start"
           ShopifyCli::Tunnel.start(@ctx)
-        when 'stop'
+        when "stop"
           ShopifyCli::Tunnel.stop(@ctx)
         else
           @ctx.puts(self.class.help)
@@ -28,11 +28,11 @@ module Node
       end
 
       def self.help
-        ShopifyCli::Context.message('node.tunnel.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.tunnel.help", ShopifyCli::TOOL_NAME)
       end
 
       def self.extended_help
-        ShopifyCli::Context.message('node.tunnel.extended_help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.tunnel.extended_help", ShopifyCli::TOOL_NAME)
       end
     end
   end

data/lib/project_types/node/forms/create.rb

@@ -1,4 +1,4 @@
-require 'uri'
+require "uri"
 
 module Node
   module Forms
@@ -7,9 +7,9 @@ module Node
       flag_arguments :title, :organization_id, :shop_domain, :type
 
       def ask
-        self.title ||= CLI::UI::Prompt.ask(ctx.message('node.forms.create.app_name'))
+        self.title ||= CLI::UI::Prompt.ask(ctx.message("node.forms.create.app_name"))
+        self.name = format_name
         self.type = ask_type
-        self.name = self.title.downcase.split(" ").join("_")
         res = ShopifyCli::Tasks::SelectOrgAndShop.call(ctx, organization_id: organization_id, shop_domain: shop_domain)
         self.organization_id = res[:organization_id]
         self.shop_domain = res[:shop_domain]
@@ -17,18 +17,27 @@ module Node
 
       private
 
+      def format_name
+        name = title.downcase.split(" ").join("_")
+
+        if name.include?("shopify")
+          ctx.abort(ctx.message("node.forms.create.error.invalid_app_name"))
+        end
+        name
+      end
+
       def ask_type
         if type.nil?
-          return CLI::UI::Prompt.ask(ctx.message('node.forms.create.app_type.select')) do |handler|
-            handler.option(ctx.message('node.forms.create.app_type.select_public')) { 'public' }
-            handler.option(ctx.message('node.forms.create.app_type.select_custom')) { 'custom' }
+          return CLI::UI::Prompt.ask(ctx.message("node.forms.create.app_type.select")) do |handler|
+            handler.option(ctx.message("node.forms.create.app_type.select_public")) { "public" }
+            handler.option(ctx.message("node.forms.create.app_type.select_custom")) { "custom" }
           end
         end
 
         unless ShopifyCli::Tasks::CreateApiClient::VALID_APP_TYPES.include?(type)
-          ctx.abort(ctx.message('node.forms.create.error.invalid_app_type', type))
+          ctx.abort(ctx.message("node.forms.create.error.invalid_app_type", type))
         end
-        ctx.puts(ctx.message('node.forms.create.app_type.selected', type))
+        ctx.puts(ctx.message("node.forms.create.app_type.selected", type))
         type
       end
     end