shopify-cli 2.3.0 → 2.6.1

data/lib/project_types/script/ui/error_handler.rb

@@ -4,7 +4,7 @@ module Script
   module UI
     module ErrorHandler
       def self.display(failed_op:, cause_of_error:, help_suggestion:)
-        $stderr.puts(CLI::UI.fmt(ShopifyCli::Context.message("script.error.generic")))
+        $stderr.puts(CLI::UI.fmt(ShopifyCLI::Context.message("script.error.generic")))
         full_msg = failed_op ? failed_op.dup : ""
         full_msg << " #{cause_of_error}" if cause_of_error
         full_msg << " #{help_suggestion}" if help_suggestion
@@ -13,7 +13,7 @@ module Script
 
       def self.display_and_raise(failed_op: nil, cause_of_error: nil, help_suggestion: nil)
         display(failed_op: failed_op, cause_of_error: cause_of_error, help_suggestion: help_suggestion)
-        raise(ShopifyCli::AbortSilent)
+        raise(ShopifyCLI::AbortSilent)
       end
 
       def self.pretty_print_and_raise(e, failed_op: nil)
@@ -26,85 +26,85 @@ module Script
         case e
         when Errno::EACCES
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.eacces_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.eacces_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.eacces_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.eacces_help"),
           }
         when Errno::ENOSPC
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.enospc_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.enospc_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.enospc_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.enospc_help"),
           }
-        when ShopifyCli::IdentityAuth::Error
+        when ShopifyCLI::IdentityAuth::Error
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.oauth_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.oauth_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.oauth_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.oauth_help"),
           }
         when Layers::Infrastructure::Errors::InvalidContextError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.invalid_context_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.invalid_context_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_context_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.invalid_context_help"),
           }
         when Errors::InvalidConfigProps
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.invalid_config_props_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.invalid_config_props_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_config_props_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.invalid_config_props_help"),
           }
         when Errors::InvalidConfigYAMLError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.invalid_config", e.config_file),
+            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_config", e.config_file),
           }
         when Layers::Infrastructure::Errors::InvalidLanguageError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.invalid_language_cause", e.language),
-            help_suggestion: ShopifyCli::Context.message(
+            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_language_cause", e.language),
+            help_suggestion: ShopifyCLI::Context.message(
               "script.error.invalid_language_help",
               Script::Layers::Application::ExtensionPoints.languages(type: e.extension_point_type).join(", ")
             ),
           }
         when Errors::InvalidScriptNameError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.invalid_script_name_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.invalid_script_name_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_script_name_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.invalid_script_name_help"),
           }
         when Errors::NoExistingAppsError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.no_existing_apps_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.no_existing_apps_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.no_existing_apps_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.no_existing_apps_help"),
           }
         when Errors::NoExistingOrganizationsError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.no_existing_orgs_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.no_existing_orgs_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.no_existing_orgs_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.no_existing_orgs_help"),
           }
         when Errors::NoExistingStoresError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.no_existing_stores_cause"),
-            help_suggestion: ShopifyCli::Context.message(
+            cause_of_error: ShopifyCLI::Context.message("script.error.no_existing_stores_cause"),
+            help_suggestion: ShopifyCLI::Context.message(
               "script.error.no_existing_stores_help",
               organization_id: e.organization_id
             ),
           }
         when Layers::Infrastructure::Errors::ScriptProjectAlreadyExistsError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.project_exists_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.project_exists_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.project_exists_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.project_exists_help"),
           }
         when Layers::Infrastructure::Errors::DeprecatedEPError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.deprecated_ep", e.ep),
-            help_suggestion: ShopifyCli::Context.message("script.error.deprecated_ep_cause"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.deprecated_ep", e.ep),
+            help_suggestion: ShopifyCLI::Context.message("script.error.deprecated_ep_cause"),
           }
         when Layers::Domain::Errors::InvalidExtensionPointError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.invalid_extension_cause", e.type),
-            help_suggestion: ShopifyCli::Context.message(
+            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_extension_cause", e.type),
+            help_suggestion: ShopifyCLI::Context.message(
               "script.error.invalid_extension_help",
-              Script::Layers::Application::ExtensionPoints.types.join(", ")
+              Script::Layers::Application::ExtensionPoints.available_types.join(", ")
             ),
           }
         when Layers::Domain::Errors::ScriptNotFoundError
           {
-            cause_of_error: ShopifyCli::Context.message(
+            cause_of_error: ShopifyCLI::Context.message(
               "script.error.script_not_found_cause",
               e.script_name,
               e.extension_point_type
@@ -112,135 +112,143 @@ module Script
           }
         when Layers::Domain::Errors::MetadataValidationError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.metadata_validation_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.metadata_validation_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.metadata_validation_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.metadata_validation_help"),
           }
         when Layers::Domain::Errors::MetadataNotFoundError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.metadata_not_found_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.metadata_not_found_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.metadata_not_found_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.metadata_not_found_help"),
           }
         when Layers::Domain::Errors::MissingScriptJsonFieldError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.missing_script_json_field_cause", e.field),
-            help_suggestion: ShopifyCli::Context.message("script.error.missing_script_json_field_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.missing_script_json_field_cause", e.field),
+            help_suggestion: ShopifyCLI::Context.message("script.error.missing_script_json_field_help"),
           }
         when Layers::Domain::Errors::InvalidScriptJsonDefinitionError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.invalid_script_json_definition_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.invalid_script_json_definition_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_script_json_definition_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.invalid_script_json_definition_help"),
           }
         when Layers::Domain::Errors::NoScriptJsonFile
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.no_script_json_file_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.no_script_json_file_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.no_script_json_file_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.no_script_json_file_help"),
           }
         when Layers::Infrastructure::Errors::AppNotInstalledError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.app_not_installed_cause"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.app_not_installed_cause"),
           }
         when Layers::Infrastructure::Errors::BuildError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.build_error_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.build_error_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.build_error_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.build_error_help"),
           }
         when Layers::Infrastructure::Errors::ScriptJsonSyntaxError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.configuration_syntax_error_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.configuration_syntax_error_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.configuration_syntax_error_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.configuration_syntax_error_help"),
           }
         when Layers::Infrastructure::Errors::ScriptJsonMissingKeysError
           {
-            cause_of_error: ShopifyCli::Context.message(
+            cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_missing_keys_error_cause",
               missing_keys: e.missing_keys
             ),
-            help_suggestion: ShopifyCli::Context.message("script.error.configuration_missing_keys_error_help"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.configuration_missing_keys_error_help"),
           }
         when Layers::Infrastructure::Errors::ScriptJsonInvalidValueError
           {
-            cause_of_error: ShopifyCli::Context.message(
+            cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_invalid_value_error_cause",
               valid_input_modes: e.valid_input_modes
             ),
-            help_suggestion: ShopifyCli::Context.message("script.error.configuration_invalid_value_error_help"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.configuration_invalid_value_error_help"),
           }
         when Layers::Infrastructure::Errors::ScriptJsonFieldsMissingKeysError
           {
-            cause_of_error: ShopifyCli::Context.message(
+            cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_schema_field_missing_keys_error_cause",
               missing_keys: e.missing_keys
             ),
-            help_suggestion: ShopifyCli::Context.message(
+            help_suggestion: ShopifyCLI::Context.message(
               "script.error.configuration_definition_schema_field_missing_keys_error_help"
             ),
           }
         when Layers::Infrastructure::Errors::ScriptJsonFieldsInvalidValueError
           {
-            cause_of_error: ShopifyCli::Context.message(
+            cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_schema_field_invalid_value_error_cause",
               valid_types: e.valid_types
             ),
-            help_suggestion: ShopifyCli::Context.message(
+            help_suggestion: ShopifyCLI::Context.message(
               "script.error.configuration_schema_field_invalid_value_error_help"
             ),
           }
         when Layers::Infrastructure::Errors::DependencyInstallError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.dependency_install_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.dependency_install_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.dependency_install_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.dependency_install_help"),
           }
         when Layers::Infrastructure::Errors::EmptyResponseError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.failed_api_request_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.failed_api_request_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.failed_api_request_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.failed_api_request_help"),
           }
         when Layers::Infrastructure::Errors::ForbiddenError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.forbidden_error_cause"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.forbidden_error_cause"),
           }
         when Layers::Infrastructure::Errors::GraphqlError
           {
-            cause_of_error: ShopifyCli::Context.message(
+            cause_of_error: ShopifyCLI::Context.message(
               "script.error.graphql_error_cause", JSON.pretty_generate(e.errors)
             ),
-            help_suggestion: ShopifyCli::Context.message("script.error.graphql_error_help"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.graphql_error_help"),
           }
         when Layers::Infrastructure::Errors::SystemCallFailureError
           {
-            cause_of_error: ShopifyCli::Context
+            cause_of_error: ShopifyCLI::Context
               .message("script.error.system_call_failure_cause", cmd: e.cmd),
-            help_suggestion: ShopifyCli::Context.message("script.error.system_call_failure_help", out: e.out),
+            help_suggestion: ShopifyCLI::Context.message("script.error.system_call_failure_help", out: e.out),
           }
         when Layers::Infrastructure::Errors::ScriptRepushError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.script_repush_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.script_repush_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.script_repush_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.script_repush_help"),
           }
         when Layers::Infrastructure::Errors::ShopAuthenticationError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.shop_auth_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.shop_auth_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.shop_auth_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.shop_auth_help"),
           }
         when Layers::Infrastructure::Errors::BuildScriptNotFoundError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.build_script_not_found"),
-            help_suggestion: ShopifyCli::Context.message("script.error.build_script_suggestion"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.build_script_not_found"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.build_script_suggestion"),
           }
         when Layers::Infrastructure::Errors::InvalidBuildScriptError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.invalid_build_script"),
-            help_suggestion: ShopifyCli::Context.message("script.error.build_script_suggestion"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_build_script"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.build_script_suggestion"),
           }
         when Layers::Infrastructure::Errors::WebAssemblyBinaryNotFoundError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.web_assembly_binary_not_found"),
-            help_suggestion: ShopifyCli::Context.message("script.error.web_assembly_binary_not_found_suggestion"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.web_assembly_binary_not_found"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.web_assembly_binary_not_found_suggestion"),
+          }
+        when Layers::Infrastructure::Errors::ProjectConfigNotFoundError
+          {
+            cause_of_error: ShopifyCLI::Context.message("script.error.project_config_not_found"),
+          }
+        when Layers::Infrastructure::Errors::InvalidProjectConfigError
+          {
+            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_project_config"),
           }
         when Layers::Infrastructure::Errors::ScriptUploadError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.script_upload_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.script_upload_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.script_upload_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.script_upload_help"),
           }
         end
       end

data/lib/project_types/script/ui/printing_spinner.rb

@@ -35,7 +35,7 @@ module Script
       # Printing within spinners requires the manipulation of ANSI escape
       # sequences in order to make sure the CLI::UI::Spinner does not overwrite
       # previously printed content.
-      class PrintingSpinnerContext < ShopifyCli::Context
+      class PrintingSpinnerContext < ShopifyCLI::Context
         include SmartProperties
         property :spinner, required: true
 

data/lib/project_types/theme/cli.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 module Theme
-  class Project < ShopifyCli::ProjectType
+  class Project < ShopifyCLI::ProjectType
     require Project.project_filepath("messages/messages")
     register_messages(Theme::Messages::MESSAGES)
   end
 
-  class Command < ShopifyCli::ProjectCommands
+  class Command < ShopifyCLI::ProjectCommands
     subcommand :Init, "init", Project.project_filepath("commands/init")
     subcommand :Serve, "serve", Project.project_filepath("commands/serve")
     subcommand :Pull, "pull", Project.project_filepath("commands/pull")
@@ -16,7 +16,7 @@ module Theme
     subcommand :Package, "package", Project.project_filepath("commands/package")
     subcommand :LanguageServer, "language-server", Project.project_filepath("commands/language_server")
   end
-  ShopifyCli::Commands.register("Theme::Command", "theme")
+  ShopifyCLI::Commands.register("Theme::Command", "theme")
 
   module Forms
     autoload :ConfirmStore, Project.project_filepath("forms/confirm_store")

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

@@ -3,8 +3,8 @@ require "theme_check"
 
 module Theme
   class Command
-    class Check < ShopifyCli::SubCommand
-      class Options < ShopifyCli::Options
+    class Check < ShopifyCLI::SubCommand
+      class Options < ShopifyCLI::Options
         def initialize(theme_check)
           super()
           @theme_check = theme_check
@@ -26,7 +26,7 @@ module Theme
       end
 
       def self.help
-        ShopifyCli::Context.message("theme.check.help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("theme.check.help", ShopifyCLI::TOOL_NAME)
       end
     end
   end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
-require "shopify-cli/theme/theme"
-require "shopify-cli/theme/development_theme"
+require "shopify_cli/theme/theme"
+require "shopify_cli/theme/development_theme"
 
 module Theme
   class Command
-    class Delete < ShopifyCli::SubCommand
+    class Delete < ShopifyCLI::SubCommand
       options do |parser, flags|
         parser.on("-d", "--development") { flags[:development] = true }
         parser.on("-a", "--show-all") { flags[:show_all] = true }
@@ -13,9 +13,9 @@ module Theme
 
       def call(args, _name)
         themes = if options.flags[:development]
-          [ShopifyCli::Theme::DevelopmentTheme.new(@ctx)]
+          [ShopifyCLI::Theme::DevelopmentTheme.new(@ctx)]
         elsif args.any?
-          args.map { |id| ShopifyCli::Theme::Theme.new(@ctx, id: id) }
+          args.map { |id| ShopifyCLI::Theme::Theme.new(@ctx, id: id) }
         else
           form = Forms::Select.ask(
             @ctx,
@@ -38,7 +38,7 @@ module Theme
           end
           theme.delete
           deleted += 1
-        rescue ShopifyCli::API::APIRequestNotFoundError
+        rescue ShopifyCLI::API::APIRequestNotFoundError
           @ctx.puts(@ctx.message("theme.delete.not_found", theme.id))
         end
 
@@ -46,7 +46,7 @@ module Theme
       end
 
       def self.help
-        ShopifyCli::Context.message("theme.delete.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("theme.delete.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
       end
 
       private

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

@@ -2,7 +2,7 @@
 
 module Theme
   class Command
-    class Init < ShopifyCli::SubCommand
+    class Init < ShopifyCLI::SubCommand
       options do |parser, flags|
         parser.on("-u", "--clone-url URL") { |url| flags[:clone_url] = url }
       end
@@ -16,7 +16,7 @@ module Theme
       end
 
       def self.help
-        ShopifyCli::Context.message("theme.init.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("theme.init.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
       end
 
       private
@@ -26,7 +26,7 @@ module Theme
       end
 
       def clone(url, name)
-        ShopifyCli::Git.clone(url, name)
+        ShopifyCLI::Git.clone(url, name)
 
         @ctx.root = File.join(@ctx.root, name)
 

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

@@ -3,13 +3,13 @@ require "theme_check"
 
 module Theme
   class Command
-    class LanguageServer < ShopifyCli::SubCommand
+    class LanguageServer < ShopifyCLI::SubCommand
       def call(*)
         ThemeCheck::LanguageServer.start
       end
 
       def self.help
-        ShopifyCli::Context.message("theme.language_server.help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("theme.language_server.help", ShopifyCLI::TOOL_NAME)
       end
     end
   end

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

@@ -4,7 +4,7 @@ require "json"
 
 module Theme
   class Command
-    class Package < ShopifyCli::SubCommand
+    class Package < ShopifyCLI::SubCommand
       THEME_DIRECTORIES = %w[
         assets
         config
@@ -25,7 +25,7 @@ module Theme
       end
 
       def self.help
-        ShopifyCli::Context.message("theme.package.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("theme.package.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
       end
 
       private

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

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
-require "shopify-cli/theme/theme"
+require "shopify_cli/theme/theme"
 
 module Theme
   class Command
-    class Publish < ShopifyCli::SubCommand
+    class Publish < ShopifyCLI::SubCommand
       options do |parser, flags|
         parser.on("-f", "--force") { flags[:force] = true }
       end
 
       def call(args, *)
         theme = if (theme_id = args.first)
-          ShopifyCli::Theme::Theme.new(@ctx, id: theme_id)
+          ShopifyCLI::Theme::Theme.new(@ctx, id: theme_id)
         else
           form = Forms::Select.ask(
             @ctx,
@@ -31,12 +31,12 @@ module Theme
 
         theme.publish
         @ctx.done(@ctx.message("theme.publish.done", theme.preview_url))
-      rescue ShopifyCli::API::APIRequestNotFoundError
+      rescue ShopifyCLI::API::APIRequestNotFoundError
         @ctx.puts(@ctx.message("theme.publish.not_found", theme.id))
       end
 
       def self.help
-        ShopifyCli::Context.message("theme.publish.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("theme.publish.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
       end
     end
   end

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
-require "shopify-cli/theme/theme"
-require "shopify-cli/theme/ignore_filter"
-require "shopify-cli/theme/syncer"
+require "shopify_cli/theme/theme"
+require "shopify_cli/theme/ignore_filter"
+require "shopify_cli/theme/syncer"
 
 module Theme
   class Command
-    class Pull < ShopifyCli::SubCommand
+    class Pull < ShopifyCLI::SubCommand
       options do |parser, flags|
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
@@ -20,7 +20,7 @@ module Theme
         delete = !options.flags[:nodelete]
 
         theme = if (theme_id = options.flags[:theme_id])
-          ShopifyCli::Theme::Theme.new(@ctx, root: root, id: theme_id)
+          ShopifyCLI::Theme::Theme.new(@ctx, root: root, id: theme_id)
         else
           form = Forms::Select.ask(
             @ctx,
@@ -32,17 +32,17 @@ module Theme
           form.theme
         end
 
-        ignore_filter = ShopifyCli::Theme::IgnoreFilter.from_path(root)
+        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, ignore_filter: ignore_filter)
         begin
           syncer.start_threads
           CLI::UI::Frame.open(@ctx.message("theme.pull.pulling", theme.name, theme.id, theme.shop)) do
             UI::SyncProgressBar.new(syncer).progress(:download_theme!, delete: delete)
           end
           @ctx.done(@ctx.message("theme.pull.done"))
-        rescue ShopifyCli::API::APIRequestNotFoundError
+        rescue ShopifyCLI::API::APIRequestNotFoundError
           @ctx.abort(@ctx.message("theme.pull.theme_not_found", theme.id))
         ensure
           syncer.shutdown
@@ -50,7 +50,7 @@ module Theme
       end
 
       def self.help
-        ShopifyCli::Context.message("theme.pull.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("theme.pull.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
       end
     end
   end

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
-require "shopify-cli/theme/theme"
-require "shopify-cli/theme/development_theme"
-require "shopify-cli/theme/ignore_filter"
-require "shopify-cli/theme/syncer"
+require "shopify_cli/theme/theme"
+require "shopify_cli/theme/development_theme"
+require "shopify_cli/theme/ignore_filter"
+require "shopify_cli/theme/syncer"
 
 module Theme
   class Command
-    class Push < ShopifyCli::SubCommand
+    class Push < ShopifyCLI::SubCommand
       options do |parser, flags|
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
@@ -26,14 +26,14 @@ module Theme
         delete = !options.flags[:nodelete]
 
         theme = if (theme_id = options.flags[:theme_id])
-          ShopifyCli::Theme::Theme.new(@ctx, root: root, id: theme_id)
+          ShopifyCLI::Theme::Theme.new(@ctx, root: root, id: theme_id)
         elsif options.flags[:development]
-          theme = ShopifyCli::Theme::DevelopmentTheme.new(@ctx, root: root)
+          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 = ShopifyCLI::Theme::Theme.new(@ctx, root: root, name: name, role: "unpublished")
           theme.create
           theme
         else
@@ -51,10 +51,10 @@ module Theme
           return unless CLI::UI::Prompt.confirm(@ctx.message("theme.push.live"))
         end
 
-        ignore_filter = ShopifyCli::Theme::IgnoreFilter.from_path(root)
+        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, ignore_filter: ignore_filter)
         begin
           syncer.start_threads
           if options.flags[:json]
@@ -72,7 +72,7 @@ module Theme
               @ctx.done(@ctx.message("theme.push.done", theme.preview_url, theme.editor_url))
             end
           end
-        rescue ShopifyCli::API::APIRequestNotFoundError
+        rescue ShopifyCLI::API::APIRequestNotFoundError
           @ctx.abort(@ctx.message("theme.push.theme_not_found", theme.id))
         ensure
           syncer.shutdown
@@ -80,7 +80,7 @@ module Theme
       end
 
       def self.help
-        ShopifyCli::Context.message("theme.push.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("theme.push.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
       end
     end
   end