bootic_cli 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 55a78add4d79c5db970e4ad5df3b038fd6db6702c674cb60092c9d9f93bcf533
-  data.tar.gz: 120a782606574c1dd7d94b25112e033cb348fd6fb2889201bbfe1bf28cf55fde
+SHA1:
+  metadata.gz: 6d23940a740e8d8427e4eccf0f5bb872a19d9470
+  data.tar.gz: fb069df631666e1f2771f5d3fc4455a4c8b1dc0a
 SHA512:
-  metadata.gz: 2a5a02b98f284912ce408de4cdcd141907e56f5b3e0b1741fbd60a42f3e32a0118e7635a82e9de57955f92ef1880ca7149d31c2c8d9b8b95c7f921382cedf5c1
-  data.tar.gz: 94ff56bc77d419c27886aef885ebcbaa93eed49d63b7eca8aa8a325c834ac6c3f05c99ab9811c481ed2e5b55e06dfea3c6072d76436027d3cce4745a8e9c6c5f
+  metadata.gz: 5a65fbc81c21cefc4fdbbcd74002970541db887fccdcded111f0fa607246ea1e8293b4758c821c674b2e9db2b919cba85cf68d856eebf3bd2d5cf5a726df8846
+  data.tar.gz: fa6bed44f947a7197a490f8407682cf7f47a1a3a0dc695aa17c5cee69549a786479c5b49773c575ebb912cdc933c32eac3541006e40fd59623a6b7d768fc4484

data/lib/bootic_cli/themes/api_theme.rb

@@ -48,6 +48,15 @@ module BooticCli
     end
 
     class APITheme
+
+      class EntityErrors < StandardError
+        attr_reader :errors
+        def initialize(errors)
+          @errors = errors
+          super "Entity has errors: #{errors.map(&:field)}"
+        end
+      end
+
       def initialize(theme)
         @theme = theme
       end
@@ -115,13 +124,6 @@ module BooticCli
       private
       attr_reader :theme
 
-      class EntityErrors < StandardError
-        attr_reader :errors
-        def initialize(errors)
-          @errors = errors
-          super "Entity has errors: #{errors.map(&:field)}"
-        end
-      end
 
       def check_errors!(entity)
         if entity.has?(:errors)

data/lib/bootic_cli/themes/workflows.rb

@@ -95,12 +95,12 @@ module BooticCli
         # first, update existing templates in each side
         notice 'Updating local templates...'
         maybe_update(diff.updated_in_target.templates, 'remote', 'local') do |t|
-          local_theme.add_template t.file_name, t.body
+          local_theme.add_template(t.file_name, t.body)
         end
 
         notice 'Updating remote templates...'
         maybe_update(diff.updated_in_source.templates, 'local', 'remote') do |t|
-          remote_theme.add_template t.file_name, t.body
+          remote_theme.add_template(t.file_name, t.body)
         end
 
         # now, download missing files on local end
@@ -166,19 +166,19 @@ module BooticCli
         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)
             end
           end
 
           if added.any?
             added.each do |path|
-              upsert_file remote_theme, path
+              upsert_file(remote_theme, path)
             end
           end
 
           if removed.any?
             removed.each do |path|
-              delete_file remote_theme, path
+              delete_file(remote_theme, path)
             end
           end
 
@@ -267,8 +267,10 @@ module BooticCli
 
       def copy_templates(from, to, opts = {})
         from.templates.each do |t|
-          to.add_template t.file_name, t.body
-          puts "Copied #{highlight(t.file_name)}"
+          handle_file_errors(:template, t) do
+            to.add_template(t.file_name, t.body)
+            puts "Copied #{highlight(t.file_name)}"
+          end
         end
       end
 
@@ -290,8 +292,11 @@ module BooticCli
 
         files.each do |a|
           pool.schedule do
-            to.add_asset a.file_name, a.file
-            puts "Copied asset #{highlight(a.file_name)} (#{a.file_size} bytes)"
+            handle_file_errors(:asset, a) do
+              to.add_asset(a.file_name, a.file)
+              size_str = a.file_size.to_i > 0 ? " (#{a.file_size} bytes)" : ''
+              puts "Copied asset #{highlight(a.file_name)}#{size_str}"
+            end
           end
         end
 
@@ -300,13 +305,15 @@ module BooticCli
 
       def upsert_file(theme, path)
         item, type = FSTheme.resolve_file(path)
-        case type
-        when :template
-          theme.add_template item.file_name, item.body
-        when :asset
-          theme.add_asset item.file_name, item.file
+        handle_file_errors(type, item) do
+          case type
+          when :template
+            theme.add_template(item.file_name, item.body)
+          when :asset
+            theme.add_asset(item.file_name, item.file)
+          end
         end
-        puts "Uploaded #{type}: #{item.file_name}"
+        puts "Uploaded #{type}: #{highlight(item.file_name)}"
       end
 
       def delete_file(theme, path)
@@ -314,11 +321,42 @@ module BooticCli
         file_name = File.basename(path)
         case type
         when :template
-          theme.remove_template file_name
+          theme.remove_template(file_name)
         when :asset
-          theme.remove_asset file_name
+          theme.remove_asset(file_name)
+        end
+        puts "Deleted remote #{type}: #{highlight(file_name)}"
+      end
+
+      def handle_file_errors(type, file, &block)
+        begin
+          yield
+        rescue APITheme::EntityErrors => e
+          fields = e.errors.map(&:field)
+
+          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
+            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
+            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
+            "has invalid #{fields.join(', ')}"
+          end
+
+          prompt.say("#{file.file_name} #{error_msg}. Skipping...", :red)
+          # abort
+
+        rescue JSON::GeneratorError => e
+          prompt.say("#{file.file_name} looks like a binary file, not a template. Skipping...", :red)
+          # abort
+
+        rescue BooticClient::ServerError => e
+          prompt.say("Couldn't save #{file.file_name}. Please try again in a few minutes.", :red)
+          abort
         end
-        puts "Deleted remote #{type}: #{file_name}"
       end
     end
   end

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ismael Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Bootic command-line client.