Fix bug 973351: Add CartridgeRepository.latest_versions for use in rh…

…c cartridge list

node/lib/openshift-origin-node/model/cartridge_repository.rb

@@ -297,6 +297,22 @@ def each
       self
     end
 
+    def latest_versions
+      cartridges = Set.new
+      @index.each_pair do |_, sw_hash|
+        sw_hash.each_pair do |_, cart_version_hash|
+          latest_version = cart_version_hash.keys.sort.last
+          cartridges.add(cart_version_hash[latest_version])
+        end
+      end
+
+      if block_given?
+        cartridges.each { |c| yield c }
+      end
+
+      cartridges
+    end
+
     ## print out all index entries in a table
     def inspect
       @index.inject("<CartridgeRepository:\n") do |memo, (name, sw_hash)|

node/lib/openshift-origin-node/model/node.rb

@@ -46,7 +46,7 @@ def self.get_cartridge_list(list_descriptors = false, porcelain = false, oo_debu
           end
         end
       else
-        CartridgeRepository.instance.each do |cartridge|
+        CartridgeRepository.instance.latest_versions do |cartridge|
           cartridge.versions.each do |version|
             begin
               cooked = Runtime::Manifest.new(cartridge.manifest_path, version, cartridge.repository_path)