shopify-cli 2.11.1 → 2.13.0

data/lib/shopify_cli/theme/include_filter.rb

@@ -9,7 +9,8 @@ module ShopifyCLI
 
       attr_reader :globs, :regexes
 
-      def initialize(patterns = [])
+      def initialize(root, patterns = [])
+        @root = Pathname.new(root)
         @patterns = patterns.nil? ? [] : patterns.compact.reject(&:empty?)
 
         regexes, globs = patterns_to_regexes_and_globs(@patterns)
@@ -22,9 +23,10 @@ module ShopifyCLI
         return true unless present?(@patterns)
 
         path = path.to_s
-
         return true if path.empty?
 
+        path = @root.join(path).to_s
+
         regexes.each do |regex|
           return true if regex_match?(regex, path)
         end

data/lib/shopify_cli/theme/syncer.rb

@@ -42,16 +42,16 @@ module ShopifyCLI
         # Latest theme assets checksums. Updated on each upload.
         @checksums = {}
 
-        # Checksums of assets with errors. 
+        # Checksums of assets with errors.
         @error_checksums = []
       end
 
       def lock_io!
-        @reporters.each { |reporter| reporter.disable! }
+        @reporters.each(&:disable!)
       end
 
       def unlock_io!
-        @reporters.each { |reporter| reporter.enable! }
+        @reporters.each(&:enable!)
       end
 
       def enqueue_updates(files)
@@ -118,7 +118,7 @@ module ShopifyCLI
               operation = @queue.pop
               break if operation.nil? # shutdown was called
               perform(operation)
-            rescue Exception => e
+            rescue Exception => e # rubocop:disable Lint/RescueException
               error_suffix = ": #{e}"
               error_suffix += + "\n\t#{e.backtrace.join("\n\t")}" if @ctx.debug?
               report_error(operation, error_suffix)
@@ -168,7 +168,7 @@ module ShopifyCLI
           # Delete local files not present remotely
           missing_files = @theme.theme_files
             .reject { |file| checksums.key?(file.relative_path.to_s) }.uniq
-            .reject { |file| @ignore_filter&.ignore?(file) }
+            .reject { |file| ignore_file?(file) }
           missing_files.each do |file|
             @ctx.debug("rm #{file.relative_path}")
             file.delete
@@ -195,7 +195,7 @@ module ShopifyCLI
         # Already enqueued
         return if @pending.include?(operation)
 
-        if ignore?(operation)
+        if ignore_operation?(operation)
           @ctx.debug("ignore #{operation.file_path}")
           return
         end
@@ -253,8 +253,17 @@ module ShopifyCLI
         response
       end
 
-      def ignore?(operation)
+      def ignore_operation?(operation)
         path = operation.file_path
+        ignore_path?(path)
+      end
+
+      def ignore_file?(file)
+        path = file.path
+        ignore_path?(path)
+      end
+
+      def ignore_path?(path)
         ignored_by_ignore_filter?(path) || ignored_by_include_filter?(path)
       end
 
@@ -279,7 +288,7 @@ module ShopifyCLI
         update_checksums(body)
 
         attachment = body.dig("asset", "attachment")
-        value = if attachment
+        if attachment
           file.write(Base64.decode64(attachment))
         else
           file.write(body.dig("asset", "value"))
@@ -296,7 +305,7 @@ module ShopifyCLI
           method: "DELETE",
           api_version: API_VERSION,
           body: JSON.generate(asset: {
-            key: file.relative_path.to_s
+            key: file.relative_path.to_s,
           })
         )
 
@@ -323,7 +332,7 @@ module ShopifyCLI
         parsed_body = JSON.parse(exception&.response&.body)
         message = parsed_body.dig("errors", "asset") || parsed_body["message"] || exception.message
         # Truncate to first lines
-        [message].flatten.map { |message| message.split("\n", 2).first }
+        [message].flatten.map { |mess| mess.split("\n", 2).first }
       rescue JSON::ParserError
         [exception.message]
       end
@@ -331,7 +340,7 @@ module ShopifyCLI
       def backoff_if_near_limit!(used, limit)
         if used > limit - @threads.size
           @ctx.debug("Near API call limit, waiting 2 sec…")
-          @backoff_mutex.synchronize { sleep 2 }
+          @backoff_mutex.synchronize { sleep(2) }
         end
       end
 

data/lib/shopify_cli/theme/theme.rb

@@ -176,10 +176,6 @@ module ShopifyCLI
           find(ctx, root) { |attrs| attrs["role"] == "main" }
         end
 
-        def development(ctx, root: nil)
-          find(ctx, root) { |attrs| attrs["role"] == "development" }
-        end
-
         # Finds a Theme by its identifier
         #
         # #### Parameters

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.11.1"
+  VERSION = "2.13.0"
 end

data/shopify-dev

@@ -3,16 +3,14 @@
 require_relative "./bin/load_shopify"
 
 exit(proc do
-  begin
-    ShopifyCLI::ErrorHandler.call do
-      ShopifyCLI::Core::EntryPoint.call(ARGV.dup)
-    end
-  rescue StandardError => error
-    ShopifyCLI::ErrorHandler.exception = error
-    if ShopifyCLI::Environment.print_stacktrace?
-      raise error
-    else
-      1
-    end
+  ShopifyCLI::ErrorHandler.call do
+    ShopifyCLI::Core::EntryPoint.call(ARGV.dup)
   end
+     rescue StandardError => error
+       ShopifyCLI::ErrorHandler.exception = error
+       if ShopifyCLI::Environment.print_stacktrace?
+         raise error
+       else
+         1
+       end
 end.call)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.13.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,9 +154,13 @@ files:
 - docs/users/installation.md
 - docs/users/migrate-from-themekit.md
 - ext/javy/hashes/javy-arm-macos-v0.1.0.gz.sha256
+- ext/javy/hashes/javy-arm-macos-v0.2.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-linux-v0.1.0.gz.sha256
+- ext/javy/hashes/javy-x86_64-linux-v0.2.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-macos-v0.1.0.gz.sha256
+- ext/javy/hashes/javy-x86_64-macos-v0.2.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-windows-v0.1.0.gz.sha256
+- ext/javy/hashes/javy-x86_64-windows-v0.2.0.gz.sha256
 - ext/javy/javy.rb
 - ext/javy/version
 - ext/shopify-extensions/extconf.rb
@@ -317,6 +321,7 @@ files:
 - lib/project_types/script/layers/infrastructure/languages/assemblyscript_task_runner.rb
 - lib/project_types/script/layers/infrastructure/languages/project_creator.rb
 - lib/project_types/script/layers/infrastructure/languages/task_runner.rb
+- lib/project_types/script/layers/infrastructure/languages/tool_version_checker.rb
 - lib/project_types/script/layers/infrastructure/languages/typescript_project_creator.rb
 - lib/project_types/script/layers/infrastructure/languages/typescript_task_runner.rb
 - lib/project_types/script/layers/infrastructure/languages/wasm_project_creator.rb
@@ -335,17 +340,25 @@ files:
 - lib/project_types/script/ui/strict_spinner.rb
 - lib/project_types/theme/cli.rb
 - lib/project_types/theme/commands/check.rb
+- lib/project_types/theme/commands/common/root_helper.rb
 - lib/project_types/theme/commands/delete.rb
 - lib/project_types/theme/commands/init.rb
 - lib/project_types/theme/commands/language_server.rb
+- lib/project_types/theme/commands/list.rb
+- lib/project_types/theme/commands/open.rb
 - lib/project_types/theme/commands/package.rb
 - lib/project_types/theme/commands/publish.rb
 - lib/project_types/theme/commands/pull.rb
 - lib/project_types/theme/commands/push.rb
 - lib/project_types/theme/commands/serve.rb
+- lib/project_types/theme/conversions/base_glob.rb
+- lib/project_types/theme/conversions/ignore_glob.rb
+- lib/project_types/theme/conversions/include_glob.rb
 - lib/project_types/theme/forms/confirm_store.rb
 - lib/project_types/theme/forms/select.rb
 - lib/project_types/theme/messages/messages.rb
+- lib/project_types/theme/presenters/theme_presenter.rb
+- lib/project_types/theme/presenters/themes_presenter.rb
 - lib/project_types/theme/ui/sync_progress_bar.rb
 - lib/rubygems_plugin.rb
 - lib/shopify_cli.rb
@@ -459,6 +472,7 @@ files:
 - lib/shopify_cli/tasks/ensure_authenticated.rb
 - lib/shopify_cli/tasks/ensure_dev_store.rb
 - lib/shopify_cli/tasks/ensure_env.rb
+- lib/shopify_cli/tasks/ensure_git_dependency.rb
 - lib/shopify_cli/tasks/ensure_loopback_url.rb
 - lib/shopify_cli/tasks/ensure_project_type.rb
 - lib/shopify_cli/tasks/select_org_and_shop.rb