shopify-cli 2.3.0 → 2.6.1

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

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
-require "shopify-cli/theme/dev_server"
+require "shopify_cli/theme/dev_server"
 
 module Theme
   class Command
-    class Serve < ShopifyCli::SubCommand
+    class Serve < ShopifyCLI::SubCommand
       options do |parser, flags|
         parser.on("--port=PORT") { |port| flags[:port] = port.to_i }
       end
 
       def call(*)
         flags = options.flags.dup
-        ShopifyCli::Theme::DevServer.start(@ctx, ".", **flags) do |syncer|
+        ShopifyCLI::Theme::DevServer.start(@ctx, ".", **flags) do |syncer|
           UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delay_low_priority_files: true)
         end
       end
 
       def self.help
-        ShopifyCli::Context.message("theme.serve.help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("theme.serve.help", ShopifyCLI::TOOL_NAME)
       end
     end
   end

data/lib/project_types/theme/forms/confirm_store.rb

@@ -1,6 +1,6 @@
 module Theme
   module Forms
-    class ConfirmStore < ShopifyCli::Form
+    class ConfirmStore < ShopifyCLI::Form
       flag_arguments :title, :force
 
       def ask

data/lib/project_types/theme/forms/select.rb

@@ -1,6 +1,6 @@
 module Theme
   module Forms
-    class Select < ShopifyCli::Form
+    class Select < ShopifyCLI::Form
       attr_accessor :theme
       flag_arguments :root, :title, :exclude_roles, :include_foreign_developments
 
@@ -17,7 +17,7 @@ module Theme
       private
 
       def themes
-        @themes ||= ShopifyCli::Theme::Theme.all(@ctx, root: root)
+        @themes ||= ShopifyCLI::Theme::Theme.all(@ctx, root: root)
           .sort_by { |theme| theme_sort_order(theme) }
       end
 

data/lib/{shopify-cli → shopify_cli}/admin_api/populate_resource_command.rb

@@ -1,9 +1,9 @@
 require "shopify_cli"
 require "optparse"
 
-module ShopifyCli
+module ShopifyCLI
   class AdminAPI
-    class PopulateResourceCommand < ShopifyCli::SubCommand
+    class PopulateResourceCommand < ShopifyCLI::SubCommand
       DEFAULT_COUNT = 5
 
       attr_reader :input
@@ -40,7 +40,7 @@ module ShopifyCli
           return @ctx.puts(output)
         end
 
-        ShopifyCli::Tasks::ConfirmStore.call(@ctx) unless @skip_shop_confirmation
+        ShopifyCLI::Tasks::ConfirmStore.call(@ctx) unless @skip_shop_confirmation
         @shop = AdminAPI.get_shop_or_abort(@ctx)
         if @silent
           spin_group = CLI::UI::SpinGroup.new

data/lib/{shopify-cli → shopify_cli}/admin_api/schema.rb

@@ -1,19 +1,19 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   class AdminAPI
     class Schema < Hash
       class << self
         def get(ctx)
-          unless ShopifyCli::DB.exists?(:shopify_admin_schema)
+          unless ShopifyCLI::DB.exists?(:shopify_admin_schema)
             shop = AdminAPI.get_shop_or_abort(ctx)
             schema = AdminAPI.query(ctx, "admin_introspection", shop: shop)
-            ShopifyCli::DB.set(shopify_admin_schema: JSON.dump(schema))
+            ShopifyCLI::DB.set(shopify_admin_schema: JSON.dump(schema))
           end
           # This is ruby magic for making a new hash with another hash.
           # It wraps the JSON in our Schema Class to have the helper methods
           # available
-          self[JSON.parse(ShopifyCli::DB.get(:shopify_admin_schema))]
+          self[JSON.parse(ShopifyCLI::DB.get(:shopify_admin_schema))]
         end
       end
 

data/lib/{shopify-cli → shopify_cli}/admin_api.rb

@@ -1,13 +1,13 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   ##
-  # ShopifyCli::AdminAPI wraps our graphql functionality with authentication so that
+  # ShopifyCLI::AdminAPI wraps our graphql functionality with authentication so that
   # these concerns are taken care of.
   #
   class AdminAPI < API
-    autoload :PopulateResourceCommand, "shopify-cli/admin_api/populate_resource_command"
-    autoload :Schema, "shopify-cli/admin_api/schema"
+    autoload :PopulateResourceCommand, "shopify_cli/admin_api/populate_resource_command"
+    autoload :Schema, "shopify_cli/admin_api/schema"
 
     class << self
       ##
@@ -24,10 +24,10 @@ module ShopifyCli
       #
       # #### Raises
       #
-      # * http 404 will raise a ShopifyCli::API::APIRequestNotFoundError
-      # * http 400..499 will raise a ShopifyCli::API::APIRequestClientError
-      # * http 500..599 will raise a ShopifyCli::API::APIRequestServerError
-      # * All other codes will raise ShopifyCli::API::APIRequestUnexpectedError
+      # * http 404 will raise a ShopifyCLI::API::APIRequestNotFoundError
+      # * http 400..499 will raise a ShopifyCLI::API::APIRequestClientError
+      # * http 500..599 will raise a ShopifyCLI::API::APIRequestServerError
+      # * All other codes will raise ShopifyCLI::API::APIRequestUnexpectedError
       #
       # #### Returns
       #
@@ -35,18 +35,18 @@ module ShopifyCli
       #
       # #### Example
       #
-      #   ShopifyCli::AdminAPI.query(@ctx, 'all_organizations')
+      #   ShopifyCLI::AdminAPI.query(@ctx, 'all_organizations')
       #
       def query(ctx, query_name, shop:, api_version: nil, **variables)
         CLI::Kit::Util.begin do
           api_client(ctx, api_version, shop).query(query_name, variables: variables)
         end.retry_after(API::APIRequestUnauthorizedError, retries: 1) do
-          ShopifyCli::IdentityAuth.new(ctx: ctx).reauthenticate
+          ShopifyCLI::IdentityAuth.new(ctx: ctx).reauthenticate
         end
       rescue API::APIRequestUnauthorizedError
         ctx.abort(ctx.message("core.api.error.failed_auth"))
       rescue API::APIRequestForbiddenError
-        ctx.abort(ctx.message("core.api.error.forbidden", ShopifyCli::TOOL_NAME))
+        ctx.abort(ctx.message("core.api.error.forbidden", ShopifyCLI::TOOL_NAME))
       end
 
       ##
@@ -65,10 +65,10 @@ module ShopifyCli
       #
       # #### Raises
       #
-      # * http 404 will raise a ShopifyCli::API::APIRequestNotFoundError
-      # * http 400..499 will raise a ShopifyCli::API::APIRequestClientError
-      # * http 500..599 will raise a ShopifyCli::API::APIRequestServerError
-      # * All other codes will raise ShopifyCli::API::APIRequestUnexpectedError
+      # * http 404 will raise a ShopifyCLI::API::APIRequestNotFoundError
+      # * http 400..499 will raise a ShopifyCLI::API::APIRequestClientError
+      # * http 500..599 will raise a ShopifyCLI::API::APIRequestServerError
+      # * All other codes will raise ShopifyCLI::API::APIRequestUnexpectedError
       #
       # #### Returns
       #
@@ -76,38 +76,38 @@ module ShopifyCli
       #
       # #### Example
       #
-      #   ShopifyCli::AdminAPI.rest_request(@ctx,
+      #   ShopifyCLI::AdminAPI.rest_request(@ctx,
       #                                     shop: 'shop.myshopify.com',
       #                                     path: 'data.json',
       #                                     token: 'password')
       #
       def rest_request(ctx, shop:, path:, query: nil, body: nil, method: "GET", api_version: nil, token: nil)
         CLI::Kit::Util.begin do
-          ShopifyCli::DB.set(shopify_exchange_token: token) unless token.nil?
+          ShopifyCLI::DB.set(shopify_exchange_token: token) unless token.nil?
           url = URI::HTTPS.build(
             host: shop,
             path: "/admin/api/#{fetch_api_version(ctx, api_version, shop)}/#{path}",
             query: query,
           )
           resp = api_client(ctx, api_version, shop, path: path).request(url: url.to_s, body: body, method: method)
-          ShopifyCli::DB.set(shopify_exchange_token: nil) unless token.nil?
+          ShopifyCLI::DB.set(shopify_exchange_token: nil) unless token.nil?
           resp
         end.retry_after(API::APIRequestUnauthorizedError) do
-          ShopifyCli::IdentityAuth.new(ctx: ctx).reauthenticate
+          ShopifyCLI::IdentityAuth.new(ctx: ctx).reauthenticate
         end
       end
 
       def get_shop_or_abort(ctx)
         ctx.abort(
-          ctx.message("core.populate.error.no_shop", ShopifyCli::TOOL_NAME)
-        ) unless ShopifyCli::DB.exists?(:shop)
-        ShopifyCli::DB.get(:shop)
+          ctx.message("core.populate.error.no_shop", ShopifyCLI::TOOL_NAME)
+        ) unless ShopifyCLI::DB.exists?(:shop)
+        ShopifyCLI::DB.get(:shop)
       end
 
       private
 
       def authenticate(ctx, _shop)
-        ShopifyCli::IdentityAuth.new(ctx: ctx).authenticate
+        ShopifyCLI::IdentityAuth.new(ctx: ctx).authenticate
       end
 
       def api_client(ctx, api_version, shop, path: "graphql.json")
@@ -119,9 +119,9 @@ module ShopifyCli
       end
 
       def access_token(ctx, shop)
-        ShopifyCli::DB.get(:shopify_exchange_token) do
+        ShopifyCLI::DB.get(:shopify_exchange_token) do
           authenticate(ctx, shop)
-          ShopifyCli::DB.get(:shopify_exchange_token)
+          ShopifyCLI::DB.get(:shopify_exchange_token)
         end
       end
 
@@ -141,12 +141,12 @@ module ShopifyCli
             .sort
             .reverse[0]
         end.retry_after(API::APIRequestUnauthorizedError, retries: 1) do
-          ShopifyCli::IdentityAuth.new(ctx: ctx).reauthenticate
+          ShopifyCLI::IdentityAuth.new(ctx: ctx).reauthenticate
         end
       rescue API::APIRequestUnauthorizedError
         ctx.abort(ctx.message("core.api.error.failed_auth"))
       rescue API::APIRequestForbiddenError
-        ctx.abort(ctx.message("core.api.error.forbidden", ShopifyCli::TOOL_NAME))
+        ctx.abort(ctx.message("core.api.error.forbidden", ShopifyCLI::TOOL_NAME))
       end
     end
 

data/lib/{shopify-cli → shopify_cli}/api.rb

@@ -1,10 +1,11 @@
 require "shopify_cli"
+require "securerandom"
 
-module ShopifyCli
+module ShopifyCLI
   class API
     include SmartProperties
 
-    property! :ctx, accepts: ShopifyCli::Context
+    property! :ctx, accepts: ShopifyCLI::Context
     property! :token, accepts: String
     property :auth_header, accepts: String
     property! :url, accepts: String
@@ -52,8 +53,9 @@ module ShopifyCli
         end
 
         # we delay this require so as to avoid a performance hit on starting the CLI
-        require "shopify-cli/http_request"
+        require "shopify_cli/http_request"
         headers = default_headers.merge(headers)
+        ctx.debug("#{method} #{uri} with X-Request-Id: #{headers["X-Request-Id"]}")
         response = if method == "POST"
           HttpRequest.post(uri, body, headers)
         elsif method == "PUT"
@@ -82,6 +84,7 @@ module ShopifyCli
           raise APIRequestUnexpectedError.new("#{response.code}\n#{response.body}", response: response)
         end
       rescue Errno::ETIMEDOUT, Timeout::Error
+        ctx.debug("timeout in #{method} #{uri} with X-Request-Id: #{headers["X-Request-Id"]}")
         raise APIRequestTimeoutError.new("Timeout")
       end.retry_after(APIRequestRetriableError, retries: 3) do |e|
         sleep(1) if e.is_a?(APIRequestThrottledError)
@@ -91,14 +94,14 @@ module ShopifyCli
     protected
 
     def load_query(name)
-      project_type = ShopifyCli::Project.current_project_type
+      project_type = ShopifyCLI::Project.current_project_type
       project_file_path = File.join(
-        ShopifyCli::ROOT, "lib", "project_types", project_type.to_s, "graphql", "#{name}.graphql"
+        ShopifyCLI::ROOT, "lib", "project_types", project_type.to_s, "graphql", "#{name}.graphql"
       )
       if !project_type.nil? && File.exist?(project_file_path)
         File.read(project_file_path)
       else
-        File.read(File.join(ShopifyCli::ROOT, "lib", "graphql", "#{name}.graphql"))
+        File.read(File.join(ShopifyCLI::ROOT, "lib", "graphql", "#{name}.graphql"))
       end
     end
 
@@ -106,9 +109,10 @@ module ShopifyCli
 
     def default_headers
       {
-        "User-Agent" => "Shopify CLI; v=#{ShopifyCli::VERSION}",
-        "Sec-CH-UA" => "Shopify CLI; v=#{ShopifyCli::VERSION} sha=#{ShopifyCli.sha}",
+        "User-Agent" => "Shopify CLI; v=#{ShopifyCLI::VERSION}",
+        "Sec-CH-UA" => "Shopify CLI; v=#{ShopifyCLI::VERSION} sha=#{ShopifyCLI.sha}",
         "Sec-CH-UA-PLATFORM" => ctx.os.to_s,
+        "X-Request-Id" => SecureRandom.uuid,
       }.tap do |headers|
         headers["X-Shopify-Cli-Employee"] = "1" if Shopifolk.acting_as_shopify_organization?
       end.merge(auth_headers(token))

data/lib/shopify_cli/command/app_sub_command.rb

@@ -0,0 +1,16 @@
+module ShopifyCLI
+  class Command
+    class AppSubCommand < SubCommand
+      class << self
+        def call_help(*)
+          output = help
+          if respond_to?(:extended_help)
+            output += "\n"
+            output += extended_help
+          end
+          @ctx.puts(output)
+        end
+      end
+    end
+  end
+end

data/lib/{shopify-cli → shopify_cli}/command.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   class Command < CLI::Kit::BaseCommand
     extend Feature::Set
 
@@ -55,7 +55,7 @@ module ShopifyCli
       end
 
       def task_registry
-        @task_registry || ShopifyCli::Tasks::Registry
+        @task_registry || ShopifyCLI::Tasks::Registry
       end
 
       def call_help(*cmds)
@@ -75,7 +75,7 @@ module ShopifyCli
 
     def initialize(ctx = nil)
       super()
-      @ctx = ctx || ShopifyCli::Context.new
+      @ctx = ctx || ShopifyCLI::Context.new
       self.options = Options.new
     end
   end

data/lib/{shopify-cli → shopify_cli}/commands/config.rb

@@ -1,8 +1,8 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   module Commands
-    class Config < ShopifyCli::Command
+    class Config < ShopifyCLI::Command
       hidden_feature(feature_set: :debug)
 
       subcommand :Feature, "feature"
@@ -13,12 +13,12 @@ module ShopifyCli
       end
 
       def self.help
