bosh_cli 1.3022.0 → 1.3025.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aa4b94a31d6b9cb57254332d70d2ecba1705b7e
-  data.tar.gz: 01fc768fedefe96eb9429c85717fac4ec420416c
+  metadata.gz: 0cc1c3ff3f779d8e7901fea7632fa7f02503e89e
+  data.tar.gz: a279e605afeca4a4a44cb617ce69fbb717e48994
 SHA512:
-  metadata.gz: 7da0c31dd8af0357a07af50bb6c986f57e60ac16dde1dad720816e4f820fa5dfd82391df514380e0558db6fec28ce905259ff75e0be2050d9eda822b06040c03
-  data.tar.gz: 7d7b108c19c985b0a874920c2085d5e77ebba323dbd8cb5a284458da4311a41cb46e147a034cee735795e3a20756869f97f46150bc3e816bd31f4b5a77497be3
+  metadata.gz: 9967ce51655bdc168cf53943b2c2b3e358497c81c76e801ed28b85d11aea4f3ace101a416cd471e3693c1e0dc8bad7eb8556ad41bb04479fc92d62c69d4c8dd2
+  data.tar.gz: 6d13a351862d24cef92af7fe3d804d657964a89bc6c404061baac4783e3ba9b83bb62416b3e4d3d23a706c0336623a37beb8c0cf2fdfd8f6e4efa8b3e9099cac

data/lib/cli/client/director.rb

@@ -613,7 +613,7 @@ module Bosh
 
         def releases_path(options = {})
           path = '/releases'
-          params = [:rebase, :skip_if_exists, :compiled].select { |p| options[p] }.map { |p| "#{p}=true" }
+          params = [:rebase, :skip_if_exists].select { |p| options[p] }.map { |p| "#{p}=true" }
           path << "?#{params.join('&')}" unless params.empty?
           path
         end

data/lib/cli/commands/release/upload_release.rb

@@ -19,7 +19,16 @@ module Bosh::Cli::Command
           :skip_if_exists => options[:skip_if_exists],
         }
 
-        if release_file.nil?
+        #only check release_dir if not compiled release tarball
+        file_type = `file --mime-type -b '#{release_file}'`
+
+        compiled_release = false
+        if file_type == /application\/x-gzip/
+          tarball = Bosh::Cli::ReleaseTarball.new(tarball_path)
+          compiled_release = tarball.compiled_release?
+        end
+
+        if release_file.nil? and !compiled_release
           check_if_release_dir
           release_file = release.latest_release_filename
           if release_file.nil?
@@ -135,7 +144,7 @@ module Bosh::Cli::Command
           report = tarball.compiled_release? ? 'Compiled Release uploaded' : 'Release uploaded'
         end
 
-        status, task_id = director.upload_release(tarball_path, {rebase: rebase, compiled: tarball.compiled_release?})
+        status, task_id = director.upload_release(tarball_path, {rebase: rebase})
         task_report(status, task_id, report)
       end
 

data/lib/cli/release_tarball.rb

@@ -6,9 +6,6 @@ module Bosh::Cli
     attr_reader :release_name, :jobs, :packages, :version
     attr_reader :skipped, :unpack_dir # Mostly for tests
 
-    @compiled_release = false
-    @packages_folder = "packages"
-
     def initialize(tarball_path)
       @tarball_path = File.expand_path(tarball_path, Dir.pwd)
       @unpack_dir   = Dir.mktmpdir

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3022.0'
+    VERSION = '1.3025.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3022.0
+  version: 1.3025.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  6073a7
+  37d29e
 email: support@cloudfoundry.com
 executables:
 - bosh