bits_service_client 0.3.2 → 2.0.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 070b68ab65a8f241bc20dea88acccdeed3606fde
-  data.tar.gz: 7622faacb43ca9c44d96b7a3ef6b7d8c24c4ea60
+  metadata.gz: fdfa2fa5067f15c29f8b4c76ab9acf3c483615bb
+  data.tar.gz: bc04fd40537a4e4fb93d46aa9ceab36c98b3aee2
 SHA512:
-  metadata.gz: 3a842ec2c61158a8a514d05838346d6206bbed3752bdf03fcdf14994937f0d0c05a68b66e7ecd7098c7bbaee71b6c728b0e156dcee89030af8f47dc20698a3b8
-  data.tar.gz: 6ce2b9d646ddd8fcbb2b4d577fe0f20920449dbc0f2828c075c0362834e9f6a50ce2859f6ee420d55dd01365205ec266b4ab210c7be927fb2e35e3b8c0e0ff5b
+  metadata.gz: a74e284649cddb7723e944d7bf5912818b72db734f724b5b95b0885a49b137b1e20df7f4893a220c4b5a6e6a4eb78c509869a675b66210f5f8cf0dea406eca76
+  data.tar.gz: 5e4bdf88df7c5e649fbfbeda92e1e17f3f09c8125af04df96cdce4f5e7d21d3389a86461932d8f75c86bcf15982e7a90e2cff629fd4e3ddc03fb674b1be3b01f

data/.ruby-version

@@ -0,0 +1 @@
+2.4.2

data/lib/bits_service_client/client.rb

@@ -165,7 +165,7 @@ module BitsService
         response: response
       }.to_json
 
-      logger.error("UnexpectedResponseCode: expected '#{expected_codes}' got #{error}")
+      logger.error("UnexpectedResponseCode: expected '#{expected_codes}' got #{response.code}")
 
       fail BlobstoreError.new(error)
     end

data/lib/bits_service_client/resource_pool.rb

@@ -15,15 +15,13 @@ module BitsService
       end
     end
 
-    def upload_entries(entries_path)
-      with_file_attachment!(entries_path, 'entries.zip') do |file_attachment|
-        body = { application: file_attachment }
-        multipart_post('/app_stash/entries', body, @vcap_request_id)
-      end
-    end
-
-    def bundles(resources_json)
-      post('/app_stash/bundles', resources_json, @vcap_request_id).tap do |response|
+    def bundles(resources_json, entries_path)
+      validate_file! entries_path
+      body = {
+        resources: UploadIO.new(StringIO.new(resources_json),'application/json', 'resources.json'),
+        application: UploadIO.new(entries_path, 'application/octet-stream', 'entries.zip')
+      }
+      multipart_post('/app_stash/bundles', body, @vcap_request_id).tap do |response|
         validate_response_code!(200, response)
       end
     end
@@ -41,20 +39,11 @@ module BitsService
         response: response
       }.to_json
 
-      @logger.error("UnexpectedResponseCode: expected #{expected} got #{error}")
+      @logger.error("UnexpectedResponseCode: expected #{expected} got #{response.code}")
 
       fail Errors::UnexpectedResponseCode.new(error)
     end
 
-    def with_file_attachment!(file_path, filename, &block)
-      validate_file! file_path
-
-      File.open(file_path) do |file|
-        attached_file = UploadIO.new(file, 'application/octet-stream', filename)
-        yield attached_file
-      end
-    end
-
     def validate_file!(file_path)
       return if File.exist?(file_path)
 
@@ -69,10 +58,7 @@ module BitsService
     end
 
     def multipart_post(path, body, vcap_request_id)
-      request = Net::HTTP::Post::Multipart.new(path, body)
-      do_request(http_client, request, vcap_request_id).tap do |response|
-        validate_response_code!(201, response)
-      end
+      do_request(http_client, Net::HTTP::Post::Multipart.new(path, body), vcap_request_id)
     end
 
     def do_request(http_client, request, vcap_request_id)

data/lib/bits_service_client/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module BitsServiceClient
-  VERSION = '0.3.2'
+  VERSION = '2.0.0.pre.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bits_service_client
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 2.0.0.pre.1
 platform: ruby
 authors:
 - Rizwan Reza
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -166,6 +166,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -194,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