bosh_cli 1.3063.0 → 1.3068.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32557ab1d6e23c9cb2ee8fd385429b136da5e1ef
-  data.tar.gz: a1acbf4c3d56114dd9a09d3e4c644a93b655e7ca
+  metadata.gz: 81edcb4ae995553fe264758a60ff6718dbeca5da
+  data.tar.gz: 7d455cc1a339f76f349d25551f84c998450c514e
 SHA512:
-  metadata.gz: 5fdfc14255c3d2def554b49033de4151209b60a0c75542d70d205bccd71e0d3dd858c524c23e4f570246c45c1980097669294b633cb5644139ad99f4a85d9564
-  data.tar.gz: 4e99b190fe9e2f5b1f63ade4260d2238b005bc8d7b2fa63bbacf7be9ed8a81f39e755362b7885f6d5a48e5e3f829992027e041dfa02535f1c196e057b05b2572
+  metadata.gz: ddca350652072a60d2935e5d50ec4548f7dc6260ba80a2115d46e4f7b49026e6dee13bc5988675248c915ace75e60b7a0e49f529742b24aec1b26a3a5e4cd0fa
+  data.tar.gz: 2e697aeb185516773620fd23ba21f9d65906e8177d8433eaddbb96e7f28e6883c6ced382a266aebfb3788f32a8dee4f8deafe6047b3b8aadff5a4a41ebe298ff

data/lib/cli/base_command.rb

@@ -46,7 +46,7 @@ module Bosh::Cli
       def release
         return @release if @release
         check_if_release_dir
-        @release = Bosh::Cli::Release.new(work_dir, options[:final])
+        @release = Bosh::Cli::Release.new(release_directory, options[:final])
       end
 
       def progress_renderer
@@ -214,10 +214,22 @@ module Bosh::Cli
           'Use the --force option to skip this check.')
     end
 
+    def release_directory
+      return @release_directory if @release_directory
+
+      if options[:dir]
+        @release_directory = File.expand_path(options[:dir])
+      else
+        @release_directory = @work_dir
+      end
+
+      @release_directory
+    end
+
     def in_release_dir?
-      File.directory?('packages') &&
-        File.directory?('jobs') &&
-        File.directory?('src')
+      File.directory?(File.join(release_directory, 'packages')) &&
+        File.directory?(File.join(release_directory, 'jobs')) &&
+        File.directory?(File.join(release_directory, 'src'))
     end
 
     def dirty_state?

data/lib/cli/commands/instances.rb

@@ -21,9 +21,8 @@ module Bosh::Cli::Command
       show_current_state(deployment_name)
       no_track_unsupported
 
-      if deployment_name.nil?
-      else
-        show_deployment deployment_name, options
+      unless deployment_name.nil?
+        show_deployment(deployment_name, options)
       end
     end
 

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

@@ -16,6 +16,7 @@ module Bosh::Cli::Command
       option '--dry-run', 'stop before writing release manifest'
       option '--name NAME', 'specify a custom release name'
       option '--version VERSION', 'specify a custom version number (ex: 1.0.0 or 1.0-beta.2+dev.10)'
+      option '--dir RELEASE_DIRECTORY', 'path to release directory'
 
       def create(manifest_file = nil)
         check_if_release_dir
@@ -28,7 +29,7 @@ module Bosh::Cli::Command
           end
 
           say('Recreating release from the manifest')
-          Bosh::Cli::ReleaseCompiler.compile(manifest_file, cache_dir, release.blobstore)
+          Bosh::Cli::ReleaseCompiler.compile(manifest_file, cache_dir, release.blobstore, [], release.dir)
           release_filename = manifest_file
         else
           version = options[:version]
@@ -55,7 +56,7 @@ module Bosh::Cli::Command
         # can't migrate without a default release name
         return if default_release_name.blank?
 
-        Bosh::Cli::Versions::MultiReleaseSupport.new(@work_dir, default_release_name, self).migrate
+        Bosh::Cli::Versions::MultiReleaseSupport.new(release.dir, default_release_name, self).migrate
       end
 
       def create_from_spec(version)
@@ -139,7 +140,7 @@ module Bosh::Cli::Command
       end
 
       def archive_repository_provider
-        @archive_repository_provider ||= Bosh::Cli::ArchiveRepositoryProvider.new(work_dir, cache_dir, release.blobstore)
+        @archive_repository_provider ||= Bosh::Cli::ArchiveRepositoryProvider.new(release.dir, cache_dir, release.blobstore)
       end
 
       def build_release(job_artifacts, manifest_only, package_artifacts, license_artifacts, name, version)
@@ -163,7 +164,7 @@ module Bosh::Cli::Command
       end
 
       def build_packages
-        packages = Bosh::Cli::Resources::Package.discover(work_dir)
+        packages = Bosh::Cli::Resources::Package.discover(release.dir)
         artifacts = packages.map do |package|
           say("Building #{package.name.make_green}...")
           artifact = archive_builder.build(package)
@@ -189,7 +190,7 @@ module Bosh::Cli::Command
       end
 
       def build_jobs(packages)
-        jobs = Bosh::Cli::Resources::Job.discover(work_dir, packages)
+        jobs = Bosh::Cli::Resources::Job.discover(release.dir, packages)
         artifacts = jobs.map do |job|
           say("Building #{job.name.make_green}...")
           artifact = archive_builder.build(job)
@@ -201,7 +202,7 @@ module Bosh::Cli::Command
       end
 
       def build_licenses
-        licenses = Bosh::Cli::Resources::License.discover(work_dir)
+        licenses = Bosh::Cli::Resources::License.discover(release.dir)
         artifacts = licenses.map do |license|
           say("Building #{'license'.make_green}...")
           artifact = archive_builder.build(license)

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

@@ -38,9 +38,8 @@ module Bosh::Cli::Command
         nl
         progress_renderer.start(tarball_file_name, "downloading...")
         tmpfile = director.download_resource(tarball_blobstore_id)
-        File.open(tarball_file_path, "wb") do |file|
-          file << File.open(tmpfile).read
-        end
+
+        FileUtils.move(tmpfile, tarball_file_path)
         progress_renderer.finish(tarball_file_name, "downloaded")
 
         if file_checksum(tarball_file_path) != tarball_sha1

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

@@ -9,6 +9,8 @@ module Bosh::Cli::Command
         'known by director (discards local job/package',
         'versions in favor of versions assigned by director)'
       option '--skip-if-exists', 'no-op; retained for backward compatibility'
+      option '--dir RELEASE_DIRECTORY', 'path to release directory'
+
       def upload(release_file = nil)
         auth_required
         show_current_state
@@ -62,7 +64,7 @@ module Bosh::Cli::Command
         blobstore = release.blobstore
         tmpdir = Dir.mktmpdir
 
-        compiler = Bosh::Cli::ReleaseCompiler.new(manifest_path, cache_dir, blobstore, package_matches)
+        compiler = Bosh::Cli::ReleaseCompiler.new(manifest_path, cache_dir, blobstore, package_matches, release.dir)
         need_repack = true
 
         unless compiler.exists?
@@ -129,7 +131,7 @@ module Bosh::Cli::Command
           report = 'Release rebased'
         else
           say("\nUploading release\n")
-          report = tarball.compiled_release? ? 'Compiled Release uploaded' : 'Release uploaded'
+          report = 'Release uploaded'
         end
 
         status, task_id = director.upload_release(tarball_path, {rebase: rebase})
@@ -153,17 +155,17 @@ module Bosh::Cli::Command
         task_report(status, task_id, report)
       end
 
-      # if we aren't already in a release directory, try going up two levels
-      # to see if that is a release directory, and then use that as the base
       def find_release_dir(manifest_path)
-        unless in_release_dir?
-          dir = File.expand_path('../..', manifest_path)
-          Dir.chdir(dir)
-          if in_release_dir?
-            @release = Bosh::Cli::Release.new(dir, options[:final])
-          end
+        release_dir_for_final_manfiest = File.expand_path('../..', manifest_path)
+        release_dir_for_dev_manfiest = File.expand_path('../../..', manifest_path)
+
+        [
+          release_dir_for_final_manfiest,
+          release_dir_for_dev_manfiest
+        ].each do |release_dir|
+          @release_directory = release_dir
+          break if in_release_dir?
         end
-
       end
 
       def get_remote_release(name)

data/lib/cli/release_compiler.rb

@@ -6,8 +6,8 @@ module Bosh::Cli
 
     attr_writer :tarball_path
 
-    def self.compile(manifest_file, artifacts_dir, blobstore)
-      new(manifest_file, artifacts_dir, blobstore).compile
+    def self.compile(manifest_file, artifacts_dir, blobstore, package_matches, release_source)
+      new(manifest_file, artifacts_dir, blobstore, package_matches, release_source).compile
     end
 
     # @param [String] manifest_file Release manifest path
@@ -15,9 +15,7 @@ module Bosh::Cli
     # @param [Array] package_matches List of package checksums that director
     #   can match
     # @param [String] release_source Release directory
-    def initialize(manifest_file, artifacts_dir, blobstore,
-                   package_matches = [], release_source = nil)
-
+    def initialize(manifest_file, artifacts_dir, blobstore, package_matches, release_source)
       @blobstore = blobstore
       @release_source = release_source || Dir.pwd
       @manifest_path = File.expand_path(manifest_file, @release_source)

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3063.0'
+    VERSION = '1.3068.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3063.0
+  version: 1.3068.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-03 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.3063.0
+        version: 1.3068.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3063.0
+        version: 1.3068.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3063.0
+        version: 1.3068.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3063.0
+        version: 1.3068.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.3063.0
+        version: 1.3068.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3063.0
+        version: 1.3068.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -304,9 +304,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  BOSH CLI
-  ac5134
+description: BOSH CLI
 email: support@cloudfoundry.com
 executables:
 - bosh