shopify-cli 2.11.2 → 2.14.0

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

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require "shopify_cli/theme/theme"
+require "shopify_cli/theme/development_theme"
+
+module Theme
+  class Command
+    class Open < ShopifyCLI::Command::SubCommand
+      recommend_default_ruby_range
+
+      options do |parser, flags|
+        parser.on("-t", "--theme=NAME_OR_ID") { |theme| flags[:theme] = theme }
+        parser.on("-l", "--live") { flags[:live] = true }
+        parser.on("-d", "--development") { flags[:development] = true }
+      end
+
+      def call(_args, _name)
+        theme = find_theme(**options.flags)
+
+        @ctx.puts(@ctx.message("theme.open.details", theme.name, theme.editor_url))
+        @ctx.open_url!(theme.preview_url)
+      end
+
+      def self.help
+        ShopifyCLI::Context.message("theme.open.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
+      end
+
+      def find_theme(theme: nil, live: nil, development: nil, **_args)
+        return theme_by_identifier(theme) if theme
+        return live_theme if live
+        return development_theme if development
+
+        select_theme
+      end
+
+      def theme_by_identifier(identifier)
+        theme = ShopifyCLI::Theme::Theme.find_by_identifier(@ctx, identifier: identifier)
+        theme || not_found_error(identifier)
+      end
+
+      def development_theme
+        theme = ShopifyCLI::Theme::DevelopmentTheme.find(@ctx)
+        theme || not_found_error("development")
+      end
+
+      def live_theme
+        ShopifyCLI::Theme::Theme.live(@ctx)
+      end
+
+      def not_found_error(identifier)
+        @ctx.abort(@ctx.message("theme.open.theme_not_found", identifier))
+      end
+
+      def select_theme
+        form = Forms::Select.ask(
+          @ctx,
+          [],
+          title: @ctx.message("theme.open.select"),
+          root: nil
+        )
+        form&.theme
+      end
+    end
+  end
+end

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

@@ -15,6 +15,7 @@ module Theme
         sections
         snippets
         templates
+        release-notes.md
       ]
 
       def call(args, _name)

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

@@ -4,41 +4,49 @@ require "shopify_cli/theme/development_theme"
 require "shopify_cli/theme/ignore_filter"
 require "shopify_cli/theme/include_filter"
 require "shopify_cli/theme/syncer"
+require "project_types/theme/commands/common/root_helper"
+require "project_types/theme/conversions/include_glob"
+require "project_types/theme/conversions/ignore_glob"
 
 module Theme
   class Command
     class Pull < ShopifyCLI::Command::SubCommand
+      include Common::RootHelper
+
       recommend_default_ruby_range
 
       options do |parser, flags|
+        Conversions::IncludeGlob.register(parser)
+        Conversions::IgnoreGlob.register(parser)
+
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
         parser.on("-t", "--theme=NAME_OR_ID") { |theme| flags[:theme] = theme }
         parser.on("-l", "--live") { flags[:live] = true }
         parser.on("-d", "--development") { flags[:development] = true }
-        parser.on("-o", "--only=PATTERN") do |pattern|
+        parser.on("-o", "--only=PATTERN", Conversions::IncludeGlob) do |pattern|
           flags[:includes] ||= []
-          flags[:includes] << pattern
+          flags[:includes] += pattern
         end
-        parser.on("-x", "--ignore=PATTERN") do |pattern|
+        parser.on("-x", "--ignore=PATTERN", Conversions::IgnoreGlob) do |pattern|
           flags[:ignores] ||= []
-          flags[:ignores] << pattern
+          flags[:ignores] += pattern
         end
       end
 
-      def call(args, _name)
-        root = args.first || "."
+      def call(_args, name)
+        root = root_value(options, name)
         delete = !options.flags[:nodelete]
         theme = find_theme(root, **options.flags)
         return if theme.nil?
 
-        include_filter = ShopifyCLI::Theme::IncludeFilter.new(options.flags[:includes])
+        include_filter = ShopifyCLI::Theme::IncludeFilter.new(root, options.flags[:includes])
         ignore_filter = ShopifyCLI::Theme::IgnoreFilter.from_path(root)
         ignore_filter.add_patterns(options.flags[:ignores]) if options.flags[:ignores]
 
         syncer = ShopifyCLI::Theme::Syncer.new(@ctx, theme: theme,
-                                               include_filter: include_filter,
-                                               ignore_filter: ignore_filter)
+          include_filter: include_filter,
+          ignore_filter: ignore_filter)
         begin
           syncer.start_threads
           CLI::UI::Frame.open(@ctx.message("theme.pull.pulling", theme.name, theme.id, theme.shop)) do
@@ -75,7 +83,7 @@ module Theme
 
         if development
           dev_theme = ShopifyCLI::Theme::DevelopmentTheme.find(@ctx, root: root)
-          return dev_theme || @ctx.abort(@ctx.message("theme.pull.theme_not_found", dev_theme.name))
+          return dev_theme || @ctx.abort(@ctx.message("theme.pull.theme_not_found", "development"))
         end
 
         select_theme(root)

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

@@ -4,13 +4,21 @@ require "shopify_cli/theme/development_theme"
 require "shopify_cli/theme/ignore_filter"
 require "shopify_cli/theme/include_filter"
 require "shopify_cli/theme/syncer"
+require "project_types/theme/commands/common/root_helper"
+require "project_types/theme/conversions/include_glob"
+require "project_types/theme/conversions/ignore_glob"
 
 module Theme
   class Command
     class Push < ShopifyCLI::Command::SubCommand
+      include Common::RootHelper
+
       recommend_default_ruby_range
 
       options do |parser, flags|
+        Conversions::IncludeGlob.register(parser)
+        Conversions::IgnoreGlob.register(parser)
+
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
         parser.on("-t", "--theme=NAME_OR_ID") { |theme| flags[:theme] = theme }
@@ -20,18 +28,18 @@ module Theme
         parser.on("-j", "--json") { flags[:json] = true }
         parser.on("-a", "--allow-live") { flags[:allow_live] = true }
         parser.on("-p", "--publish") { flags[:publish] = true }
-        parser.on("-o", "--only=PATTERN") do |pattern|
+        parser.on("-o", "--only=PATTERN", Conversions::IncludeGlob) do |pattern|
           flags[:includes] ||= []
-          flags[:includes] << pattern
+          flags[:includes] += pattern
         end
-        parser.on("-x", "--ignore=PATTERN") do |pattern|
+        parser.on("-x", "--ignore=PATTERN", Conversions::IgnoreGlob) do |pattern|
           flags[:ignores] ||= []
-          flags[:ignores] << pattern
+          flags[:ignores] += pattern
         end
       end
 
-      def call(args, _name)
-        root = args.first || "."
+      def call(_args, name)
+        root = root_value(options, name)
         delete = !options.flags[:nodelete]
         theme = find_theme(root, **options.flags)
         return if theme.nil?
@@ -42,13 +50,13 @@ module Theme
           return unless CLI::UI::Prompt.confirm(question)
         end
 
-        include_filter = ShopifyCLI::Theme::IncludeFilter.new(options.flags[:includes])
+        include_filter = ShopifyCLI::Theme::IncludeFilter.new(root, options.flags[:includes])
         ignore_filter = ShopifyCLI::Theme::IgnoreFilter.from_path(root)
         ignore_filter.add_patterns(options.flags[:ignores]) if options.flags[:ignores]
 
         syncer = ShopifyCLI::Theme::Syncer.new(@ctx, theme: theme,
-                                               include_filter: include_filter,
-                                               ignore_filter: ignore_filter)
+          include_filter: include_filter,
+          ignore_filter: ignore_filter)
         begin
           syncer.start_threads
           if options.flags[:json]

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

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 require "shopify_cli/theme/dev_server"
+require "project_types/theme/commands/common/root_helper"
 
 module Theme
   class Command
     class Serve < ShopifyCLI::Command::SubCommand
+      include Common::RootHelper
+
       recommend_default_ruby_range
 
       DEFAULT_HTTP_HOST = "127.0.0.1"
@@ -15,10 +18,11 @@ module Theme
         parser.on("--live-reload=MODE") { |mode| flags[:mode] = as_reload_mode(mode) }
       end
 
-      def call(*)
+      def call(_args, name)
+        root = root_value(options, name)
         flags = options.flags.dup
         host = flags[:host] || DEFAULT_HTTP_HOST
-        ShopifyCLI::Theme::DevServer.start(@ctx, ".", host: host, **flags) do |syncer|
+        ShopifyCLI::Theme::DevServer.start(@ctx, root, host: host, **flags) do |syncer|
           UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delay_low_priority_files: true)
         end
       rescue ShopifyCLI::Theme::DevServer::AddressBindingError

data/lib/project_types/theme/conversions/base_glob.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Theme
+  module Conversions
+    class BaseGlob
+      class << self
+        def register(parser)
+          parser.accept(self) { |_val| convert(parser) }
+        end
+
+        def convert(parser)
+          argv = parser.default_argv
+          option_index = argv.index { |v| options.include?(v) }
+
+          return [] if option_index.nil?
+
+          start_index = option_index + 1
+          option_by_key = options_map(parser)
+          values = []
+
+          argv[start_index..-1].each do |value|
+            return values unless option_by_key[value].nil?
+            values << value
+          end
+
+          values
+        end
+
+        def options
+          raise "`#{self.class.name}#options` must be defined"
+        end
+
+        private
+
+        def options_map(parser)
+          map = {}
+          parser.top.list.each do |option|
+            map[option.short.first] = option
+            map[option.long.first] = option
+          end
+          map
+        end
+
+        def parameter?(value)
+          value.start_with?("-")
+        end
+      end
+    end
+  end
+end

data/lib/project_types/theme/conversions/ignore_glob.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative "base_glob"
+
+module Theme
+  module Conversions
+    class IgnoreGlob < BaseGlob
+      class << self
+        def options
+          %w(-x --ignore)
+        end
+      end
+    end
+  end
+end

data/lib/project_types/theme/conversions/include_glob.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative "base_glob"
+
+module Theme
+  module Conversions
+    class IncludeGlob < BaseGlob
+      class << self
+        def options
+          %w(-o --only)
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require "project_types/theme/presenters/themes_presenter"
+
 module Theme
   module Forms
     class Select < ShopifyCLI::Form
@@ -6,53 +10,21 @@ module Theme
 
       def ask
         self.theme = CLI::UI::Prompt.ask(title, allow_empty: false) do |handler|
-          themes.each do |theme|
+          theme_presenters.each do |presenter|
+            theme = presenter.theme
+
             next if exclude_roles&.include?(theme.role)
             next if !include_foreign_developments && theme.foreign_development?
-            handler.option("#{theme.name} #{theme_tags(theme)}") { theme }
+
+            handler.option(presenter.to_s(:short)) { theme }
           end
         end
       end
 
       private
 
-      def themes
-        @themes ||= ShopifyCLI::Theme::Theme.all(@ctx, root: root)
-          .sort_by { |theme| theme_sort_order(theme) }
-      end
-
-      def theme_sort_order(theme)
-        case theme.role
-        when "live"
-          0
-        when "unpublished"
-          1
-        when "development"
-          2
-        else
-          3
-        end
-      end
-
-      def theme_tags(theme)
-        color = case theme.role
-        when "live"
-          "green"
-        when "unpublished"
-          "yellow"
-        when "development"
-          "blue"
-        else
-          "italic"
-        end
-
-        tags = ["{{#{color}:[#{theme.role}]}}"]
-
-        if theme.current_development?
-          tags << "{{cyan:[yours]}}}}"
-        end
-
-        tags.join(" ")
+      def theme_presenters
+        Theme::Presenters::ThemesPresenter.new(ctx, root).all
       end
     end
   end

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

@@ -7,6 +7,8 @@ module Theme
           Suite of commands for developing Shopify themes. See {{command:%1$s theme <command> --help}} for usage of each command.
             Usage: {{command:%1$s theme [ %2$s ]}}
         HELP
+        ensure_user_error: "You are not authorized to edit themes on %s.",
+        ensure_user_try_this: "Make sure you are a user of that store, and allowed to edit themes.",
 
         init: {
           help: <<~HELP,
@@ -65,8 +67,8 @@ module Theme
                 {{command:-j, --json}}             Output JSON instead of a UI.
                 {{command:-a, --allow-live}}       Allow push to a live theme.
                 {{command:-p, --publish}}          Publish as the live theme after uploading.
-                {{command:-o, --only}}             Upload only the specified files.
-                {{command:-x, --ignore}}           Skip uploading the specified files.
+                {{command:-o, --only}}             Upload only the specified files (Multiple flags allowed).
+                {{command:-x, --ignore}}           Skip uploading the specified files (Multiple flags allowed).
 
               Run without options to select theme from a list.
           HELP
@@ -87,7 +89,7 @@ module Theme
               {{info:View your theme:}}
               {{underline:%s}}
 
-              {{info:Customize this theme in the Online Store Editor:}}
+              {{info:Customize this theme in the Theme Editor:}}
               {{underline:%s}}
           DONE
           name: "Theme name",
@@ -96,7 +98,7 @@ module Theme
           help: <<~HELP,
             Uploads the current theme as a development theme to the connected store, then prints theme editor and preview URLs to your terminal. While running, changes will push to the store in real time.
 
-            Usage: {{command:%s theme serve}}
+            Usage: {{command:%s theme serve [ ROOT ]}}
 
             Options:
               {{command:--port=PORT}}        Local port to serve theme preview from.
@@ -130,7 +132,7 @@ module Theme
           SERVING
           customize_or_preview: <<~CUSTOMIZE_OR_PREVIEW,
 
-            Customize this theme in the Online Store Editor:
+            Customize this theme in the Theme Editor:
             {{green:%s}}
 
             Share this theme preview:
@@ -202,8 +204,8 @@ module Theme
               {{command:-l, --live}}             Pull theme files from your remote live theme.
               {{command:-d, --development}}      Pull theme files from your remote development theme.
               {{command:-n, --nodelete}}         Runs the pull command without deleting local files.
-              {{command:-o, --only}}             Download only the specified files.
-              {{command:-x, --ignore}}           Skip downloading the specified files.
+              {{command:-o, --only}}             Download only the specified files (Multiple flags allowed).
+              {{command:-x, --ignore}}           Skip downloading the specified files (Multiple flags allowed).
 
             Run without options to select theme from a list.
           HELP
@@ -215,6 +217,35 @@ module Theme
           WARN
           theme_not_found: "Theme \"%s\" doesn't exist",
         },
+        open: {
+          select: "Select a theme to open",
+          theme_not_found: "Theme \"%s\" doesn't exist",
+          details: <<~DETAILS,
+            {{*}} {{bold:%s}}
+
+            Customize your theme in the Theme Editor:
+            {{green:%s}}
+
+          DETAILS
+          help: <<~HELP,
+            {{command:%s theme open}}: Opens the preview of your remote theme.
+
+            Usage: {{command:%s theme open}}
+
+            Options:
+              {{command:-t, --theme=NAME_OR_ID}} Theme ID or name of your theme.
+              {{command:-l, --live}}             Open your live theme.
+              {{command:-d, --development}}      Open your development theme.
+          HELP
+        },
+        list: {
+          title: "{{*}} List of {{bold:%s}} themes:",
+          help: <<~HELP,
+            {{command:%s theme list}}: Lists your remote themes.
+
+            Usage: {{command:%s theme list}}
+          HELP
+        },
       },
     }.freeze
   end

data/lib/project_types/theme/presenters/theme_presenter.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+module Theme
+  module Presenters
+    class ThemePresenter
+      extend Forwardable
+
+      COLOR_BY_ROLE = {
+        "live" => "green",
+        "unpublished" => "yellow",
+        "development" => "blue",
+      }
+
+      attr_reader :theme
+
+      def_delegators :theme, :id, :name, :role
+
+      def initialize(theme)
+        @theme = theme
+      end
+
+      def to_s(mode = :long)
+        case mode
+        when :short
+          "{{bold:#{name} #{theme_tags}}}"
+        when :long
+          "{{green:##{id}}} {{bold:#{name} #{theme_tags}}}"
+        else
+          inspect
+        end
+      end
+
+      private
+
+      def theme_tags
+        tags = ["{{#{tag_color}:[#{role}]}}"]
+        tags << "{{cyan:[yours]}}}}" if theme.current_development?
+        tags.join(" ")
+      end
+
+      def tag_color
+        COLOR_BY_ROLE[role] || "italic"
+      end
+    end
+  end
+end

data/lib/project_types/theme/presenters/themes_presenter.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative "theme_presenter"
+
+module Theme
+  module Presenters
+    class ThemesPresenter
+      ORDER_BY_ROLE = %w(live unpublished development)
+
+      def initialize(ctx, root)
+        @ctx = ctx
+        @root = root
+      end
+
+      def all
+        all_themes
+          .sort_by { |theme| order_by_role(theme) }
+          .map { |theme| ThemePresenter.new(theme) }
+      end
+
+      private
+
+      def order_by_role(theme)
+        ORDER_BY_ROLE.index(theme.role) || ORDER_BY_ROLE.size
+      end
+
+      def all_themes
+        ShopifyCLI::Theme::Theme.all(@ctx, root: @root)
+      end
+    end
+  end
+end

data/lib/shopify_cli/api.rb

@@ -85,7 +85,7 @@ module ShopifyCLI
         end
       rescue Errno::ETIMEDOUT, Timeout::Error
         ctx.debug("timeout in #{method} #{uri} with X-Request-Id: #{headers["X-Request-Id"]}")
-        raise APIRequestTimeoutError.new("Timeout")
+        raise APIRequestTimeoutError, "Timeout"
       end.retry_after(APIRequestRetriableError, retries: 3) do |e|
         sleep(1) if e.is_a?(APIRequestThrottledError)
       end

data/lib/shopify_cli/commands/app/create/node.rb

@@ -4,6 +4,7 @@ module ShopifyCLI
       class Create
         class Node < ShopifyCLI::Command::AppSubCommand
           prerequisite_task :ensure_authenticated
+          prerequisite_task :ensure_git_dependency
 
           recommend_default_node_range
           recommend_default_ruby_range

data/lib/shopify_cli/commands/app/create/php.rb

@@ -4,6 +4,7 @@ module ShopifyCLI
       class Create
         class PHP < ShopifyCLI::Command::AppSubCommand
           prerequisite_task :ensure_authenticated
+          prerequisite_task :ensure_git_dependency
 
           options do |parser, flags|
             parser.on("--name=NAME") { |name| flags[:name] = name }

data/lib/shopify_cli/commands/app/create/rails.rb

@@ -4,6 +4,7 @@ module ShopifyCLI
       class Create
         class Rails < ShopifyCLI::Command::AppSubCommand
           prerequisite_task :ensure_authenticated
+          prerequisite_task :ensure_git_dependency
 
           recommend_default_ruby_range
           recommend_default_node_range

data/lib/shopify_cli/commands/app/deploy.rb

@@ -2,7 +2,7 @@ module ShopifyCLI
   module Commands
     class App
       class Deploy < ShopifyCLI::Command::AppSubCommand
-        subcommand :Heroku, "heroku", "shopify_cli/commands/app/deploy/heroku"
+        prerequisite_task :ensure_git_dependency
 
         recommend_default_ruby_range
 

data/lib/shopify_cli/constants.rb

@@ -61,12 +61,12 @@ module ShopifyCLI
     module SupportedVersions
       module Ruby
         FROM = "2.6.6"
-        TO = "3.1.0"
+        TO = "3.2.0"
       end
 
       module Node
         FROM = "14.5.0"
-        TO = "17.0.0"
+        TO = "18.0.0"
       end
     end
 

data/lib/shopify_cli/context.rb

@@ -103,7 +103,7 @@ module ShopifyCLI
     # any command run by the context.
     attr_accessor :env
 
-    def initialize(root: Dir.pwd, env: ($original_env || ENV).clone) # :nodoc:
+    def initialize(root: Dir.pwd, env: ($original_env || ENV).to_h) # :nodoc:
       self.root = root
       self.env = env
     end
@@ -164,7 +164,7 @@ module ShopifyCLI
 
     # will return true while tests are running, either locally or on CI
     def testing?
-      ci? || ENV["TEST"]
+      ci? || ENV["SHOPIFY_CLI_TEST"]
     end
 
     ##
@@ -570,21 +570,19 @@ module ShopifyCLI
       trap("INFO", "DEFAULT")
 
       fork do
-        begin
-          r, w = IO.pipe
+        r, w = IO.pipe
+        @signal = false
+        trap("SIGINFO") do
+          @signal = true
+          w.write(0)
+        end
+        while r.read(1)
+          next unless @signal
           @signal = false
-          trap("SIGINFO") do
-            @signal = true
-            w.write(0)
-          end
-          while r.read(1)
-            next unless @signal
-            @signal = false
-            yield
-          end
-        rescue Interrupt
-          exit(0)
+          yield
         end
+      rescue Interrupt
+        exit(0)
       end
     end