-        ShopifyCli::Context.message("core.config.help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("core.config.help", ShopifyCLI::TOOL_NAME)
       end
 
-      class Feature < ShopifyCli::SubCommand
+      class Feature < ShopifyCLI::SubCommand
         def self.help
-          ShopifyCli::Context.message("core.config.feature.help", ShopifyCli::TOOL_NAME)
+          ShopifyCLI::Context.message("core.config.feature.help", ShopifyCLI::TOOL_NAME)
         end
 
         options do |parser, flags|
@@ -29,13 +29,13 @@ module ShopifyCli
 
         def call(args, _name)
           feature_name = args.shift
-          return @ctx.puts(@ctx.message("core.config.help", ShopifyCli::TOOL_NAME)) if feature_name.nil?
-          is_enabled = ShopifyCli::Feature.enabled?(feature_name)
+          return @ctx.puts(@ctx.message("core.config.help", ShopifyCLI::TOOL_NAME)) if feature_name.nil?
+          is_enabled = ShopifyCLI::Feature.enabled?(feature_name)
           if options.flags[:action] == "disable" && is_enabled
-            ShopifyCli::Feature.disable(feature_name)
+            ShopifyCLI::Feature.disable(feature_name)
             @ctx.puts(@ctx.message("core.config.feature.disabled", feature_name))
           elsif options.flags[:action] == "enable" && !is_enabled
-            ShopifyCli::Feature.enable(feature_name)
+            ShopifyCLI::Feature.enable(feature_name)
             @ctx.puts(@ctx.message("core.config.feature.enabled", feature_name))
           elsif is_enabled
             @ctx.puts(@ctx.message("core.config.feature.is_enabled", feature_name))
@@ -45,9 +45,9 @@ module ShopifyCli
         end
       end
 
-      class Analytics < ShopifyCli::SubCommand
+      class Analytics < ShopifyCLI::SubCommand
         def self.help
-          ShopifyCli::Context.message("core.config.analytics.help", ShopifyCli::TOOL_NAME)
+          ShopifyCLI::Context.message("core.config.analytics.help", ShopifyCLI::TOOL_NAME)
         end
 
         options do |parser, flags|
@@ -57,12 +57,12 @@ module ShopifyCli
         end
 
         def call(_args, _name)
-          is_enabled = ShopifyCli::Config.get_bool("analytics", "enabled")
+          is_enabled = ShopifyCLI::Config.get_bool("analytics", "enabled")
           if options.flags[:action] == "disable" && is_enabled
-            ShopifyCli::Config.set("analytics", "enabled", false)
+            ShopifyCLI::Config.set("analytics", "enabled", false)
             @ctx.puts(@ctx.message("core.config.analytics.disabled"))
           elsif options.flags[:action] == "enable" && !is_enabled
-            ShopifyCli::Config.set("analytics", "enabled", true)
+            ShopifyCLI::Config.set("analytics", "enabled", true)
             @ctx.puts(@ctx.message("core.config.analytics.enabled"))
           elsif is_enabled
             @ctx.puts(@ctx.message("core.config.analytics.is_enabled"))

data/lib/{shopify-cli → shopify_cli}/commands/help.rb

@@ -1,8 +1,8 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   module Commands
-    class Help < ShopifyCli::Command
+    class Help < ShopifyCLI::Command
       def call(args, _name)
         command = args.shift
         if command && command != "help"
@@ -20,7 +20,7 @@ module ShopifyCli
           end
         end
 
-        preamble = @ctx.message("core.help.preamble", ShopifyCli::TOOL_NAME)
+        preamble = @ctx.message("core.help.preamble", ShopifyCLI::TOOL_NAME)
         @ctx.puts(preamble)
 
         available_commands = resolved_commands.select { |_name, c| !c.hidden? }
@@ -43,7 +43,7 @@ module ShopifyCli
       end
 
       def resolved_commands
-        ShopifyCli::Commands::Registry
+        ShopifyCLI::Commands::Registry
           .resolved_commands
           .sort
       end

data/lib/{shopify-cli → shopify_cli}/commands/login.rb

@@ -1,8 +1,8 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   module Commands
-    class Login < ShopifyCli::Command
+    class Login < ShopifyCLI::Command
       PROTOCOL_REGEX = /^https?\:\/\//
       PERMANENT_DOMAIN_SUFFIX = /\.myshopify\.(com|io)$/
 
@@ -15,7 +15,7 @@ module ShopifyCli
 
       def call(*)
         shop = (options.flags[:shop] || @ctx.getenv("SHOPIFY_SHOP" || nil))
-        ShopifyCli::DB.set(shop: self.class.validate_shop(shop)) unless shop.nil?
+        ShopifyCLI::DB.set(shop: self.class.validate_shop(shop)) unless shop.nil?
 
         if shop.nil? && Shopifolk.check
           Shopifolk.reset
@@ -28,17 +28,17 @@ module ShopifyCli
 
         # As password auth will soon be deprecated, we enable only in CI
         if @ctx.ci? && (password = options.flags[:password] || @ctx.getenv("SHOPIFY_PASSWORD"))
-          ShopifyCli::DB.set(shopify_exchange_token: password)
+          ShopifyCLI::DB.set(shopify_exchange_token: password)
         else
           IdentityAuth.new(ctx: @ctx).authenticate
           org = select_organization
-          ShopifyCli::DB.set(organization_id: org["id"].to_i) unless org.nil?
+          ShopifyCLI::DB.set(organization_id: org["id"].to_i) unless org.nil?
           Whoami.call([], "whoami")
         end
       end
 
       def self.help
-        ShopifyCli::Context.message("core.login.help", ShopifyCli::TOOL_NAME)
+        ShopifyCLI::Context.message("core.login.help", ShopifyCLI::TOOL_NAME)
       end
 
       def self.validate_shop(shop)
@@ -75,7 +75,7 @@ module ShopifyCli
       private
 
       def select_organization
-        organizations = ShopifyCli::PartnersAPI::Organizations.fetch_all(@ctx)
+        organizations = ShopifyCLI::PartnersAPI::Organizations.fetch_all(@ctx)
 
         if organizations.count == 0
           nil

data/lib/shopify_cli/commands/logout.rb

@@ -0,0 +1,39 @@
+require "shopify_cli"
+require "shopify_cli/theme/development_theme"
+
+module ShopifyCLI
+  module Commands
+    class Logout < ShopifyCLI::Command
+      def call(*)
+        try_delete_development_theme
+        ShopifyCLI::IdentityAuth.delete_tokens_and_keys
+        ShopifyCLI::DB.del(:shop) if has_shop?
+        ShopifyCLI::DB.del(:organization_id) if has_organization_id?
+        ShopifyCLI::Shopifolk.reset
+        @ctx.puts(@ctx.message("core.logout.success"))
+      end
+
+      def self.help
+        ShopifyCLI::Context.message("core.logout.help", ShopifyCLI::TOOL_NAME)
+      end
+
+      private
+
+      def has_shop?
+        ShopifyCLI::DB.exists?(:shop)
+      end
+
+      def has_organization_id?
+        ShopifyCLI::DB.exists?(:organization_id)
+      end
+
+      def try_delete_development_theme
+        return unless has_shop?
+
+        ShopifyCLI::Theme::DevelopmentTheme.delete(@ctx)
+      rescue ShopifyCLI::API::APIRequestError
+        # Ignore since we can't delete it
+      end
+    end
+  end
+end

data/lib/{shopify-cli → shopify_cli}/commands/populate/customer.rb

@@ -1,13 +1,13 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   module Commands
     class Populate
-      class Customer < ShopifyCli::AdminAPI::PopulateResourceCommand
+      class Customer < ShopifyCLI::AdminAPI::PopulateResourceCommand
         @input_type = :CustomerInput
 
         def defaults
-          first_name, last_name = ShopifyCli::Helpers::Haikunator.name
+          first_name, last_name = ShopifyCLI::Helpers::Haikunator.name
           {
             firstName: first_name,
             lastName: last_name,
@@ -16,7 +16,7 @@ module ShopifyCli
 
         def message(data)
           ret = data["customerCreate"]["customer"]
-          id = ShopifyCli::API.gid_to_id(ret["id"])
+          id = ShopifyCLI::API.gid_to_id(ret["id"])
           @ctx.message("core.populate.customer.added", ret["displayName"], @shop, admin_url, id)
         end
       end

data/lib/{shopify-cli → shopify_cli}/commands/populate/draft_order.rb

@@ -1,9 +1,9 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   module Commands
     class Populate
-      class DraftOrder < ShopifyCli::AdminAPI::PopulateResourceCommand
+      class DraftOrder < ShopifyCLI::AdminAPI::PopulateResourceCommand
         @input_type = :DraftOrderInput
 
         def defaults
@@ -12,14 +12,14 @@ module ShopifyCli
               originalUnitPrice: price,
               quantity: 1,
               weight: { value: 10, unit: "GRAMS" },
-              title: ShopifyCli::Helpers::Haikunator.title,
+              title: ShopifyCLI::Helpers::Haikunator.title,
             }],
           }
         end
 
         def message(data)
           ret = data["draftOrderCreate"]["draftOrder"]
-          id = ShopifyCli::API.gid_to_id(ret["id"])
+          id = ShopifyCLI::API.gid_to_id(ret["id"])
           @ctx.message("core.populate.draft_order.added", @shop, admin_url, id)
         end
       end

data/lib/{shopify-cli → shopify_cli}/commands/populate/product.rb

@@ -1,21 +1,21 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   module Commands
     class Populate
-      class Product < ShopifyCli::AdminAPI::PopulateResourceCommand
+      class Product < ShopifyCLI::AdminAPI::PopulateResourceCommand
         @input_type = :ProductInput
 
         def defaults
           {
-            title: ShopifyCli::Helpers::Haikunator.title,
+            title: ShopifyCLI::Helpers::Haikunator.title,
             variants: [{ price: price }],
           }
         end
 
         def message(data)
           ret = data["productCreate"]["product"]
-          id = ShopifyCli::API.gid_to_id(ret["id"])
+          id = ShopifyCLI::API.gid_to_id(ret["id"])
           @ctx.message("core.populate.product.added", ret["title"], @shop, admin_url, id)
         end
       end

data/lib/shopify_cli/commands/populate.rb

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

data/lib/shopify_cli/commands/store.rb

@@ -0,0 +1,15 @@
+require "shopify_cli"
+
+module ShopifyCLI
+  module Commands
+    class Store < ShopifyCLI::Command
+      def call(_args, _name)
+        @ctx.puts(@ctx.message("core.store.shop", ShopifyCLI::AdminAPI.get_shop_or_abort(@ctx)))
+      end
+
+      def self.help
+        ShopifyCLI::Context.message("core.store.help", ShopifyCLI::TOOL_NAME)
+      end
+    end
+  end
+end