provide-ruby 0.47.0 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec6928b05313600fcbbb95d4752e43bc80d238c4
-  data.tar.gz: 7ddd610abff05b11300e93ff937ce549dde280e4
+  metadata.gz: 68c84c5069f300e92f8508baed25a76628d9dafe
+  data.tar.gz: 3fce87065b8a1c4dbe2cd5d253f8a064364acc3a
 SHA512:
-  metadata.gz: e7c681e501c8baeb3a5f4be32293c9f4cbb5229cd7d82cbc3e946bb921875e7a65ad5aecebac9cd42ea4421b10ceb5c4bfdc6e0ecc00f662f1e646ea6b7e8b1f
-  data.tar.gz: 0ff43e8e28f0559d3d99a87838396f944e10657be46700458873ab8a0df538325a284f62d2fcef73327ec19e1d80df3497773a2a6ef85562a5a6b10857f1aefe
+  metadata.gz: 0353d05787bab6270e3ff309d5d9d6939660bd0205f56129d551dbd4ed8d86bcbd561dc89ee3243ca6d06b36c2d096efa6be4e938c4faf46f0ff0a7405ff3078
+  data.tar.gz: 37283b3702fdedc0dcdc2e1681737c7fb0a23f4580b30decc1f73733ce8512d15cc251ba309a7708831bc33ebb77b07f41c96bdcbac4f205cab437505b93bffb

data/lib/provide-ruby/services/bookie.rb

@@ -44,31 +44,18 @@ module Provide
 
       def client
         @client ||= begin
-<<<<<<< HEAD
         Provide::ApiClient.new(@scheme, @host, 'api/v1/', @token)
-=======
-          Provide::ApiClient.new(@scheme, @host, 'api/v1/', @token)
->>>>>>> Add bookie service
         end
       end
 
       def parse(response)
         begin
-<<<<<<< HEAD
-        body = response.code == 204 ? nil : JSON.parse(response.body)
-        return response.code, response.headers, body
-        rescue
-        raise Exception.new({
-            :code => response.code,
-        })
-=======
           body = response.code == 204 ? nil : JSON.parse(response.body)
           return response.code, body
         rescue
           raise Exception.new({
             :code => response.code,
           })
->>>>>>> Add bookie service
         end
       end
     end

data/lib/provide-ruby/version.rb

@@ -1,3 +1,3 @@
 module Provide
-  VERSION = '0.47.0'
+  VERSION = '0.48.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: provide-ruby
 version: !ruby/object:Gem::Version
-  version: 0.47.0
+  version: 0.48.0
 platform: ruby
 authors:
 - Kyle Thomas