bosh_cli 1.3146.10.0 → 1.3147.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee097443b7d5a3edf7a5f8814a6569083d750b62
-  data.tar.gz: 7a9dc35127ef4a8a0dba19b36e00734c2814ad4c
+  metadata.gz: 5af72447c3783652381af6e46241865c048dacba
+  data.tar.gz: 2fcf5235942a879dcafdf03b7561a9d6cc7d64a8
 SHA512:
-  metadata.gz: 4cf010e1c2ba790bfb7d713a8619115886f72248f6d47b796f96007e0c289236b4273fbf49f1f6a6a46e81f66b87a646c3e5c5a21a662af2b8a79fedd0d59e27
-  data.tar.gz: db326fd8b94542c5405a030d685680fff8ba0d43b20008617b84c8666846509e6e16537c35f0ad782e8f015f7728cfa69077814cc49e4507e6151a1c27e71665
+  metadata.gz: 95dab00041cb7a86a7b5f3c6475154c3c46910555cd892afc81f3426cb66effce7d1bbc53e642d04fe87c18c62a57ab787a8a618faa154385d9f5734b3aa9102
+  data.tar.gz: 1aa30f427fde8d48750ff3dd1581822bbd46a5c0e8b493f07f09cf47f57934a6c836ba2ea2893b0249db97b1da0f6d4a6dcfd3969cf6fbacf84b81f4ca1fa56b

data/lib/cli/base_command.rb

@@ -260,13 +260,6 @@ module Bosh::Cli
       end
     end
 
-    def valid_index_for(manifest_hash, job, index, options = {})
-      index = '0' if job_unique_in_deployment?(manifest_hash, job)
-      err('You should specify the job index. There is more than one instance of this job type.') if index.nil?
-      index = index.to_i if options[:integer_index]
-      index
-    end
-
     def normalize_url(url)
       url = url.gsub(/\/$/, '')
       url = "https://#{url}" unless url.match(/^http:?/)

data/lib/cli/commands/job_management.rb

@@ -9,9 +9,9 @@ module Bosh::Cli
 
       # bosh start
       usage 'start'
-      desc 'Start job/instance'
+      desc 'Start all jobs/job/instance'
       option '--force', FORCE
-      def start_job(job, index = nil)
+      def start_job(job = '*', index = nil)
         change_job_state(:start, job, index)
       end
 
@@ -32,19 +32,19 @@ module Bosh::Cli
 
       # bosh restart
       usage 'restart'
-      desc 'Restart job/instance (soft stop + start)'
+      desc 'Restart all jobs/job/instance (soft stop + start)'
       option '--force', FORCE
       option '--skip-drain', SKIP_DRAIN
-      def restart_job(job, index = nil)
+      def restart_job(job = '*', index = nil)
         change_job_state(:restart, job, index)
       end
 
       # bosh recreate
       usage 'recreate'
-      desc 'Recreate job/instance (hard stop + start)'
+      desc 'Recreate all jobs/job/instance (hard stop + start)'
       option '--force', FORCE
       option '--skip-drain', SKIP_DRAIN
-      def recreate_job(job, index = nil)
+      def recreate_job(job = '*', index = nil)
         change_job_state(:recreate, job, index)
       end
 
@@ -53,10 +53,6 @@ module Bosh::Cli
       def change_job_state(state, job, index = nil)
         auth_required
         manifest = parse_manifest(state)
-        unless job == '*'
-          job_must_exist_in_deployment(manifest.hash, job)
-          index = valid_index_for(manifest.hash, job, index) unless state == :stop || state  == :detach
-        end
         job_state = JobState.new(self, manifest, skip_drain: skip_drain?)
         status, task_id, completion_desc = job_state.change(state, job, index, force?)
         task_report(status, task_id, completion_desc)

data/lib/cli/commands/log_management.rb

@@ -11,11 +11,10 @@ module Bosh::Cli::Command
     option '--dir destination_directory', String, 'download directory'
     option '--all', 'deprecated'
 
-    def fetch_logs(job, index = nil)
+    def fetch_logs(job, index)
       auth_required
 
       manifest = prepare_deployment_manifest(show_state: true)
-      index = valid_index_for(manifest.hash, job, index)
       check_arguments(index)
 
       logs_downloader = Bosh::Cli::LogsDownloader.new(director, self)
@@ -76,4 +75,3 @@ module Bosh::Cli::Command
     end
   end
 end
-

data/lib/cli/commands/ssh.rb

@@ -27,9 +27,6 @@ module Bosh::Cli
         end
 
         manifest = prepare_deployment_manifest(show_state: true)
-        job_must_exist_in_deployment(manifest.hash, job)
-
-        index = valid_index_for(manifest.hash, job, index, integer_index: true)
 
         if command.empty?
           setup_interactive_shell(manifest.name, job, index)
@@ -60,7 +57,6 @@ module Bosh::Cli
         end
 
         manifest = prepare_deployment_manifest(show_state: true)
-        job_must_exist_in_deployment(manifest.hash, job)
 
         if args.size != 2
           err('Please enter valid source and destination paths')
@@ -79,7 +75,6 @@ module Bosh::Cli
         end
 
         manifest = prepare_deployment_manifest(show_state: true)
-        job_must_exist_in_deployment(manifest.hash, job)
 
         say("Cleaning up ssh artifacts from #{job}/#{index}")
         director.cleanup_ssh(manifest.name, job, "^#{SSH_USER_PREFIX}", [index])

data/lib/cli/commands/vm.rb

@@ -20,9 +20,6 @@ module Bosh::Cli
           resurrection = Resurrection.new(new_state)
 
           manifest = prepare_deployment_manifest(show_state: true)
-          job_must_exist_in_deployment(manifest.hash, job)
-          index = valid_index_for(manifest.hash, job, index, integer_index: true)
-
           director.change_vm_resurrection(manifest.name, job, index, resurrection.paused?)
         end
       end

data/lib/cli/deployment_helper.rb

@@ -128,10 +128,6 @@ module Bosh::Cli
       !!find_job(manifest_hash, job_name)
     end
 
-    def job_must_exist_in_deployment(manifest_hash, job)
-      err("Job `#{job}' doesn't exist") unless job_exists_in_deployment?(manifest_hash, job)
-    end
-
     def prompt_for_job_and_index
       jobs_list = jobs_and_indexes
 

data/lib/cli/release_tarball.rb

@@ -1,5 +1,3 @@
-require 'open3'
-
 module Bosh::Cli
   class ReleaseTarball
     include Validation
@@ -23,84 +21,36 @@ module Bosh::Cli
 
     def unpack_manifest
       return @unpacked_manifest unless @unpacked_manifest.nil?
-      exit_success = safe_fast_unpack('./release.MF')
+      exit_success = fast_unpack('./release.MF')
       @unpacked_manifest = !!exit_success
     end
 
     def unpack_jobs
       return @unpacked_jobs unless @unpacked_jobs.nil?
-      exit_success = safe_fast_unpack('./jobs/')
-      unless all_release_jobs_unpacked?
-        exit_success = safe_unpack('./jobs/')
-      end
+      exit_success = fast_unpack('./jobs/')
       @unpacked_jobs = !!exit_success
     end
 
     def unpack_license
       return @unpacked_license unless @unpacked_license.nil?
-      exit_success = safe_fast_unpack('./license.tgz')
+      exit_success = fast_unpack('./license.tgz')
       @unpacked_license = !!exit_success
     end
 
-    # On machines using GNU based tar command, it should be able to unpack files irrespective of
-    # the ./ prefix in the file name
-    def safe_fast_unpack(target)
-      exit_status = raw_fast_unpack(target)
-      if !exit_status
-        processed_target = handle_dot_slash_prefix(target)
-        exit_status = raw_fast_unpack(processed_target)
-      end
-      exit_status
-    end
-
-    def safe_unpack(target)
-      exit_status = raw_unpack(target)
-      if !exit_status
-        processed_target = handle_dot_slash_prefix(target)
-        exit_status = raw_unpack(processed_target)
-      end
-      exit_status
-    end
-
-    # This will [add or remove] the './' when trying to extract a specific file from archive
-    def handle_dot_slash_prefix(target)
-      if target =~ /^\.\/.*/
-        target.sub!(/^\.\//, '')
-      else
-        target.prepend("./")
-      end
-    end
-
-    def raw_fast_unpack(target)
-      tar_version, _, _ = Open3.capture3('tar', '--version')
-
-      case tar_version
-        when /.*gnu.*/i
-          Kernel.system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "--occurrence", "#{target}", out: "/dev/null", err: "/dev/null")
-        when /.*bsd.*/i
-          if target[-1, 1] == "/"
-            raw_unpack(target)
-          else
-            Kernel.system("tar", "-C", @unpack_dir, "--fast-read", "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
-          end
+    def fast_unpack(target)
+      if RUBY_PLATFORM =~ /linux/
+        system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "--occurrence", "#{target}", out: "/dev/null", err: "/dev/null")
+      elsif RUBY_PLATFORM =~ /darwin/
+        if target[-1, 1] == "/"
+          system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
         else
-          raw_unpack(target)
+          system("tar", "-C", @unpack_dir, "--fast-read", "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
+        end
+      else
+        system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
       end
     end
 
-    def raw_unpack(target)
-      Kernel.system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
-    end
-
-    # verifies that all jobs in release manifest were unpacked
-    def all_release_jobs_unpacked?
-      return false if manifest_yaml['jobs'].nil?
-
-      manifest_job_names = manifest_yaml['jobs'].map { |j| j['name'] }.sort
-      unpacked_job_file_names = Dir.glob(File.join(@unpack_dir, 'jobs', '*')).map { |f| File.basename(f, '.*') }.sort
-      unpacked_job_file_names == manifest_job_names
-    end
-
     # Unpacks tarball to @unpack_dir, returns true if succeeded, false if failed
     def unpack
       return @unpacked unless @unpacked.nil?

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3146.10.0'
+    VERSION = '1.3147.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3146.10.0
+  version: 1.3147.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2015-12-01 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.3146.10.0
+        version: 1.3147.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3146.10.0
+        version: 1.3147.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3146.10.0
+        version: 1.3147.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3146.10.0
+        version: 1.3147.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.3146.10.0
+        version: 1.3147.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3146.10.0
+        version: 1.3147.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement