shopify-cli 1.3.1 → 1.7.0

data/lib/shopify-cli/command.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   class Command < CLI::Kit::BaseCommand

data/lib/shopify-cli/commands.rb

@@ -1,9 +1,9 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   module Commands
     Registry = CLI::Kit::CommandRegistry.new(
-      default: 'help',
+      default: "help",
       contextual_resolver: nil,
     )
     @core_commands = []
@@ -18,12 +18,12 @@ module ShopifyCli
       @core_commands.include?(cmd)
     end
 
-    register :Config, 'config', 'shopify-cli/commands/config', true
-    register :Connect, 'connect', 'shopify-cli/commands/connect', true
-    register :Create, 'create', 'shopify-cli/commands/create', true
-    register :Help, 'help', 'shopify-cli/commands/help', true
-    register :Logout, 'logout', 'shopify-cli/commands/logout', true
-    register :System, 'system', 'shopify-cli/commands/system', true
-    register :Version, 'version', 'shopify-cli/commands/version', true
+    register :Config, "config", "shopify-cli/commands/config", true
+    register :Connect, "connect", "shopify-cli/commands/connect", true
+    register :Create, "create", "shopify-cli/commands/create", true
+    register :Help, "help", "shopify-cli/commands/help", true
+    register :Logout, "logout", "shopify-cli/commands/logout", true
+    register :System, "system", "shopify-cli/commands/system", true
+    register :Version, "version", "shopify-cli/commands/version", true
   end
 end

data/lib/shopify-cli/commands/config.rb

@@ -1,73 +1,73 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   module Commands
     class Config < ShopifyCli::Command
       hidden_feature(feature_set: :debug)
 
-      subcommand :Feature, 'feature'
-      subcommand :Analytics, 'analytics'
+      subcommand :Feature, "feature"
+      subcommand :Analytics, "analytics"
 
       def call(*)
         @ctx.puts(self.class.help)
       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
         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|
-          parser.on('--enable') { flags[:action] = 'enable' }
-          parser.on('--disable') { flags[:action] = 'disable' }
-          parser.on('--status') { flags[:action] = 'status' }
+          parser.on("--enable") { flags[:action] = "enable" }
+          parser.on("--disable") { flags[:action] = "disable" }
+          parser.on("--status") { flags[:action] = "status" }
         end
 
         def call(args, _name)
           feature_name = args.shift
-          return @ctx.puts(@ctx.message('core.config.help', ShopifyCli::TOOL_NAME)) if feature_name.nil?
+          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
+          if options.flags[:action] == "disable" && is_enabled
             ShopifyCli::Feature.disable(feature_name)
-            @ctx.puts(@ctx.message('core.config.feature.disabled', feature_name))
-          elsif options.flags[:action] == 'enable' && !is_enabled
+            @ctx.puts(@ctx.message("core.config.feature.disabled", feature_name))
+          elsif options.flags[:action] == "enable" && !is_enabled
             ShopifyCli::Feature.enable(feature_name)
-            @ctx.puts(@ctx.message('core.config.feature.enabled', 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))
+            @ctx.puts(@ctx.message("core.config.feature.is_enabled", feature_name))
           else
-            @ctx.puts(@ctx.message('core.config.feature.is_disabled', feature_name))
+            @ctx.puts(@ctx.message("core.config.feature.is_disabled", feature_name))
           end
         end
       end
 
       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|
-          parser.on('--enable') { flags[:action] = 'enable' }
-          parser.on('--disable') { flags[:action] = 'disable' }
-          parser.on('--status') { flags[:action] = 'status' }
+          parser.on("--enable") { flags[:action] = "enable" }
+          parser.on("--disable") { flags[:action] = "disable" }
+          parser.on("--status") { flags[:action] = "status" }
         end
 
         def call(_args, _name)
-          is_enabled = ShopifyCli::Config.get_bool('analytics', 'enabled')
-          if options.flags[:action] == 'disable' && is_enabled
-            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)
-            @ctx.puts(@ctx.message('core.config.analytics.enabled'))
+          is_enabled = ShopifyCli::Config.get_bool("analytics", "enabled")
+          if options.flags[:action] == "disable" && is_enabled
+            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)
+            @ctx.puts(@ctx.message("core.config.analytics.enabled"))
           elsif is_enabled
-            @ctx.puts(@ctx.message('core.config.analytics.is_enabled'))
+            @ctx.puts(@ctx.message("core.config.analytics.is_enabled"))
           else
-            @ctx.puts(@ctx.message('core.config.analytics.is_disabled'))
+            @ctx.puts(@ctx.message("core.config.analytics.is_disabled"))
           end
         end
       end

data/lib/shopify-cli/commands/connect.rb

@@ -1,46 +1,63 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   module Commands
     class Connect < ShopifyCli::Command
-      def call(*)
-        project_type = ask_project_type unless Project.has_current?
-
-        if Project.has_current? && Project.current && Project.current.env
-          @ctx.puts @ctx.message('core.connect.already_connected_warning')
-          prod_warning = @ctx.message('core.connect.production_warning')
-          @ctx.puts prod_warning if [:rails, :node].include?(Project.current_project_type)
+      class << self
+        def call(args, command_name)
+          ProjectType.load_type(args[0]) unless args.empty?
+          super
         end
 
-        org = ShopifyCli::Tasks::EnsureEnv.call(@ctx, regenerate: true)
-        write_cli_yml(project_type, org['id']) unless Project.has_current?
-        api_key = Project.current(force_reload: true).env['api_key']
-        @ctx.puts(@ctx.message('core.connect.connected', get_app(org['apps'], api_key).first["title"]))
+        def help
+          ShopifyCli::Context.message("core.connect.help", ShopifyCli::TOOL_NAME)
+        end
       end
 
-      def get_app(apps, api_key)
-        apps.select { |app| app["apiKey"] == api_key }
+      def call(args, command_name)
+        if Project.current&.env
+          @ctx.puts(@ctx.message("core.connect.already_connected_warning"))
+        end
+
+        project_type = ask_project_type
+
+        klass = ProjectType.load_type(project_type)&.connect_command
+
+        if klass
+          klass.ctx = @ctx
+          klass.call(args, command_name, "connect")
+        else
+          app = default_connect(project_type)
+          @ctx.done(@ctx.message("core.connect.connected", app))
+        end
       end
 
       def ask_project_type
-        CLI::UI::Prompt.ask(@ctx.message('core.connect.project_type_select')) do |handler|
+        CLI::UI::Prompt.ask(@ctx.message("core.connect.project_type_select")) do |handler|
           ShopifyCli::Commands::Create.all_visible_type.each do |type|
             handler.option(type.project_name) { type.project_type }
           end
         end
       end
 
+      def default_connect(project_type)
+        org = ShopifyCli::Tasks::EnsureEnv.call(@ctx, regenerate: true)
+        write_cli_yml(project_type, org["id"]) unless Project.has_current?
+        api_key = Project.current(force_reload: true).env["api_key"]
+        get_app(org["apps"], api_key).first["title"]
+      end
+
       def write_cli_yml(project_type, org_id)
         ShopifyCli::Project.write(
           @ctx,
           project_type: project_type,
           organization_id: org_id,
         )
-        @ctx.done(@ctx.message('core.connect.cli_yml_saved'))
+        @ctx.done(@ctx.message("core.connect.cli_yml_saved"))
       end
 
-      def self.help
-        ShopifyCli::Context.message('core.connect.help', ShopifyCli::TOOL_NAME)
+      def get_app(apps, api_key)
+        apps.select { |app| app["apiKey"] == api_key }
       end
     end
   end

data/lib/shopify-cli/commands/create.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   module Commands
@@ -10,11 +10,11 @@ module ShopifyCli
 
       def call(args, command_name)
         unless args.empty?
-          @ctx.puts(@ctx.message('core.create.error.invalid_app_type', args[0]))
+          @ctx.puts(@ctx.message("core.create.error.invalid_app_type", args[0]))
           return @ctx.puts(self.class.help)
         end
 
-        type_name = CLI::UI::Prompt.ask(@ctx.message('core.create.project_type_select')) do |handler|
+        type_name = CLI::UI::Prompt.ask(@ctx.message("core.create.project_type_select")) do |handler|
           self.class.all_visible_type.each do |type|
             handler.option(type.project_name) { type.project_type }
           end
@@ -22,7 +22,7 @@ module ShopifyCli
 
         klass = ProjectType.load_type(type_name).create_command
         klass.ctx = @ctx
-        klass.call(args, command_name, 'create')
+        klass.call(args, command_name, "create")
       end
 
       def self.all_visible_type
@@ -33,7 +33,7 @@ module ShopifyCli
 
       def self.help
         project_types = all_visible_type.map(&:project_type).sort.join(" | ")
-        ShopifyCli::Context.message('core.create.help', ShopifyCli::TOOL_NAME, project_types)
+        ShopifyCli::Context.message("core.create.help", ShopifyCli::TOOL_NAME, project_types)
       end
 
       def self.extended_help

data/lib/shopify-cli/commands/help.rb

@@ -1,11 +1,11 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   module Commands
     class Help < ShopifyCli::Command
       def call(args, _name)
         command = args.shift
-        if command && command != 'help'
+        if command && command != "help"
           if Registry.exist?(command)
             cmd, _ = Registry.lookup_command(command)
             subcmd, _ = cmd.subcommand_registry.lookup_command(args.first)
@@ -16,15 +16,15 @@ module ShopifyCli
             end
             return
           else
-            @ctx.puts(@ctx.message('core.help.error.command_not_found', command))
+            @ctx.puts(@ctx.message("core.help.error.command_not_found", command))
           end
         end
 
-        preamble = @ctx.message('core.help.preamble', ShopifyCli::TOOL_NAME)
+        preamble = @ctx.message("core.help.preamble", ShopifyCli::TOOL_NAME)
         @ctx.puts(preamble)
 
         core_commands.each do |name, klass|
-          next if name == 'help'
+          next if name == "help"
           @ctx.puts("{{command:#{name}}}: #{klass.help}\n")
         end
 
@@ -34,7 +34,7 @@ module ShopifyCli
         @ctx.puts("{{bold:Available commands for #{project_type_name} projects:}}\n\n")
 
         local_commands.each do |name, klass|
-          next if name == 'help'
+          next if name == "help"
           @ctx.puts("{{command:#{name}}}: #{klass.help}\n")
         end
       end

data/lib/shopify-cli/commands/logout.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   module Commands
@@ -12,11 +12,11 @@ module ShopifyCli
         LOGIN_TOKENS.each do |token|
           ShopifyCli::DB.del(token) if ShopifyCli::DB.exists?(token)
         end
-        @ctx.puts(@ctx.message('core.logout.success'))
+        @ctx.puts(@ctx.message("core.logout.success"))
       end
 
       def self.help
-        ShopifyCli::Context.message('core.logout.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("core.logout.help", ShopifyCli::TOOL_NAME)
       end
     end
   end

data/lib/shopify-cli/commands/system.rb

@@ -1,5 +1,5 @@
-require 'shopify_cli'
-require 'rbconfig'
+require "shopify_cli"
+require "rbconfig"
 
 module ShopifyCli
   module Commands
@@ -9,13 +9,13 @@ module ShopifyCli
       def call(args, _name)
         show_all_details = false
         flag = args.shift
-        if flag && flag != 'all'
-          @ctx.puts(@ctx.message('core.system.error.unknown_option', flag))
+        if flag && flag != "all"
+          @ctx.puts(@ctx.message("core.system.error.unknown_option", flag))
           @ctx.puts("\n" + self.class.help)
           return
         end
 
-        show_all_details = true if flag == 'all'
+        show_all_details = true if flag == "all"
 
         display_environment if show_all_details
 
@@ -23,10 +23,11 @@ module ShopifyCli
         display_cli_ruby(show_all_details)
         display_utility_commands(show_all_details)
         display_project_commands(show_all_details)
+        display_shopify_staff_identity if show_all_details
       end
 
       def self.help
-        ShopifyCli::Context.message('core.system.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("core.system.help", ShopifyCli::TOOL_NAME)
       end
 
       private
@@ -46,14 +47,14 @@ module ShopifyCli
 
         cli_constants += cli_constants_extra if show_all_details
 
-        @ctx.puts(@ctx.message('core.system.header'))
+        @ctx.puts(@ctx.message("core.system.header"))
         cli_constants.each do |s|
-          @ctx.puts("  " + @ctx.message('core.system.const', s, ShopifyCli.const_get(s.to_sym)) + "\n")
+          @ctx.puts("  " + @ctx.message("core.system.const", s, ShopifyCli.const_get(s.to_sym)) + "\n")
         end
 
         if show_all_details
           cli_path_methods.each do |m|
-            @ctx.puts("  " + @ctx.message('core.system.const', m.upcase, ShopifyCli.send(m)) + "\n")
+            @ctx.puts("  " + @ctx.message("core.system.const", m.upcase, ShopifyCli.send(m)) + "\n")
           end
         end
       end
@@ -61,55 +62,55 @@ module ShopifyCli
       def display_cli_ruby(_show_all_details)
         rbconfig_constants = %w(host RUBY_VERSION_NAME)
 
-        @ctx.puts("\n" + @ctx.message('core.system.ruby_header', RbConfig.ruby))
+        @ctx.puts("\n" + @ctx.message("core.system.ruby_header", RbConfig.ruby))
         rbconfig_constants.each do |s|
-          @ctx.puts("  " + @ctx.message('core.system.rb_config', RbConfig::CONFIG[s], s))
+          @ctx.puts("  " + @ctx.message("core.system.rb_config", RbConfig::CONFIG[s], s))
         end
       end
 
       def display_utility_commands(_show_all_details)
         commands = %w(git curl tar)
 
-        @ctx.puts("\n" + @ctx.message('core.system.command_header'))
+        @ctx.puts("\n" + @ctx.message("core.system.command_header"))
         commands.each do |s|
           cmd_path = @ctx.which(s)
 
           if !cmd_path.nil?
-            @ctx.puts("  " + @ctx.message('core.system.command_with_path', s, cmd_path))
+            @ctx.puts("  " + @ctx.message("core.system.command_with_path", s, cmd_path))
           else
-            @ctx.puts("  " + @ctx.message('core.system.command_not_found', s))
+            @ctx.puts("  " + @ctx.message("core.system.command_not_found", s))
           end
         end
       end
 
       def display_ngrok
-        ngrok_location = File.join(ShopifyCli.cache_dir, @ctx.windows? ? 'ngrok.exe' : 'ngrok')
+        ngrok_location = File.join(ShopifyCli.cache_dir, "ngrok#{@ctx.executable_file_extension}")
         if File.exist?(ngrok_location)
-          @ctx.puts("  " + @ctx.message('core.system.ngrok_available', ngrok_location))
+          @ctx.puts("  " + @ctx.message("core.system.ngrok_available", ngrok_location))
         else
-          @ctx.puts("  " + @ctx.message('core.system.ngrok_not_available'))
+          @ctx.puts("  " + @ctx.message("core.system.ngrok_not_available"))
         end
       end
 
       def display_project_commands(_show_all_details)
         case Project.current_project_type
         when :node
-          display_project('Node.js', %w(npm node yarn))
+          display_project("Node.js", %w(npm node yarn))
         when :rails
-          display_project('Rails', %w(gem rails rake ruby))
+          display_project("Rails", %w(gem rails rake ruby))
         end
       end
 
       def display_project(project_type, commands)
-        @ctx.puts("\n" + @ctx.message('core.system.project.header', project_type))
+        @ctx.puts("\n" + @ctx.message("core.system.project.header", project_type))
         commands.each do |s|
           cmd_path = @ctx.which(s)
           if !cmd_path.nil?
-            version_output, _ = @ctx.capture2e(s, '--version')
+            version_output, _ = @ctx.capture2e(s, "--version")
             version = version_output.match(/(\d+\.[^\s]+)/)[0]
-            @ctx.puts("  " + @ctx.message('core.system.project.command_with_path', s, cmd_path.strip, version.strip))
+            @ctx.puts("  " + @ctx.message("core.system.project.command_with_path", s, cmd_path.strip, version.strip))
           else
-            @ctx.puts("  " + @ctx.message('core.system.project.command_not_found', s))
+            @ctx.puts("  " + @ctx.message("core.system.project.command_not_found", s))
           end
         end
         display_ngrok
@@ -117,28 +118,36 @@ module ShopifyCli
       end
 
       def display_project_environment
-        @ctx.puts("\n  " + @ctx.message('core.system.project.env_header'))
-        if File.exist?('./.env')
+        @ctx.puts("\n  " + @ctx.message("core.system.project.env_header"))
+        if File.exist?("./.env")
           Project.current.env.to_h.each do |k, v|
-            display_value = if v.nil? || v.strip == ''
-              @ctx.message('core.system.project.env_not_set')
+            display_value = if v.nil? || v.strip == ""
+              @ctx.message("core.system.project.env_not_set")
             else
               k.match(/^SHOPIFY_API/) ? "********" : v
             end
-            @ctx.puts("  " + @ctx.message('core.system.project.env', k, display_value))
+            @ctx.puts("  " + @ctx.message("core.system.project.env", k, display_value))
           end
         else
-          @ctx.puts("  " + @ctx.message('core.system.project.no_env'))
+          @ctx.puts("  " + @ctx.message("core.system.project.no_env"))
         end
       end
 
       def display_environment
-        @ctx.puts(@ctx.message('core.system.environment_header'))
+        @ctx.puts(@ctx.message("core.system.environment_header"))
         %w(TERM SHELL PATH USING_SHOPIFY_CLI LANG).each do |k|
-          @ctx.puts("  " + @ctx.message('core.system.env', k, ENV[k])) unless ENV[k].nil?
+          @ctx.puts("  " + @ctx.message("core.system.env", k, ENV[k])) unless ENV[k].nil?
         end
         @ctx.puts("")
       end
+
+      def display_shopify_staff_identity
+        is_shopifolk = ShopifyCli::Shopifolk.check
+        if is_shopifolk
+          @ctx.puts("\n" + @ctx.message("core.system.identity_header"))
+          @ctx.puts("  " + @ctx.message("core.system.identity_is_shopifolk"))
+        end
+      end
     end
   end
 end