shopify-cli 2.9.0 → 2.10.0

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,43 @@
+# frozen_string_literal: true
+
+require_relative "filter/path_matcher"
+
+module ShopifyCLI
+  module Theme
+    class IncludeFilter
+      include Filter::PathMatcher
+
+      def initialize(pattern = nil)
+        @pattern = pattern
+      end
+
+      def match?(path)
+        return true unless present?(@pattern)
+
+        if regex_pattern?
+          regex_match?(regex_pattern, path)
+        else
+          glob_match?(glob_pattern, path)
+        end
+      end
+
+      private
+
+      def present?(pattern)
+        !pattern.nil? && !pattern.empty?
+      end
+
+      def regex_pattern?
+        @is_regex_pattern ||= regex?(@pattern)
+      end
+
+      def regex_pattern
+        @regex_pattern ||= as_regex(@pattern)
+      end
+
+      def glob_pattern
+        @glob_pattern ||= as_glob(@pattern)
+      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/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.9.0"
+  VERSION = "2.10.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"

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.

data/vendor/deps/ruby2_keywords/README.md

@@ -0,0 +1,67 @@
+# ruby2_keywords
+
+Provides empty `Module#ruby2_keywords` method, for the forward
+source-level compatibility against ruby2.7 and ruby3.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'ruby2_keywords'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install ruby2_keywords
+
+## Usage
+
+For class/module instance methods:
+
+```ruby
+require 'ruby2_keywords'
+
+module YourModule
+  ruby2_keywords def delegating_method(*args)
+    other_method(*args)
+  end
+end
+```
+
+For global methods:
+
+```ruby
+require 'ruby2_keywords'
+
+ruby2_keywords def oldstyle_keywords(options = {})
+end
+```
+
+You can do the same for a method defined by `Module#define_method`:
+
+```ruby
+define_method :delegating_method do |*args, &block|
+  other_method(*args, &block)
+end
+ruby2_keywords :delegating_method
+```
+
+## Contributing
+
+Bug reports and pull requests are welcome on [GitHub] or
+[Ruby Issue Tracking System].
+
+## License
+
+The gem is available as open source under the terms of the
+[Ruby License] or the [2-Clause BSD License].
+
+[GitHub]: https://github.com/ruby/ruby2_keywords/
+[Ruby Issue Tracking System]: https://bugs.ruby-lang.org
+[Ruby License]: https://www.ruby-lang.org/en/about/license.txt
+[2-Clause BSD License]: https://opensource.org/licenses/BSD-2-Clause

data/vendor/deps/ruby2_keywords/Rakefile

@@ -0,0 +1,54 @@
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+helper = Bundler::GemHelper.instance
+
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList["test/**/test_*.rb"]
+end
+
+task :default => :test
+
+task "build" => "date_epoch"
+
+task "date_epoch" do
+  ENV["SOURCE_DATE_EPOCH"] = IO.popen(%W[git -C #{__dir__} log -1 --format=%ct], &:read).chomp
+end
+
+def helper.update_gemspec
+  path = "#{__dir__}/#{gemspec.name}.gemspec"
+  File.open(path, "r+b") do |f|
+    if (d = f.read).sub!(/^(version\s*=\s*)".*"/) {$1 + gemspec.version.to_s.dump}
+      f.rewind
+      f.truncate(0)
+      f.print(d)
+    end
+  end
+end
+
+def helper.commit_bump
+  sh(%W[git -C #{__dir__} commit -m bump\ up\ to\ #{gemspec.version}
+        #{gemspec.name}.gemspec])
+end
+
+def helper.version=(v)
+  gemspec.version = v
+  update_gemspec
+  commit_bump
+  tag_version
+end
+major, minor, teeny = helper.gemspec.version.segments
+
+task "bump:teeny" do
+  helper.version = Gem::Version.new("#{major}.#{minor}.#{teeny+1}")
+end
+
+task "bump:minor" do
+  raise "can't bump up minor"
+end
+
+task "bump:major" do
+  raise "can't bump up major"
+end
+
+task "bump" => "bump:teeny"

data/vendor/deps/ruby2_keywords/lib/ruby2_keywords.rb

@@ -0,0 +1,57 @@
+class Module
+  unless private_method_defined?(:ruby2_keywords)
+    private
+    # call-seq:
+    #    ruby2_keywords(method_name, ...)
+    #
+    # Does nothing.
+    def ruby2_keywords(name, *)
+      # nil
+    end
+  end
+end
+
+main = TOPLEVEL_BINDING.receiver
+unless main.respond_to?(:ruby2_keywords, true)
+  # call-seq:
+  #    ruby2_keywords(method_name, ...)
+  #
+  # Does nothing.
+  def main.ruby2_keywords(name, *)
+    # nil
+  end
+end
+
+class Proc
+  unless method_defined?(:ruby2_keywords)
+    # call-seq:
+    #    proc.ruby2_keywords -> proc
+    #
+    # Does nothing and just returns the receiver.
+    def ruby2_keywords
+      self
+    end
+  end
+end
+
+class << Hash
+  unless method_defined?(:ruby2_keywords_hash?)
+    # call-seq:
+    #    Hash.ruby2_keywords_hash?(hash) -> false
+    #
+    # Returns false.
+    def ruby2_keywords_hash?(hash)
+      false
+    end
+  end
+
+  unless method_defined?(:ruby2_keywords_hash)
+    # call-seq:
+    #    Hash.ruby2_keywords_hash(hash) -> new_hash
+    #
+    # Duplicates a given hash and returns the new hash.
+    def ruby2_keywords_hash(hash)
+      hash.dup
+    end
+  end
+end

data/vendor/deps/ruby2_keywords/ruby2_keywords.gemspec

@@ -0,0 +1,18 @@
+version = "0.0.4"
+abort "Version must not reach 1" if version[/\d+/].to_i >= 1
+
+Gem::Specification.new do |s|
+  s.name = "ruby2_keywords"
+  s.version = version
+  s.summary = "Shim library for Module#ruby2_keywords"
+  s.homepage = "https://github.com/ruby/ruby2_keywords"
+  s.licenses = ["Ruby", "BSD-2-Clause"]
+  s.authors = ["Nobuyoshi Nakada"]
+  s.require_paths = ["lib"]
+  s.rdoc_options = ["--main", "README.md"]
+  s.files = [
+    "LICENSE",
+    "README.md",
+    "lib/ruby2_keywords.rb",
+  ]
+end

data/vendor/deps/ruby2_keywords/test/test_keyword.rb

@@ -0,0 +1,41 @@
+require 'test/unit'
+LOADING_RUBY2_KEYWORDS = (RUBY_VERSION.scan(/\d+/).map(&:to_i) <=> [2, 7]) < 0
+if LOADING_RUBY2_KEYWORDS
+  require 'ruby2_keywords'
+end
+
+class TestKeywordArguments < Test::Unit::TestCase
+  def test_loaded_features
+    list = $LOADED_FEATURES.grep(%r[/ruby2_keywords\.rb\z])
+    if LOADING_RUBY2_KEYWORDS
+      assert_not_empty(list)
+      assert_not_include($LOADED_FEATURES, "ruby2_keywords.rb")
+    else
+      assert_empty(list)
+      assert_include($LOADED_FEATURES, "ruby2_keywords.rb")
+    end
+  end
+
+  def test_module_ruby2_keywords
+    assert_send([Module, :private_method_defined?, :ruby2_keywords])
+    assert_operator(Module.instance_method(:ruby2_keywords).arity, :<, 0)
+  end
+
+  def test_toplevel_ruby2_keywords
+    main = TOPLEVEL_BINDING.receiver
+    assert_send([main, :respond_to?, :ruby2_keywords, true])
+    assert_operator(main.method(:ruby2_keywords).arity, :<, 0)
+  end
+
+  def test_proc_ruby2_keywords
+    assert_respond_to(Proc.new {}, :ruby2_keywords)
+  end
+
+  def test_hash_ruby2_keywords_hash?
+    assert_false(Hash.ruby2_keywords_hash?({}))
+  end
+
+  def test_hash_ruby2_keywords_hash
+    assert_equal({}, Hash.ruby2_keywords_hash({}.freeze))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -458,6 +458,8 @@ files:
 - lib/shopify_cli/tasks/select_org_and_shop.rb
 - lib/shopify_cli/tasks/update_dashboard_urls.rb
 - lib/shopify_cli/theme/dev_server.rb
+- lib/shopify_cli/theme/dev_server/cdn/cdn_helper.rb
+- lib/shopify_cli/theme/dev_server/cdn_assets.rb
 - lib/shopify_cli/theme/dev_server/cdn_fonts.rb
 - lib/shopify_cli/theme/dev_server/certificate_manager.rb
 - lib/shopify_cli/theme/dev_server/header_hash.rb
@@ -472,7 +474,9 @@ files:
 - lib/shopify_cli/theme/dev_server/web_server.rb
 - lib/shopify_cli/theme/development_theme.rb
 - lib/shopify_cli/theme/file.rb
+- lib/shopify_cli/theme/filter/path_matcher.rb
 - lib/shopify_cli/theme/ignore_filter.rb
+- lib/shopify_cli/theme/include_filter.rb
 - lib/shopify_cli/theme/mime_type.rb
 - lib/shopify_cli/theme/syncer.rb
 - lib/shopify_cli/theme/syncer/error_reporter.rb
@@ -536,6 +540,12 @@ files:
 - vendor/deps/cli-ui/lib/cli/ui/widgets/base.rb
 - vendor/deps/cli-ui/lib/cli/ui/widgets/status.rb
 - vendor/deps/cli-ui/lib/cli/ui/wrap.rb
+- vendor/deps/ruby2_keywords/LICENSE
+- vendor/deps/ruby2_keywords/README.md
+- vendor/deps/ruby2_keywords/Rakefile
+- vendor/deps/ruby2_keywords/lib/ruby2_keywords.rb
+- vendor/deps/ruby2_keywords/ruby2_keywords.gemspec
+- vendor/deps/ruby2_keywords/test/test_keyword.rb
 - vendor/deps/smart_properties/REVISION
 - vendor/deps/smart_properties/lib/smart_properties.rb
 - vendor/deps/smart_properties/lib/smart_properties/errors.rb