shopify-cli 2.2.2 → 2.6.0

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

@@ -1,6 +1,6 @@
 require "fileutils"
 
-module ShopifyCli
+module ShopifyCLI
   ##
   # ProcessSupervision wraps a running process spawned by `exec` and keeps track
   # if its `pid` and keeps a log file for it as well
@@ -19,7 +19,7 @@ module ShopifyCli
     class << self
       def run_dir
         # is the directory where the pid and logfile are kept
-        File.join(ShopifyCli.cache_dir, "sv")
+        File.join(ShopifyCLI.cache_dir, "sv")
       end
 
       ##
@@ -36,7 +36,7 @@ module ShopifyCli
       #   will be nil if the process is not running.
       #
       def for_ident(identifier)
-        pid, time = File.read(File.join(ShopifyCli::ProcessSupervision.run_dir, "#{identifier}.pid")).split(":")
+        pid, time = File.read(File.join(ShopifyCLI::ProcessSupervision.run_dir, "#{identifier}.pid")).split(":")
         new(identifier, pid: Integer(pid), time: time)
       rescue Errno::ENOENT
         nil
@@ -50,19 +50,31 @@ module ShopifyCli
       #
       # * `identifier` - a string or symbol to identify the new process by.
       # * `args` - a command to run, either a string or array of strings
+      # * `force_spawn` - whether we want the child process to be a spawn and not a fork, so it is terminated along with
+      #                   the parent
       #
       # #### Returns
       #
       # * `process` - ProcessSupervision instance if the process is running, this
       #   will be nil if the process did not start.
       #
-      def start(identifier, args)
+      def start(identifier, args, force_spawn: false)
         return for_ident(identifier) if running?(identifier)
 
-        # Windows doesn't support forking process without extra gems, so we resort to spawning a new child process -
-        # that means that it dies along with the original process if it is interrupted. On UNIX, we fork the process so
-        # that it doesn't have to be restarted on every run.
-        if Context.new.windows?
+        # Some systems don't support forking process without extra gems, so we resort to spawning a new child process -
+        # that means that it dies along with the original process if it is interrupted. If possible, we fork the process
+        # so that it doesn't have to be restarted on every run.
+        if Process.respond_to?(:fork) && !force_spawn
+          fork do
+            pid_file = new(identifier, pid: Process.pid)
+            pid_file.write
+            STDOUT.reopen(pid_file.log_path, "w")
+            STDERR.reopen(pid_file.log_path, "w")
+            STDIN.reopen("/dev/null", "r")
+            Process.setsid
+            exec(*args)
+          end
+        else
           pid_file = new(identifier)
 
           # Make sure the file exists and is empty, otherwise Windows fails
@@ -77,16 +89,6 @@ module ShopifyCli
           pid_file.write
 
           Process.detach(pid)
-        else
-          fork do
-            pid_file = new(identifier, pid: Process.pid)
-            pid_file.write
-            STDOUT.reopen(pid_file.log_path, "w")
-            STDERR.reopen(pid_file.log_path, "w")
-            STDIN.reopen("/dev/null", "r")
-            Process.setsid
-            exec(*args)
-          end
         end
 
         sleep(0.1)
@@ -132,9 +134,9 @@ module ShopifyCli
       @identifier = identifier
       @pid = pid
       @time = time
-      FileUtils.mkdir_p(ShopifyCli::ProcessSupervision.run_dir)
-      @pid_path = File.join(ShopifyCli::ProcessSupervision.run_dir, "#{identifier}.pid")
-      @log_path = File.join(ShopifyCli::ProcessSupervision.run_dir, "#{identifier}.log")
+      FileUtils.mkdir_p(ShopifyCLI::ProcessSupervision.run_dir)
+      @pid_path = File.join(ShopifyCLI::ProcessSupervision.run_dir, "#{identifier}.pid")
+      @log_path = File.join(ShopifyCLI::ProcessSupervision.run_dir, "#{identifier}.log")
     end
 
     ##

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   ##
-  # ShopifyCli::Project captures the current project that the user is working on.
+  # ShopifyCLI::Project captures the current project that the user is working on.
   # This class can be used to fetch and save project environment as well as the
   # project config `.shopify-cli.yml`.
   #
@@ -25,13 +25,13 @@ module ShopifyCli
       #
       # #### Raises
       #
-      # * `ShopifyCli::Abort` - If the cli is not currently in a project directory
+      # * `ShopifyCLI::Abort` - If the cli is not currently in a project directory
       #   then this will be raised with a message implying that the user is not in
       #   a project directory.
       #
       # #### Example
       #
-      #   project = ShopifyCli::Project.current
+      #   project = ShopifyCLI::Project.current
       #
       def current(force_reload: false)
         clear if force_reload
@@ -60,7 +60,7 @@ module ShopifyCli
       #
       # #### Example
       #
-      #   type = ShopifyCli::Project.current_project_type
+      #   type = ShopifyCLI::Project.current_project_type
       #
       def current_project_type
         return unless has_current?
@@ -81,7 +81,7 @@ module ShopifyCli
       #
       # #### Example
       #
-      #   type = ShopifyCli::Project.current_project_type
+      #   type = ShopifyCLI::Project.current_project_type
       #
       def write(ctx, project_type:, organization_id:, **identifiers)
         require "yaml" # takes 20ms, so deferred as late as possible.
@@ -113,7 +113,7 @@ module ShopifyCli
       def at(dir)
         proj_dir = directory(dir)
         unless proj_dir
-          raise(ShopifyCli::Abort, Context.message("core.project.error.not_in_project"))
+          raise(ShopifyCLI::Abort, Context.message("core.project.error.not_in_project"))
         end
         @at ||= Hash.new { |h, k| h[k] = new(directory: k) }
         @at[proj_dir]
@@ -136,11 +136,11 @@ module ShopifyCli
     #
     # #### Returns
     #
-    # * `env` - An instance of a ShopifyCli::Resources::EnvFile
+    # * `env` - An instance of a ShopifyCLI::Resources::EnvFile
     #
     # #### Example
     #
-    #   ShopifyCli::Project.current.env
+    #   ShopifyCLI::Project.current.env
     #
     def env
       @env ||= begin
@@ -159,18 +159,18 @@ module ShopifyCli
     #
     # #### Raises
     #
-    # * `ShopifyCli::Abort` - If the yml is invalid or poorly formatted
-    # * `ShopifyCli::Abort` - If the yml file does not exist
+    # * `ShopifyCLI::Abort` - If the yml is invalid or poorly formatted
+    # * `ShopifyCLI::Abort` - If the yml file does not exist
     #
     # #### Example
     #
-    #   ShopifyCli::Project.current.config
+    #   ShopifyCLI::Project.current.config
     #
     def config
       @config ||= begin
         config = load_yaml_file(".shopify-cli.yml")
         unless config.is_a?(Hash)
-          raise ShopifyCli::Abort, Context.message("core.yaml.error.not_hash", ".shopify-cli.yml")
+          raise ShopifyCLI::Abort, Context.message("core.yaml.error.not_hash", ".shopify-cli.yml")
         end
 
         # The app_type key was deprecated in favour of project_type, so replace it
@@ -191,12 +191,12 @@ module ShopifyCli
       begin
         YAML.load_file(f)
       rescue Psych::SyntaxError => e
-        raise(ShopifyCli::Abort, Context.message("core.yaml.error.invalid", relative_path, e.message))
+        raise(ShopifyCLI::Abort, Context.message("core.yaml.error.invalid", relative_path, e.message))
       # rescue Errno::EACCES => e
       # TODO
       #   Dev::Helpers::EaccesHandler.diagnose_and_raise(f, e, mode: :read)
       rescue Errno::ENOENT
-        raise ShopifyCli::Abort, Context.message("core.yaml.error.not_found", f)
+        raise ShopifyCLI::Abort, Context.message("core.yaml.error.not_found", f)
       end
     end
   end

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

@@ -1,4 +1,4 @@
-module ShopifyCli
+module ShopifyCLI
   class ProjectCommands < Command
     def call(*)
       @ctx.puts(self.class.help)
@@ -6,9 +6,9 @@ module ShopifyCli
 
     def self.help
       project_type = name.split("::")[0].downcase
-      ShopifyCli::Context.message(
+      ShopifyCLI::Context.message(
         "#{project_type}.help",
-        ShopifyCli::TOOL_NAME,
+        ShopifyCLI::TOOL_NAME,
         subcommand_registry.command_names.join(" | ")
       )
     end

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

@@ -1,4 +1,4 @@
-module ShopifyCli
+module ShopifyCLI
   class ProjectType
     extend Feature::Set
 
@@ -20,7 +20,7 @@ module ShopifyCli
       end
 
       def load_type(current_type, shallow = false)
-        filepath = File.join(ShopifyCli::ROOT, "lib", "project_types", current_type.to_s, "cli.rb")
+        filepath = File.join(ShopifyCLI::ROOT, "lib", "project_types", current_type.to_s, "cli.rb")
         return unless File.exist?(filepath)
         @shallow_load = shallow
         @current_type = current_type
@@ -31,7 +31,7 @@ module ShopifyCli
       end
 
       def load_all
-        Dir.glob(File.join(ShopifyCli::ROOT, "lib", "project_types", "*", "cli.rb")).map do |filepath|
+        Dir.glob(File.join(ShopifyCLI::ROOT, "lib", "project_types", "*", "cli.rb")).map do |filepath|
           load_type(filepath.split(File::Separator)[-2].to_sym, true)
         end
       end
@@ -41,7 +41,7 @@ module ShopifyCli
       end
 
       def project_filepath(path)
-        File.join(ShopifyCli::PROJECT_TYPES_DIR, project_type.to_s, path)
+        File.join(ShopifyCLI::PROJECT_TYPES_DIR, project_type.to_s, path)
       end
 
       def title(name)
@@ -50,7 +50,7 @@ module ShopifyCli
 
       def register_task(task, name)
         return if project_load_shallow
-        ShopifyCli::Tasks.register(task, name)
+        ShopifyCLI::Tasks.register(task, name)
       end
 
       def register_messages(messages)

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

@@ -4,13 +4,13 @@
 # are resolved relative to `Kernal`, but the top-level namespace is
 # configurable:
 #
-#    ShopifyCli::Resolve.call(:object).value # => Object
-#    ShopifyCli::Resolve.call('minitest/test').value # => MiniTest::Test
-#    ShopifyCli::Resolve.call(:test, namespace: MiniTest) # => MiniTest::Test
+#    ShopifyCLI::Resolve.call(:object).value # => Object
+#    ShopifyCLI::Resolve.call('minitest/test').value # => MiniTest::Test
+#    ShopifyCLI::Resolve.call(:test, namespace: MiniTest) # => MiniTest::Test
 #
-module ShopifyCli
+module ShopifyCLI
   class ResolveConstant
-    include ShopifyCli::MethodObject
+    include ShopifyCLI::MethodObject
     property! :namespace, accepts: ->(ns) { ns.respond_to?(:const_get) }, default: -> { Kernel }
 
     def call(name)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ShopifyCli
+module ShopifyCLI
   module Resources
     class EnvFile
       include SmartProperties

data/lib/shopify_cli/resources.rb

@@ -0,0 +1,5 @@
+module ShopifyCLI
+  module Resources
+    autoload :EnvFile, "shopify_cli/resources/env_file"
+  end
+end

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

@@ -1,4 +1,4 @@
-module ShopifyCli
+module ShopifyCLI
   ##
   # This module defines two containers for wrapping the result of an action. One
   # for signifying the successful execution of an action and one for signifying
@@ -261,8 +261,8 @@ module ShopifyCli
       end
 
       ##
-      # raises an `ShopifyCli::Result::UnexpectedError` as a
-      # `ShopifyCli::Result::Failure` does not carry a success value.
+      # raises an `ShopifyCLI::Result::UnexpectedError` as a
+      # `ShopifyCLI::Result::Failure` does not carry a success value.
       #
       def value
         raise UnexpectedFailure
@@ -342,7 +342,7 @@ module ShopifyCli
     end
 
     ##
-    # wraps the given value into a `ShopifyCli::Result::Success` container
+    # wraps the given value into a `ShopifyCLI::Result::Success` container
     #
     # #### Parameters
     #
@@ -353,7 +353,7 @@ module ShopifyCli
     end
 
     ##
-    # wraps the given value into a `ShopifyCli::Result::Failure` container
+    # wraps the given value into a `ShopifyCLI::Result::Failure` container
     #
     # #### Parameters
     #
@@ -367,8 +367,8 @@ module ShopifyCli
     # takes either a value or a block and chooses the appropriate result
     # container based on the type of the value or the type of the block's return
     # value. If the type is an exception, it is wrapped in a
-    # `ShopifyCli::Result::Failure` and otherwise in a
-    # `ShopifyCli::Result::Success`. If a block was provided instead of value, a
+    # `ShopifyCLI::Result::Failure` and otherwise in a
+    # `ShopifyCLI::Result::Success`. If a block was provided instead of value, a
     # `Proc` is returned and the result wrapping doesn't occur until the block
     # is invoked.
     #
@@ -384,12 +384,12 @@ module ShopifyCli
     #
     # #### Examples
     #
-    #   Result.wrap(1) # => ShopifyCli::Result::Success
-    #   Result.wrap(RuntimeError.new) # => ShopifyCli::Result::Failure
+    #   Result.wrap(1) # => ShopifyCLI::Result::Success
+    #   Result.wrap(RuntimeError.new) # => ShopifyCLI::Result::Failure
     #
     #   Result.wrap { 1 } # => Proc
-    #   Result.wrap { 1 }.call # => ShopifyCli::Result::Success
-    #   Result.wrap { raise }.call # => ShopifyCli::Result::Failure
+    #   Result.wrap { 1 }.call # => ShopifyCLI::Result::Success
+    #   Result.wrap { raise }.call # => ShopifyCLI::Result::Failure
     #
     #   Result.wrap { |s| s.upcase }.call("hello").tap do |result|
     #     result # => Result::Success

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

@@ -1,6 +1,6 @@
-module ShopifyCli
+module ShopifyCLI
   ##
-  # ShopifyCli::Shopifolk contains the logic to determine if the user appears to be a Shopify staff
+  # ShopifyCLI::Shopifolk contains the logic to determine if the user appears to be a Shopify staff
   #
   # The Shopifolk Feature flag will persist between runs so if the flag is enabled or disabled,
   # it will still be in that same state until the next class invocation.
@@ -20,10 +20,10 @@ module ShopifyCli
       #
       # #### Example
       #
-      #     ShopifyCli::Shopifolk.check
+      #     ShopifyCLI::Shopifolk.check
       #
       def check
-        ShopifyCli::Shopifolk.new.shopifolk?
+        ShopifyCLI::Shopifolk.new.shopifolk?
       end
 
       def act_as_shopify_organization
@@ -52,10 +52,10 @@ module ShopifyCli
       return true if Feature.enabled?(FEATURE_NAME)
 
       if shopifolk_by_gcloud? && shopifolk_by_dev?
-        ShopifyCli::Feature.enable(FEATURE_NAME)
+        ShopifyCLI::Feature.enable(FEATURE_NAME)
         true
       else
-        ShopifyCli::Feature.disable(FEATURE_NAME)
+        ShopifyCLI::Feature.disable(FEATURE_NAME)
         false
       end
     end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   class SubCommand < Command
     class << self
       def call(args, command_name, parent_command)

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

@@ -1,6 +1,6 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   class Task
     def self.call(*args, **kwargs)
       task = new

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

@@ -1,11 +1,11 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   module Tasks
-    class ConfirmStore < ShopifyCli::Task
+    class ConfirmStore < ShopifyCLI::Task
       def call(ctx)
         @ctx = ctx
-        store = ShopifyCli::AdminAPI.get_shop_or_abort(ctx)
+        store = ShopifyCLI::AdminAPI.get_shop_or_abort(ctx)
         if CLI::UI::Prompt.confirm(ctx.message("core.tasks.confirm_store.prompt", store), default: false)
           ctx.puts(ctx.message("core.tasks.confirm_store.confirmation", store))
         else

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

@@ -1,13 +1,13 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   module Tasks
-    class CreateApiClient < ShopifyCli::Task
+    class CreateApiClient < ShopifyCLI::Task
       VALID_APP_TYPES = %w(public custom)
       DEFAULT_APP_URL = "https://shopify.github.io/shopify-cli/help/start-app/"
 
       def call(ctx, org_id:, title:, type:)
-        resp = ShopifyCli::PartnersAPI.query(
+        resp = ShopifyCLI::PartnersAPI.query(
           ctx,
           "create_app",
           org: org_id.to_i,
@@ -31,7 +31,7 @@ module ShopifyCli
           ctx.abort(user_errors.map { |err| "#{err["field"]} #{err["message"]}" }.join(", "))
         end
 
-        ShopifyCli::Core::Monorail.metadata[:api_key] = resp.dig("data", "appCreate", "app", "apiKey")
+        ShopifyCLI::Core::Monorail.metadata[:api_key] = resp.dig("data", "appCreate", "app", "apiKey")
 
         resp.dig("data", "appCreate", "app")
       end

data/lib/shopify_cli/tasks/ensure_authenticated.rb

@@ -0,0 +1,13 @@
+require "shopify_cli"
+
+module ShopifyCLI
+  module Tasks
+    class EnsureAuthenticated < ShopifyCLI::Task
+      def call(ctx)
+        ctx.abort(
+          ctx.message("core.identity_auth.login_prompt", ShopifyCLI::TOOL_NAME)
+        ) unless ShopifyCLI::IdentityAuth::IDENTITY_ACCESS_TOKENS.all? { |key| ShopifyCLI::DB.exists?(key) }
+      end
+    end
+  end
+end

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

@@ -1,8 +1,8 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   module Tasks
-    class EnsureDevStore < ShopifyCli::Task
+    class EnsureDevStore < ShopifyCLI::Task
       def call(ctx)
         @ctx = ctx
         return ctx.abort(ctx.message(
@@ -12,7 +12,7 @@ module ShopifyCli
         return unless CLI::UI::Prompt.confirm(
           ctx.message("core.tasks.ensure_dev_store.convert_to_dev_store", project.env.shop)
         )
-        ShopifyCli::PartnersAPI.query(ctx, "convert_dev_to_test_store", input: {
+        ShopifyCLI::PartnersAPI.query(ctx, "convert_dev_to_test_store", input: {
           organizationID: shop["orgID"].to_i,
           shopId: shop["shopId"],
         })
@@ -22,13 +22,13 @@ module ShopifyCli
       private
 
       def project
-        @project ||= ShopifyCli::Project.current
+        @project ||= ShopifyCLI::Project.current
       end
 
       def shop
         @shop ||= begin
           current_domain = project.env.shop
-          ShopifyCli::PartnersAPI::Organizations.fetch_all(@ctx).map do |org|
+          ShopifyCLI::PartnersAPI::Organizations.fetch_all(@ctx).map do |org|
             org["stores"].find do |store|
               store["orgID"] = org["id"]
               store["shopDomain"] == current_domain

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

@@ -1,8 +1,8 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   module Tasks
-    class EnsureEnv < ShopifyCli::Task
+    class EnsureEnv < ShopifyCLI::Task
       def call(ctx, regenerate: false, required: [:api_key, :secret])
         @ctx = ctx
         env_data =
@@ -50,7 +50,7 @@ module ShopifyCli
             handler.option(@ctx.message("core.tasks.ensure_env.app_type.select_public")) { "public" }
             handler.option(@ctx.message("core.tasks.ensure_env.app_type.select_custom")) { "custom" }
           end
-          ShopifyCli::Tasks::CreateApiClient.call(@ctx, org_id: org_id, title: title, type: type)
+          ShopifyCLI::Tasks::CreateApiClient.call(@ctx, org_id: org_id, title: title, type: type)
         else
           CLI::UI::Prompt.ask(@ctx.message("core.tasks.ensure_env.app_select")) do |handler|
             apps.each { |app| handler.option(app["title"]) { app } }

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

@@ -1,16 +1,16 @@
-module ShopifyCli
+module ShopifyCLI
   module Tasks
-    class EnsureLoopbackURL < ShopifyCli::Task
+    class EnsureLoopbackURL < ShopifyCLI::Task
       def call(ctx)
         @ctx = ctx
         api_key = Project.current.env.api_key
-        result = ShopifyCli::PartnersAPI.query(ctx, "get_app_urls", apiKey: api_key)
+        result = ShopifyCLI::PartnersAPI.query(ctx, "get_app_urls", apiKey: api_key)
         loopback = IdentityAuth::REDIRECT_HOST
         app = result["data"]["app"]
         urls = app["redirectUrlWhitelist"]
         if urls.grep(/#{loopback}/).empty?
           with_loopback = urls.push(loopback)
-          ShopifyCli::PartnersAPI.query(@ctx, "update_dashboard_urls", input: {
+          ShopifyCLI::PartnersAPI.query(@ctx, "update_dashboard_urls", input: {
             redirectUrlWhitelist: with_loopback, apiKey: api_key
           })
         end

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

@@ -1,10 +1,10 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   module Tasks
-    class EnsureProjectType < ShopifyCli::Task
+    class EnsureProjectType < ShopifyCLI::Task
       def call(ctx, project_type)
-        return true if project_type.to_sym == ShopifyCli::Project.current_project_type
+        return true if project_type.to_sym == ShopifyCLI::Project.current_project_type
         ctx.abort(ctx.message("core.tasks.ensure_project_type.wrong_project_type", project_type))
       end
     end

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

@@ -1,8 +1,8 @@
 require "shopify_cli"
 
-module ShopifyCli
+module ShopifyCLI
   module Tasks
-    class SelectOrgAndShop < ShopifyCli::Task
+    class SelectOrgAndShop < ShopifyCLI::Task
       attr_reader :ctx
 
       def call(ctx, organization_id: nil, shop_domain: nil)
@@ -12,7 +12,7 @@ module ShopifyCli
         unless Shopifolk.acting_as_shopify_organization?
           shop_domain ||= get_shop_domain(org)
         end
-        ShopifyCli::Core::Monorail.metadata[:organization_id] = org["id"].to_i
+        ShopifyCLI::Core::Monorail.metadata[:organization_id] = org["id"].to_i
         response(org["id"].to_i, shop_domain)
       end
 
@@ -25,20 +25,20 @@ module ShopifyCli
       end
 
       def organizations
-        @organizations ||= ShopifyCli::PartnersAPI::Organizations.fetch_all(ctx)
+        @organizations ||= ShopifyCLI::PartnersAPI::Organizations.fetch_all(ctx)
       end
 
       def get_organization(organization_id)
         @organization ||= if !organization_id.nil?
-          org = ShopifyCli::PartnersAPI::Organizations.fetch(ctx, id: organization_id)
+          org = ShopifyCLI::PartnersAPI::Organizations.fetch(ctx, id: organization_id)
           if org.nil?
-            ctx.puts(ctx.message("core.tasks.select_org_and_shop.authentication_issue", ShopifyCli::TOOL_NAME))
+            ctx.puts(ctx.message("core.tasks.select_org_and_shop.authentication_issue", ShopifyCLI::TOOL_NAME))
             ctx.abort(ctx.message("core.tasks.select_org_and_shop.error.organization_not_found"))
           end
           org
         elsif organizations.count == 0
           if Shopifolk.acting_as_shopify_organization?
-            ctx.abort(ctx.message("core.tasks.select_org_and_shop.error.shopifolk_notice", ShopifyCli::TOOL_NAME))
+            ctx.abort(ctx.message("core.tasks.select_org_and_shop.error.shopifolk_notice", ShopifyCLI::TOOL_NAME))
           else
             ctx.abort(ctx.message("core.tasks.select_org_and_shop.error.no_organizations"))
           end
@@ -64,7 +64,7 @@ module ShopifyCli
         if valid_stores.count == 0
           ctx.puts(ctx.message("core.tasks.select_org_and_shop.error.no_development_stores"))
           ctx.puts(ctx.message("core.tasks.select_org_and_shop.create_store", organization["id"]))
-          ctx.puts(ctx.message("core.tasks.select_org_and_shop.authentication_issue", ShopifyCli::TOOL_NAME))
+          ctx.puts(ctx.message("core.tasks.select_org_and_shop.authentication_issue", ShopifyCLI::TOOL_NAME))
         elsif valid_stores.count == 1
           domain = valid_stores.first["shopDomain"]
           ctx.puts(ctx.message("core.tasks.select_org_and_shop.development_store", domain))

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

@@ -1,24 +1,24 @@
-module ShopifyCli
+module ShopifyCLI
   module Tasks
-    class UpdateDashboardURLS < ShopifyCli::Task
+    class UpdateDashboardURLS < ShopifyCLI::Task
       NGROK_REGEX = /https:\/\/([a-z0-9\-]+\.ngrok\.io)(.*)/
 
       def call(ctx, url:, callback_url:)
         @ctx = ctx
-        project = ShopifyCli::Project.current
+        project = ShopifyCLI::Project.current
         api_key = project.env.api_key
-        result = ShopifyCli::PartnersAPI.query(ctx, "get_app_urls", apiKey: api_key)
+        result = ShopifyCLI::PartnersAPI.query(ctx, "get_app_urls", apiKey: api_key)
         app = result["data"]["app"]
         consent = check_application_url(app["applicationUrl"], url)
         constructed_urls = construct_redirect_urls(app["redirectUrlWhitelist"], url, callback_url)
         return if url == app["applicationUrl"]
-        ShopifyCli::PartnersAPI.query(@ctx, "update_dashboard_urls", input: {
+        ShopifyCLI::PartnersAPI.query(@ctx, "update_dashboard_urls", input: {
           applicationUrl: consent ? url : app["applicationUrl"],
           redirectUrlWhitelist: constructed_urls, apiKey: api_key
         })
         @ctx.puts(@ctx.message("core.tasks.update_dashboard_urls.updated"))
       rescue
-        @ctx.puts(@ctx.message("core.tasks.update_dashboard_urls.update_error", ShopifyCli::TOOL_NAME))
+        @ctx.puts(@ctx.message("core.tasks.update_dashboard_urls.update_error", ShopifyCLI::TOOL_NAME))
         raise
       end