bootic_cli 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce65ebb8fcfa965e89d36c586b1e8727b107293a
-  data.tar.gz: 65a6397f16c67cd0384cd32562b811b629329515
+  metadata.gz: d2765e7635f1721bf89ff0c5f35e089229a917bf
+  data.tar.gz: 585e9460e97ee451c0ff8167a74177843231a7bb
 SHA512:
-  metadata.gz: 3cb885f8025ac8a13a10073b4ed53924a324a5058fa293b0195f64df17b863ea7a7584edad90928ffc81dfbd03d71b84d1621cbad57945360ff3e97ed27457fc
-  data.tar.gz: e00d252e1e00dad78e4588d1f7040e2a0954db1914007ac5b550620ddc71bc3096847ba98604dffdd471645078b052fff3510f882839b95ab2cc6e4c0310e8d8
+  metadata.gz: 126f5bd5af00aefdbca55b4a7a474042b80ddb36e83719b5fde9ee68d6a7c2c551053d6c76b6d47445b29181d005d42252b31e2d95cfba1c364f4498a5105bfd
+  data.tar.gz: 5a9f2eb890175edb519bac77d7b472055f13b9de15a13c1e7040ead4a7db96a4d05b7f59153105c4fe2ea7d1dd5b0ab2e74a75b689f6531b4d003d8e9ab4d072

data/lib/bootic_cli/themes/fs_theme.rb

@@ -30,20 +30,25 @@ module BooticCli
       end
 
       ASSETS_DIR = 'assets'.freeze
-      TEMPLATE_PATTERNS = ['*.liquid', '*.html', '*.css', '*.js', 'theme.yml'].freeze
+      TEMPLATE_PATTERNS = ['sections/*.html', '*.html', '*.css', '*.js', 'theme.yml', 'settings.json'].freeze
       ASSET_PATTERNS = [File.join(ASSETS_DIR, '*')].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
       # this is not part of the generic Theme interface
       def self.resolve_type(path)
         path =~ /assets\// ? :asset : :template
       end
 
-      def self.resolve_file(path)
+      def self.resolve_file(path, workdir)
         file = File.new(path)
         type = resolve_type(path)
-        file_name = File.basename(path)
+        file_name = resolve_path(path, workdir)
 
+        # initialize a new asset or template as it might be a new file
         item = if path =~ /assets\//
           ThemeAsset.new(file_name, file, file.mtime.utc)
         else
@@ -87,7 +92,7 @@ module BooticCli
       def templates
         @templates ||= (
           paths_for(TEMPLATE_PATTERNS).sort.map do |path|
-            name = File.basename(path)
+            name = self.class.resolve_path(path, dir)
             file = File.new(path)
             Template.new(name, file.read, file.mtime.utc)
           end
@@ -114,6 +119,9 @@ module BooticCli
           body = body.gsub(/\r\n?/, "\n")
         end
 
+        dir = File.dirname(path)
+        FileUtils.mkdir_p(dir) unless File.exist?(dir)
+
         File.open(path, 'w') do |io|
           io.write(body)
         end
@@ -155,7 +163,9 @@ module BooticCli
       end
 
       def paths_for(patterns)
-        patterns.reduce([]) {|m, pattern| m + Dir[File.join(dir, pattern)]}
+        patterns.reduce([]) do |m, pattern|
+          m + Dir[File.join(dir, pattern)]
+        end
       end
 
       def setup

data/lib/bootic_cli/themes/workflows.rb

@@ -189,21 +189,22 @@ module BooticCli
 
       def watch(dir, remote_theme, watcher: Listen)
         listener = watcher.to(dir) do |modified, added, removed|
+
           if modified.any?
             modified.each do |path|
-              upsert_file(remote_theme, path)
+              upsert_file(remote_theme, path, dir)
             end
           end
 
           if added.any?
             added.each do |path|
-              upsert_file(remote_theme, path)
+              upsert_file(remote_theme, path, dir)
             end
           end
 
           if removed.any?
             removed.each do |path|
-              delete_file(remote_theme, path)
+              delete_file(remote_theme, path, dir)
             end
           end
 
@@ -321,9 +322,10 @@ module BooticCli
         pool.start
       end
 
-      def upsert_file(theme, path)
+      def upsert_file(theme, path, dir)
         return if File.basename(path)[0] == '.' # filter out .lock and .state
-        item, type = FSTheme.resolve_file(path)
+
+        item, type = FSTheme.resolve_file(path, dir)
         success = handle_file_errors(type, item) do
           case type
           when :template
@@ -335,9 +337,9 @@ module BooticCli
         puts "Uploaded #{type}: #{highlight(item.file_name)}" if success
       end
 
-      def delete_file(theme, path)
+      def delete_file(theme, path, dir)
         type = FSTheme.resolve_type(path)
-        file_name = File.basename(path)
+        file_name = FSTheme.resolve_path(path, dir)
         success = case type
         when :template
           theme.remove_template(file_name)

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = '0.7.3'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Ismael Celis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor