bosh_cli 1.2754.0 → 1.2765.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc7f9861eca72a12c8eb131107b0483040a87c9c
-  data.tar.gz: 9a5460703219b885cf9067183ca7d23ec0dd27a2
+  metadata.gz: d626a4e2a9ad9f7034527d7f8273c4f3f98c719e
+  data.tar.gz: 22d3ce83edbc686e86eb24d600a41fd50328f1a2
 SHA512:
-  metadata.gz: 6c563411a781a2ed642b132547639148c2719b0b8c36bd3c28d8d748b3ebf8e40ea75b2797fdade189d95d68c71a83a71ae89feac3fe6bb10ad8bc6276cf95aa
-  data.tar.gz: 0039bd37b311f0b35b1222ba3e738bbecfb83e26964fdd725722deb5023d3d85757dce1d65da08a6f2739912d9dc8b8b84d1b4463f8ffeeb20717bb0191b5862
+  metadata.gz: 39d04edc6573e7ae7e4c8357f57b1eb098abf8d2002fb38fe1577ea2274f7a7601753dd60e36ceeae93ffbabc46c4c0cf31cfb121296c5c86e77f6f4e8f4fa39
+  data.tar.gz: 78a334ced86c9a15133d19c0726fa4bb2f303012421088dff4c0343fce5318fbab5491341644418868495074caca92ae268ca2be480a443459d47d13c64506ba

data/lib/cli/client/director.rb

@@ -162,13 +162,7 @@ module Bosh
           options                = options.dup
           options[:content_type] = 'application/x-compressed'
 
-          upload_and_track(:post, '/releases', filename, options)
-        end
-
-        def rebase_release(filename, options = {})
-          options                = options.dup
-          options[:content_type] = 'application/x-compressed'
-          upload_and_track(:post, '/releases?rebase=true', filename, options)
+          upload_and_track(:post, releases_path(options), filename, options)
         end
 
         def upload_remote_release(release_location, options = {})
@@ -177,16 +171,7 @@ module Bosh
           options[:payload]      = JSON.generate(payload)
           options[:content_type] = 'application/json'
 
-          request_and_track(:post, '/releases', options)
-        end
-
-        def rebase_remote_release(release_location, options = {})
-          options                = options.dup
-          payload                = { 'location' => release_location }
-          options[:payload]      = JSON.generate(payload)
-          options[:content_type] = 'application/json'
-
-          request_and_track(:post, '/releases?rebase=true', options)
+          request_and_track(:post, releases_path(options), options)
         end
 
         def delete_stemcell(name, version, options = {})
@@ -599,6 +584,13 @@ module Bosh
           @director_name ||= get_status['name']
         end
 
+        def releases_path(options = {})
+          path = '/releases'
+          params = [:rebase, :skip_if_exists].select { |p| options[p] }.map { |p| "#{p}=true" }
+          path << "?#{params.join('&')}" unless params.empty?
+          path
+        end
+
         def request(method, uri, content_type = nil, payload = nil, headers = {}, options = {})
           headers = headers.dup
           headers['Content-Type'] = content_type if content_type

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

@@ -131,26 +131,31 @@ module Bosh::Cli::Command
 
         if rebase
           say("Uploading release (#{'will be rebased'.make_yellow})")
-          status, task_id = director.rebase_release(tarball_path)
-          task_report(status, task_id, 'Release rebased')
+          report = 'Release rebased'
         else
           say("\nUploading release\n")
-          status, task_id = director.upload_release(tarball_path)
-          task_report(status, task_id, 'Release uploaded')
+          report = 'Release uploaded'
         end
+        status, task_id = director.upload_release(tarball_path, rebase: rebase)
+        task_report(status, task_id, report)
       end
 
       def upload_remote_release(release_location, upload_options = {})
         nl
         if upload_options[:rebase]
           say("Using remote release `#{release_location}' (#{'will be rebased'.make_yellow})")
-          status, task_id = director.rebase_remote_release(release_location)
-          task_report(status, task_id, 'Release rebased')
+          report = 'Release rebased'
         else
           say("Using remote release `#{release_location}'")
-          status, task_id = director.upload_remote_release(release_location)
-          task_report(status, task_id, 'Release uploaded')
+          report = 'Release uploaded'
         end
+
+        status, task_id = director.upload_remote_release(
+          release_location,
+          rebase: upload_options[:rebase],
+          skip_if_exists: upload_options[:skip_if_exists],
+        )
+        task_report(status, task_id, report)
       end
 
       # if we aren't already in a release directory, try going up two levels

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2754.0'
+    VERSION = '1.2765.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2754.0
+  version: 1.2765.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-11-05 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.2754.0
+        version: 1.2765.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2754.0
+        version: 1.2765.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2754.0
+        version: 1.2765.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2754.0
+        version: 1.2765.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2754.0
+        version: 1.2765.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2754.0
+        version: 1.2765.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
         version: 0.5.4
 description: |-
   BOSH CLI
-  9fe2b2
+  ae0a5a
 email: support@cloudfoundry.com
 executables:
 - bosh