compact_index 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6492761458b50fdbcb83b689108a86cb615a92d
-  data.tar.gz: 004af9c6c3d5ab2d3b34d31681a3e37eceaacabd
+  metadata.gz: bbd6a30b0d60a7d08b00d9d46e06c277995840cf
+  data.tar.gz: 7afb08dbfa5fcc801aac009bb2153fab50a8ff6b
 SHA512:
-  metadata.gz: 80543b634e539cc4027c0242b156416f4ca24d810ce62357808d30c3a8fa58547a4459016695fd7593d574b1a3d1a26e2af47bf0e38b634d82f3b7988c6e1d67
-  data.tar.gz: 65230c95d25f3f4c51f0caf6805cd516ed51c67b6dd6a2e82179fb569fb607cda69d8e1ab89e0eed3e97708ae80b7435da593cacf98eb242c76526560e4ef9b1
+  metadata.gz: aeb75821bbec6205ddaf38aed73d4552e7e1f7d11889cf7f9f6cf4e9981f12ebe7e51a9c5e822d62d165922f6c9ab8dc2fa44ef66a26ffa272fdd251e43577f1
+  data.tar.gz: 900911a7cbef27e3602158d148257ecc60fa5e016983ecd668f1a92ac43299e2f39662f01ccf6ffc6b6a71103a9f0c82bf1a0904c9d475d6e7ebdc4fc633b9fa

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm: 2.1.5
 script: bundle exec rspec
-before_script: cp spec/config.yml.example spec/config.yml
 

data/compact_index.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sequel"
-  spec.add_dependency "pg"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3"
 end

data/lib/compact_index.rb

@@ -1,6 +1,5 @@
 require "compact_index/version"
 require "compact_index/versions_file"
-require "compact_index/gem_info"
 
 module CompactIndex
   def self.names(gem_names)
@@ -14,16 +13,16 @@ module CompactIndex
   def self.info(params)
     output = "---\n"
     params.each do |version|
-      output << version_line(version[:number], version[:dependencies]) << "\n"
+      output << version_line(version) << "\n"
     end
     output
   end
 
   private
-    def self.version_line(version, dependencies = nil)
-      if dependencies
-        dependencies.sort! { |a,b| a[:gem] <=> b[:gem] }
-        deps = dependencies.map do |d|
+    def self.version_line(version)
+      if version[:dependencies]
+        version[:dependencies].sort! { |a,b| a[:gem] <=> b[:gem] }
+        deps = version[:dependencies].map do |d|
           [
              d[:gem],
              d[:version].gsub(/, /, "&")
@@ -33,8 +32,16 @@ module CompactIndex
         deps = []
       end
 
-      line = version
+      line = version[:number]
       line << " " << deps.join(",") if deps.any?
+      line << "|"
+
+      after_pipe = []
+      after_pipe << "checksum:#{version[:checksum]}"
+      after_pipe << "ruby:#{version[:ruby_version]}" if version[:ruby_version]
+      after_pipe << "rubygems:#{version[:rubygems_version]}" if version[:rubygems_version]
+      line << after_pipe.join(",")
+      
       line
     end
 end

data/lib/compact_index/version.rb

@@ -1,3 +1,3 @@
 module CompactIndex
-  VERSION = "0.3.1"
+  VERSION = "0.4.1"
 end

data/lib/compact_index/versions_file.rb

@@ -8,7 +8,7 @@ class CompactIndex::VersionsFile
   def create(gems)
     content = "created_at: #{Time.now.iso8601}"
     content += "\n---\n"
-    content += parse_gems(gems)
+    content += parse_gems_for_create(gems)
 
     File.open(@path, 'w') do |io|
       io.write content
@@ -34,6 +34,16 @@ class CompactIndex::VersionsFile
 
   private
 
+
+    def parse_gems_for_create(gems)
+      fixed_format_gems = gems.map do |k,v|
+        numbers = v.map { |x| x[:number] }
+        { name: k, versions: numbers, checksum: v.first[:checksum] }
+      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)
@@ -41,16 +51,19 @@ class CompactIndex::VersionsFile
 
     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]
+          checksums[v[:created_at]] ||= {}
+          checksums[v[:created_at]] = v[:checksum]
         end
       end
-      by_created_at.sort.map do |_,gems|
+      by_created_at.sort.map do |created_at,gems|
         gems.map do |name, versions|
-          { name: name, versions: versions }
+          { name: name, versions: versions, checksum: checksums[created_at] }
         end
       end.flatten
     end
@@ -58,7 +71,7 @@ class CompactIndex::VersionsFile
     def gem_lines(gems)
       gems.reduce("") do |concat, entry|
         versions = sort_versions(entry[:versions])
-        concat + "#{entry[:name]} #{versions.join(',')}\n"
+        concat + "#{entry[:name]} #{versions.join(',')} #{entry[:checksum]}\n"
       end
     end
 

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: compact_index
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - fotanus@gmail.com
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +64,6 @@ files:
 - db/migrations/06_add_created_at_to_versions.rb
 - db/migrations/07_add_checksum_to_versions.rb
 - lib/compact_index.rb
-- lib/compact_index/gem_info.rb
 - lib/compact_index/version.rb
 - lib/compact_index/versions_file.rb
 homepage: https://github.com/bundler/compact_index

data/lib/compact_index/gem_info.rb

@@ -1,91 +0,0 @@
-require 'compact_index'
-
-# Return data about all the gems: all gem names, all versions of all gems, all dependencies for all versions of a gem
-class CompactIndex::GemInfo
-  DepKey = Struct.new(:name, :number, :platform, :required_ruby_version, :rubygems_version, :checksum)
-
-  def initialize(connection)
-    @conn = connection
-  end
-
-  # @param [String] array of strings with the gem names
-  def deps_for(gems = [])
-    dataset =
-      if gems.any?
-        @conn[<<-SQL, Sequel.value_list(gems)]
-          SELECT rv.name, rv.number, rv.platform, rv.required_ruby_version, rv.checksum,
-                 rv.rubygems_version, d.requirements, for_dep_name.name dep_name
-          FROM
-            (SELECT r.name, v.number, v.platform,v.rubygems_version, v.checksum,
-                    v.required_ruby_version, v.id AS version_id
-            FROM rubygems AS r, versions AS v
-            WHERE v.rubygem_id = r.id
-              AND v.indexed is true
-              AND r.name IN ?) AS rv
-          LEFT JOIN dependencies AS d ON
-            d.version_id = rv.version_id
-          LEFT JOIN rubygems AS for_dep_name ON
-            d.rubygem_id = for_dep_name.id
-            AND d.scope = 'runtime';
-        SQL
-      else
-        @conn[<<-SQL]
-          SELECT rv.name, rv.number, rv.platform, d.requirements, for_dep_name.name dep_name
-          FROM
-            (SELECT r.name, v.number, v.platform, v.id AS version_id
-            FROM rubygems AS r, versions AS v
-            WHERE v.rubygem_id = r.id
-              AND v.indexed is true) AS rv
-          LEFT JOIN dependencies AS d ON
-            d.version_id = rv.version_id
-          LEFT JOIN rubygems AS for_dep_name ON
-            d.rubygem_id = for_dep_name.id
-            AND d.scope = 'runtime';
-SQL
-      end
-
-    deps = {}
-
-    dataset.each do |row|
-      key = DepKey.new(row[:name], row[:number], row[:platform], row[:required_ruby_version], row[:rubygems_version], row[:checksum])
-      deps[key] = [] unless deps[key]
-      deps[key] << [row[:dep_name], row[:requirements]] if row[:dep_name]
-    end
-
-    deps.map do |dep_key, gem_deps|
-      {
-        name:                  dep_key.name,
-        number:                dep_key.number,
-        platform:              dep_key.platform,
-        rubygems_version:      dep_key.rubygems_version,
-        required_ruby_version: dep_key.required_ruby_version,
-        checksum:              dep_key.checksum,
-        dependencies:          gem_deps
-      }
-    end
-  end
-
-  # return list of gem names
-  def names
-    @conn[:rubygems].select(:name).order(:name).all.map {|r| r[:name] }
-  end
-
-  # return a list of gem names and their versions
-  def versions
-    specs_hash = Hash.new {|h, k| h[k] = [] }
-    rows = @conn[<<-SQL]
-      SELECT v.full_name, v.number, v.platform
-      FROM versions AS v
-      WHERE v.indexed is true
-SQL
-    rows.each do |row|
-      full_name = row[:full_name]
-      version = row[:number]
-      version += "-" << row[:platform] unless row[:platform] == "ruby"
-      name = full_name.chomp("-" << version)
-      specs_hash[name] << version
-    end
-
-    specs_hash.each {|k, v| v.sort! }
-  end
-end