shopify-cli 2.7.3 → 2.10.0

data/lib/project_types/theme/commands/push.rb

@@ -2,6 +2,7 @@
 require "shopify_cli/theme/theme"
 require "shopify_cli/theme/development_theme"
 require "shopify_cli/theme/ignore_filter"
+require "shopify_cli/theme/include_filter"
 require "shopify_cli/theme/syncer"
 
 module Theme
@@ -10,12 +11,14 @@ module Theme
       options do |parser, flags|
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
+        parser.on("-t", "--theme=NAME_OR_ID") { |theme| flags[:theme] = theme }
         parser.on("-l", "--live") { flags[:live] = true }
         parser.on("-d", "--development") { flags[:development] = true }
         parser.on("-u", "--unpublished") { flags[:unpublished] = true }
         parser.on("-j", "--json") { flags[:json] = true }
         parser.on("-a", "--allow-live") { flags[:allow_live] = true }
         parser.on("-p", "--publish") { flags[:publish] = true }
+        parser.on("-o", "--only=PATTERN") { |pattern| flags[:includes] = pattern }
         parser.on("-x", "--ignore=PATTERN") do |pattern|
           flags[:ignores] ||= []
           flags[:ignores] << pattern
@@ -25,39 +28,22 @@ module Theme
       def call(args, _name)
         root = args.first || "."
         delete = !options.flags[:nodelete]
-
-        theme = if (theme_id = options.flags[:theme_id])
-          ShopifyCLI::Theme::Theme.new(@ctx, root: root, id: theme_id)
-        elsif options.flags[:live]
-          ShopifyCLI::Theme::Theme.live(@ctx, root: root)
-        elsif options.flags[:development]
-          theme = ShopifyCLI::Theme::DevelopmentTheme.new(@ctx, root: root)
-          theme.ensure_exists!
-          theme
-        elsif options.flags[:unpublished]
-          name = CLI::UI::Prompt.ask(@ctx.message("theme.push.name"), allow_empty: false)
-          theme = ShopifyCLI::Theme::Theme.new(@ctx, root: root, name: name, role: "unpublished")
-          theme.create
-          theme
-        else
-          form = Forms::Select.ask(
-            @ctx,
-            [],
-            title: @ctx.message("theme.push.select"),
-            root: root,
-          )
-          return unless form
-          form.theme
-        end
+        theme = find_theme(root, **options.flags)
+        return if theme.nil?
 
         if theme.live? && !options.flags[:allow_live]
-          return unless CLI::UI::Prompt.confirm(@ctx.message("theme.push.live"))
+          question = @ctx.message("theme.push.live")
+          question += @ctx.message("theme.push.theme", theme.name, theme.id) if options.flags[:live]
+          return unless CLI::UI::Prompt.confirm(question)
         end
 
+        include_filter = ShopifyCLI::Theme::IncludeFilter.new(options.flags[:includes])
         ignore_filter = ShopifyCLI::Theme::IgnoreFilter.from_path(root)
         ignore_filter.add_patterns(options.flags[:ignores]) if options.flags[:ignores]
 
-        syncer = ShopifyCLI::Theme::Syncer.new(@ctx, theme: theme, ignore_filter: ignore_filter)
+        syncer = ShopifyCLI::Theme::Syncer.new(@ctx, theme: theme,
+                                               include_filter: include_filter,
+                                               ignore_filter: ignore_filter)
         begin
           syncer.start_threads
           if options.flags[:json]
@@ -76,16 +62,67 @@ module Theme
             end
           end
           raise ShopifyCLI::AbortSilent if syncer.has_any_error?
-        rescue ShopifyCLI::API::APIRequestNotFoundError
-          @ctx.abort(@ctx.message("theme.push.theme_not_found", theme.id))
         ensure
           syncer.shutdown
         end
+      rescue ShopifyCLI::API::APIRequestNotFoundError
+        @ctx.abort(@ctx.message("theme.push.theme_not_found", "##{theme.id}"))
       end
 
       def self.help
         ShopifyCLI::Context.message("theme.push.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
       end
+
+      private
+
+      def find_theme(root, theme_id: nil, theme: nil, live: nil, development: nil, unpublished: nil, **_args)
+        if theme_id
+          @ctx.warn(@ctx.message("theme.push.deprecated_themeid"))
+          return ShopifyCLI::Theme::Theme.new(@ctx, root: root, id: theme_id)
+        end
+
+        if live
+          return ShopifyCLI::Theme::Theme.live(@ctx, root: root)
+        end
+
+        if development
+          new_theme = ShopifyCLI::Theme::DevelopmentTheme.new(@ctx, root: root)
+          new_theme.ensure_exists!
+          return new_theme
+        end
+
+        if unpublished
+          name = theme || ask_theme_name
+          new_theme = ShopifyCLI::Theme::Theme.new(@ctx, root: root, name: name, role: "unpublished")
+          new_theme.create
+          return new_theme
+        end
+
+        if theme
+          selected_theme = ShopifyCLI::Theme::Theme.find_by_identifier(@ctx, root: root, identifier: theme)
+          return selected_theme || @ctx.abort(@ctx.message("theme.push.theme_not_found", theme))
+        end
+
+        select_theme(root)
+      end
+
+      def ask_theme_name
+        CLI::UI::Prompt.ask(@ctx.message("theme.push.name"), allow_empty: false)
+      end
+
+      def select_theme(root)
+        form = Forms::Select.ask(
+          @ctx,
+          [],
+          title: @ctx.message("theme.push.select"),
+          root: root,
+        )
+        form&.theme
+      end
+
+      def themes(root)
+        ShopifyCLI::Theme::Theme.all(@ctx, root: root)
+      end
     end
   end
 end

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

@@ -10,6 +10,7 @@ module Theme
         parser.on("--host=HOST") { |host| flags[:host] = host.to_s }
         parser.on("--port=PORT") { |port| flags[:port] = port.to_i }
         parser.on("--poll") { flags[:poll] = true }
+        parser.on("--live-reload=MODE") { |mode| flags[:mode] = as_reload_mode(mode) }
       end
 
       def call(*)
@@ -23,6 +24,10 @@ module Theme
           ShopifyCLI::Context.message("theme.serve.error.address_binding_error", ShopifyCLI::TOOL_NAME)
       end
 
+      def self.as_reload_mode(mode)
+        ShopifyCLI::Theme::DevServer::ReloadMode.get!(mode)
+      end
+
       def self.help
         ShopifyCLI::Context.message("theme.serve.help", ShopifyCLI::TOOL_NAME)
       end

data/lib/project_types/theme/messages/messages.rb

@@ -57,14 +57,16 @@ module Theme
               Usage: {{command:%s theme push [ ROOT ]}}
 
               Options:
-                {{command:-i, --themeid=THEMEID}} Theme ID. Must be an existing theme on your store.
-                {{command:-l, --live}}            Push to your remote live theme, and update your live store.
-                {{command:-d, --development}}     Push to your remote development theme, and create it if needed.
-                {{command:-u, --unpublished}}     Create a new unpublished theme and push to it.
-                {{command:-n, --nodelete}}        Runs the push command without deleting remote files from Shopify.
-                {{command:-j, --json}}            Output JSON instead of a UI.
-                {{command:-a, --allow-live}}      Allow push to a live theme.
-                {{command:-p, --publish}}         Publish as the live theme after uploading.
+                {{command:-t, --theme=NAME_OR_ID}} Theme ID or name of the remote theme.
+                {{command:-l, --live}}             Push to your remote live theme, and update your live store.
+                {{command:-d, --development}}      Push to your remote development theme, and create it if needed.
+                {{command:-u, --unpublished}}      Create a new unpublished theme and push to it.
+                {{command:-n, --nodelete}}         Runs the push command without deleting remote files from Shopify.
+                {{command:-j, --json}}             Output JSON instead of a UI.
+                {{command:-a, --allow-live}}       Allow push to a live theme.
+                {{command:-p, --publish}}          Publish as the live theme after uploading.
+                {{command:-o, --only}}             Upload only the specified files.
+                {{command:-x, --ignore}}           Skip uploading the specified files.
 
               Run without options to select theme from a list.
           HELP
@@ -74,7 +76,11 @@ module Theme
           push: "Pushing theme files to Shopify",
           select: "Select theme to push to",
           live: "Are you sure you want to push to your live theme?",
-          theme_not_found: "Theme #%s doesn't exist",
+          theme: "\n  Theme: {{blue:%s #%s}} {{green:[live]}}",
+          deprecated_themeid: <<~WARN,
+            {{warning:The {{command:-i, --themeid}} flag is deprecated. Use {{command:-t, --theme}} instead.}}
+          WARN
+          theme_not_found: "Theme \"%s\" doesn't exist",
           done: <<~DONE,
             {{green:Your theme was pushed successfully}}
 
@@ -93,10 +99,16 @@ module Theme
             Usage: {{command:%s theme serve}}
 
             Options:
-              {{command:--port=PORT}} Local port to serve theme preview from
-              {{command:--poll}}      Force polling to detect file changes
-              {{command:--host=HOST}} Set which network interface the web server listens on. The default value is 127.0.0.1.
+              {{command:--port=PORT}}        Local port to serve theme preview from.
+              {{command:--poll}}             Force polling to detect file changes.
+              {{command:--host=HOST}}        Set which network interface the web server listens on. The default value is 127.0.0.1.
+              {{command:--live-reload=MODE}} The live reload mode switches the server behavior when a file is modified:
+                                 - {{command:hot-reload}} Hot reloads local changes to CSS and sections (default)
+                                 - {{command:full-page}}  Always refreshes the entire page
+                                 - {{command:off}}        Deactivate live reload
           HELP
+          reload_mode_is_not_valid: "The live reload mode `%s` is not valid.",
+          try_a_valid_reload_mode: "Try a valid live reload mode: %s.",
           viewing_theme: "Viewing theme…",
           syncing_theme: "Syncing theme #%s on %s",
           open_fail: "Couldn't open the theme",
@@ -130,9 +142,7 @@ module Theme
             You are not authorized to edit themes on %s.
             Make sure you are a user of that store, and allowed to edit themes.
           ENSURE_USER
-          already_in_use_error: "Error",
           address_already_in_use: "The address \"%s\" is already in use.",
-          try_this: "Try this",
           try_port_option: "Use the --port=PORT option to serve the theme in a different port.",
         },
         check: {
@@ -188,16 +198,22 @@ module Theme
             Usage: {{command:%s theme pull [ ROOT ]}}
 
             Options:
-              {{command:-i, --themeid=THEMEID}} The Theme ID. Must be an existing theme on your store.
-              {{command:-l, --live}}            Pull theme files from your remote live theme.
-              {{command:-n, --nodelete}}        Runs the pull command without deleting local files.
+              {{command:-t, --theme=NAME_OR_ID}} Theme ID or name of the remote theme.
+              {{command:-l, --live}}             Pull theme files from your remote live theme.
+              {{command:-d, --development}}      Pull theme files from your remote development theme.
+              {{command:-n, --nodelete}}         Runs the pull command without deleting local files.
+              {{command:-o, --only}}             Download only the specified files.
+              {{command:-x, --ignore}}           Skip downloading the specified files.
 
             Run without options to select theme from a list.
           HELP
           select: "Select a theme to pull from",
           pulling: "Pulling theme files from %s (#%s) on %s",
           done: "Theme pulled successfully",
-          not_found: "{{x}} Theme #%s doesn't exist",
+          deprecated_themeid: <<~WARN,
+            {{warning:The {{command:-i, --themeid}} flag is deprecated. Use {{command:-t, --theme}} instead.}}
+          WARN
+          theme_not_found: "Theme \"%s\" doesn't exist",
         },
       },
     }.freeze

data/lib/shopify_cli/command.rb

@@ -29,6 +29,12 @@ module ShopifyCLI
           run_prerequisites
           cmd.call(args, command_name)
         end
+      rescue OptionParser::InvalidOption => error
+        arg = error.args.first
+        raise ShopifyCLI::Abort, @ctx.message("core.errors.option_parser.invalid_option", arg)
+      rescue OptionParser::MissingArgument => error
+        arg = error.args.first
+        raise ShopifyCLI::Abort, @ctx.message("core.errors.option_parser.missing_argument", arg)
       end
 
       def options(&block)

data/lib/shopify_cli/commands/login.rb

@@ -7,7 +7,7 @@ module ShopifyCLI
       PERMANENT_DOMAIN_SUFFIX = /\.myshopify\.(com|io)$/
 
       options do |parser, flags|
-        parser.on("--store=STORE") { |url| flags[:shop] = url }
+        parser.on("-s", "--store=STORE") { |url| flags[:shop] = url }
         # backwards compatibility allow 'shop' for now
         parser.on("--shop=SHOP") { |url| flags[:shop] = url }
         parser.on("--password=PASSWORD") { |password| flags[:password] = password }

data/lib/shopify_cli/commands/switch.rb

@@ -4,7 +4,7 @@ module ShopifyCLI
   module Commands
     class Switch < ShopifyCLI::Command
       options do |parser, flags|
-        parser.on("--store=STORE") { |url| flags[:shop] = url }
+        parser.on("-s", "--store=STORE") { |url| flags[:shop] = url }
         # backwards compatibility allow 'shop' for now
         parser.on("--shop=SHOP") { |url| flags[:shop] = url }
       end

data/lib/shopify_cli/constants.rb

@@ -30,17 +30,22 @@ module ShopifyCLI
 
     module EnvironmentVariables
       STACKTRACE = "SHOPIFY_CLI_STACKTRACE"
+      TTY = "SHOPIFY_CLI_TTY"
 
       # When true the CLI points to a local instance of
       # the partners dashboard and identity.
       LOCAL_PARTNERS = "SHOPIFY_APP_CLI_LOCAL_PARTNERS"
 
-      # When true the CLI points to a spin instance of spin
-      SPIN_PARTNERS = "SHOPIFY_APP_CLI_SPIN_PARTNERS"
+      # When true the CLI points to spin instances of services
+      SPIN = "SPIN"
+      INFER_SPIN = "INFER_SPIN"
       SPIN_WORKSPACE = "SPIN_WORKSPACE"
       SPIN_NAMESPACE = "SPIN_NAMESPACE"
       SPIN_HOST = "SPIN_HOST"
 
+      # Deprecated, equivalent to using SPIN=1
+      SPIN_PARTNERS = "SHOPIFY_APP_CLI_SPIN_PARTNERS"
+
       # Environments
       TEST = "SHOPIFY_CLI_TEST"
       ACCEPTANCE_TEST = "SHOPIFY_CLI_ACCEPTANCE_TEST"
@@ -61,5 +66,9 @@ module ShopifyCLI
     module Links
       NEW_ISSUE = "https://github.com/Shopify/shopify-cli/issues/new"
     end
+
+    module Extension
+      DEFAULT_PORT = 39351
+    end
   end
 end

data/lib/shopify_cli/context.rb

@@ -44,6 +44,56 @@ module ShopifyCLI
         str = Context.messages.dig(*key_parts)
         str ? str % params : key
       end
+
+      # a wrapper around Kernel.puts to allow for easy formatting
+      #
+      # #### Parameters
+      # * `text` - a string message to output
+      def puts(*args)
+        Kernel.puts(CLI::UI.fmt(*args))
+      end
+
+      # aborts the current running command and outputs an error message:
+      # - when the `help_message` is not provided, the error message appears in
+      #   a red frame, prefixed by an ✗ icon
+      # - when the `help_message` is provided, the error message appears in a
+      #   red frame, and the help message appears in a green frame
+      #
+      # #### Parameters
+      # * `error_message` - an error message to output
+      # * `help_message` - an optional help message
+      #
+      # #### Example
+      #
+      #   ShopifyCLI::Context.abort("Execution error")
+      #   # Output:
+      #   # ┏━━ Error ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+      #   # ┃ ✗ Execution error
+      #   # ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+      #
+      #   ShopifyCLI::Context.abort("Execution error", "export EXECUTION=1")
+      #   # Output:
+      #   # ┏━━ Error ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+      #   # ┃ Execution error
+      #   # ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+      #   # ┏━━ Try this ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+      #   # ┃ export EXECUTION=1
+      #   # ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+      #
+      def abort(error_message, help_message = nil)
+        raise ShopifyCLI::Abort, "{{x}} #{error_message}" if help_message.nil?
+
+        frame(message("core.error"), color: :red) { self.puts(error_message) }
+        frame(message("core.try_this"), color: :green) { self.puts(help_message) }
+
+        raise ShopifyCLI::AbortSilent
+      end
+
+      private
+
+      def frame(title, color:, &block)
+        CLI::UI::Frame.open(title, color: CLI::UI.resolve_color(color), timing: false, &block)
+      end
     end
 
     # is the directory root that the current command is running in. If you want to
@@ -61,14 +111,19 @@ module ShopifyCLI
     # will return which operating system that the cli is running on [:mac, :linux]
     def os
       host = uname
-      return :mac_m1 if /arm64-apple-darwin/i.match(host)
+      return :mac_m1 if /arm64.*darwin/i.match(host)
       return :mac if /darwin/i.match(host)
       return :windows if /mswin|mingw|cygwin/i.match(host)
       return :linux if /linux|bsd/i.match(host)
       :unknown
     end
 
-    # will return true if the cli is running on an apple computer.
+    # will return true if the cli is running on an ARM Apple computer.
+    def mac_m1?
+      os == :mac_m1
+    end
+
+    # will return true if the cli is running on a Intel x86 Apple computer.
     def mac?
       os == :mac
     end
@@ -90,7 +145,7 @@ module ShopifyCLI
 
     # will return true if being launched from a tty
     def tty?
-      $stdin.tty? && !testing?
+      $stdin.tty?
     end
 
     # will return true if the cli is being run from an installation, and not a
@@ -329,7 +384,7 @@ module ShopifyCLI
           system("xdg-open", uri.to_s)
         elsif windows?
           system("start \"\" \"#{uri}\"")
-        elsif mac?
+        elsif mac? || mac_m1?
           system("open", uri.to_s)
         else
           open_url!(uri)
@@ -349,13 +404,13 @@ module ShopifyCLI
       puts "{{yellow:*}} #{text}"
     end
 
-    # a wrapper around Kernel.puts to allow for easy formatting
+    # proxy call to Context.puts.
     #
     # #### Parameters
     # * `text` - a string message to output
     #
     def puts(*args)
-      Kernel.puts(CLI::UI.fmt(*args))
+      Context.puts(*args)
     end
 
     # a wrapper around $stderr.puts to allow for easy formatting
@@ -385,14 +440,13 @@ module ShopifyCLI
       puts("{{v}} #{text}")
     end
 
-    # aborts the current running command and outputs an error message, prefixed
-    # by a red x
+    # proxy call to Context.abort.
     #
     # #### Parameters
-    # * `text` - a string message to output
-    #
-    def abort(text)
-      raise ShopifyCLI::Abort, "{{x}} #{text}"
+    # * `error_message` - an error message to output
+    # * `help_message` - an optional help message
+    def abort(error_message, help_message = nil)
+      Context.abort(error_message, help_message)
     end
 
     # outputs a message, prefixed by a red `DEBUG` tag. This will only output to

data/lib/shopify_cli/core/executor.rb

@@ -3,10 +3,10 @@ require "shopify_cli"
 module ShopifyCLI
   module Core
     class Executor < CLI::Kit::Executor
-      def initialize(ctx, task_registry, *args, **kwargs)
-        @ctx = ctx || ShopifyCLI::Context.new
-        @task_registry = task_registry || ShopifyCLI::Tasks::TaskRegistry.new
-        super(*args, **kwargs)
+      ruby2_keywords def initialize(ctx, task_registry, *args)
+        @ctx = ctx || ShopifyCli::Context.new
+        @task_registry = task_registry || ShopifyCli::Tasks::TaskRegistry.new
+        super(*args)
       end
 
       def call(command, command_name, args)

data/lib/shopify_cli/environment.rb

@@ -4,6 +4,21 @@ module ShopifyCLI
   module Environment
     TRUTHY_ENV_VARIABLE_VALUES = ["1", "true", "TRUE", "yes", "YES"]
 
+    def self.interactive=(interactive)
+      @interactive = interactive
+    end
+
+    def self.interactive?(env_variables: ENV)
+      if env_variables.key?(Constants::EnvironmentVariables::TTY)
+        env_variable_truthy?(
+          Constants::EnvironmentVariables::TTY,
+          env_variables: env_variables
+        )
+      else
+        @interactive ||= STDIN.tty?
+      end
+    end
+
     def self.development?(env_variables: ENV)
       env_variable_truthy?(
         Constants::EnvironmentVariables::DEVELOPMENT,
@@ -11,10 +26,6 @@ module ShopifyCLI
       )
     end
 
-    def self.interactive?
-      ShopifyCLI::Context.new.tty?
-    end
-
     def self.use_local_partners_instance?(env_variables: ENV)
       env_variable_truthy?(
         Constants::EnvironmentVariables::LOCAL_PARTNERS,
@@ -50,17 +61,10 @@ module ShopifyCLI
       )
     end
 
-    def self.use_spin_partners_instance?(env_variables: ENV)
-      env_variable_truthy?(
-        Constants::EnvironmentVariables::SPIN_PARTNERS,
-        env_variables: env_variables
-      )
-    end
-
     def self.partners_domain(env_variables: ENV)
       if use_local_partners_instance?(env_variables: env_variables)
         "partners.myshopify.io"
-      elsif use_spin_partners_instance?(env_variables: env_variables)
+      elsif use_spin?(env_variables: env_variables)
         "partners.#{spin_url(env_variables: env_variables)}"
       else
         "partners.shopify.com"
@@ -68,15 +72,31 @@ module ShopifyCLI
     end
 
     def self.use_spin?(env_variables: ENV)
-      !env_variables[Constants::EnvironmentVariables::SPIN_WORKSPACE].nil? &&
-        !env_variables[Constants::EnvironmentVariables::SPIN_NAMESPACE].nil?
+      env_variable_truthy?(
+        Constants::EnvironmentVariables::SPIN,
+        env_variables: env_variables
+      ) || env_variable_truthy?(
+        Constants::EnvironmentVariables::SPIN_PARTNERS,
+        env_variables: env_variables
+      )
+    end
+
+    def self.infer_spin?(env_variables: ENV)
+      env_variable_truthy?(
+        Constants::EnvironmentVariables::INFER_SPIN,
+        env_variables: env_variables
+      )
     end
 
     def self.spin_url(env_variables: ENV)
-      spin_workspace = spin_workspace(env_variables: env_variables)
-      spin_namespace = spin_namespace(env_variables: env_variables)
-      spin_host = spin_host(env_variables: env_variables)
-      "#{spin_workspace}.#{spin_namespace}.#{spin_host}"
+      if infer_spin?(env_variables: env_variables)
+        %x(spin info fqdn 2> /dev/null).strip
+      else
+        spin_workspace = spin_workspace(env_variables: env_variables)
+        spin_namespace = spin_namespace(env_variables: env_variables)
+        spin_host = spin_host(env_variables: env_variables)
+        "#{spin_workspace}.#{spin_namespace}.#{spin_host}"
+      end
     end
 
     def self.send_monorail_events?(env_variables: ENV)
@@ -95,11 +115,21 @@ module ShopifyCLI
     end
 
     def self.spin_workspace(env_variables: ENV)
-      env_variables[Constants::EnvironmentVariables::SPIN_WORKSPACE]
+      env_value = env_variables[Constants::EnvironmentVariables::SPIN_WORKSPACE]
+      return env_value unless env_value.nil?
+
+      if env_value.nil?
+        raise "No value set for #{Constants::EnvironmentVariables::SPIN_WORKSPACE}"
+      end
     end
 
     def self.spin_namespace(env_variables: ENV)
-      env_variables[Constants::EnvironmentVariables::SPIN_NAMESPACE]
+      env_value = env_variables[Constants::EnvironmentVariables::SPIN_NAMESPACE]
+      return env_value unless env_value.nil?
+
+      if env_value.nil?
+        raise "No value set for #{Constants::EnvironmentVariables::SPIN_NAMESPACE}"
+      end
     end
 
     def self.spin_host(env_variables: ENV)

data/lib/shopify_cli/form.rb

@@ -15,6 +15,8 @@ module ShopifyCLI
         rescue ShopifyCLI::Abort => err
           ctx.puts(err.message)
           nil
+        rescue ShopifyCLI::AbortSilent
+          nil
         end
       end
 

data/lib/shopify_cli/identity_auth.rb

@@ -229,6 +229,7 @@ module ShopifyCLI
       uri = URI.parse("#{auth_url}#{endpoint}")
       https = Net::HTTP.new(uri.host, uri.port)
       https.use_ssl = true
+      https.verify_mode = OpenSSL::SSL::VERIFY_NONE if ENV["SSL_VERIFY_NONE"]
       request = Net::HTTP::Post.new(uri.path)
       request["User-Agent"] = "Shopify CLI #{::ShopifyCLI::VERSION}"
       request.body = URI.encode_www_form(params)
@@ -255,7 +256,7 @@ module ShopifyCLI
     def auth_url
       if Environment.use_local_partners_instance?
         "https://identity.myshopify.io/oauth"
-      elsif Environment.use_spin_partners_instance?
+      elsif Environment.use_spin?
         "https://identity.#{Environment.spin_url}/oauth"
       else
         "https://accounts.shopify.com/oauth"
@@ -263,7 +264,7 @@ module ShopifyCLI
     end
 
     def client_id_for_application(application_name)
-      client_ids = if Environment.use_local_partners_instance? || Environment.use_spin_partners_instance?
+      client_ids = if Environment.use_local_partners_instance? || Environment.use_spin?
         DEV_APPLICATION_CLIENT_IDS
       else
         APPLICATION_CLIENT_IDS
@@ -279,7 +280,7 @@ module ShopifyCLI
     end
 
     def client_id
-      if Environment.use_local_partners_instance? || Environment.use_spin_partners_instance?
+      if Environment.use_local_partners_instance? || Environment.use_spin?
         Constants::Identity::CLIENT_ID_DEV
       else
         # In the future we might want to use Identity's dynamic

data/lib/shopify_cli/messages/messages.rb

@@ -14,6 +14,12 @@ module ShopifyCLI
         },
       },
       core: {
+        errors: {
+          option_parser: {
+            invalid_option: "The option {{command:%s}} is not supported.",
+            missing_argument: "The required argument {{command:%s}} is missing.",
+          },
+        },
         app: {
           help: <<~HELP,
           Suite of commands for developing apps. See {{command:%1$s app <command> --help}} for usage of each command.
@@ -719,7 +725,7 @@ module ShopifyCLI
           signup_suggestion: <<~MESSAGE,
             {{*}} To avoid tunnels that timeout, it is recommended to signup for a free ngrok
             account at {{underline:https://ngrok.com/signup}}. After you signup, install your
-            personalized authorization token using {{command:%s [ node | rails ] tunnel auth <token>}}.
+            personalized authorization token using {{command:%s app tunnel auth <token>}}.
           MESSAGE
           start: "{{v}} ngrok tunnel running at {{underline:%s}}",
           start_with_account: "{{v}} ngrok tunnel running at {{underline:%s}}, with account %s",
@@ -784,6 +790,8 @@ module ShopifyCLI
           logged_in_partner_only: "Logged into partner organization {{green:%s}}",
           logged_in_partner_and_shop: "Logged into store {{green:%s}} in partner organization {{green:%s}}",
         },
+        error: "Error",
+        try_this: "Try this",
       },
     }.freeze
   end