bosh_vcloud_cpi 0.11.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de4a47e0f689272835360dc7203eb81d8bd81f9e
-  data.tar.gz: 55aee9e3bd10f585e72d29a54182f00f3baac2fa
+  metadata.gz: b76d0b8d822089eeb0bbb208ef9852e8f603ae85
+  data.tar.gz: 65515e75dcb915ee3c625463591d496126ede813
 SHA512:
-  metadata.gz: 6eadfa9f176fb111c1caadfd0c0141e1754e7e98c6d7eb13a8ac3463fbc15cae55123bd26f961cde1c88a76183a8a06c35ae853ac9cdaf19e04a9570b762dc48
-  data.tar.gz: ebe73f70e5704d9cc1a02705191c19c9b00cd048caa123a32bc6d6ff693cb1c907585c888bd3b9e66e3849819695b3e4e3f9450aa50faccba84b3078617f1e8b
+  metadata.gz: 36b47a7f7b0be4a0f5d55e9b44d8ca79a6c69cea568f32ed378a1c48876149e5a3e028bedbf65a64692754ee2d7a50ad69dfe3e4d72012aa755c6cf05667cc4e
+  data.tar.gz: 50a4ea6a31b4a10651e86f11f58111b9779117b9fbdebbd38ebbca2212377556e642e24ce3bfc206ee85f1f7875ecd8a3bb110f2985232c0e298fd6080051601

data/README.md

@@ -1,5 +1,4 @@
 # BOSH VCloud Cloud Provider Interface
-Copyright (c) VMware, Inc.
 
 ## Introduction
 

data/lib/cloud/vcloud/steps/save_agent_env.rb

@@ -1,9 +1,12 @@
 require 'common/common'
 require 'yajl'
+require 'open3'
 
 module VCloudCloud
   module Steps
     class SaveAgentEnv < Step
+      NO_ERROR_SHELL_OUTPUT_HACK = 'no-error'
+
       def perform(&block)
         vm = client.reload state[:vm]
         metadata_link = "#{vm.metadata_link.href}/#{state[:env_metadata_key]}"
@@ -16,11 +19,11 @@ module VCloudCloud
         env_path = File.join tmpdir, 'env'
         iso_path = File.join tmpdir, 'env.iso'
         File.open(env_path, 'w') { |f| f.write env_json }
-        command = "#{create_iso_cmd} -o #{iso_path} #{env_path} 2>&1"
-        output = `#{command}`
-        message = "command `#{command}`: exited with stats: `#{$?.exitstatus}`: and output `#{output}`"
+        command = "#{create_iso_cmd} -o #{iso_path} #{env_path} 2>&1 && >&2 printf #{NO_ERROR_SHELL_OUTPUT_HACK}"
+        _, stdout, stderr = Open3.popen3("#{command}")
+        message = "command `#{command}`: output `#{stdout.readlines}`"
         @logger.debug message
-        raise message unless $?.success?
+        raise message unless stderr.readlines.include? NO_ERROR_SHELL_OUTPUT_HACK
 
         metadata = VCloudSdk::Xml::WrapperFactory.create_instance 'MetadataValue'
         metadata.value = env_json

data/lib/cloud/vcloud/steps/stemcell_info.rb

@@ -4,8 +4,10 @@ module VCloudCloud
       def perform(image, &block)
         tmpdir = state[:stemcell_dir] = Dir.mktmpdir
         # examine files in the tarball
-        `tar -C #{tmpdir} -xzf #{File.absolute_path(image)}`
-        raise 'Invalid stemcell image' unless $?.success?
+        _, stderr, status = Open3.capture3("tar -C #{tmpdir} -xzf #{File.absolute_path(image)}")
+
+        raise "Invalid stemcell image: #{stderr}" unless status.success?
+
         files = Dir.glob File.join(tmpdir, '*.ovf')
         # stemcell should only include one .ovf file
         raise "Invalid stemcell image: having #{files.length} .ovf files" if files.length != 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vcloud_cpi
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.1
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -70,16 +70,16 @@ dependencies:
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -122,9 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  BOSH vCloud CPI
-  3754cd
+description: BOSH vCloud CPI
 email: support@cloudfoundry.com
 executables: []
 extensions: []
@@ -164,7 +162,6 @@ files:
 - lib/cloud/vcloud/steps/upload_media_files.rb
 - lib/cloud/vcloud/steps/upload_template_files.rb
 - lib/cloud/vcloud/vcd_client.rb
-- lib/cloud/vcloud/version.rb
 - lib/cloud/vcloud/xml/constants.rb
 - lib/cloud/vcloud/xml/wrapper.rb
 - lib/cloud/vcloud/xml/wrapper_classes/admin_catalog.rb

data/lib/cloud/vcloud/version.rb

@@ -1,7 +0,0 @@
-module Bosh
-  module Clouds
-    class VCloud
-      VERSION = '0.11.0'
-    end
-  end
-end