hammer_cli_katello 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c986520c7269bb372ae951449583bb5a9ecdc176
-  data.tar.gz: e907badfbd1b54a1d210de801c1c6109a1725e50
+  metadata.gz: 4556bee10b52aedbf3caa32c550a164d21ff2ca7
+  data.tar.gz: 667182ec87a5e00546aca103c4edb87d7aeac9b5
 SHA512:
-  metadata.gz: 7cf1fa2ba30493f3df29ffb603d799ed22707bc4531984a98435dbc032656fe917e28b8aeecd82c45b6f5e76b456620bd20f1e18c425a5a660add29ac18b00cb
-  data.tar.gz: 51e0bb6f6a08bce5b49f03d0101fa605bba935fc7fdae225685bb421c38a83302d12642f3a62aa0a8936f3c0eb61811e46113c5ad481455d9ec29fb23b8739b2
+  metadata.gz: b9e0a2894fad21f851f1c82393cc99515846e0175e0aecbd5a46c2fba5867f102359c4e49b2cc520e7ed848bf963af2ad5760776c1c1fd514b0524a1f1eef196
+  data.tar.gz: 71da3a347a16002c09230ccce59b0e65ed0e5225c31fe7e2a4f8808b0f395631d8ae018e63bf94198424e276e7c7eb92480f2590f2e33d8edd5e3d21f32304a9

data/lib/hammer_cli_katello/repository.rb

@@ -238,8 +238,9 @@ module HammerCLIKatello
           }
         ], last_file: true)
         print_message _("Repository updated")
-      rescue
+      rescue => e
         @failure = true
+        logger.error e
         output.print_error _("Failed to upload tag '%s' to repository.") % tag
       ensure
         content_upload_resource.call(:destroy, :repository_id => get_identifier, :id => upload_id)
@@ -282,7 +283,7 @@ module HammerCLIKatello
 
       resource :repositories, :upload_content
       command_name "upload-content"
-      CONTENT_CHUNK_SIZE = 4_000_000 # bytes
+      CONTENT_CHUNK_SIZE = 2_500_000 # bytes to make sure it's lower than django's default 2621440
 
       class BinaryPath < HammerCLI::Options::Normalizers::File
         def format(path)
@@ -379,8 +380,9 @@ module HammerCLIKatello
         ], opts)
 
         print_results(filename, results)
-      rescue
+      rescue => e
         @failure = true
+        logger.error e
         output.print_error _("Failed to upload file '%s' to repository. Please check "\
                              "the file and try again.") % filename
       ensure
@@ -405,7 +407,11 @@ module HammerCLIKatello
             :multipart => true
           }
 
-          content_upload_resource.call(:update, params, request_headers)
+          # To workaround rest-client bug with false negative warnings,
+          # see https://github.com/rest-client/rest-client/pull/670 for more details
+          silence_warnings do
+            content_upload_resource.call(:update, params, request_headers)
+          end
           offset += CONTENT_CHUNK_SIZE
         end
       end
@@ -441,6 +447,16 @@ module HammerCLIKatello
           end
         end
       end
+
+      def silence_warnings
+        original_verbose = $VERBOSE
+        $VERBOSE = nil
+        begin
+          yield
+        ensure
+          $VERBOSE = original_verbose
+        end
+      end
     end
     # rubocop:enable ClassLength
 

data/lib/hammer_cli_katello/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIKatello
   def self.version
-    @version ||= Gem::Version.new('0.13.3')
+    @version ||= Gem::Version.new('0.13.4')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Adam Price
@@ -34,7 +34,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman