bootic_cli 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1053a78f5dcee0b27021985457476ccc2ff4666842c887b2a2bf86cc5b4eb5cf
-  data.tar.gz: 62d10a5ad2b1d927275a247a5898d1d16090b7e1c624790fbbed801e3b4a1094
+  metadata.gz: a296e4252d391af00cccfff4af93d652c2daa29e4b8d65cd42202331bfc1b70d
+  data.tar.gz: 2f485bdd0c668f84738a21d7872404180ebaf04f594d37b1e000bc5df1966f52
 SHA512:
-  metadata.gz: 3b7f0b1a2357cf1f4655d09fed51b134d37c091987c99b5bca5164ab13e06dafc04f588fa7ec380d9e03c28d6db3b919993d7e858a7c8a30ad940e4ba7fa47e9
-  data.tar.gz: 79969ffa8e65899084cadd182708347dd79280412a2a77413eea68aa2f1d803909cea29e8fa5a92e97d9af9644ed86f9c4f6e94c25d91f472300030e89accb9d
+  metadata.gz: 8d44a11d8d69d2bd619cd69b8f9e8cfcaf42eea3674f6281cc14c9d70f74c1660da618f4b07983a034ac2d23534e380d83f485946705c641032af12feaa4c835
+  data.tar.gz: 6ad0e38e1b4274e68cc52c9d987f0b126af1d786707d2962d82b719bbc158ad4bb8bfba7efe3b1e63bf59ae05cd27e35753ccadea3c09deceeeceb0e735bb546

data/lib/bootic_cli/commands/themes.rb

@@ -139,7 +139,7 @@ module BooticCli
           if options['force'].nil? && has_lockfile?
             prompt.say("Looks like there's another process already watching this dir.")
             prompt.say("If this is not the case, please run this command with --force (or -f)")
-            abort
+            exit
           end
 
           local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, options['public'])
@@ -220,7 +220,7 @@ module BooticCli
         within_theme do
           unless File.directory?(dir) and contains_theme?(dir)
             prompt.say("Path doesn't exist or doesn't contain theme: #{dir}")
-            abort
+            exit
           end
 
           dirname = File.dirname(dir)
@@ -254,14 +254,14 @@ module BooticCli
       def warn_about_public
         unless prompt.yes_or_no?("You're pushing changes directly to your public theme. Are you sure?", true)
           prompt.say("Ok, sure. You can skip the above warning prompt by passing a `--public` flag.")
-          abort
+          exit
         end
       end
 
       def within_theme(&block)
         unless is_within_theme?
           prompt.say "This directory doesn't look like a Bootic theme! (#{current_expanded_dir})", :magenta
-          abort
+          exit
         end
 
         logged_in_action do
@@ -313,7 +313,7 @@ module BooticCli
             input = shell.ask("#{question} [#{default_char}]").strip
           rescue Interrupt
             say "\nCtrl-C received. Bailing out!", :magenta
-            abort
+            exit
           end
 
           return default_answer if input == '' || input.downcase == default_char

data/lib/bootic_cli/themes/api_theme.rb

@@ -31,6 +31,7 @@ module BooticCli
         end
 
         # file sizes may differ as they are served by CDN (that shrinks them)
+        # puts "Comparing APIAsset vs other digest:\n#{digest}\n#{other.digest}"
         self.digest == other.digest # && self.file_size == other.file_size
       end
 

data/lib/bootic_cli/themes/fs_theme.rb

@@ -19,12 +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}"
+            # puts "Other has no digest, so comparing dates: #{self.updated_on.to_i} vs #{other.updated_on.to_i}"
             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}"
+          # puts "Comparing FSTheme vs other digest:\n#{digest}\n#{other.digest}"
           self.digest == other.digest # self.file_size == other.file_size
         end
       end
@@ -33,22 +33,34 @@ module BooticCli
       TEMPLATE_PATTERNS = ['sections/*.html', '*.html', '*.css', '*.js', '*.json', 'theme.yml'].freeze
       ASSET_PATTERNS = [File.join(ASSETS_DIR, '*')].freeze
 
+      ASSET_PATH_REGEX = /^assets\/[^\/]+$/.freeze
+      TEMPLATE_PATH_REGEX = /^[^\/]+\.(html|css|scss|js|json|yml)$/.freeze
+      SECTION_PATH_REGEX = /^sections\/[^\/]+.html$/.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
+      # 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
+      def self.resolve_type(path, dir)
+        relative_path = resolve_path(path, dir)
+
+        if relative_path[ASSET_PATH_REGEX]
+          :asset
+        elsif relative_path[TEMPLATE_PATH_REGEX] || relative_path[SECTION_PATH_REGEX]
+          :template
+        end
       end
 
       def self.resolve_file(path, workdir)
-        file = File.new(path)
-        type = resolve_type(path)
+        unless type = resolve_type(path, workdir)
+          return # neither an asset or template
+        end
 
         # initialize a new asset or template as it might be a new file
-        item = if path =~ /assets\//
+        file = File.new(path)
+        item = if type == :asset
           file_name = File.basename(path)
           ThemeAsset.new(file_name, file, file.mtime.utc)
         else

data/lib/bootic_cli/themes/workflows.rb

@@ -326,6 +326,11 @@ module BooticCli
         return if File.basename(path)[0] == '.' # filter out .lock and .state
 
         item, type = FSTheme.resolve_file(path, dir)
+        unless item
+          # puts "Not a template or asset: #{path}"
+          return
+        end
+
         success = handle_file_errors(type, item) do
           case type
           when :template
@@ -338,7 +343,11 @@ module BooticCli
       end
 
       def delete_file(theme, path, dir)
-        type = FSTheme.resolve_type(path)
+        unless type = FSTheme.resolve_type(path, dir)
+          # puts "Not a template or asset: #{path}"
+          return
+        end
+
         success = case type
         when :template
           file_name = FSTheme.resolve_path(path, dir)
@@ -346,8 +355,6 @@ module BooticCli
         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)}" if success
       end
@@ -361,7 +368,7 @@ module BooticCli
 
           if fields.include?('$.updated_on') || fields.include?('updated_on')
             prompt.say("#{file.file_name} timestamp #{e.errors.first.messages.first}", :red)
-            abort
+            exit
           end
 
           error_msg = if fields.include?('file_content_type') or fields.include?('content_type')
@@ -389,15 +396,15 @@ module BooticCli
 
         rescue APITheme::UnknownResponse => e # 502s, 503s, etc
           prompt.say("Got an unknown response from server: #{e.message}. Please try again in a minute.", :red)
-          abort
+          exit
 
-        rescue Net::OpenTimeout, Net::ReadTimeout => e
+        rescue SocketError, Net::OpenTimeout, Net::ReadTimeout => e
           prompt.say("I'm having trouble connecting to the server. Please try again in a minute.", :red)
-          abort
+          exit
 
         rescue BooticClient::ServerError => e
           prompt.say("Couldn't save #{file.file_name}. Please try again in a few minutes.", :red)
-          abort
+          exit
         end
       end
     end

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = '0.9.2'
+  VERSION = '0.9.4'
 end

metadata

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