bootic_cli 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fbe63e3f8892b9be422288d367464522beb7bcfd
-  data.tar.gz: 2d9849bf9eb82a019a5982b004d73a56ae1d659c
+SHA256:
+  metadata.gz: 19dcc9147bd84c2b93d61e879276f62c9a2f6cd9eaa5743c6253ac0fa228e2e7
+  data.tar.gz: 5d8b8b62298052e7e1288c56f6157a52074f3f206acc8ef6d54387dc280ed7a4
 SHA512:
-  metadata.gz: 2638f38d560a340c7728f5a98a8b0423742516cbe85a147f6aec63ed6fd3eeed6e9a6d630c24b193d729a56917826e9d53f7715808321cc98e39cf1e9f3836ef
-  data.tar.gz: 7904fa01e25336adc20f4a7f53f35a84f0ce28b84861192c27aa3637b20eaf8bf2861905a24b169394a2f067693b067093f40687a828d98b7849aebe2b00062d
+  metadata.gz: a39d8dc64b83fd85cfbfeb2560804ed4339a008593074e8145c65c91c9fd054465681d79948776e8bc22f632e4d4605864e10f39bf12817d9254e6187fc00419
+  data.tar.gz: c7c5cff0786564b00ece4d3135a246f401115eba87f348912b8c177a2e85b4e359c91ba006c29887f13a98c097d84efc4d97315474925e7fe56e05578dcad815

data/lib/bootic_cli/cli.rb

@@ -177,7 +177,12 @@ module BooticCli
         IRB.conf[:PROMPT_MODE] = :CUSTOM
         IRB.conf[:AUTO_INDENT] = false
 
-        IRB.irb nil, context
+        begin
+          IRB.irb nil, context
+        rescue ThreadError => e
+          # puts "#{e.class} -> #{e.message}"
+          exit(1)
+        end
       end
     end
 

data/lib/bootic_cli/themes/api_theme.rb

@@ -27,17 +27,17 @@ module BooticCli
       def ==(other)
         if digest.to_s == '' || other.digest.to_s == ''
           # puts "One or the other digest is empty: #{digest} -- #{other.digest}"
-          return super 
+          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)
+      def fetch_data(attempt = 1, skip_verify = false)
         uri = URI.parse(rels[:file].href)
         opts = REQUEST_OPTS.merge({
-          # verify_mode: OpenSSL::SSL::VERIFY_PEER # OpenSSL::SSL::VERIFY_NONE
+          verify_mode: skip_verify ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER,
           use_ssl: uri.port == 443
         })
 
@@ -50,6 +50,9 @@ module BooticCli
         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
 
@@ -113,7 +116,12 @@ module BooticCli
 
       def remove_template(file_name)
         tpl = theme.templates.find { |t| t.file_name == file_name }
-        check_errors!(tpl.delete_template) if tpl && tpl.can?(:delete_template)
+        if tpl && tpl.can?(:delete_template)
+          res = tpl.delete_template
+          check_errors!(res) if res.respond_to?(:can?)
+        else
+          puts "Cannot delete #{file_name}"
+        end
       end
 
       def add_asset(file_name, file)
@@ -124,8 +132,13 @@ module BooticCli
       end
 
       def remove_asset(file_name)
-        asset = theme.assets.find{|t| t.file_name == file_name }
-        check_errors!(asset.delete_theme_asset) if asset
+        asset = theme.assets.find { |t| t.file_name == file_name }
+        if asset and asset.can?(:delete_theme_asset)
+          res = asset.delete_theme_asset
+          check_errors!(res) if res.respond_to?(:can?)
+        else
+          puts "Cannot delete asset: #{file_name}"
+        end
       end
 
       private

data/lib/bootic_cli/themes/workflows.rb

@@ -267,15 +267,21 @@ module BooticCli
       end
 
       def remove_all(from, to)
-        from.templates.each { |f| to.remove_template(f.file_name) }
-        from.assets.each { |f| to.remove_asset(f.file_name) }
+        from.templates.each do |f|
+          puts "Removing template #{highlight(f.file_name)}"
+          to.remove_template(f.file_name)
+        end
+        from.assets.each do |f|
+          puts "Removing asset #{highlight(f.file_name)}"
+          to.remove_asset(f.file_name)
+        end
       end
 
       def copy_templates(from, to, opts = {})
         from.templates.each do |t|
           handle_file_errors(:template, t) do
             to.add_template(t.file_name, t.body)
-            puts "Copied #{highlight(t.file_name)}"
+            puts "Copied template #{highlight(t.file_name)}"
           end
         end
       end
@@ -332,6 +338,8 @@ module BooticCli
           theme.remove_template(file_name)
         when :asset
           theme.remove_asset(file_name)
+        else
+          raise "Invalid type: #{type}"
         end
         puts "Deleted remote #{type}: #{highlight(file_name)}"
       end
@@ -361,7 +369,7 @@ module BooticCli
           prompt.say("#{file.file_name} looks like a binary file, not a template. Skipping...", :red)
           # abort
 
-        rescue Net::OpenTimeout, Net::ReadTimeout => e 
+        rescue Net::OpenTimeout, Net::ReadTimeout => e
           prompt.say("I'm having trouble connecting to the server. Please try again in a minute.", :red)
           abort
 

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Ismael Celis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Bootic command-line client.