bosh_cli 1.3215.0 → 1.3215.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc4be75113ca070560e879af3f3fc472afd85769
-  data.tar.gz: 4180b23ee8a86bcd205594ad87353296ad0275a4
+  metadata.gz: c1e8b8e5a9346950cf3091d9a741a5b74068a2d6
+  data.tar.gz: f11a927065dcd013da89fd9f83f5d774a1dbf694
 SHA512:
-  metadata.gz: 6a408893e2a231d677b309a7ebb00f3327364e0d5c9c9544c227c76f6283a6f6b0a241868655784c6c7ef8322b07bc61cbbeb9e69ab12551c841c571b2d749af
-  data.tar.gz: 2e459c0bcdc67dc91a97e219d964aa7bb29d0e9c678ba6bef81f96b2a71d73749357e6322ceb560c0b4efffd3d097161c2b8bd4203d063d7c58dad3217700014
+  metadata.gz: dae020c223686d089c0216689236755a48d7010bba3cff192175658d786662bb8f4e06f73a5d3e6c622136c0301a60c72e3401948b6592f9f9c2ed3cbb9e5a03
+  data.tar.gz: f6f04a1ab35b01bdfd941a2c61028425a4a65a44eae25ea561afecfccbf0d6813806a1e6febc609153181062e972a34d97558b50d0ceba9331c185371bc173ac

data/lib/cli.rb

@@ -43,6 +43,7 @@ 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,6 +10,7 @@ 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')
 
@@ -39,6 +40,8 @@ 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,6 +35,7 @@ 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
@@ -179,7 +180,7 @@ module Bosh::Cli
 
     def upload_packages?(package_matches = [])
       return true if package_matches.nil?
-      package_matches.size != manifest_yaml[@packages_folder].size
+      package_matches.uniq.size != manifest_yaml[@packages_folder].map { |p| p['version'] }.uniq.size
     end
 
     # Repacks tarball according to the structure of remote release

data/lib/cli/sorted_release_archiver.rb

@@ -6,23 +6,12 @@ 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.0'
+    VERSION = '1.3215.3.0'
   end
 end

metadata

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