bootic_cli 0.9.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f377bc24f806e46ed13a2e33e3e05dbbb9d7ee13eeb6c3e35435d071db23010d
-  data.tar.gz: 1bb40192a7377e4ea7c515408944e81181d7b39f5d3723d312c45a190ac536ac
+  metadata.gz: 216121435cde22e62af2e80deace1604d9bbdc2c1fb4815fedb18a40b4bc24a9
+  data.tar.gz: 2d3e00c8bf4a651d107555ca7ec5e3fcc871d82976bec3f65c39183c08f09bd0
 SHA512:
-  metadata.gz: d14d075517cecdf8741b4cfda530c340be66507c655e38802e107f20fc20cc51dd3ec1f476b198aa4554b137969f127ce1fa1fa1b1603595e412a26b7d4bd2f2
-  data.tar.gz: 691d45ebd725cbe58e13205eeeb19c0850fa3fdddaf037793168ee896d3636f3fe0cec59b2ea3b4790b5522d0e7826aedd2ebca4809515d78fd390ad7727ffb7
+  metadata.gz: d80d3453d1d3d0fb7bfe73cbccc4cd5cb5652e7fb0ed9081611d29f5e42e8c6d2456cb0f4ca7a3ccfbed4e739afed8e61c2c9b2bbae73849ec826525185b2f7d
+  data.tar.gz: 7db8337b8b6225af0d39400f9967b881ab6d1a026c026ef0e18dd56361b64b4b85cbb0bf8be2c76bbb0ed26087ca73d0e0199654f83ff5ef6b1cd87d7afce330

data/bootic_cli.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'thor', '~> 0'
+  spec.add_dependency 'thor', '~> 1.x'
   spec.add_dependency 'bootic_client', "~> 0.0.31"
   spec.add_dependency 'diffy', "~> 3.2"
   spec.add_dependency 'listen', "~> 3.1"

data/lib/bootic_cli/commands/themes.rb

@@ -184,12 +184,8 @@ module BooticCli
 
             # prompt.say("Publishing means all your public theme's templates and assets will be replaced and lost.")
             if prompt.yes_or_no?("Would you like to make a local copy of your current public theme before publishing?", diff.any?) # default to true if changes exist
-              backup_path = File.join(local_theme.path, "public-theme-backup-#{Time.now.to_i}")
-              backup_theme = theme_selector.select_local_theme(backup_path, local_theme.subdomain)
-
-              prompt.say("Gotcha. Backing up your public theme into #{prompt.highlight(backup_theme.path)}")
-              workflows.pull(backup_theme, public_theme)
-              prompt.say "Done! Existing public theme was saved to #{prompt.highlight(File.basename(backup_theme.path))}", :cyan
+              path = File.join(local_theme.path, "backups", "public-theme-backup-#{Time.now.to_i}")
+              create_backup_from(public_theme, local_theme, path)
             end
 
             workflows.publish(local_theme, remote_theme)
@@ -197,6 +193,16 @@ module BooticCli
         end
       end
 
+      desc 'backup', 'Create a backup copy of the current remote theme'
+      option :dev, banner: '<true|false>', type: :boolean, aliases: '-d', desc: 'Clones development theme instead of the public one (default)'
+      def backup(path = nil)
+        within_theme do
+          local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, options['dev'].nil?)
+          path ||= File.join(local_theme.path, "backups", "#{remote_theme.public? ? 'public' : 'dev'}-theme-backup-#{Time.now.to_i}")
+          create_backup_from(remote_theme, local_theme, path)
+        end
+      end
+
       # desc 'open', 'Open theme preview URL in a browser'
       # option :public, banner: '<true|false>', type: :boolean, aliases: '-p', desc: 'Opens public theme URL'
       # def open
@@ -303,6 +309,13 @@ module BooticCli
         @theme_selector ||= BooticCli::Themes::ThemeSelector.new(root, prompt: prompt)
       end
 
+      def create_backup_from(theme, local_theme, backup_path)
+        backup_theme = theme_selector.select_local_theme(backup_path, local_theme.subdomain)
+        prompt.say("Gotcha. Backing up your #{theme.public? ? 'public' : 'dev'} theme into #{prompt.highlight(backup_theme.path)}")
+        workflows.pull(backup_theme, theme)
+        prompt.say "Done! Existing #{theme.public? ? 'public' : 'dev'} theme was saved to #{prompt.highlight(File.basename(backup_theme.path))}", :cyan
+      end
+
       class Prompt
         def initialize(shell = Thor::Shell::Color.new)
           @shell = shell

data/lib/bootic_cli/themes/api_theme.rb

@@ -1,5 +1,5 @@
 require 'time'
-require 'net/http'
+require 'bootic_cli/utils'
 
 module BooticCli
   module Themes
@@ -15,13 +15,8 @@ module BooticCli
     end
 
     class APIAsset < ItemWithTime
-      REQUEST_OPTS = {
-        open_timeout: 5,
-        read_timeout: 5
-      }
-
       def file
-        @file ||= StringIO.new(fetch_data)
+        @file ||= BooticCli::Utils.fetch_http_file(rels[:file].href)
       end
 
       def ==(other)
@@ -34,27 +29,6 @@ module BooticCli
         # puts "Comparing APIAsset vs other digest:\n#{digest}\n#{other.digest}"
         self.digest == other.digest # && self.file_size == other.file_size
       end
-
-      def fetch_data(attempt = 1, skip_verify = false)
-        uri = URI.parse(rels[:file].href)
-        opts = REQUEST_OPTS.merge({
-          verify_mode: skip_verify ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER,
-          use_ssl: uri.port == 443
-        })
-
-        Net::HTTP.start(uri.host, uri.port, opts) do |http|
-          resp = http.get(uri.path)
-          raise "Invalid response: #{resp.code}" unless resp.code.to_i == 200
-          resp.body
-        end
-      rescue Net::OpenTimeout, Net::ReadTimeout => e
-        raise if attempt > 3 # max attempts
-        # puts "#{e.class} for #{File.basename(uri.path)}! Retrying request..."
-        fetch_data(attempt + 1)
-      rescue OpenSSL::SSL::SSLError => e
-        # retry but skipping verification
-        fetch_data(attempt + 1, true)
-      end
     end
 
     class APITheme

data/lib/bootic_cli/themes/fs_theme.rb

@@ -30,12 +30,16 @@ module BooticCli
       end
 
       ASSETS_DIR = 'assets'.freeze
-      TEMPLATE_PATTERNS = ['sections/*.html', '*.html', '*.css', '*.js', '*.json', '*.yml'].freeze
+      TEMPLATE_PATTERNS = [
+        '*.html', '*.css', '*.js', '*.json', '*.yml',
+        'sections/*.html', 'partials/*.html', 'data/*.json', 'data/*.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
+      SECTION_PATH_REGEX = /^(sections|partials)\/[^\/]+\.html$/.freeze
+      DATA_PATH_REGEX = /^data\/[^\/]+\.(json|yml)$/.freeze
 
       def self.resolve_path(path, dir)
         File.expand_path(path).sub(File.expand_path(dir) + '/', '')
@@ -48,7 +52,7 @@ module BooticCli
 
         if relative_path[ASSET_PATH_REGEX]
           :asset
-        elsif relative_path[TEMPLATE_PATH_REGEX] || relative_path[SECTION_PATH_REGEX]
+        elsif relative_path[TEMPLATE_PATH_REGEX] || relative_path[SECTION_PATH_REGEX] || relative_path[DATA_PATH_REGEX]
           :template
         end
       end
@@ -104,7 +108,7 @@ module BooticCli
 
       def templates
         @templates ||= (
-          paths_for(TEMPLATE_PATTERNS).sort.map do |path|
+          paths_for(TEMPLATE_PATTERNS).map do |path|
             name = self.class.resolve_path(path, dir)
             file = File.new(path)
             Template.new(name, file.read, file.mtime.utc)

data/lib/bootic_cli/themes/workflows.rb

@@ -400,7 +400,7 @@ module BooticCli
           prompt.say("Got an unknown response from server: #{e.message}. Please try again in a minute.", :red)
           exit
 
-        rescue SocketError, Net::OpenTimeout, Net::ReadTimeout => e
+        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
 

data/lib/bootic_cli/utils.rb

@@ -0,0 +1,33 @@
+require 'net/http'
+
+module BooticCli
+  module Utils
+    REQUEST_OPTS = {
+      open_timeout: 5,
+      read_timeout: 5
+    }.freeze
+
+    MAX_FETCH_ATTEMPTS = 3
+
+    def self.fetch_http_file(href, attempt: 1, skip_verify: false)
+      uri = URI.parse(href)
+      opts = REQUEST_OPTS.merge({
+        verify_mode: skip_verify ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER,
+        use_ssl: uri.port == 443
+      })
+
+      Net::HTTP.start(uri.host, uri.port, opts) do |http|
+        resp = http.get(uri.path)
+        raise "Invalid response: #{resp.code}" unless resp.code.to_i == 200
+        StringIO.new(resp.body)
+      end
+    rescue Net::OpenTimeout, Net::ReadTimeout => e
+      raise if attempt > MAX_FETCH_ATTEMPTS # max attempts
+      # puts "#{e.class} for #{File.basename(uri.path)}! Retrying request..."
+      fetch_http_file(href, attempt: attempt + 1)
+    rescue OpenSSL::SSL::SSLError => e
+      # retry but skipping verification
+      fetch_http_file(href, attempt: attempt + 1, skip_verify: true)
+    end
+  end
+end

data/lib/bootic_cli/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Ismael Celis
 - Tomás Pollak
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-26 00:00:00.000000000 Z
+date: 2025-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.x
 - !ruby/object:Gem::Dependency
   name: bootic_client
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +160,7 @@ files:
 - lib/bootic_cli/themes/theme_selector.rb
 - lib/bootic_cli/themes/updated_theme.rb
 - lib/bootic_cli/themes/workflows.rb
+- lib/bootic_cli/utils.rb
 - lib/bootic_cli/version.rb
 - lib/bootic_cli/worker_pool.rb
 - libexec/inspector
@@ -187,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Bootic command-line client.
 test_files: []