bootic_cli 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d367fc55f094ab200cc69836ed66a79c153ce766
-  data.tar.gz: a3aeee896b866038b588991bab6bb742a1c7114b
+SHA256:
+  metadata.gz: cd67c5e244fa152afde49d0ded817c9733d6ce640aee72c14854f635566e0a43
+  data.tar.gz: 51b29bf4e75a6f597887198fbdfa66df41301370f2a3169de0f4bcba363b755b
 SHA512:
-  metadata.gz: f057c66358b85c1ceb1d58e874922a5ceec891aca95e9039e7a784d36d7fdb97662345d633e868d56eac19f7e0b09e95654ba3fe2fc5602120a5c808320f8498
-  data.tar.gz: e5ff8006d9b702befaf184822258306c194a947841ad5af8e7b3fa923ba5d4b0c6ca98cfa5df92e7c03f67fe5ddf91e3c9383c66a5455344f9216d60fb492cb2
+  metadata.gz: 4e6094bca75a4a68b4a94a80180e543fdae6286612a8697fb66662821e896b3b4008ed2abb0a62c4ea89c64f0346b3efe8a57ac583467151d359531b708ffff5
+  data.tar.gz: 1e32cc79ee74403371a7b5daeecc6355a32db967559701f7d262b5509baea3d74c4a5a0224c1dec395063a00e97850aeebbf85023d9266e4ceaa0aae47144988

data/lib/bootic_cli/themes/api_theme.rb

@@ -14,17 +14,37 @@ module BooticCli
     end
 
     class APIAsset < ItemWithTime
+      REQUEST_OPTS = {
+        open_timeout: 5,
+        read_timeout: 5
+      }
+
       def file
-        @file ||= (
-          data = Net::HTTP.get(URI.parse(rels[:file].href))
-          StringIO.new(data)
-        )
+        @file ||= StringIO.new(fetch_data)
       end
 
       def ==(other)
         return super if digest.to_s == '' || other.digest.to_s == ''
         self.file_size == other.file_size && self.digest == other.digest
       end
+
+      def fetch_data(attempt = 1)
+        uri = URI.parse(rels[:file].href)
+        opts = REQUEST_OPTS.merge({
+          # verify_mode: OpenSSL::SSL::VERIFY_PEER # OpenSSL::SSL::VERIFY_NONE
+          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)
+      end
     end
 
     class APITheme

data/lib/bootic_cli/themes/mem_theme.rb

@@ -2,7 +2,7 @@ module BooticCli
   module Themes
     class MemTheme
       Template = Struct.new(:file_name, :body, :updated_on)
-      ThemeAsset = Struct.new(:file_name, :file, :updated_on)
+      ThemeAsset = Struct.new(:file_name, :file, :updated_on, :file_size)
 
       def initialize
         reload!
@@ -26,7 +26,7 @@ module BooticCli
 
       def add_template(file_name, body, mtime: Time.now)
         tpl = Template.new(file_name, body, mtime)
-        if idx = templates.index{|t| t.file_name == file_name }
+        if idx = templates.index { |t| t.file_name == file_name }
           templates[idx] = tpl
         else
           templates << tpl
@@ -34,14 +34,14 @@ module BooticCli
       end
 
       def remove_template(file_name)
-        if idx = templates.index{|t| t.file_name == file_name }
+        if idx = templates.index { |t| t.file_name == file_name }
           templates.delete_at idx
         end
       end
 
       def add_asset(file_name, file, mtime: Time.now)
         asset = ThemeAsset.new(file_name, file, mtime)
-        if idx = assets.index{|t| t.file_name == file_name }
+        if idx = assets.index { |t| t.file_name == file_name }
           assets[idx] = asset
         else
           assets << asset
@@ -49,7 +49,7 @@ module BooticCli
       end
 
       def remove_asset(file_name)
-        if idx = assets.index{|t| t.file_name == file_name }
+        if idx = assets.index { |t| t.file_name == file_name }
           assets.delete_at idx
         end
       end

data/lib/bootic_cli/themes/workflows.rb

@@ -274,7 +274,7 @@ module BooticCli
       def copy_templates(from, to, opts = {})
         from.templates.each do |t|
           to.add_template t.file_name, t.body
-          puts "Copied #{t.file_name}"
+          puts "Copied #{highlight(t.file_name)}"
         end
       end
 
@@ -297,7 +297,7 @@ module BooticCli
         files.each do |a|
           pool.schedule do
             to.add_asset a.file_name, a.file
-            puts "Copied asset #{a.file_name}"
+            puts "Copied asset #{highlight(a.file_name)} (#{a.file_size} bytes)"
           end
         end
 

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Ismael Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Bootic command-line client.