bosh_cli 1.3147.0 → 1.3148.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/cli.rb +1 -0
  3. data/lib/cli/commands/release/upload_release.rb +1 -1
  4. data/lib/cli/release_tarball.rb +12 -9
  5. data/lib/cli/version.rb +1 -1
  6. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5af72447c3783652381af6e46241865c048dacba
4
- data.tar.gz: 2fcf5235942a879dcafdf03b7561a9d6cc7d64a8
3
+ metadata.gz: 409b77b1cb36c4302ac029ad18ff9507aa635369
4
+ data.tar.gz: dd0729c268dcec4f195c09496356b456c937f4b4
5
5
  SHA512:
6
- metadata.gz: 95dab00041cb7a86a7b5f3c6475154c3c46910555cd892afc81f3426cb66effce7d1bbc53e642d04fe87c18c62a57ab787a8a618faa154385d9f5734b3aa9102
7
- data.tar.gz: 1aa30f427fde8d48750ff3dd1581822bbd46a5c0e8b493f07f09cf47f57934a6c836ba2ea2893b0249db97b1da0f6d4a6dcfd3969cf6fbacf84b81f4ca1fa56b
6
+ metadata.gz: 105b1c0801f3eedf307595ea2c827762e3d065aec01a677eeb979078366fd8b6cf7e2310be8a6e1f9aa6c65dc15a0fe3a2864f7ed15458853c3518119353bb73
7
+ data.tar.gz: 1d45ebac80a4d10559ec3a4bd2d553c31785e364ddf20ddb452897781f0055516769c1833a2cacc886af80b9a8102af6d6c8024a7db9fdb3ff24693cd732e018
data/lib/cli.rb CHANGED
@@ -30,6 +30,7 @@ autoload :YAML, 'yaml'
30
30
  require 'netaddr'
31
31
  require 'zlib'
32
32
  require 'archive/tar/minitar'
33
+ require 'open3'
33
34
  include Archive::Tar
34
35
 
35
36
  require 'semi_semantic/version'
data/lib/cli/commands/release/upload_release.rb CHANGED
@@ -80,7 +80,7 @@ If --name & --version are provided, they will be used for checking if release ex
80
80
  private
81
81
 
82
82
  def upload_manifest(manifest_path, upload_options = {})
83
- package_matches = match_remote_packages(File.read(manifest_path))
83
+ package_matches = upload_options[:fix] ? [] : match_remote_packages(File.read(manifest_path))
84
84
 
85
85
  find_release_dir(manifest_path)
86
86
 
data/lib/cli/release_tarball.rb CHANGED
@@ -38,16 +38,19 @@ module Bosh::Cli
38
38
  end
39
39
 
40
40
  def fast_unpack(target)
41
- if RUBY_PLATFORM =~ /linux/
42
- system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "--occurrence", "#{target}", out: "/dev/null", err: "/dev/null")
43
- elsif RUBY_PLATFORM =~ /darwin/
44
- if target[-1, 1] == "/"
45
- system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
41
+ tar_version, _, _ = Open3.capture3('tar', '--version')
42
+
43
+ case tar_version
44
+ when /.*gnu.*/i
45
+ Kernel.system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "--occurrence", "#{target}", out: "/dev/null", err: "/dev/null")
46
+ when /.*bsd.*/i
47
+ if target[-1, 1] == "/"
48
+ Kernel.system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
49
+ else
50
+ Kernel.system("tar", "-C", @unpack_dir, "--fast-read", "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
51
+ end
46
52
  else
47
- system("tar", "-C", @unpack_dir, "--fast-read", "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
48
- end
49
- else
50
- system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
53
+ Kernel.system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
51
54
  end
52
55
  end
53
56
 
data/lib/cli/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Cli
3
- VERSION = '1.3147.0'
3
+ VERSION = '1.3148.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3147.0
4
+ version: 1.3148.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-12-01 00:00:00.000000000 Z
11
+ date: 2015-12-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.3147.0
19
+ version: 1.3148.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.3147.0
26
+ version: 1.3148.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bosh-template
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.3147.0
33
+ version: 1.3148.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.3147.0
40
+ version: 1.3148.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: cf-uaa-lib
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.3147.0
131
+ version: 1.3148.0
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.3147.0
138
+ version: 1.3148.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: net-ssh
141
141
  requirement: !ruby/object:Gem::Requirement