bosh_cli 1.3022.0 → 1.3025.0

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.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/cli/client/director.rb +1 -1
  3. data/lib/cli/commands/release/upload_release.rb +11 -2
  4. data/lib/cli/release_tarball.rb +0 -3
  5. data/lib/cli/version.rb +1 -1
  6. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6aa4b94a31d6b9cb57254332d70d2ecba1705b7e
4
- data.tar.gz: 01fc768fedefe96eb9429c85717fac4ec420416c
3
+ metadata.gz: 0cc1c3ff3f779d8e7901fea7632fa7f02503e89e
4
+ data.tar.gz: a279e605afeca4a4a44cb617ce69fbb717e48994
5
5
  SHA512:
6
- metadata.gz: 7da0c31dd8af0357a07af50bb6c986f57e60ac16dde1dad720816e4f820fa5dfd82391df514380e0558db6fec28ce905259ff75e0be2050d9eda822b06040c03
7
- data.tar.gz: 7d7b108c19c985b0a874920c2085d5e77ebba323dbd8cb5a284458da4311a41cb46e147a034cee735795e3a20756869f97f46150bc3e816bd31f4b5a77497be3
6
+ metadata.gz: 9967ce51655bdc168cf53943b2c2b3e358497c81c76e801ed28b85d11aea4f3ace101a416cd471e3693c1e0dc8bad7eb8556ad41bb04479fc92d62c69d4c8dd2
7
+ data.tar.gz: 6d13a351862d24cef92af7fe3d804d657964a89bc6c404061baac4783e3ba9b83bb62416b3e4d3d23a706c0336623a37beb8c0cf2fdfd8f6e4efa8b3e9099cac
data/lib/cli/client/director.rb CHANGED
@@ -613,7 +613,7 @@ module Bosh
613
613
 
614
614
  def releases_path(options = {})
615
615
  path = '/releases'
616
- params = [:rebase, :skip_if_exists, :compiled].select { |p| options[p] }.map { |p| "#{p}=true" }
616
+ params = [:rebase, :skip_if_exists].select { |p| options[p] }.map { |p| "#{p}=true" }
617
617
  path << "?#{params.join('&')}" unless params.empty?
618
618
  path
619
619
  end
data/lib/cli/commands/release/upload_release.rb CHANGED
@@ -19,7 +19,16 @@ module Bosh::Cli::Command
19
19
  :skip_if_exists => options[:skip_if_exists],
20
20
  }
21
21
 
22
- if release_file.nil?
22
+ #only check release_dir if not compiled release tarball
23
+ file_type = `file --mime-type -b '#{release_file}'`
24
+
25
+ compiled_release = false
26
+ if file_type == /application\/x-gzip/
27
+ tarball = Bosh::Cli::ReleaseTarball.new(tarball_path)
28
+ compiled_release = tarball.compiled_release?
29
+ end
30
+
31
+ if release_file.nil? and !compiled_release
23
32
  check_if_release_dir
24
33
  release_file = release.latest_release_filename
25
34
  if release_file.nil?
@@ -135,7 +144,7 @@ module Bosh::Cli::Command
135
144
  report = tarball.compiled_release? ? 'Compiled Release uploaded' : 'Release uploaded'
136
145
  end
137
146
 
138
- status, task_id = director.upload_release(tarball_path, {rebase: rebase, compiled: tarball.compiled_release?})
147
+ status, task_id = director.upload_release(tarball_path, {rebase: rebase})
139
148
  task_report(status, task_id, report)
140
149
  end
141
150
 
data/lib/cli/release_tarball.rb CHANGED
@@ -6,9 +6,6 @@ module Bosh::Cli
6
6
  attr_reader :release_name, :jobs, :packages, :version
7
7
  attr_reader :skipped, :unpack_dir # Mostly for tests
8
8
 
9
- @compiled_release = false
10
- @packages_folder = "packages"
11
-
12
9
  def initialize(tarball_path)
13
10
  @tarball_path = File.expand_path(tarball_path, Dir.pwd)
14
11
  @unpack_dir = Dir.mktmpdir
data/lib/cli/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Cli
3
- VERSION = '1.3022.0'
3
+ VERSION = '1.3025.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.3022.0
4
+ version: 1.3025.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-07-23 00:00:00.000000000 Z
11
+ date: 2015-07-27 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.3022.0
19
+ version: 1.3025.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.3022.0
26
+ version: 1.3025.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.3022.0
33
+ version: 1.3025.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.3022.0
40
+ version: 1.3025.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.3022.0
131
+ version: 1.3025.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.3022.0
138
+ version: 1.3025.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: net-ssh
141
141
  requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
306
306
  version: '0'
307
307
  description: |-
308
308
  BOSH CLI
309
- 6073a7
309
+ 37d29e
310
310
  email: support@cloudfoundry.com
311
311
  executables:
312
312
  - bosh