bootic_cli 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33dd7903e0e41865015bbbf447ba8eeb5f129349
-  data.tar.gz: 8a082e16833d9da57bdc7f408f652f5b43677c4b
+  metadata.gz: c0ca07dc72c5128ad36d0238086d41432565e60a
+  data.tar.gz: 18647ebabc38ea74417ffc4ba4beb627e463494d
 SHA512:
-  metadata.gz: e5b628ce27bd6bb46520a971a8dc5c49acc8bb36f1bd029bf9fcfeed327e92b177c8da4e7ef6ecbff5c90e638141a87596fb547f4bc6cf32e1de846c5926d953
-  data.tar.gz: 46b6bed1f17ac6fae5f102d444014714fdb79cfcc2405bd5e798680b2ea0941cc22aaf8769b19089f28912b6166c323f2e2ea5f082257988d0e64123f33d7a3e
+  metadata.gz: 14fbbce3f9176faab1138b03e511d57b214ee19dbdf6289f7780cfe8bc3d6052ea87b681706ba38922e17d6f6ad4947eed85d1f3f58af2afded64dc55a2c913e
+  data.tar.gz: a4fec4c63aea720c868bea2f48dbfb865db4677e1054433edb8fb6258ddeab3b72c4dc2836dc6d9e62232a169089d67da955b6391242946f0edbb5c6f1adde94

data/lib/bootic_cli/themes/api_theme.rb

@@ -9,6 +9,7 @@ module BooticCli
       end
 
       def ==(other)
+        # puts "Comparing with time #{self.updated_on} vs #{other.updated_on}"
         self.updated_on == other.updated_on
       end
     end
@@ -24,8 +25,13 @@ module BooticCli
       end
 
       def ==(other)
-        return super if digest.to_s == '' || other.digest.to_s == ''
-        self.file_size == other.file_size && self.digest == other.digest
+        if digest.to_s == '' || other.digest.to_s == ''
+          # puts "One or the other digest is empty: #{digest} -- #{other.digest}"
+          return super 
+        end
+
+        # file sizes may differ as they are served by CDN (that shrinks them)
+        self.digest == other.digest # && self.file_size == other.file_size
       end
 
       def fetch_data(attempt = 1)
@@ -53,12 +59,13 @@ module BooticCli
         attr_reader :errors
         def initialize(errors)
           @errors = errors
-          super "Entity has errors: #{errors.map(&:field)}"
+          super "Entity has errors: #{errors.map(&:field).join(', ')}"
         end
       end
 
       def initialize(theme)
         @theme = theme
+        puts "Entity has errors: #{theme.errors.map(&:messages).join(', ')}" if theme.has?(:errors)
       end
 
       # this is unique to API themes
@@ -124,7 +131,6 @@ module BooticCli
       private
       attr_reader :theme
 
-
       def check_errors!(entity)
         if entity.has?(:errors)
           raise EntityErrors.new(entity.errors)

data/lib/bootic_cli/themes/fs_theme.rb

@@ -19,10 +19,12 @@ 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
           end
 
-          self.file_size == other.file_size && self.digest == other.digest
+          # file sizes may differ as they are served by CDN (that shrinks them)
+          self.digest == other.digest # self.file_size == other.file_size
         end
       end
 

data/lib/bootic_cli/themes/workflows.rb

@@ -284,18 +284,20 @@ module BooticCli
         files = from.assets.find_all do |a|
           if opts[:overwrite]
             true
-          else
-            target_asset = to.assets.find { |t| t.file_name == a.file_name }
-            if target_asset
-              opts[:interactive] && prompt.yes_or_no?("Asset exists: #{highlight(a.file_name)}. Overwrite?", false)
+          elsif existing = to.assets.find { |t| t.file_name == a.file_name }
+            if existing == a # exact copy, no need to overwrite
+              false
             else
-              true
+              opts[:interactive] && prompt.yes_or_no?("Asset exists: #{highlight(a.file_name)}. Overwrite?", false)
             end
+          else
+            true
           end
         end
 
         pool = BooticCli::WorkerPool.new(CONCURRENCY)
 
+        # puts "Downloading assets: #{files.count}"
         files.each do |a|
           pool.schedule do
             handle_file_errors(:asset, a) do

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Ismael Celis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor