compact_index 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 057af6bb8ef8c7251c6d7d22fc714db46285cd9e
-  data.tar.gz: 3ef2a4c6081ca4c61e1f730a8b68e6e6081d7ae2
+  metadata.gz: 87fc1665041ba2af025514fe237e33f96889d2e2
+  data.tar.gz: 9e207f65d64a0a52873c75689f32d4711b5066bd
 SHA512:
-  metadata.gz: 9d7c04c51b9d424f2aa36d2c8b7d30b130c91d39fca80667ea75e561b03499279bb3e4cd5a264fd725c214712a11638c233ad31ce9c4512b415546152cb94314
-  data.tar.gz: b972136984bfe3e5f3fb5b4d835a0816166d37457c473552ea81e49a9a2b91ddffc8dd182593e8338c32a514e894d7c5e78d6013a9d019113f158292d06cadf0
+  metadata.gz: 6d30ee18ae3e651d79c980c211dac350c72c73ab34df3ce814b3aa1c42a21ea3a6f0768cebbd7d8119f1522bc8a48305639514861fbe15875efa645c840ec121
+  data.tar.gz: 2e3cf006537b2575f19558a815e9126f5fa4d08b23bd5f19001415449c7cfc1f668a69d812ea30d434877150cc6c9047b3ecd73319344cf694082da6c3a246a2

data/.gitignore

@@ -7,4 +7,3 @@
 /pkg/
 /spec/reports/
 /tmp/
-spec/config.yml

data/lib/compact_index.rb

@@ -3,31 +3,38 @@ require "compact_index/versions_file"
 require "compact_index/gem_info"
 
 module CompactIndex
-  def self.names(conn)
-    "---\n" + GemInfo.new(conn).names.join("\n") + "\n"
+  def self.names(gem_names)
+    "---\n" + gem_names.join("\n") + "\n"
   end
 
-  def self.versions(conn)
-    VersionsFile.new(conn).with_new_gems
+  def self.versions(path, gems)
+    versions_file = VersionsFile.new(path)
+    versions_file.contents(gems)
   end
 
-  def self.info(conn, name)
+  def self.info(params)
     output = "---\n"
-    name = [name] if name.kind_of? String
-    GemInfo.new(conn).deps_for(name).each do |row|
-      output << version_line(row) << "\n"
+    params.each do |version|
+      output << version_line(version[:number], version[:dependencies]) << "\n"
     end
     output
   end
 
   private
-    def self.version_line(row)
-      deps = row[:dependencies].map do |d|
-        [d.first, d.last.gsub(/, /, "&")].join(":")
+    def self.version_line(version, dependencies = nil)
+      if dependencies
+        dependencies.sort! { |a,b| a[:gem] <=> b[:gem] }
+        deps = dependencies.map do |d|
+          [
+             d[:gem],
+             d[:version].gsub(/, /, "&")
+          ].join
+        end
+      else
+        deps = []
       end
 
-      line = row[:number].to_s
-      line << "-#{row[:platform]}" unless row[:platform] == "ruby"
+      line = version
       line << " " << deps.join(",") if deps.any?
       line
     end

data/lib/compact_index/version.rb

@@ -1,3 +1,3 @@
 module CompactIndex
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/compact_index/versions_file.rb

@@ -1,76 +1,70 @@
 require 'compact_index'
 
 class CompactIndex::VersionsFile
-  PATH = "versions.list"
-  def initialize(connection)
-    @conn = connection
+  def initialize(file = nil)
+    @path = file || "/versions.list"
   end
 
-  def create_or_update
-    if File.exists? PATH
-      update
-    else
-      create
-    end
-  end
-
-  def create
+  def create(gems)
     content = "created_at: #{Time.now.iso8601}"
     content += "\n---\n"
-    content += gems_for_new_file
+    content += parse_gems(gems)
 
-    File.open(PATH, 'w') do |io|
+    File.open(@path, 'w') do |io|
       io.write content
     end
   end
 
-  def update
-    to_write = with_new_gems
-    File.open(PATH, 'w') do |io|
-      io.write to_write
+  def update(gems)
+    File.open(@path, 'a') do |io|
+      io.write parse_gems(gems)
     end
   end
 
-  def with_new_gems
-    if new_gems.empty?
-      content
-    else
-      content + "\n" + new_gems
-    end
+  def contents(gems=nil)
+    out = File.open(@path).read
+    out += parse_gems(gems) if gems
+    out
   end
 
+  def updated_at
+    DateTime.parse(File.mtime(@path).to_s)
+  end
+
+
   private
-    def content
-      File.open(PATH).read
 
+    def parse_gems(gems)
+      sorted_gems = format_by_created_time(gems)
+      gem_lines(sorted_gems)
     end
 
-    def created_at
-      DateTime.parse(File.mtime(PATH).to_s)
+    def format_by_created_time(gems)
+      by_created_at = {}
+      gems.each do |gem|
+        gem[:versions].each do |v|
+          by_created_at[v[:created_at]] ||= {}
+          by_created_at[v[:created_at]][gem[:name]] ||= []
+          by_created_at[v[:created_at]][gem[:name]] << v[:number]
+        end
+      end
+      by_created_at.sort.map do |_,gems|
+        gems.map do |name, versions|
+          { name: name, versions: versions }
+        end
+      end.flatten
     end
 
-    def gems_for_new_file
-      dataset = @conn[<<-SQL]
-          SELECT
-            r.name, string_agg(
-                      concat_ws('-', v.number, nullif(v.platform,'ruby')), ','
-                      ORDER BY number ASC
-                    )
-          FROM rubygems AS r, versions AS v
-          WHERE v.rubygem_id = r.id AND
-                v.indexed is true
-          GROUP BY r.name
-      SQL
-      dataset.map { |entry| "#{entry[:name]} #{entry[:string_agg]}" }.join("\n")
+    def gem_lines(gems)
+      gems.reduce("") do |concat, entry|
+        versions = sort_versions(entry[:versions])
+        concat + "#{entry[:name]} #{versions.join(',')}\n"
+      end
     end
 
-    def new_gems
-      dataset = @conn[<<-SQL, created_at]
-          SELECT r.name, concat_ws('-', v.number, nullif(v.platform,'ruby'))
-          FROM rubygems AS r, versions AS v
-          WHERE v.rubygem_id = r.id AND v.indexed is true AND v.created_at > ?
-          ORDER BY v.created_at, r.name, concat_ws
-      SQL
-      dataset.map { |entry| "#{entry[:name]} #{entry[:concat_ws]}" }.join("\n")
+    def sort_versions(versions)
+      versions.sort do |a,b|
+        gem_comp = Gem::Version.new(a) <=> Gem::Version.new(b)
+      end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compact_index
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - fotanus@gmail.com
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel