shopify-cli 2.31.0 → 2.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 671907fe67b2c0ee4ff9c99a55bfbf53562f15f7540c23c6fb07ddb9b46398df
-  data.tar.gz: 5a327f5060b50fa1761a20d5ca1601cab1fc44e7f3e1b7ab62e6747b9a92a164
+  metadata.gz: b1f827e0b1d481a8fdd6e7160ef85d6e63bee0a7607f6bf148693956f901d67c
+  data.tar.gz: 5882878a69100c7ac97255c80a0ca868ca616be1eca5a523c3e1ddf1e8896dc4
 SHA512:
-  metadata.gz: 2baa5372dc8502fe0764378b556b043eb136415ee9f94f1ea42fead7e367f46bdc0114b6e79f0eef99cb92270117561f004d09157e9bce3b45912aaead4bd20a
-  data.tar.gz: 42819560813ed73fc39d09e68d5e7d07a68ca6b70af5666abca8741740f6d2fb912d500a28bd5ba9dbcb076ad0f9444097157a778cabd506abca06c6db302021
+  metadata.gz: 5f2335aecb476e962d7283d33187acb94cae34a1b6b23f52f48ad890c4daaeeabf0afeaecb0a3740a57ac98c86a18a7f35422430da2eea5413472fc85c740360
+  data.tar.gz: 6e9b70d65c59e9531b44e270d752637999bccaaf844c7f89be659c04f3f6f343bd89ce72e1e25c46d0d16dc66873233a5268aba8aab2eed873e0a086a7af0b6a

data/CHANGELOG.md

@@ -2,6 +2,14 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.32.0 - 2022-11-14
+
+### Added
+* [#2680](https://github.com/Shopify/shopify-cli/pull/2680): Validate on `shopify theme share/pull/push/serve` if users are running the command in a theme/empty directory
+
+### Fixed
+* [#2683](https://github.com/Shopify/shopify-cli/pull/2683): Fix timeout issue with the `shopify theme push` command and the `--json` flag
+
 ## Version 2.31.0 - 2022-11-07
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.31.0)
+    shopify-cli (2.32.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.11.0)
@@ -101,7 +101,7 @@ GEM
     mocha (1.13.0)
     multi_test (0.1.2)
     multipart-post (2.1.1)
-    nokogiri (1.13.8)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.22.0)

data/lib/project_types/theme/commands/common/root_helper.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "project_types/theme/models/specification_handlers/theme"
+
 module Theme
   class Command
     module Common
@@ -35,8 +37,28 @@ module Theme
           "."
         end
 
+        def valid_theme_directory?(root)
+          Theme::Models::SpecificationHandlers::Theme.new(root).valid? ||
+            current_directory_confirmed?
+        end
+
+        def exist_and_not_empty?(root)
+          Dir.exist?(root) && !Dir[File.join(root, "*")].empty?
+        end
+
         private
 
+        def current_directory_confirmed?
+          raise "Current theme directory can't be confirmed during tests" if @ctx.testing?
+
+          Forms::ConfirmStore.ask(
+            @ctx,
+            [],
+            title: @ctx.message("theme.confirm_current_directory"),
+            force: options.flags[:force],
+          ).confirmed?
+        end
+
         def default_argv(options)
           options.parser.default_argv.compact
         end

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

@@ -34,10 +34,13 @@ module Theme
           flags[:ignores] ||= []
           flags[:ignores] |= pattern
         end
+        parser.on("-f", "--force") { flags[:force] = true }
       end
 
       def call(_args, name)
         root = root_value(options, name)
+        return if exist_and_not_empty?(root) && !valid_theme_directory?(root)
+
         delete = !options.flags[:nodelete]
         theme = find_theme(root, **options.flags)
         return if theme.nil?

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

@@ -39,10 +39,13 @@ module Theme
           flags[:ignores] ||= []
           flags[:ignores] |= pattern
         end
+        parser.on("-f", "--force") { flags[:force] = true }
       end
 
       def call(_args, name)
         root = root_value(options, name)
+        return unless valid_theme_directory?(root)
+
         delete = !options.flags[:nodelete]
         theme = find_theme(root, **options.flags)
         return if theme.nil?

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

@@ -34,12 +34,15 @@ module Theme
           flags[:ignores] ||= []
           flags[:ignores] |= pattern
         end
+        parser.on("-f", "--force") { flags[:force] = true }
       end
 
       def call(_args, name)
         valid_authentication_method!
 
         root = root_value(options, name)
+        return unless valid_theme_directory?(root)
+
         flags = options.flags.dup
         host = flags[:host] || DEFAULT_HTTP_HOST
 

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

@@ -11,8 +11,14 @@ module Theme
 
       recommend_default_ruby_range
 
+      options do |parser, flags|
+        parser.on("-f", "--force") { flags[:force] = true }
+      end
+
       def call(_args, name)
         root = root_value(options, name)
+        return unless valid_theme_directory?(root)
+
         theme = create_theme(root)
 
         upload(theme)

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

@@ -18,6 +18,8 @@ module Theme
         ENSURE_USER
         stable_flag_suggestion: "If the current command isn't working as expected," \
           " we suggest re-running the command with the {{command: --stable}} flag",
+        confirm_current_directory: "It doesn’t seem like you’re running this command in a theme directory. " \
+          "Are you sure you want to proceed?",
         init: {
           help: <<~HELP,
             {{command:%s theme init}}: Clones a Git repository to use as a starting point for building a new theme.

data/lib/project_types/theme/models/specification_handlers/theme.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Theme
+  module Models
+    module SpecificationHandlers
+      class Theme
+        REQUIRED_FOLDERS = %w(config layout sections templates)
+
+        def initialize(root)
+          @root = root
+        end
+
+        def valid?
+          REQUIRED_FOLDERS.all? { |required_folder| Dir.exist?(File.join(@root, required_folder)) }
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/theme/syncer/uploader.rb

@@ -212,7 +212,7 @@ module ShopifyCLI
         end
 
         def update_progress_bar(size, total)
-          @update_progress_bar_block.call(size, total)
+          @update_progress_bar_block&.call(size, total)
         end
 
         # Handler errors

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.31.0"
+  VERSION = "2.32.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.31.0
+  version: 2.32.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2022-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -328,6 +328,7 @@ files:
 - 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/models/specification_handlers/theme.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