pushmi_pullyu 0.2.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 392efadaf852092c534f920017037957bb22436c
4
- data.tar.gz: e297ea545d6c31ad594721d9c952e9e6a0ccf719
3
+ metadata.gz: 3b34bdd0883ef4592a5ff948064f97a5a3dc77ef
4
+ data.tar.gz: 22d0a614987f7f7eea846c35202caa660e9ffb56
5
5
  SHA512:
6
- metadata.gz: 751a8b7ce779203c369a41680cb45b394cb67062ff6fdf9c1e944015633ff3feeef50992a8a0b6ee7cc764c270bacad76d407c5b5c9737479417d64b7c6dab57
7
- data.tar.gz: 1e2343f0960560cdfc512ddc5a447b1dd80cafd6efae98b16bb39937d01a4798a4f49eb33ce9a7174c23f8d83d8af1578c9b2f889d29593265cff8bff891f56c
6
+ metadata.gz: 2eea2aedc38f64a591c8110b0c398b1b2a88374c326f81b02df4e5477480a9f7345fe057a628d9c1bc2e704cf1ef5ef7cfcb91848667de370ba855082f907fe7
7
+ data.tar.gz: 182be508058f421542cd6ad9c498a0c6324fd001ef76a1b1a135800d176112d7bae5db3707dc596f8f075d959eb2846c0b38c886f3cb91e6492885178f20b047
@@ -23,12 +23,6 @@ class PushmiPullyu::SwiftDepositer
23
23
 
24
24
  era_container = swift_connection.container(swift_container)
25
25
 
26
- deposited_file = if era_container.object_exists?(file_base_name)
27
- era_container.object(file_base_name)
28
- else
29
- era_container.create_object(file_base_name)
30
- end
31
-
32
26
  # Add swift metadata with in accordance to AIP spec:
33
27
  # https://docs.google.com/document/d/154BqhDPAdGW-I9enrqLpBYbhkF9exX9lV3kMaijuwPg/edit#
34
28
  metadata = {
@@ -41,9 +35,15 @@ class PushmiPullyu::SwiftDepositer
41
35
  # ruby-openstack wants all keys of the metadata to be named like "X-Object-Meta-{{Key}}", so update them
42
36
  metadata.transform_keys! { |key| "X-Object-Meta-#{key}" }
43
37
 
44
- deposited_file.write(File.open(file_name),
45
- { 'etag' => checksum,
46
- 'content-type' => 'application/x-tar' }.merge(metadata))
38
+ headers = { 'etag' => checksum,
39
+ 'content-type' => 'application/x-tar' }.merge(metadata)
40
+
41
+ if era_container.object_exists?(file_base_name)
42
+ deposited_file = era_container.object(file_base_name)
43
+ deposited_file.write(File.open(file_name), headers)
44
+ else
45
+ deposited_file = era_container.create_object(file_base_name, headers, File.open(file_name))
46
+ end
47
47
 
48
48
  deposited_file
49
49
  end
@@ -1,3 +1,3 @@
1
1
  module PushmiPullyu
2
- VERSION = '0.2.0'.freeze
2
+ VERSION = '0.2.1'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pushmi_pullyu
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shane Murnaghan
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-06-08 00:00:00.000000000 Z
11
+ date: 2017-06-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport