bosh_cli 1.3215.3.0 → 1.3215.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1e8b8e5a9346950cf3091d9a741a5b74068a2d6
-  data.tar.gz: f11a927065dcd013da89fd9f83f5d774a1dbf694
+  metadata.gz: b3b79ac5a8377c99cad46de0f2f788e3859310d4
+  data.tar.gz: b8f9b134f53385092d33cf8c2a5ae09ed786ea78
 SHA512:
-  metadata.gz: dae020c223686d089c0216689236755a48d7010bba3cff192175658d786662bb8f4e06f73a5d3e6c622136c0301a60c72e3401948b6592f9f9c2ed3cbb9e5a03
-  data.tar.gz: f6f04a1ab35b01bdfd941a2c61028425a4a65a44eae25ea561afecfccbf0d6813806a1e6febc609153181062e972a34d97558b50d0ceba9331c185371bc173ac
+  metadata.gz: 8dcc139f7050d386586bf31b9a768f30339deb6da2fd115b692a0477ef0ce1c9bbe2c7931e8fe8abbea010b46416bf7b7f750d633d71dad2f5fa9bef064bf11e
+  data.tar.gz: 3322806005d9b5560c50cb3d9fe1c5604016f061b5cbf9a3738e140ed36e44f9e9709374ac9560d8ab8fb87cd5c9b657de628821743da02619f94cc9bc461aa9

data/lib/cli.rb

@@ -43,7 +43,6 @@ end
 
 require 'common/common'
 require 'common/exec'
-require 'common/release/release_directory'
 require 'common/version/release_version'
 require 'common/version/release_version_list'
 require 'common/version/bosh_version'

data/lib/cli/commands/deployment_diff.rb

@@ -10,7 +10,6 @@ module Bosh::Cli::Command
         no_redact = options[:no_redact]
         changes = @director.diff_deployment(@manifest.name, @manifest.yaml, no_redact)
         diff = changes['diff']
-        error = changes['error']
 
         header('Detecting deployment changes')
 
@@ -40,8 +39,6 @@ module Bosh::Cli::Command
           end
         end
 
-        say(error) if error
-
         changes['context']
       rescue Bosh::Cli::ResourceNotFound
         inspect_deployment_changes(

data/lib/cli/release_tarball.rb

@@ -35,7 +35,6 @@ module Bosh::Cli
     end
 
     def unpack_license
-      return false if manifest_yaml['license'].nil?
       return @unpacked_license unless @unpacked_license.nil?
       exit_success = safe_fast_unpack('./license.tgz')
       @unpacked_license = !!exit_success
@@ -180,7 +179,7 @@ module Bosh::Cli
 
     def upload_packages?(package_matches = [])
       return true if package_matches.nil?
-      package_matches.uniq.size != manifest_yaml[@packages_folder].map { |p| p['version'] }.uniq.size
+      package_matches.size != manifest_yaml[@packages_folder].size
     end
 
     # Repacks tarball according to the structure of remote release

data/lib/cli/sorted_release_archiver.rb

@@ -6,12 +6,23 @@ module Bosh::Cli
 
     def archive(destination_file)
       Dir.chdir(@dir) do
-        ordered_release_files = Bosh::Common::Release::ReleaseDirectory.new('.').ordered_release_files
         success = Kernel.system('tar', '-C', @dir, '-pczf', destination_file, *ordered_release_files, out: '/dev/null', err: '/dev/null')
         if !success
           raise InvalidRelease, 'Cannot create release tarball'
         end
       end
     end
+
+    private
+
+    def ordered_release_files
+      ordered_release_files = ['./release.MF']
+      license_files = (Dir.entries('.') & ['LICENSE', 'NOTICE']).sort
+      unless license_files.empty?
+        ordered_release_files += license_files.map { |filename| "./#{filename}" }
+      end
+      ordered_release_files += ['./jobs', './packages']
+      ordered_release_files
+    end
   end
 end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3215.3.0'
+    VERSION = '1.3215.4.0'
   end
 end

metadata

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