bootic_cli 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64db13bc720e2ff73d52f53f170ab8e0f320736b2ce2d59f17b6a9484c59ab18
-  data.tar.gz: 6a430f14bf10f222943c216a80b1d0b46fa35bbd4d0eafaaf8f89f31346585c4
+  metadata.gz: a296e4252d391af00cccfff4af93d652c2daa29e4b8d65cd42202331bfc1b70d
+  data.tar.gz: 2f485bdd0c668f84738a21d7872404180ebaf04f594d37b1e000bc5df1966f52
 SHA512:
-  metadata.gz: c120a547235bb4cdd35ae63fdc029bcd972362f52f0e49a6c845933d85a443d7e1309c366e52433785c0a867156c477e883d1108e09f1d2ccea0f3b59c00332a
-  data.tar.gz: 309c38cd514887e071fc631a78d4229c928e8c533601afff2568905a8e324876c90fe46a0b96b9e6164984d3db66192093c6302142a135cac03976991c600a9d
+  metadata.gz: 8d44a11d8d69d2bd619cd69b8f9e8cfcaf42eea3674f6281cc14c9d70f74c1660da618f4b07983a034ac2d23534e380d83f485946705c641032af12feaa4c835
+  data.tar.gz: 6ad0e38e1b4274e68cc52c9d987f0b126af1d786707d2962d82b719bbc158ad4bb8bfba7efe3b1e63bf59ae05cd27e35753ccadea3c09deceeeceb0e735bb546

data/lib/bootic_cli/themes/fs_theme.rb

@@ -33,22 +33,34 @@ module BooticCli
       TEMPLATE_PATTERNS = ['sections/*.html', '*.html', '*.css', '*.js', '*.json', 'theme.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/workflows.rb

@@ -326,6 +326,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 +343,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 +355,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.4'
 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.4
 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-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor