shopify-cli 1.5.0 → 1.9.0

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

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Rails
   module Commands
     class Generate < ShopifyCli::Command
-      subcommand :Webhook, 'webhook', Project.project_filepath('commands/generate/webhook')
+      subcommand :Webhook, "webhook", Project.project_filepath("commands/generate/webhook")
 
       def call(*)
         @ctx.puts(self.class.help)
       end
 
       def self.help
-        ShopifyCli::Context.message('rails.generate.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("rails.generate.help", ShopifyCli::TOOL_NAME)
       end
 
       def self.extended_help
@@ -24,7 +24,7 @@ module Rails
           end
           extended_help += "\n"
         end
-        extended_help += ShopifyCli::Context.message('rails.generate.extended_help', ShopifyCli::TOOL_NAME)
+        extended_help += ShopifyCli::Context.message("rails.generate.extended_help", ShopifyCli::TOOL_NAME)
       end
 
       def self.run_generate(script, name, ctx)
@@ -38,11 +38,11 @@ module Rails
       def self.response(code, name, ctx)
         case code
         when 1
-          ctx.message('rails.generate.error.generic', name)
+          ctx.message("rails.generate.error.generic", name)
         when 2
-          ctx.message('rails.generate.error.name_exists', name)
+          ctx.message("rails.generate.error.name_exists", name)
         else
-          ctx.message('rails.error.generic')
+          ctx.message("rails.error.generic")
         end
       end
     end

data/lib/project_types/rails/commands/generate/webhook.rb

@@ -1,5 +1,5 @@
-require 'shopify_cli'
-require 'json'
+require "shopify_cli"
+require "json"
 module Rails
   module Commands
     class Generate
@@ -7,16 +7,16 @@ module Rails
         def call(args, _name)
           selected_type = args.first
           schema = ShopifyCli::AdminAPI::Schema.get(@ctx)
-          webhooks = schema.get_names_from_type('WebhookSubscriptionTopic')
+          webhooks = schema.get_names_from_type("WebhookSubscriptionTopic")
           unless selected_type && webhooks.include?(selected_type)
-            selected_type = CLI::UI::Prompt.ask(@ctx.message('rails.generate.webhook.select')) do |handler|
+            selected_type = CLI::UI::Prompt.ask(@ctx.message("rails.generate.webhook.select")) do |handler|
               webhooks.each do |type|
                 handler.option(type) { type }
               end
             end
           end
           spin_group = CLI::UI::SpinGroup.new
-          spin_group.add(@ctx.message('rails.generate.webhook.selected', selected_type)) do |spinner|
+          spin_group.add(@ctx.message("rails.generate.webhook.selected", selected_type)) do |spinner|
             Rails::Commands::Generate.run_generate(generate_command(selected_type), selected_type, @ctx)
             spinner.update_title("{{green:#{selected_type}}} config/initializers/shopify_app.rb")
           end
@@ -24,7 +24,7 @@ module Rails
         end
 
         def self.help
-          ShopifyCli::Context.message('rails.generate.webhook.help', ShopifyCli::TOOL_NAME)
+          ShopifyCli::Context.message("rails.generate.webhook.help", ShopifyCli::TOOL_NAME)
         end
 
         def generate_command(selected_type)

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

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

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

@@ -1,22 +1,22 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module Rails
   module Commands
     class Populate < ShopifyCli::Command
-      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")
+      subcommand :Customer, "customers", Project.project_filepath("commands/populate/customer")
+      subcommand :DraftOrder, "draftorders", Project.project_filepath("commands/populate/draft_order")
 
       def call(_args, _name)
         @ctx.puts(self.class.help)
       end
 
       def self.help
-        ShopifyCli::Context.message('rails.populate.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("rails.populate.help", ShopifyCli::TOOL_NAME)
       end
 
       def self.extended_help
-        ShopifyCli::Context.message('rails.populate.extended_help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("rails.populate.extended_help", ShopifyCli::TOOL_NAME)
       end
     end
   end

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

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module Rails
   module Commands
@@ -15,11 +15,11 @@ module Rails
         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(
-            'rails.populate.customer.added',
-            ret['displayName'],
+            "rails.populate.customer.added",
+            ret["displayName"],
             ShopifyCli::Project.current.env.shop,
             admin_url,
             id

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

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module Rails
   module Commands
@@ -11,16 +11,16 @@ module Rails
             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('rails.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("rails.populate.draft_order.added", ShopifyCli::Project.current.env.shop, admin_url, id)
         end
       end
     end

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

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module Rails
   module Commands
@@ -14,11 +14,11 @@ module Rails
         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(
-            'rails.populate.product.added',
-            ret['title'],
+            "rails.populate.product.added",
+            ret["title"],
             ShopifyCli::Project.current.env.shop,
             admin_url,
             id

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

@@ -5,15 +5,15 @@ module Rails
       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('rails.serve.error.host_must_be_https')) if url.match(/^https/i).nil?
+        @ctx.abort(@ctx.message("rails.serve.error.host_must_be_https")) if url.match(/^https/i).nil?
         project.env.update(@ctx, :host, url)
         ShopifyCli::Tasks::UpdateDashboardURLS.call(
           @ctx,
@@ -23,28 +23,28 @@ module Rails
 
         if project.env.shop
           project_url = "#{project.env.host}/login?shop=#{project.env.shop}"
-          @ctx.puts("\n" + @ctx.message('rails.serve.open_info', project_url) + "\n")
+          @ctx.puts("\n" + @ctx.message("rails.serve.open_info", project_url) + "\n")
         end
 
-        CLI::UI::Frame.open(@ctx.message('rails.serve.running_server')) do
+        CLI::UI::Frame.open(@ctx.message("rails.serve.running_server")) do
           env = ShopifyCli::Project.current.env.to_h
-          env.delete('HOST')
-          env['PORT'] = ShopifyCli::Tunnel::PORT.to_s
-          env['GEM_PATH'] = Gem.gem_path(@ctx)
+          env.delete("HOST")
+          env["PORT"] = ShopifyCli::Tunnel::PORT.to_s
+          env["GEM_PATH"] = Gem.gem_path(@ctx)
           if @ctx.windows?
             @ctx.system("ruby bin\\rails server", env: env)
           else
-            @ctx.system('bin/rails server', env: env)
+            @ctx.system("bin/rails server", env: env)
           end
         end
       end
 
       def self.help
-        ShopifyCli::Context.message('rails.serve.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("rails.serve.help", ShopifyCli::TOOL_NAME)
       end
 
       def self.extended_help
-        ShopifyCli::Context.message('rails.serve.extended_help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("rails.serve.extended_help", ShopifyCli::TOOL_NAME)
       end
     end
   end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'shopify_cli'
+require "shopify_cli"
 
 module Rails
   module Commands
@@ -10,17 +10,17 @@ module Rails
       def call(args, _name)
         subcommand = args.shift
         case subcommand
-        when 'auth'
+        when "auth"
           token = args.shift
           if token.nil?
-            @ctx.puts(@ctx.message('rails.tunnel.error.token_argument_missing'))
+            @ctx.puts(@ctx.message("rails.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 Rails
       end
 
       def self.help
-        ShopifyCli::Context.message('rails.tunnel.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("rails.tunnel.help", ShopifyCli::TOOL_NAME)
       end
 
       def self.extended_help
-        ShopifyCli::Context.message('rails.tunnel.extended_help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("rails.tunnel.extended_help", ShopifyCli::TOOL_NAME)
       end
     end
   end

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

@@ -1,27 +1,27 @@
-require 'uri'
+require "uri"
 
 module Rails
   module Forms
     class Create < ShopifyCli::Form
       attr_accessor :name
       flag_arguments :title, :organization_id, :shop_domain, :type, :db
-      VALID_DB_TYPES = ['sqlite3',
-                        'mysql',
-                        'postgresql',
-                        'sqlite3',
-                        'oracle',
-                        'frontbase',
-                        'ibm_db',
-                        'sqlserver',
-                        'jdbcmysql',
-                        'jdbcsqlite3',
-                        'jdbcpostgresql',
-                        'jdbc']
+      VALID_DB_TYPES = ["sqlite3",
+                        "mysql",
+                        "postgresql",
+                        "sqlite3",
+                        "oracle",
+                        "frontbase",
+                        "ibm_db",
+                        "sqlserver",
+                        "jdbcmysql",
+                        "jdbcsqlite3",
+                        "jdbcpostgresql",
+                        "jdbc"]
 
       def ask
-        self.title ||= CLI::UI::Prompt.ask(ctx.message('rails.forms.create.app_name'))
+        self.title ||= CLI::UI::Prompt.ask(ctx.message("rails.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]
@@ -30,26 +30,36 @@ module Rails
 
       private
 
+      def format_name
+        name = title.downcase.split(" ").join("_")
+
+        if name.include?("shopify")
+          ctx.abort(ctx.message("rails.forms.create.error.invalid_app_name"))
+        end
+
+        name
+      end
+
       def ask_type
         if type.nil?
-          return CLI::UI::Prompt.ask(ctx.message('rails.forms.create.app_type.select')) do |handler|
-            handler.option(ctx.message('rails.forms.create.app_type.select_public')) { 'public' }
-            handler.option(ctx.message('rails.forms.create.app_type.select_custom')) { 'custom' }
+          return CLI::UI::Prompt.ask(ctx.message("rails.forms.create.app_type.select")) do |handler|
+            handler.option(ctx.message("rails.forms.create.app_type.select_public")) { "public" }
+            handler.option(ctx.message("rails.forms.create.app_type.select_custom")) { "custom" }
           end
         end
 
         unless ShopifyCli::Tasks::CreateApiClient::VALID_APP_TYPES.include?(type)
-          ctx.abort(ctx.message('rails.forms.create.error.invalid_app_type', type))
+          ctx.abort(ctx.message("rails.forms.create.error.invalid_app_type", type))
         end
-        ctx.puts(ctx.message('rails.forms.create.app_type.selected', type))
+        ctx.puts(ctx.message("rails.forms.create.app_type.selected", type))
         type
       end
 
       def ask_db
         if db.nil?
-          return 'sqlite3' unless CLI::UI::Prompt.confirm(ctx.message('rails.forms.create.db.want_select'),
-                                                          default: false)
-          @db = CLI::UI::Prompt.ask(ctx.message('rails.forms.create.db.select')) do |handler|
+          return "sqlite3" unless CLI::UI::Prompt.confirm(ctx.message("rails.forms.create.db.want_select"),
+            default: false)
+          @db = CLI::UI::Prompt.ask(ctx.message("rails.forms.create.db.select")) do |handler|
             VALID_DB_TYPES.each do |db_type|
               handler.option(ctx.message("rails.forms.create.db.select_#{db_type}")) { db_type }
             end
@@ -57,9 +67,9 @@ module Rails
         end
 
         unless VALID_DB_TYPES.include?(db)
-          ctx.abort(ctx.message('rails.forms.create.error.invalid_db_type', db))
+          ctx.abort(ctx.message("rails.forms.create.error.invalid_db_type", db))
         end
-        ctx.puts(ctx.message('rails.forms.create.db.selected', db))
+        ctx.puts(ctx.message("rails.forms.create.db.selected", db))
         db
       end
     end

data/lib/project_types/rails/gem.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Rails
   class Gem
@@ -14,52 +14,52 @@ module Rails
         name = args.shift
         version = args.shift
         gem = new(ctx: ctx, name: name, version: version)
-        ctx.debug(ctx.message('rails.gem.installed_debug', name, gem.installed?))
+        ctx.debug(ctx.message("rails.gem.installed_debug", name, gem.installed?))
         gem.installed? ? true : gem.install!
       end
 
       def binary_path_for(ctx, binary)
-        path_to_binary = File.join(gem_home(ctx), 'bin', binary)
+        path_to_binary = File.join(gem_home(ctx), "bin", binary)
         File.exist?(path_to_binary) ? path_to_binary : binary
       end
 
       def gem_home(ctx)
-        ctx.getenv('GEM_HOME') || apply_gem_home(ctx)
+        ctx.getenv("GEM_HOME") || apply_gem_home(ctx)
       end
 
       def gem_path(ctx)
-        ctx.getenv('GEM_PATH') || apply_gem_path(ctx)
+        ctx.getenv("GEM_PATH") || apply_gem_path(ctx)
       end
 
       private
 
       def apply_gem_home(ctx)
-        path = ''
+        path = ""
         # extract GEM_HOME from `gem environment home` command
-        out, stat = ctx.capture2e('gem', 'environment', 'home')
-        path = out&.empty? ? '' : out.strip if stat.success?
+        out, stat = ctx.capture2e("gem", "environment", "home")
+        path = out&.empty? ? "" : out.strip if stat.success?
         # fallback if return from `gem environment home` is empty (somewhat unlikely)
         path = fallback_gem_home_path(ctx) if path.empty?
         # fallback if path isn't writable (if using a system installed ruby)
         path = fallback_gem_home_path(ctx) unless File.writable?(path)
         ctx.mkdir_p(path) unless Dir.exist?(path)
-        ctx.debug(ctx.message('rails.gem.setting_gem_home', path))
-        ctx.setenv('GEM_HOME', path)
+        ctx.debug(ctx.message("rails.gem.setting_gem_home", path))
+        ctx.setenv("GEM_HOME", path)
       end
 
       def apply_gem_path(ctx)
-        path = ''
-        out, stat = ctx.capture2e('gem', 'environment', 'path')
-        path = out&.empty? ? '' : out.strip if stat.success?
+        path = ""
+        out, stat = ctx.capture2e("gem", "environment", "path")
+        path = out&.empty? ? "" : out.strip if stat.success?
         # usually GEM_PATH already contains GEM_HOME
         # if gem_home() falls back to our fallback path, we need to add it
         path = gem_home(ctx) + File::PATH_SEPARATOR + path unless path.include?(gem_home(ctx))
-        ctx.debug(ctx.message('rails.gem.setting_gem_path', path))
-        ctx.setenv('GEM_PATH', path)
+        ctx.debug(ctx.message("rails.gem.setting_gem_path", path))
+        ctx.setenv("GEM_PATH", path)
       end
 
       def fallback_gem_home_path(ctx)
-        File.join(ctx.getenv('HOME'), '.gem', 'ruby', RUBY_VERSION)
+        File.join(ctx.getenv("HOME"), ".gem", "ruby", RUBY_VERSION)
       end
     end
 
@@ -67,7 +67,7 @@ module Rails
       found = false
       paths = self.class.gem_path(ctx).split(File::PATH_SEPARATOR)
       paths.each do |path|
-        ctx.debug(ctx.message('rails.gem.checking_installation_path', "#{path}/gems/", name))
+        ctx.debug(ctx.message("rails.gem.checking_installation_path", "#{path}/gems/", name))
         found = !!Dir.glob("#{path}/gems/#{name}-*").detect do |f|
           gem_satisfies_version?(f)
         end
@@ -78,18 +78,18 @@ module Rails
 
     def install!
       spin = CLI::UI::SpinGroup.new
-      spin.add(ctx.message('rails.gem.installing', name)) do |spinner|
+      spin.add(ctx.message("rails.gem.installing", name)) do |spinner|
         args = %w(gem install)
         args.push(name)
         unless version.nil?
-          if ctx.windows? && version.include?('~')
-            args.push('-v', "\"#{version}\"")
+          if ctx.windows? && version.include?("~")
+            args.push("-v", "\"#{version}\"")
           else
-            args.push('-v', version)
+            args.push("-v", version)
           end
         end
         ctx.system(*args)
-        spinner.update_title(ctx.message('rails.gem.installed', name))
+        spinner.update_title(ctx.message("rails.gem.installed", name))
       end
       spin.wait
     end
@@ -98,8 +98,8 @@ module Rails
       if version
         # there was a specific version given during new(), so
         # check version of gem found to determine match
-        require 'semantic/semantic'
-        found_version, _ = path.match(%r{/#{Regexp.quote(name)}-([\d\.]+)})&.captures
+        require "semantic/semantic"
+        found_version, _ = path.match(%r{/#{Regexp.quote(name)}-(\d\.\d\.\d)})&.captures
         found_version.nil? ? false : Semantic::Version.new(found_version).satisfies?(version)
       else
         # otherwise ignore the actual version number,