compact_index 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45af59196a7c0e110d5a888103c573b88da564d4
-  data.tar.gz: c7aa0e482d9f5bd5f08708633676151ba46fbe95
+  metadata.gz: d64d44d1fea23ce0a76b7845acc0014b8ca8aec7
+  data.tar.gz: 51b9ae7960a546363e9d78327467f7a8b482ab68
 SHA512:
-  metadata.gz: a3ddc30cb5ea6dfd4a82f08772f0ca75e36a62e46c441f03f5687837be5d46292b4b9658b37e780cd3b07d8ecb9e54553cb6e276d5dbe20d32d70bf74a502f51
-  data.tar.gz: 3989c7b72b3582b6df70e86a1db72b4c65c2dd5795ad0f637db4c2579da95b169842d65889846ade6412634b70514a6743e3cd77d004c1c75cdfd74491ddbc5c
+  metadata.gz: 7aee9ae1d0b33076d8e6109cef53eee7c2e4e805007114f446b50736c9cfd4f3877fd2dbd27dcb1096294b771a90386ea2a6d20a3a39f35a18d0d267d2cd01ae
+  data.tar.gz: 434971c492a216938303c67a16cdb399a49aed8232065c6f93640830bf2e86e842debca4a3dffc51cf4f5431fb9b5ace7104c49db004ca67d0bff597e5ccf4c9

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.9.0 (August 17, 2015)
+
+Features:
+
+  - Remove sort responsability from compact_index
+  - Change interface for versions_file in order to receive sorted gems
+
+
 ## 0.8.1 (August 13, 2015)
 
 Bugfixes:

data/lib/compact_index.rb

@@ -12,16 +12,7 @@ module CompactIndex
 
   def self.info(params)
     output = "---\n"
-    sorted = params.sort do |a,b|
-      if a[:created_at] and b[:created_at]
-        a[:created_at] <=> b[:created_at] 
-      elsif a[:created_at]
-        -1
-      else
-        1
-      end
-    end
-    sorted.each do |version|
+    params.each do |version|
       output << version_line(version) << "\n"
     end
     output
@@ -30,7 +21,7 @@ module CompactIndex
   private
     def self.version_line(version)
       if version[:dependencies]
-        version[:dependencies].sort! { |a,b| a[:gem] <=> b[:gem] }
+        version[:dependencies]
         deps = version[:dependencies].map do |d|
           [
              d[:gem],

data/lib/compact_index/version.rb

@@ -1,3 +1,3 @@
 module CompactIndex
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

data/lib/compact_index/versions_file.rb

@@ -48,50 +48,46 @@ class CompactIndex::VersionsFile
     end
 
     def parse_gems_for_create(gems)
-      fixed_format_gems = gems.map do |k,v|
-        numbers = v.map { |x| [x[:number], x[:platform] ] }
-        { name: k, versions: numbers, checksum: v.first[:checksum] }
+      # Join all versions for each gem in one hash
+      gems_hash = {}
+      gems.each do |entry|
+        gems_hash[entry[:name]] ||= []
+        gems_hash[entry[:name]] += entry[:versions]
       end
-      fixed_format_gems.sort! { |a,b| a[:name] <=> b[:name] }
-      gem_lines(fixed_format_gems)
-    end
 
-    def parse_gems(gems)
-      sorted_gems = format_by_created_time(gems)
-      gem_lines(sorted_gems)
+      # Transform hash in a list of line informations to be printed
+      gems = gems_hash.map do |gem, versions|
+        { name: gem, versions: versions, checksum: versions.first[:checksum] }
+      end
+
+      # Sort gems by name and versions by number
+      gems.sort! { |a,b| a[:name] <=> b[:name] }
+      gems.each do |entry|
+        entry[:versions].sort_by! { |v| Gem::Version.create(v[:number]) }
+      end
+
+      gem_lines(gems)
     end
 
-    def format_by_created_time(gems)
-      by_created_at = {}
-      checksums = {}
-      gems.each do |name, versions|
-        versions.each do |v|
-          by_created_at[v[:created_at]] ||= {}
-          by_created_at[v[:created_at]][name] ||= []
-          by_created_at[v[:created_at]][name] << [v[:number], v[:platform]]
-          checksums[v[:created_at]] ||= {}
-          checksums[v[:created_at]] = v[:checksum]
-        end
+    def parse_gems(gems)
+      gem_lines = gems.map do |entry|
+        {
+          name: entry[:name],
+          versions: entry[:versions],
+          checksum: entry[:versions].first[:checksum]
+        }
       end
-      by_created_at.sort.map do |created_at,gems|
-        gems.map do |name, versions|
-          { name: name, versions: versions, checksum: checksums[created_at] }
-        end
-      end.flatten
+      gem_lines(gem_lines)
     end
 
     def gem_lines(gems)
       gems.reduce("") do |concat, entry|
-        versions = sort_versions(entry[:versions])
-        versions.map! { |version, platform| number_and_platform(version, platform) }
-        concat << "#{entry[:name]} #{versions.join(',')} #{entry[:checksum]}\n"
+        versions = entry[:versions]
+        number_and_plat = versions.map { |version| number_and_platform(version[:number], version[:platform]) }
+        concat << "#{entry[:name]} #{number_and_plat.join(',')} #{entry[:checksum]}\n"
       end
     end
 
-    def sort_versions(versions)
-      versions.sort_by { |v| Gem::Version.create(v.first) }
-    end
-
     def number_and_platform(number, platform)
       if platform.nil? || platform == 'ruby'
         number

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compact_index
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - fotanus@gmail.com
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake