bootic_cli 0.9.3 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64db13bc720e2ff73d52f53f170ab8e0f320736b2ce2d59f17b6a9484c59ab18
-  data.tar.gz: 6a430f14bf10f222943c216a80b1d0b46fa35bbd4d0eafaaf8f89f31346585c4
+  metadata.gz: 4e9689455a4845de27825aa295f27f84c1e45035bbb350413f85f171a26e4bd0
+  data.tar.gz: ce296652260b9f18af912d636272b6df039be1207584c2b6d619ecfd3cfb1331
 SHA512:
-  metadata.gz: c120a547235bb4cdd35ae63fdc029bcd972362f52f0e49a6c845933d85a443d7e1309c366e52433785c0a867156c477e883d1108e09f1d2ccea0f3b59c00332a
-  data.tar.gz: 309c38cd514887e071fc631a78d4229c928e8c533601afff2568905a8e324876c90fe46a0b96b9e6164984d3db66192093c6302142a135cac03976991c600a9d
+  metadata.gz: e3b44f183224b102820bc1f8a4f200d43d277fb385e973d5a792144cda1cc16ea852209c084d364436226dd72a7b377f444e4c9e6aecf70dcf9abe8618367756
+  data.tar.gz: 855814910c7e021eee1386a2fc1fea56384fd8dad25eead5d4438be5824ff0a9afaecd51c8d3c7ae439d049e17c43eabfd1fc3a49ca5a6527f11d1ce40dcd760

data/lib/bootic_cli/commands/themes.rb

@@ -147,6 +147,8 @@ module BooticCli
 
           diff = BooticCli::Themes::ThemeDiff.new(source: local_theme, target: remote_theme)
           if diff.any?
+            # puts diff.summary
+
             if prompt.yes_or_no?("There are differences between the remote theme and your local copy. Sync now?", true)
               workflows.sync(local_theme, remote_theme)
               prompt.say "Synced!", :cyan

data/lib/bootic_cli/themes/fs_theme.rb

@@ -30,25 +30,37 @@ module BooticCli
       end
 
       ASSETS_DIR = 'assets'.freeze
-      TEMPLATE_PATTERNS = ['sections/*.html', '*.html', '*.css', '*.js', '*.json', 'theme.yml'].freeze
+      TEMPLATE_PATTERNS = ['sections/*.html', '*.html', '*.css', '*.js', '*.json', '*.yml'].freeze
       ASSET_PATTERNS = [File.join(ASSETS_DIR, '*')].freeze
 
+      ASSET_PATH_REGEX = /^assets\/[^\/]+$/.freeze
+      TEMPLATE_PATH_REGEX = /^[^\/]+\.(html|css|scss|js|json|yml)$/.freeze
+      SECTION_PATH_REGEX = /^sections\/[^\/]+.html$/.freeze
+
       def self.resolve_path(path, dir)
         File.expand_path(path).sub(File.expand_path(dir) + '/', '')
       end
 
-      # helper to resolve the right type (Template or Asset) from a local path
+      # helper to resolve the right type (Template or Asset) from a local path
       # this is not part of the generic Theme interface
-      def self.resolve_type(path)
-        path =~ /assets\// ? :asset : :template
+      def self.resolve_type(path, dir)
+        relative_path = resolve_path(path, dir)
+
+        if relative_path[ASSET_PATH_REGEX]
+          :asset
+        elsif relative_path[TEMPLATE_PATH_REGEX] || relative_path[SECTION_PATH_REGEX]
+          :template
+        end
       end
 
       def self.resolve_file(path, workdir)
-        file = File.new(path)
-        type = resolve_type(path)
+        unless type = resolve_type(path, workdir)
+          return # neither an asset or template
+        end
 
         # initialize a new asset or template as it might be a new file
-        item = if path =~ /assets\//
+        file = File.new(path)
+        item = if type == :asset
           file_name = File.basename(path)
           ThemeAsset.new(file_name, file, file.mtime.utc)
         else

data/lib/bootic_cli/themes/missing_items_theme.rb

@@ -9,6 +9,10 @@ module BooticCli
         templates.any? || assets.any?
       end
 
+      def count
+        templates.count + assets.count
+      end
+
       def templates
         @templates ||= find_missing_files(source.templates, target.templates)
       end

data/lib/bootic_cli/themes/theme_diff.rb

@@ -9,6 +9,16 @@ module BooticCli
         @force_update = force_update
       end
 
+      def summary
+        msg = []
+        msg.push(" - Updated in source: #{updated_in_source.count}") if updated_in_source.any?
+        msg.push(" - Updated in target: #{updated_in_target.count}") if updated_in_target.any?
+        msg.push(" - Missing in target: #{missing_in_target.count}") if missing_in_target.any?
+        msg.push(" - Missing in source: #{missing_in_source.count}") if missing_in_source.any?
+        msg.unshift("Summary:") if msg.any?
+        msg.join("\n")
+      end
+
       def any?
         updated_in_source.any? || updated_in_target.any? || missing_in_target.any? || missing_in_source.any?
       end

data/lib/bootic_cli/themes/updated_theme.rb

@@ -28,6 +28,10 @@ module BooticCli
         templates.any? # || assets.any?
       end
 
+      def count
+        templates.count
+      end
+
       def templates
         @templates ||= map_pair(source.templates, target.templates) do |a, b|
           diff = Diffy::Diff.new(normalize_endings(b.body), normalize_endings(a.body), context: 1)

data/lib/bootic_cli/themes/workflows.rb

@@ -168,6 +168,8 @@ module BooticCli
         changes = ThemeDiff.new(source: local_theme, target: remote_theme)
         if changes.any?
           prompt.say "There are differences between your local and the remote version of your shop's development theme."
+          puts changes.summary
+
           if prompt.yes_or_no? "Push your local changes now?", true
             push(local_theme, remote_theme, delete: true)
           else
@@ -326,6 +328,11 @@ module BooticCli
         return if File.basename(path)[0] == '.' # filter out .lock and .state
 
         item, type = FSTheme.resolve_file(path, dir)
+        unless item
+          puts "Not a template or asset: #{path}"
+          return
+        end
+
         success = handle_file_errors(type, item) do
           case type
           when :template
@@ -338,7 +345,11 @@ module BooticCli
       end
 
       def delete_file(theme, path, dir)
-        type = FSTheme.resolve_type(path)
+        unless type = FSTheme.resolve_type(path, dir)
+          # puts "Not a template or asset: #{path}"
+          return
+        end
+
         success = case type
         when :template
           file_name = FSTheme.resolve_path(path, dir)
@@ -346,8 +357,6 @@ module BooticCli
         when :asset
           file_name = File.basename(path)
           theme.remove_asset(file_name)
-        else
-          raise "Invalid type: #{type}"
         end
         puts "Deleted remote #{type}: #{highlight(file_name)}" if success
       end

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = '0.9.3'
+  VERSION = '0.9.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.5
 platform: ruby
 authors:
 - Ismael Celis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-22 00:00:00.000000000 Z
+date: 2023-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor