bits_service_client 3.1.0 → 3.2.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44fbc9a0fec22bc71ed1ca9e9decf630b8b81873
-  data.tar.gz: 838f854375bd5f408bdb6c9d5f446fd620ec5efd
+  metadata.gz: 44e82c59bafd111f31c71bee2ad4394f96114289
+  data.tar.gz: 345531e83292d27d85d041c7cd9f9ccbbcecf06f
 SHA512:
-  metadata.gz: d2b6485026adc2db6b381bac0f3c74677ef6adbdd51e3e350ccf32f443a96a80e16d363385af268bca7f4a16a8f1ca9096bfe10add56ae992f0e71b7843c2865
-  data.tar.gz: e05527c375042d04fa43a9d0c3337ce09ce2ebb5d66f1dddc1615638ae9f9d96c7ed468857dce74f125ee4f84941718e4723c9d8abded15c7d015004a0326daf
+  metadata.gz: 94d69cc843e90f3a66fe03181d93a6454f3ec35549efbc32ed441febd0d07dbb9ef6976f01c3c850684a3992db7c89ff9c816d1b50f65c1c2df455e597314279
+  data.tar.gz: fbe522713d8379704f999fe0b2ca80cbef68d7bd417b3c0c3e7c4336bf1e94cbdb3b9537a708e2993d558f8e92ce0ebf5d1719c8f7d2d6495b255433089ef1e2

data/lib/bits_service_client/client.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 require 'active_support/inflector'
 require 'bits_service_client/logging_http_client'
+require 'tmpdir'
+require "open3"
 
 module BitsService
   class Client
@@ -33,29 +35,39 @@ module BitsService
     end
 
     def cp_to_blobstore(source_path, destination_key, resources: nil)
-      filename = File.basename(source_path)
-      with_file_attachment!(source_path, filename) do |file_attachment|
-        body = { :"#{@resource_type.to_s.singularize}" => file_attachment }
-
-        if resources != nil
-          body[:resources] = resources.to_json
+      if source_path.to_s.empty?
+        file = Tempfile.new(['empty', '.zip'])
+        source_path = file.path
+        file.close!
+        Dir.mktmpdir do |dir|
+          output, error, status = Open3.capture3(%(/usr/bin/zip #{source_path} #{dir}))
+          unless status.success?
+            logger.error("Could not create a zip with no contents.\n STDOUT: \"#{output}\"\n STDERR: \"#{error}\"")
+            raise Errors::Error.new('Could not create a zip with no contents')
+          end
         end
+      end
 
-        response = @private_http_client.do_request(Net::HTTP::Put::Multipart.new(resource_path(destination_key), body), @vcap_request_id)
-        validate_response_code!(201, response)
-        if response.body == nil
-          logger.error("UnexpectedMissingBody: expected body with json payload. Got empty body.")
+      body = { :"#{@resource_type.to_s.singularize}" => UploadIO.new(source_path, 'application/octet-stream') }
 
-          fail BlobstoreError.new({
-            response_code: response.code,
-            response_body: response.body,
-            response: response
-          }.to_json)
-        end
-        shas = JSON.parse(response.body, symbolize_names: true)
-        validate_keys_present!([:sha1, :sha256], shas, response)
-        return shas
+      if resources != nil
+        body[:resources] = resources.to_json
       end
+
+      response = @private_http_client.do_request(Net::HTTP::Put::Multipart.new(resource_path(destination_key), body), @vcap_request_id)
+      validate_response_code!(201, response)
+      if response.body == nil
+        logger.error("UnexpectedMissingBody: expected body with json payload. Got empty body.")
+
+        fail BlobstoreError.new({
+          response_code: response.code,
+          response_body: response.body,
+          response: response
+        }.to_json)
+      end
+      shas = JSON.parse(response.body, symbolize_names: true)
+      validate_keys_present!([:sha1, :sha256], shas, response)
+      return shas
     end
 
     def download_from_blobstore(source_key, destination_path, mode: nil)
@@ -204,15 +216,6 @@ module BitsService
       File.join('/', prefix.to_s, guid.to_s)
     end
 
-    def with_file_attachment!(file_path, filename, &block)
-      raise Errors::FileDoesNotExist.new("Could not find file: #{file_path}") unless File.exist?(file_path)
-
-      File.open(file_path) do |file|
-        attached_file = UploadIO.new(file, 'application/octet-stream', filename)
-        yield attached_file
-      end
-    end
-
     def endpoint(http_client)
       http_client == @public_http_client ? @public_endpoint : @private_endpoint
     end

data/lib/bits_service_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BitsServiceClient
-  VERSION = '3.1.0'
+  VERSION = '3.2.0.pre.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bits_service_client
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0.pre.1
 platform: ruby
 authors:
 - Rizwan Reza
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -195,9 +195,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14.1