bootic_cli 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 216121435cde22e62af2e80deace1604d9bbdc2c1fb4815fedb18a40b4bc24a9
-  data.tar.gz: 2d3e00c8bf4a651d107555ca7ec5e3fcc871d82976bec3f65c39183c08f09bd0
+  metadata.gz: 810eddf35c01c317b19fb60930b7112ed974fd35a793241895965a39b84c83e7
+  data.tar.gz: 10c44b948045fc88a895299ad429912b67bbae5dfc2e59796b3a75073d7e1411
 SHA512:
-  metadata.gz: d80d3453d1d3d0fb7bfe73cbccc4cd5cb5652e7fb0ed9081611d29f5e42e8c6d2456cb0f4ca7a3ccfbed4e739afed8e61c2c9b2bbae73849ec826525185b2f7d
-  data.tar.gz: 7db8337b8b6225af0d39400f9967b881ab6d1a026c026ef0e18dd56361b64b4b85cbb0bf8be2c76bbb0ed26087ca73d0e0199654f83ff5ef6b1cd87d7afce330
+  metadata.gz: 7b9e1ac14b64fa1e8fbea3a0a5b02bb0aaa49e9fc41a2cc9694ccaf787ca53cacfb407b7321465097ad595ecc94084d9c488bb63229332c73644d23064649db9
+  data.tar.gz: f611a28457b4c58d35bb97fa70e0aafd20c4d6c1467a61f8e184c221f0ab4188aaa966ea56c530bbb6ea9c9b575c2d83c85bfa896005b96eee81d293d812b19f

data/lib/bootic_cli/cli.rb

@@ -177,18 +177,23 @@ module BooticCli
         IRB.conf[:PROMPT_MODE] = :CUSTOM
         IRB.conf[:AUTO_INDENT] = false
         irb = IRB::Irb.new(IRB::WorkSpace.new(context))
-        IRB.conf[:MAIN_CONTEXT] = irb.context
 
-        trap('SIGINT') do
-          irb.signal_handle
-        end
+        if irb.respond_to?(:run)
+          irb.run
+        else
+          IRB.conf[:MAIN_CONTEXT] = irb.context
+
+          trap('SIGINT') do
+            irb.signal_handle
+          end
 
-        begin
-          catch(:IRB_EXIT) do
-            irb.eval_input
+          begin
+            catch(:IRB_EXIT) do
+              irb.eval_input
+            end
+          ensure
+            IRB.irb_at_exit
           end
-        ensure
-          IRB.irb_at_exit
         end
       end
     end

data/lib/bootic_cli/commands/themes.rb

@@ -25,8 +25,18 @@ module BooticCli
             prompt.say "Directory already exists! (#{local_theme.path})", :red
           else
             prompt.say "Cloning theme files into #{local_theme.path}"
-            workflows.pull(local_theme, remote_theme)
+
+            # write the pairing info first, so that if the pull below fails partway
+            # through, the directory is still resumable with `bootic themes pull`
             local_theme.write_subdomain
+
+            begin
+              workflows.pull(local_theme, remote_theme)
+            rescue BooticCli::Themes::Workflows::RetryableError => e
+              prompt.say e.message, :red
+              prompt.say "Once your connection is back, run `bootic themes pull` from within #{local_theme.path} to finish cloning.", :magenta
+              exit 1
+            end
           end
         end
       end
@@ -273,7 +283,13 @@ module BooticCli
         end
 
         logged_in_action do
-          yield
+          begin
+            yield
+          rescue BooticCli::Themes::Workflows::RetryableError => e
+            prompt.say e.message, :red
+            prompt.say "Once your connection is back, run `bootic themes pull` from within this directory to resume.", :magenta
+            exit 1
+          end
         end
       end
 

data/lib/bootic_cli/themes/theme_selector.rb

@@ -59,15 +59,15 @@ module BooticCli
       end
 
       def find_remote_shop(subdomain = nil)
-        if !subdomain
-          return root.shops.first
-        end
-
-        if root.has?(:all_shops)
+        found = if subdomain.nil?
+          root.shops.first
+        elsif root.has?(:all_shops)
           root.all_shops(subdomains: subdomain).find { |s| s.subdomain == subdomain }
         else
           root.shops.find { |s| s.subdomain == subdomain }
         end
+
+        found or raise "No active shop named #{subdomain}"
       end
 
       private

data/lib/bootic_cli/themes/workflows.rb

@@ -26,6 +26,14 @@ module BooticCli
 
     class Workflows
       CONCURRENCY = 10
+      MAX_ATTEMPTS = 3 # 1 initial try + 2 retries
+
+      # raised when a transient error (network or server-side) persists after retrying
+      class RetryableError < StandardError; end
+      # client couldn't reach the server at all (timeouts, DNS/socket errors)
+      class ConnectionError < RetryableError; end
+      # server responded, but with an error (502s, 503s, etc)
+      class ServerUnavailableError < RetryableError; end
 
       def initialize(prompt: NullPrompt)
         @prompt = prompt
@@ -362,7 +370,9 @@ module BooticCli
       end
 
       def handle_file_errors(type, file, &block)
+        attempts = 0
         begin
+          attempts += 1
           yield
           true
         rescue APITheme::EntityErrors => e
@@ -396,17 +406,21 @@ module BooticCli
           prompt.say("Invalid request: #{e.message}. Skipping...", :red)
           false # just continue, don't abort
 
-        rescue APITheme::UnknownResponse => e # 502s, 503s, etc
-          prompt.say("Got an unknown response from server: #{e.message}. Please try again in a minute.", :red)
-          exit
-
         rescue Faraday::TimeoutError, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
-          prompt.say("I'm having trouble connecting to the server. Please try again in a minute.", :red)
-          exit
+          if attempts < MAX_ATTEMPTS
+            prompt.say("Trouble connecting to the server while saving #{file.file_name} (#{e.message}). Retrying (attempt #{attempts + 1}/#{MAX_ATTEMPTS})...", :yellow)
+            retry
+          end
 
-        rescue BooticClient::ServerError => e
-          prompt.say("Couldn't save #{file.file_name}. Please try again in a few minutes.", :red)
-          exit
+          raise ConnectionError, "Couldn't reach the server to save #{file.file_name} after #{attempts} attempts (#{e.message})."
+
+        rescue APITheme::UnknownResponse, BooticClient::ServerError => e # 502s, 503s, etc
+          if attempts < MAX_ATTEMPTS
+            prompt.say("Server error while saving #{file.file_name} (#{e.message}). Retrying (attempt #{attempts + 1}/#{MAX_ATTEMPTS})...", :yellow)
+            retry
+          end
+
+          raise ServerUnavailableError, "Server kept failing to save #{file.file_name} after #{attempts} attempts (#{e.message})."
         end
       end
     end

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = '1.1.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ismael Celis
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-02 00:00:00.000000000 Z
+date: 2026-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor