shopify-cli 2.9.0 → 2.11.0

data/lib/shopify_cli/method_object.rb

@@ -66,15 +66,27 @@ module ShopifyCLI
       # initializer or to `call`. If the keyword argument matches the name of
       # property, it is forwarded to the initializer, otherwise to call.
       #
-      def call(*args, **kwargs, &block)
-        properties.keys.yield_self do |properties|
-          instance = new(**kwargs.slice(*properties))
-          kwargs = kwargs.slice(*(kwargs.keys - properties))
-          if kwargs.any?
-            instance.call(*args, **kwargs, &block)
-          else
-            instance.call(*args, &block)
-          end
+      ruby2_keywords def call(*args, &block)
+        # This is an extremely complicated case of delegation. The method wants
+        # to delegate arguments, but to have control over which keyword
+        # arguments are delegated. I'm not sure the forward and backward
+        # compatibility of this unusual form of delegation has really been
+        # explored or there's any good way to support it. So I have done
+        # done something hacky here and I'm looking at the last argument and
+        # modifying the package of arguments to be delegated in-place.
+        if args.last.is_a?(Hash)
+          kwargs = args.last
+
+          initializer_kwargs = kwargs.slice(*properties.keys)
+          instance = new(**initializer_kwargs)
+
+          kwargs.reject! { |key| initializer_kwargs.key?(key) }
+          args.pop if kwargs.empty?
+          instance.call(*args, &block)
+        else
+          # Since the former is so complicated - let's have a fast path that
+          # is much simpler.
+          new.call(*args, &block)
         end
       end
 

data/lib/shopify_cli/partners_api.rb

@@ -38,7 +38,11 @@ module ShopifyCLI
       def query(ctx, query_name, **variables)
         CLI::Kit::Util.begin do
           api_client(ctx).query(query_name, variables: variables)
-        end.retry_after(API::APIRequestUnauthorizedError, retries: 1) do
+        end.retry_after(
+          API::APIRequestUnauthorizedError,
+          retries: 1,
+          only: -> { !IdentityAuth::EnvAuthToken.partners_token_present? }
+        ) do
           ShopifyCLI::IdentityAuth.new(ctx: ctx).reauthenticate
         end
       rescue API::APIRequestUnauthorizedError => e
@@ -60,9 +64,10 @@ module ShopifyCLI
       private
 
       def api_client(ctx)
+        identity_auth = ShopifyCLI::IdentityAuth.new(ctx: ctx)
         new(
           ctx: ctx,
-          token: IdentityAuth.fetch_or_auth_partners_token(ctx: ctx),
+          token: identity_auth.fetch_or_auth_partners_token,
           url: "https://#{Environment.partners_domain}/api/cli/graphql",
         )
       end

data/lib/shopify_cli/result.rb

@@ -363,70 +363,72 @@ module ShopifyCLI
       Result::Failure.new(error)
     end
 
-    ##
-    # 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
-    # `Proc` is returned and the result wrapping doesn't occur until the block
-    # is invoked.
-    #
-    # #### Parameters
-    #
-    # * `*args` should be an `Array` with zero or one element
-    # * `&block` should be a `Proc` that takes zero or one argument
-    #
-    # #### Returns
-    #
-    # Returns either a `Result::Success`, `Result::Failure` or a `Proc` that
-    # produces one of the former when invoked.
-    #
-    # #### Examples
-    #
-    #   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 { |s| s.upcase }.call("hello").tap do |result|
-    #     result # => Result::Success
-    #     result.value # => "HELLO"
-    #   end
-    #
-    def self.wrap(*values, &block)
-      raise ArgumentError, "expected either a value or a block" unless (values.length == 1) ^ block
+    class << self
+      ##
+      # 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
+      # `Proc` is returned and the result wrapping doesn't occur until the block
+      # is invoked.
+      #
+      # #### Parameters
+      #
+      # * `*args` should be an `Array` with zero or one element
+      # * `&block` should be a `Proc` that takes zero or one argument
+      #
+      # #### Returns
+      #
+      # Returns either a `Result::Success`, `Result::Failure` or a `Proc` that
+      # produces one of the former when invoked.
+      #
+      # #### Examples
+      #
+      #   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 { |s| s.upcase }.call("hello").tap do |result|
+      #     result # => Result::Success
+      #     result.value # => "HELLO"
+      #   end
+      #
+      ruby2_keywords def wrap(*values, &block)
+        raise ArgumentError, "expected either a value or a block" unless (values.length == 1) ^ block
 
-      if values.length == 1
-        values.pop.yield_self do |value|
-          case value
-          when Result::Success, Result::Failure
-            value
-          when NilClass, Exception
-            Result.failure(value)
-          else
-            Result.success(value)
-          end
-        end
-      else
-        ->(*args) do
-          begin
-            wrap(block.call(*args))
-          rescue Exception => error # rubocop:disable Lint/RescueException
-            wrap(error)
+        if values.length == 1
+          values.pop.yield_self do |value|
+            case value
+            when Result::Success, Result::Failure
+              value
+            when NilClass, Exception
+              Result.failure(value)
+            else
+              Result.success(value)
+            end
           end
+        else
+          ->(*args) do
+            begin
+              wrap(block.call(*args))
+            rescue Exception => error # rubocop:disable Lint/RescueException
+              wrap(error)
+            end
+          end.ruby2_keywords
         end
       end
-    end
 
-    ##
-    # Wraps the given block and invokes it with the passed arguments.
-    #
-    def self.call(*args, &block)
-      raise ArgumentError, "expected a block" unless block
-      wrap(&block).call(*args)
+      ##
+      # Wraps the given block and invokes it with the passed arguments.
+      #
+      ruby2_keywords def call(*args, &block)
+        raise ArgumentError, "expected a block" unless block
+        wrap(&block).call(*args)
+      end
     end
   end
 end

data/lib/shopify_cli/services/app/create/rails_service.rb

@@ -41,12 +41,7 @@ module ShopifyCLI
 
             raise ShopifyCLI::AbortSilent if form.nil?
 
-            ruby_version = Rails::Ruby.version(context)
-            context.abort(context.message("core.app.create.rails.error.invalid_ruby_version")) unless
-              ruby_version.satisfies?("~>2.5") || ruby_version.satisfies?("~>3.0.0")
-
-            check_node
-            check_yarn
+            check_dependencies
 
             build(form.name, form.db)
             set_custom_ua
@@ -106,6 +101,18 @@ module ShopifyCLI
             end
           end
 
+          def check_dependencies
+            check_ruby
+            check_node
+            check_yarn
+          end
+
+          def check_ruby
+            ruby_version = Rails::Ruby.version(context)
+            return if ruby_version.satisfies?("~>2.5") || ruby_version.satisfies?("~>3.0.0")
+            context.abort(context.message("core.app.create.rails.error.invalid_ruby_version"))
+          end
+
           def check_node
             cmd_path = context.which("node")
             if cmd_path.nil?
@@ -148,11 +155,13 @@ module ShopifyCLI
           end
 
           def build(name, db)
-            context.abort(context.message("core.app.create.rails.error.install_failure",
-              "rails")) unless install_gem("rails",
-                "<6.1")
-            context.abort(context.message("core.app.create.rails.error.install_failure", "bundler ~>2.0")) unless
-              install_gem("bundler", "~>2.0")
+            unless install_gem("rails")
+              context.abort(context.message("core.app.create.rails.error.install_failure", "rails"))
+            end
+
+            unless install_gem("bundler", "~>2.0")
+              context.abort(context.message("core.app.create.rails.error.install_failure", "bundler ~>2.0"))
+            end
 
             full_path = File.join(context.root, name)
             context.abort(context.message("core.app.create.rails.error.dir_exists", name)) if Dir.exist?(full_path)
@@ -173,7 +182,7 @@ module ShopifyCLI
 
             context.puts(context.message("core.app.create.rails.adding_shopify_gem"))
             File.open(File.join(context.root, "Gemfile"), "a") do |f|
-              f.puts "\ngem 'shopify_app', '>=17.0.3'"
+              f.puts "\ngem 'shopify_app', '>=18.1.0'"
             end
             CLI::UI::Frame.open(context.message("core.app.create.rails.running_bundle_install")) do
               syscall(%w(bundle install))
@@ -188,7 +197,7 @@ module ShopifyCLI
               syscall(%w(rails db:migrate RAILS_ENV=development))
             end
 
-            unless File.exist?(File.join(context.root, "config/webpacker.yml"))
+            if install_webpacker?
               CLI::UI::Frame.open(context.message("core.app.create.rails.running_webpacker_install")) do
                 syscall(%w(rails webpacker:install))
               end
@@ -208,6 +217,21 @@ module ShopifyCLI
           def install_gem(name, version = nil)
             Rails::Gem.install(context, name, version)
           end
+
+          def install_webpacker?
+            rails_version < ::Semantic::Version.new("7.0.0") &&
+              !File.exist?(File.join(context.root, "config/webpacker.yml"))
+          end
+
+          def rails_version
+            output, status = context.capture2e("rails", "--version")
+            unless status.success?
+              context.abort(context.message("core.app.create.rails.error.install_failure", "rails"))
+            end
+
+            version = output.scan(/Rails \d+\.\d+\.\d+/).first.split(" ").last
+            ::Semantic::Version.new(version)
+          end
         end
       end
     end

data/lib/shopify_cli/task.rb

@@ -2,9 +2,11 @@ require "shopify_cli"
 
 module ShopifyCLI
   class Task
-    def self.call(*args, **kwargs)
-      task = new
-      task.call(*args, **kwargs)
+    class << self
+      ruby2_keywords def call(*args)
+        task = new
+        task.call(*args)
+      end
     end
 
     private

data/lib/shopify_cli/theme/file.rb

@@ -18,7 +18,7 @@ module ShopifyCLI
 
       def read
         if text?
-          path.read
+          path.read(universal_newline: true)
         else
           path.read(mode: "rb")
         end
@@ -27,7 +27,7 @@ module ShopifyCLI
       def write(content)
         path.parent.mkpath unless path.parent.directory?
         if text?
-          path.write(content)
+          path.write(content, universal_newline: true)
         else
           path.write(content, 0, mode: "wb")
         end

data/lib/shopify_cli/theme/filter/path_matcher.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    module Filter
+      module PathMatcher
+        def regex_match?(regex, path)
+          regex.match?(path)
+        rescue StandardError
+          false
+        end
+
+        def glob_match?(glob, path)
+          !!::File.fnmatch?(glob, path)
+        end
+
+        def regex?(pattern)
+          pattern.start_with?("/") && pattern.end_with?("/")
+        end
+
+        def as_regex(pattern)
+          Regexp.new(pattern.gsub(%r{^\/|\/$}, ""))
+        end
+
+        def as_glob(pattern)
+          # if specifying a directory, match everything below it
+          pattern += "*" if pattern.end_with?("/")
+
+          # The pattern will be scoped to root directory, so it should match anything
+          # within that space
+          pattern.prepend("*") unless pattern.start_with?("*")
+
+          pattern
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/theme/ignore_filter.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
+require_relative "filter/path_matcher"
+
 module ShopifyCLI
   module Theme
     class IgnoreFilter
+      include Filter::PathMatcher
+
       FILE = ".shopifyignore"
 
       DEFAULT_REGEXES = [
@@ -72,11 +76,11 @@ module ShopifyCLI
         return true if path.empty?
 
         regexes.each do |regex|
-          return true if regex.match(path)
+          return true if regex_match?(regex, path)
         end
 
         globs.each do |glob|
-          return true if ::File.fnmatch?(glob, path)
+          return true if glob_match?(glob, path)
         end
 
         false
@@ -91,24 +95,16 @@ module ShopifyCLI
         new_regexes = DEFAULT_REGEXES.dup
         new_globs = DEFAULT_GLOBS.dup
 
-        patterns.each do |pattern|
-          pattern = pattern.strip
-
-          if pattern.start_with?("/") && pattern.end_with?("/")
-            new_regexes << Regexp.new(pattern.gsub(%r{^\/|\/$}, ""))
-            next
+        patterns
+          .map(&:strip)
+          .each do |pattern|
+            if regex?(pattern)
+              new_regexes << as_regex(pattern)
+            else
+              new_globs << as_glob(pattern)
+            end
           end
 
-          # if specifying a directory, match everything below it
-          pattern += "*" if pattern.end_with?("/")
-
-          # The pattern will be scoped to root directory, so it should match anything
-          # within that space
-          pattern.prepend("*") unless pattern.start_with?("*")
-
-          new_globs << pattern
-        end
-
         [new_regexes, new_globs]
       end
     end

data/lib/shopify_cli/theme/include_filter.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require_relative "filter/path_matcher"
+
+module ShopifyCLI
+  module Theme
+    class IncludeFilter
+      include Filter::PathMatcher
+
+      attr_reader :globs, :regexes
+
+      def initialize(patterns = [])
+        @patterns = patterns.nil? ? [] : patterns.compact.reject(&:empty?)
+
+        regexes, globs = patterns_to_regexes_and_globs(@patterns)
+
+        @regexes = regexes
+        @globs = globs
+      end
+
+      def match?(path)
+        return true unless present?(@patterns)
+
+        path = path.to_s
+
+        return true if path.empty?
+
+        regexes.each do |regex|
+          return true if regex_match?(regex, path)
+        end
+
+        globs.each do |glob|
+          return true if glob_match?(glob, path)
+        end
+
+        false
+      end
+
+      private
+
+      def present?(patterns)
+        !patterns.nil? && !patterns.empty?
+      end
+
+      # Take in string patterns and convert them to either
+      # regex patterns or glob patterns so that they are handled in an expected manner.
+      def patterns_to_regexes_and_globs(patterns)
+        new_regexes = []
+        new_globs = []
+
+        patterns
+          .map(&:strip)
+          .each do |pattern|
+            if regex?(pattern)
+              new_regexes << as_regex(pattern)
+            else
+              new_globs << as_glob(pattern)
+            end
+          end
+
+        [new_regexes, new_globs]
+      end
+    end
+  end
+end

data/lib/shopify_cli/theme/syncer.rb

@@ -16,13 +16,15 @@ module ShopifyCLI
       API_VERSION = "unstable"
 
       attr_reader :checksums
+      attr_accessor :include_filter
       attr_accessor :ignore_filter
 
       def_delegators :@error_reporter, :has_any_error?
 
-      def initialize(ctx, theme:, ignore_filter: nil)
+      def initialize(ctx, theme:, include_filter: nil, ignore_filter: nil)
         @ctx = ctx
         @theme = theme
+        @include_filter = include_filter
         @ignore_filter = ignore_filter
         @error_reporter = ErrorReporter.new(ctx)
         @standard_reporter = StandardReporter.new(ctx)
@@ -193,7 +195,7 @@ module ShopifyCLI
         # Already enqueued
         return if @pending.include?(operation)
 
-        if @ignore_filter&.ignore?(operation.file_path)
+        if ignore?(operation)
           @ctx.debug("ignore #{operation.file_path}")
           return
         end
@@ -251,6 +253,19 @@ module ShopifyCLI
         response
       end
 
+      def ignore?(operation)
+        path = operation.file_path
+        ignored_by_ignore_filter?(path) || ignored_by_include_filter?(path)
+      end
+
+      def ignored_by_ignore_filter?(path)
+        ignore_filter&.ignore?(path)
+      end
+
+      def ignored_by_include_filter?(path)
+        include_filter && !include_filter.match?(path)
+      end
+
       def get(file)
         _status, body, response = ShopifyCLI::AdminAPI.rest_request(
           @ctx,

data/lib/shopify_cli/utilities.rb

@@ -0,0 +1,7 @@
+module ShopifyCLI
+  module Utilities
+    def self.version_dropping_pre_and_build(version)
+      Semantic::Version.new("#{version.major}.#{version.minor}.#{version.patch}")
+    end
+  end
+end

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.9.0"
+  VERSION = "2.11.0"
 end

data/lib/shopify_cli.rb

@@ -15,12 +15,13 @@ ENV["PATH"] = ENV["PATH"].split(":").select { |p| p.start_with?("/", "~") }.join
 vendor_path = File.expand_path("../../vendor/lib", __FILE__)
 $LOAD_PATH.unshift(vendor_path) unless $LOAD_PATH.include?(vendor_path)
 
-deps = %w(cli-ui cli-kit smart_properties webrick)
+deps = %w(cli-ui cli-kit smart_properties ruby2_keywords webrick)
 deps.each do |dep|
   vendor_path = File.expand_path("../../vendor/deps/#{dep}/lib", __FILE__)
   $LOAD_PATH.unshift(vendor_path) unless $LOAD_PATH.include?(vendor_path)
 end
 
+require "ruby2_keywords"
 require "cli/ui"
 require "cli/kit"
 require "smart_properties"
@@ -135,6 +136,7 @@ module ShopifyCLI
   autoload :Tasks, "shopify_cli/tasks"
   autoload :TransformDataStructure, "shopify_cli/transform_data_structure"
   autoload :Tunnel, "shopify_cli/tunnel"
+  autoload :Utilities, "shopify_cli/utilities"
 
   require "shopify_cli/messages/messages"
   Context.load_messages(ShopifyCLI::Messages::MESSAGES)

data/vendor/deps/cli-kit/lib/cli/kit/system.rb

@@ -174,11 +174,16 @@ module CLI
         end
 
         def os
-          return :mac if /darwin/.match(RUBY_PLATFORM)
-          return :linux if /linux/.match(RUBY_PLATFORM)
-          return :windows if /mingw32/.match(RUBY_PLATFORM)
-
-          raise "Could not determine OS from platform #{RUBY_PLATFORM}"
+          @current_os ||= case RbConfig::CONFIG['host_os']
+          when /darwin/ then :mac
+          when /linux/ then :linux
+          else
+            if RUBY_PLATFORM !~ /cygwin/ && ENV['OS'] == 'Windows_NT'
+              :windows
+            else
+              raise "Could not determine OS from host_os #{RbConfig::CONFIG["host_os"]}"
+            end
+          end
         end
 
         private
@@ -222,7 +227,7 @@ module CLI
         end
 
         def which(cmd, env)
-          exts = os == :windows ? env.fetch('PATHEXT', ['']).split(';') : ['']
+          exts = (os == :windows && env['PATHEXT']&.split(';')) || ['']
           env.fetch('PATH', '').split(File::PATH_SEPARATOR).each do |path|
             exts.each do |ext|
               exe = File.join(path, "#{cmd}#{ext}")

data/vendor/deps/cli-kit/lib/cli/kit/util.rb

@@ -168,9 +168,13 @@ module CLI
           @block_that_might_raise = block_that_might_raise
         end
 
-        def retry_after(exception = StandardError, retries: 1, &before_retry)
+        def retry_after(exception = StandardError, retries: 1, only: nil, &before_retry)
           @block_that_might_raise.call
         rescue exception => e
+          should_retry = only ? only.call : true
+  
+          raise unless should_retry
+
           raise if (retries -= 1) < 0
           if before_retry
             if before_retry.arity == 0

data/vendor/deps/cli-ui/lib/cli/ui/os.rb

@@ -4,15 +4,17 @@ module CLI
       # Determines which OS is currently running the UI, to make it easier to
       # adapt its behaviour to the features of the OS.
       def self.current
-        @current_os ||= case RUBY_PLATFORM
+        @current_os ||= case RbConfig::CONFIG['host_os']
         when /darwin/
           Mac
         when /linux/
           Linux
-        when /mingw32/
-          Windows
         else
-          raise "Could not determine OS from platform #{RUBY_PLATFORM}"
+          if RUBY_PLATFORM !~ /cygwin/ && ENV['OS'] == 'Windows_NT'
+            Windows
+          else
+            raise "Could not determine OS from host_os #{RbConfig::CONFIG["host_os"]}"
+          end
         end
       end
 

data/vendor/deps/ruby2_keywords/LICENSE

@@ -0,0 +1,22 @@
+Copyright 2019-2020 Nobuyoshi Nakada, Yusuke Endoh
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.