bootic_cli 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac3bf0e553c05ee15cb57744d5ec3c219c4985df
-  data.tar.gz: 63daaae9646840e44425b3c1dd7b9a00aba28a6a
+  metadata.gz: 66ebab01b114029b6d6cff68f2957df471694fbe
+  data.tar.gz: f593e3f37ed9dd3cd7ec48730afd8509f4e6f480
 SHA512:
-  metadata.gz: b3de93b783be8f16d12f4bfd442a1825047e02bfb2fa8b0ba49e0eddd6b6c8a57017c716f72da94c8b35af1f863d8cc171951db78346242904f23aa28ad75223
-  data.tar.gz: a61f6cb78962889818b13c2641042af88aab5c6b167d39748721518e58536054f8627c3d652c52290db986bb23d8a1e8e1a2cbc1091b92dab5422f2c9b7770ea
+  metadata.gz: 13d97b88ee377d64743699dd420349601cecc0c7b3a94380c9771dc553094044ea33764164e85eb5e44a4e6983ba510f897047ea266e03fd0f55ab001293b0f4
+  data.tar.gz: 28b87bf9559eca1c3271ad74d37e2ea7f3c385d509d5ef34a677100d5edc345e5bb8ad424f6b390b6dceeb1da333b34044b49bf53cc397a5bd3727041202473c

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,10 +116,18 @@ 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)
@@ -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,10 +20,11 @@ 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

data/lib/bootic_cli/themes/workflows.rb

@@ -324,7 +324,7 @@ module BooticCli
       def upsert_file(theme, path)
         return if File.basename(path)[0] == '.' # filter out .lock and .state
         item, type = FSTheme.resolve_file(path)
-        handle_file_errors(type, item) do
+        success = handle_file_errors(type, item) do
           case type
           when :template
             theme.add_template(item.file_name, item.body)
@@ -332,7 +332,7 @@ 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)
@@ -352,15 +352,21 @@ module BooticCli
       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 +374,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.7.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.7.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-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor