bosh_cli 1.3146.3.0 → 1.3146.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 694f47e66555bd3b4e497a98ccfe817504395d0f
-  data.tar.gz: 89b19c212b3023e19ac315beb78984d33bf3b398
+  metadata.gz: 31e78bc31516fc30cd9104b338278871faedb16e
+  data.tar.gz: 6db3dfc60e2d60b6fe7168b858572f58b22a3659
 SHA512:
-  metadata.gz: cda11af64444d89339711b10935f24f11f4f8600f85965a304e08fc8136a2bfec230a08ad7c43d6ed1a0b4082a5cfda0ca77a0a26d7abe242ce911cf76590dd0
-  data.tar.gz: a43a019d09ff6e65356a2582f9d099872c9894498de40b55e7308f38daf391642f87c8651e7611bbac79bb15b68abca2662ce6221ec55a3cd7b5c1406e675fec
+  metadata.gz: e7c6bebf45c400d25e65c509f45da0235914faf807965ae3456ac229cfc72d851dc8c31ec9630ae3da8f4b608ef0b24a59505e4b37b97062cec368680d0e5b00
+  data.tar.gz: dd1ec5728638e4d32a0d91b096d605495720b08f27e11c6f8febdd2c48a0e02d6cf8d8c909d9952785647d4cb7aec09daaae712fbfc98038d65e9f661a3ff671

data/lib/cli/release_tarball.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 module Bosh::Cli
   class ReleaseTarball
     include Validation
@@ -21,36 +23,84 @@ module Bosh::Cli
 
     def unpack_manifest
       return @unpacked_manifest unless @unpacked_manifest.nil?
-      exit_success = fast_unpack('./release.MF')
+      exit_success = safe_fast_unpack('./release.MF')
       @unpacked_manifest = !!exit_success
     end
 
     def unpack_jobs
       return @unpacked_jobs unless @unpacked_jobs.nil?
-      exit_success = fast_unpack('./jobs/')
+      exit_success = safe_fast_unpack('./jobs/')
+      unless all_release_jobs_unpacked?
+        exit_success = safe_unpack('./jobs/')
+      end
       @unpacked_jobs = !!exit_success
     end
 
     def unpack_license
       return @unpacked_license unless @unpacked_license.nil?
-      exit_success = fast_unpack('./license.tgz')
+      exit_success = safe_fast_unpack('./license.tgz')
       @unpacked_license = !!exit_success
     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
-          system("tar", "-C", @unpack_dir, "--fast-read", "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
-        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
-        system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
+        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
+        else
+          raw_unpack(target)
       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.3.0'
+    VERSION = '1.3146.4.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3146.3.0
+  version: 1.3146.4.0
 platform: ruby
 authors:
 - VMware
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3146.3.0
+        version: 1.3146.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3146.3.0
+        version: 1.3146.4.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3146.3.0
+        version: 1.3146.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3146.3.0
+        version: 1.3146.4.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.3.0
+        version: 1.3146.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3146.3.0
+        version: 1.3146.4.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement