bosh_cli 0.19.3 → 0.19.4

data/lib/cli/commands/release.rb

@@ -107,33 +107,19 @@ module Bosh::Cli::Command
       end
     end
 
-    def get_remote_packages(manifest_yaml, remote_release)
-      remote_packages_sha1 = match_remote_packages(manifest_yaml)
-
-      # Older directors may not match packages. For such
-      # cases we select packages from the existing release.
-      if remote_packages_sha1.size == 0 && remote_release
-        remote_packages_sha1 = remote_release["packages"].map do |pkg|
-          pkg["sha1"]
-        end
-      end
-      remote_packages_sha1
-    end
-
     def upload_manifest(manifest_path)
       manifest = load_yaml_file(manifest_path)
       remote_release = get_remote_release(manifest["name"]) rescue nil
-      remote_jobs = remote_release["jobs"] if remote_release
-      remote_packages_sha1 = get_remote_packages(File.read(manifest_path),
-                                                 remote_release)
+      package_matches = match_remote_packages(File.read(manifest_path))
+
       blobstore = release.blobstore
       tmpdir = Dir.mktmpdir
 
       at_exit { FileUtils.rm_rf(tmpdir) }
 
-      compiler = Bosh::Cli::ReleaseCompiler.new(manifest_path, blobstore,
-                                                remote_jobs,
-                                                remote_packages_sha1)
+      compiler =
+        Bosh::Cli::ReleaseCompiler.new(manifest_path, blobstore,
+                                       remote_release, package_matches)
       need_repack = true
 
       unless compiler.exists?
@@ -159,19 +145,17 @@ module Bosh::Cli::Command
 
       begin
         remote_release = get_remote_release(tarball.release_name) rescue nil
-        if remote_release
-          if remote_release["versions"].include?(tarball.version)
-            err("This release version has already been uploaded")
-          end
-          remote_jobs = remote_release["jobs"]
+
+        if remote_release &&
+          remote_release["versions"].include?(tarball.version)
+          err("This release version has already been uploaded")
         end
 
         if repack
-          remote_packages_sha1 = get_remote_packages(tarball.manifest,
-                                                     remote_release)
+          package_matches = match_remote_packages(tarball.manifest)
 
           say("Checking if can repack release for faster upload...")
-          repacked_path = tarball.repack(remote_jobs, remote_packages_sha1)
+          repacked_path = tarball.repack(remote_release, package_matches)
           if repacked_path.nil?
             say("Uploading the whole release".green)
           else

data/lib/cli/release_compiler.rb

@@ -10,28 +10,45 @@ module Bosh::Cli
       new(manifest_file, blobstore).compile
     end
 
-    def initialize(manifest_file, blobstore, remote_jobs = nil,
-                   remote_packages_sha1 = [], release_dir = nil)
+    # @param [String] manifest_file Release manifest path
+    # @param [Bosh::Blobstore::Client] blobstore Blobstore client
+    # @param [Hash] remote_release Remote release info from director
+    # @param [Array] package_matches List of package checksums that director
+    #   can match
+    # @param [String] release_dir Release directory
+    def initialize(manifest_file, blobstore, remote_release = nil,
+                   package_matches = [], release_dir = nil)
+
+      @blobstore = blobstore
+      @release_dir = release_dir || Dir.pwd
+      @manifest_file = File.expand_path(manifest_file, @release_dir)
+      @tarball_path = nil
+
       @build_dir = Dir.mktmpdir
       @jobs_dir = File.join(@build_dir, "jobs")
       @packages_dir = File.join(@build_dir, "packages")
-      @blobstore = blobstore
-      @release_dir = release_dir || Dir.pwd
-      @remote_packages_sha1 = remote_packages_sha1
+
+      @package_matches = Set.new(package_matches)
 
       at_exit { FileUtils.rm_rf(@build_dir) }
 
       FileUtils.mkdir_p(@jobs_dir)
       FileUtils.mkdir_p(@packages_dir)
 
-      @manifest_file = File.expand_path(manifest_file, @release_dir)
       @manifest = load_yaml_file(manifest_file)
 
-      if remote_jobs
-        @remote_jobs = remote_jobs.map do |job|
+      if remote_release
+        # TODO: instead of OpenStruct conversion we should probably
+        # introduce proper abstractions for things below
+        @remote_packages = remote_release["packages"].map do |pkg|
+          OpenStruct.new(pkg)
+        end
+
+        @remote_jobs = remote_release["jobs"].map do |job|
           OpenStruct.new(job)
         end
       else
+        @remote_packages = []
         @remote_jobs = []
       end
 
@@ -53,7 +70,7 @@ module Bosh::Cli
       header("Copying packages")
       @packages.each do |package|
         say("#{package.name} (#{package.version})".ljust(30), " ")
-        if @remote_packages_sha1.any? { |sha1| sha1 == package.sha1 }
+        if remote_package_exists?(package)
           say("SKIP".yellow)
           next
         end
@@ -69,7 +86,7 @@ module Bosh::Cli
       header("Copying jobs")
       @jobs.each do |job|
         say("#{job.name} (#{job.version})".ljust(30), " ")
-        if remote_object_exists?(@remote_jobs, job)
+        if remote_job_exists?(job)
           say("SKIP".yellow)
           next
         end
@@ -163,10 +180,30 @@ module Bosh::Cli
       raise BlobstoreError, "Blobstore error: #{e}"
     end
 
-    def remote_object_exists?(collection, local_object)
-      collection.any? do |remote_object|
+    # Checks if local package is already known remotely
+    # @param [#name, #version] local_package
+    # @return [Boolean]
+    def remote_package_exists?(local_package)
+      # If checksum is known to director we can always match it
+      return true if @package_matches.include?(local_package.sha1)
+
+      remote_object_exists?(@remote_packages, local_package)
+    end
+
+    # Checks if local job is already known remotely
+    # @param [#name, #version] local_job
+    # @return [Boolean]
+    def remote_job_exists?(local_job)
+      remote_object_exists?(@remote_jobs, local_job)
+    end
+
+    # @param [Enumerable] remote_objects Remote object collection
+    # @param [#name, #version] local_object
+    # @return [Boolean]
+    def remote_object_exists?(remote_objects, local_object)
+      remote_objects.any? do |remote_object|
         remote_object.name == local_object.name &&
-            remote_object.version.to_s == local_object.version.to_s
+          remote_object.version.to_s == local_object.version.to_s
       end
     end
 

data/lib/cli/release_tarball.rb

@@ -32,11 +32,9 @@ module Bosh::Cli
 
     # Repacks tarball according to the structure of remote release
     # Return path to repackaged tarball or nil if repack has failed
-    def repack(remote_jobs = nil, remote_packages_sha1 = nil)
+    def repack(remote_release = nil, package_matches = [])
       return nil unless valid?
       unpack
-      remote_jobs ||= []
-      remote_packages_sha1 ||= []
 
       tmpdir = Dir.mktmpdir
       repacked_path = File.join(tmpdir, "release-repack.tgz")
@@ -45,30 +43,41 @@ module Bosh::Cli
 
       manifest = load_yaml_file(File.join(@unpack_dir, "release.MF"))
 
-      local_packages  = manifest["packages"]
+      # Remote release could be not-existent, then package matches are supposed
+      # to satisfy everything
+      remote_release ||= {"jobs" => [], "packages" => []}
+
+      local_packages = manifest["packages"]
       local_jobs = manifest["jobs"]
+      remote_packages = remote_release["packages"]
+      remote_jobs = remote_release["jobs"]
 
       @skipped = 0
 
       Dir.chdir(@unpack_dir) do
+        # TODO: this code can be dried up a little bit (as it is somewhat
+        # similar to what's going on in ReleaseCompiler)
+
         local_packages.each do |package|
-          say("#{package['name']} (#{package['version']})".ljust(30), " ")
-          if remote_packages_sha1.any? { |sha1| sha1 == package["sha1"] }
+          say("#{package["name"]} (#{package["version"]})".ljust(30), " ")
+          if package_matches.include?(package["sha1"]) ||
+            remote_packages.any? { |rp| package["name"] == rp["name"] &&
+              package["version"].to_s == rp["version"].to_s }
             say("SKIP".green)
             @skipped += 1
-            FileUtils.rm_rf(File.join("packages", "#{package['name']}.tgz"))
+            FileUtils.rm_rf(File.join("packages", "#{package["name"]}.tgz"))
           else
             say("UPLOAD".red)
           end
         end
 
         local_jobs.each do |job|
-          say("#{job['name']} (#{job['version']})".ljust(30), " ")
+          say("#{job["name"]} (#{job["version"]})".ljust(30), " ")
           if remote_jobs.any? { |rj| job["name"] == rj["name"] &&
               job["version"].to_s == rj["version"].to_s }
             say("SKIP".green)
             @skipped += 1
-            FileUtils.rm_rf(File.join("jobs", "#{job['name']}.tgz"))
+            FileUtils.rm_rf(File.join("jobs", "#{job["name"]}.tgz"))
           else
             say("UPLOAD".red)
           end

data/lib/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Cli
-    VERSION = "0.19.3"
+    VERSION = "0.19.4"
   end
 end

data/spec/unit/release_tarball_spec.rb

@@ -17,9 +17,8 @@ describe Bosh::Cli::ReleaseTarball do
         "jobs" => [{ "name" => "cacher", "version" => "1" },
                     { "name" => "sweeper", "version" => "1" }]
       }
-      remote_packages_sha1 = ["86bd8b15562cde007f030a303fa64779af5fa4e7"]
-      repacked_tarball_path = tarball.repack(remote_release["jobs"],
-                                             remote_packages_sha1)
+      package_matches = ["86bd8b15562cde007f030a303fa64779af5fa4e7"]
+      repacked_tarball_path = tarball.repack(remote_release, package_matches)
 
       tarball.skipped.should == 2
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.19.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -317,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3443692206202112856
+      hash: 1823880374092927602
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3443692206202112856
+      hash: 1823880374092927602
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23