bootic_cli 0.7.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac3bf0e553c05ee15cb57744d5ec3c219c4985df
-  data.tar.gz: 63daaae9646840e44425b3c1dd7b9a00aba28a6a
+  metadata.gz: 78aa25989c89e07072dc2cdac0502d391ed1b403
+  data.tar.gz: 9421b7000cf397519a6c68ec2da26078d3522bee
 SHA512:
-  metadata.gz: b3de93b783be8f16d12f4bfd442a1825047e02bfb2fa8b0ba49e0eddd6b6c8a57017c716f72da94c8b35af1f863d8cc171951db78346242904f23aa28ad75223
-  data.tar.gz: a61f6cb78962889818b13c2641042af88aab5c6b167d39748721518e58536054f8627c3d652c52290db986bb23d8a1e8e1a2cbc1091b92dab5422f2c9b7770ea
+  metadata.gz: dad570ef8547281df61d8f6630abb3aaa5c0ab422b68a2b7daa92efc3ac09e64a7b3850c88f8a5d5ba8090b10de2ee3a09f4a781b01e28632a2719587403d884
+  data.tar.gz: 568c143b7d446d88153f786e48a31253caaa471ba3a355b7af71ce6a33922ecb0b0066c8b685e4a724b20ed94e5155636bc6955f95812ad901465644d6706caa

data/lib/bootic_cli/commands/themes.rb

@@ -270,7 +270,7 @@ module BooticCli
       end
 
       def contains_theme?(path)
-        File.exist?(File.join(path, 'layout.html'))
+        File.exist?(File.join(path, 'settings.json')) || File.exist?(File.join(path, 'layout.html'))
       end
 
       def is_within_theme?

data/lib/bootic_cli/themes/api_theme.rb

@@ -10,7 +10,7 @@ module BooticCli
 
       def ==(other)
         # puts "Comparing with time #{self.updated_on} vs #{other.updated_on}"
-        self.updated_on == other.updated_on
+        self.updated_on.to_i == other.updated_on.to_i
       end
     end
 
@@ -116,17 +116,25 @@ module BooticCli
       end
 
       def add_template(file_name, body)
-        check_errors! theme.create_template(
+        params = {
           file_name: file_name,
           body: body
-        )
+        }
+
+        if ts = get_updated_on(file_name)
+          params.merge!(last_updated_on: ts.to_i)
+        end
+
+        check_errors!(theme.create_template(params)).tap do |entity|
+          template_updated(file_name, entity)
+        end
       end
 
       def remove_template(file_name)
         tpl = theme.templates.find { |t| t.file_name == file_name }
         if tpl && tpl.can?(:delete_template)
           res = tpl.delete_template
-          check_errors!(res) if res.respond_to?(:can?)
+          res.status.to_i < 300
         else
           puts "Cannot delete #{file_name}"
         end
@@ -143,7 +151,7 @@ module BooticCli
         asset = theme.assets.find { |t| t.file_name == file_name }
         if asset and asset.can?(:delete_theme_asset)
           res = asset.delete_theme_asset
-          check_errors!(res) if res.respond_to?(:can?)
+          res.status.to_i < 300
         else
           puts "Cannot delete asset: #{file_name}"
         end
@@ -152,6 +160,18 @@ module BooticCli
       private
       attr_reader :theme
 
+      def get_updated_on(file_name)
+        if tpl = templates.find { |t| t.file_name == file_name }
+          tpl.updated_on
+        end
+      end
+
+      def template_updated(file_name, new_template)
+        if index = templates.index { |t| t.file_name == file_name }
+          templates[index] = ItemWithTime.new(new_template)
+        end
+      end
+
       def check_errors!(entity)
         if entity.has?(:errors)
           raise EntityErrors.new(entity.errors)

data/lib/bootic_cli/themes/fs_theme.rb

@@ -8,7 +8,7 @@ module BooticCli
 
       Template = Struct.new(:file_name, :body, :updated_on) do
         def ==(other)
-          self.updated_on == other.updated_on
+          self.updated_on.to_i == other.updated_on.to_i
         end
       end
 
@@ -20,32 +20,39 @@ module BooticCli
         def ==(other)
           if other.digest.to_s == '' # api theme asset without a digest set
             # puts "Other has no digest, so comparing dates: #{self.updated_on} vs #{other.updated_on}"
-            return self.updated_on == other.updated_on
+            return self.updated_on.to_i == other.updated_on.to_i
           end
 
           # file sizes may differ as they are served by CDN (that shrinks them)
+          # puts "Comparing digests:\n#{digest}\n#{other.digest}"
           self.digest == other.digest # self.file_size == other.file_size
         end
       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)
 
+        # initialize a new asset or template as it might be a new file
         item = if path =~ /assets\//
+          file_name = File.basename(path)
           ThemeAsset.new(file_name, file, file.mtime.utc)
         else
+          file_name = resolve_path(path, workdir)
           Template.new(file_name, file.read, file.mtime.utc)
         end
 
@@ -86,7 +93,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
@@ -113,6 +120,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
@@ -154,7 +164,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,10 +322,11 @@ 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)
-        handle_file_errors(type, item) do
+
+        item, type = FSTheme.resolve_file(path, dir)
+        success = handle_file_errors(type, item) do
           case type
           when :template
             theme.add_template(item.file_name, item.body)
@@ -332,35 +334,42 @@ module BooticCli
             theme.add_asset(item.file_name, item.file)
           end
         end
-        puts "Uploaded #{type}: #{highlight(item.file_name)}"
+        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)
-        case type
+        success = case type
         when :template
+          file_name = FSTheme.resolve_path(path, dir)
           theme.remove_template(file_name)
         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)}"
+        puts "Deleted remote #{type}: #{highlight(file_name)}" if success
       end
 
       def handle_file_errors(type, file, &block)
         begin
           yield
+          true
         rescue APITheme::EntityErrors => e
           fields = e.errors.map(&:field)
 
-          error_msg = if fields.include?("file_content_type") or fields.include?("content_type")
+          if fields.include?('$.updated_on') || fields.include?('updated_on')
+            prompt.say("#{file.file_name} timestamp #{e.errors.first.messages.first}", :red)
+            abort
+          end
+
+          error_msg = if fields.include?('file_content_type') or fields.include?('content_type')
             "is an unsupported file type for #{type}s."
-          elsif fields.include?("file_file_size") # big asset
+          elsif fields.include?('file_file_size') # big asset
             size_str = file.file_size.to_i > 0 ? "(#{file.file_size} KB) " : ''
             "#{size_str}is heavier than the maximum allowed for assets (1 MB)"
-          elsif fields.include?("body") # big template
+          elsif fields.include?('body') # big template
             str = file.file_name[/\.(html|liquid)$/] ? "Try splitting it into smaller chunks" : "Try saving it as an asset instead"
             str += ", since templates can hold up to 64 KB of data."
           else
@@ -368,11 +377,11 @@ module BooticCli
           end
 
           prompt.say("#{file.file_name} #{error_msg}. Skipping...", :red)
-          # abort
+          false # abort
 
         rescue JSON::GeneratorError => e
           prompt.say("#{file.file_name} looks like a binary file, not a template. Skipping...", :red)
-          # abort
+          false # just continue, don't abort
 
         rescue Net::OpenTimeout, Net::ReadTimeout => e
           prompt.say("I'm having trouble connecting to the server. Please try again in a minute.", :red)

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = '0.7.1'
+  VERSION = '0.8.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Ismael Celis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-07 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor