rubygems-generate_index 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e89ec0ba401376957ef5cd59bfaecd5e77bc043775fa0f4414332dffab489aa
-  data.tar.gz: 9032f6fe7bb94da4d1b9c11bfd29bbbd0f6bb4bc74d054c2825c833121ea84c0
+  metadata.gz: 1ad952327cbcaa7acf0cae3fa55046eb6453bec284c897fcf2b02f49ff1a6cc1
+  data.tar.gz: 0bad6263323bd12ff67c039cbc80246df6631dfa285876585336b91d5620ff7f
 SHA512:
-  metadata.gz: ad0f57dd0f7a01f1b6702848190c5623af4787ffde8817ee090fb334b1c575f47f112f21aee01d047dbe12df1409635a40abb55ae9617bd3c29dd913de91c458
-  data.tar.gz: ee119a9d5bad9b7045d22868eaf08e4c2efbc9097eb03ed1f9cd2f3b858da00fbedc596fc839d22aa2db7f6a51ea41cef7ae3ce3fd4fc7f8d94ce1130bf24b75
+  metadata.gz: e0ff2c9f9aec05d64453bbe3a8a5092cd43649e87cf1fd2000ad36e7c29b4a35e5223d9ff7319f4cbcf1e0f7d8371a2f573958c68937cc6667afc9d17cca47d7
+  data.tar.gz: 4f7f011e4624a6d3600fdc95b4bc14e4c408b05c7ce377b17206a70a3248594004a79dba3f25a3a08fa1a7da4c52002f064e2497d7a35eae68f1412f88ad7044

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubygems-generate_index (1.0.0)
+    rubygems-generate_index (1.1.0)
       compact_index (~> 0.14.0)
 
 GEM
@@ -63,4 +63,4 @@ DEPENDENCIES
   test-unit (~> 3.0)
 
 BUNDLED WITH
-   2.4.19
+   2.4.22

data/lib/rubygems/commands/generate_index_command.rb

@@ -12,7 +12,7 @@ class Gem::Commands::GenerateIndexCommand < Gem::Command
   def initialize
     super "generate_index",
           "Generates the index files for a gem server directory",
-          :directory => ".", :build_modern => true
+          :directory => ".", :build_modern => true, :build_compact => true
 
     @deprecated_options = { "generate_index" => {} } unless defined?(@deprecated_options)
 
@@ -30,15 +30,20 @@ class Gem::Commands::GenerateIndexCommand < Gem::Command
     deprecate_option("--modern", version: "4.0", extra_msg: "Modern indexes (specs, latest_specs, and prerelease_specs) are always generated, so this option is not needed.")
     deprecate_option("--no-modern", version: "4.0", extra_msg: "The `--no-modern` option is currently ignored. Modern indexes (specs, latest_specs, and prerelease_specs) are always generated.")
 
+    add_option "--[no-]compact",
+                "Generate compact index files" do |value, options|
+      options[:build_compact] = value
+    end
+
     add_option "--update",
-               "Update modern indexes with gems added",
+               "Update modern and compact indices with gems added",
                "since the last update" do |value, options|
       options[:update] = value
     end
   end
 
   def defaults_str # :nodoc:
-    "--directory . --modern"
+    "--directory . --modern --compact"
   end
 
   def description # :nodoc:

data/lib/rubygems/indexer.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "compact_index"
 require "rubygems"
 require "rubygems/package"
 require "tmpdir"
@@ -23,6 +24,11 @@ class Gem::Indexer
 
   attr_accessor :build_modern
 
+  ##
+  # Build compact index files when true
+
+  attr_accessor :build_compact
+
   ##
   # Index install location
 
@@ -64,6 +70,7 @@ class Gem::Indexer
     options = { :build_modern => true }.merge options
 
     @build_modern = options[:build_modern]
+    @build_compact = options[:build_compact]
 
     @dest_directory = directory
     @directory = Dir.mktmpdir "gem_generate_index"
@@ -103,6 +110,7 @@ class Gem::Indexer
     Gem::Specification._resort! specs
     build_marshal_gemspecs specs
     build_modern_indices specs if @build_modern
+    build_compact_index specs if @build_compact
 
     compress_indices
   end
@@ -196,6 +204,57 @@ class Gem::Indexer
                "#{@prerelease_specs_index}.gz"]
   end
 
+  ##
+  # Builds compact index files
+
+  def build_compact_index(specs)
+    gems = compact_index_gems(specs)
+
+    progress = ui.progress_reporter gems.count + 2,
+      "Generating compact index files for #{gems.count} gems",
+      "Complete"
+
+    Gem.time "Generated compact index files" do
+      info_dir = File.join(@directory, "info")
+      FileUtils.mkdir_p info_dir, :mode => 0o700
+
+      gems.each do |gem|
+        info = CompactIndex.info(gem.versions)
+
+        info_checksum = Digest::MD5.hexdigest(info)
+        gem[:versions].last[:info_checksum] = info_checksum
+
+        info_path = File.join(@directory, "info", gem.name)
+        if File.exist?(info_path)
+          raise "info file already exists: #{info_path}"
+        end
+
+        File.open(info_path, "wb") do |io|
+          io.write info
+        end
+
+        progress.updated "/info/#{gem.name}"
+      end
+
+      File.open(File.join(@directory, "names"), "wb") do |io|
+        io.write CompactIndex.names(gems.map(&:name))
+      end
+      progress.updated "/names"
+
+      CompactIndex::VersionsFile.new(
+        File.join(@directory, "versions")
+      ).create(
+        gems,
+      )
+
+      progress.updated "/versions"
+
+      @files << info_dir << File.join(@directory, "names") << File.join(@directory, "versions")
+
+      progress.done
+    end
+  end
+
   def map_gems_to_specs(gems)
     gems.map do |gemfile|
       if File.size(gemfile) == 0
@@ -389,6 +448,12 @@ class Gem::Indexer
                          @prerelease_specs_index)
     end
 
+    if @build_compact
+      Gem.time "Updated compact index files" do
+        files += update_compact_index released, @dest_directory, @directory
+      end
+    end
+
     compress_indices
 
     verbose = Gem.configuration.really_verbose
@@ -439,6 +504,87 @@ class Gem::Indexer
     end
   end
 
+  ##
+  # Combines specs in +index+ and +source+ then writes out a new
+  # compact index to +dest+.
+
+  def update_compact_index(new_specs, source, dest)
+    files = []
+    source_versions_path = File.join(source, "versions")
+    versions_file = CompactIndex::VersionsFile.new source_versions_path
+
+    gems = compact_index_gems new_specs
+
+    FileUtils.mkdir_p File.join(dest, "info")
+
+    new_names = []
+    gems.each do |gem|
+      existing_info_path = File.join(source, "info", gem.name)
+      if File.exist? existing_info_path
+        info = Gem.read_binary(existing_info_path) +
+               CompactIndex.info(gem.versions).sub(/\A---\n/, "")
+      else
+        new_names << gem.name
+        info = CompactIndex.info gem.versions
+      end
+
+      info_checksum = Digest::MD5.hexdigest(info)
+      gem[:versions].last[:info_checksum] = info_checksum
+
+      info_path = File.join(dest, "info", gem.name)
+      if File.exist?(info_path)
+        raise "info file already exists: #{info_path}"
+      end
+
+      File.open(info_path, "wb") do |io|
+        io.write info
+      end
+      files << info_path
+    end
+
+    versions_path = File.join(dest, "versions")
+    File.open(versions_path, "wb") do |io|
+      io.write versions_file.contents(gems)
+    end
+    files << versions_path
+
+    unless new_names.empty?
+      old_names = Gem.read_binary(File.join(source, "names")).lines(chomp: true)[2..]
+      names_path = File.join(dest, "names")
+
+      names = old_names + new_names
+      names.sort!
+
+      File.open(names_path, "wb") do |io|
+        io.write CompactIndex.names(names)
+      end
+
+      files << names_path
+    end
+
+    files
+  end
+
+  def compact_index_gems(specs)
+    versions_by_name = Hash.new {|h, k| h[k] = [] }
+    specs.each do |spec|
+      checksum = spec.loaded_from && Digest::SHA256.file(spec.loaded_from).base64digest!
+      versions_by_name[spec.name] << CompactIndex::GemVersion.new(
+        spec.version.version,
+        spec.platform,
+        checksum,
+        nil, # info_checksum
+        spec.dependencies.map {|d| CompactIndex::Dependency.new(d.name, d.requirement.to_s) },
+        spec.required_ruby_version&.to_s,
+        spec.required_rubygems_version&.to_s
+      )
+    end
+    versions_by_name.map do |name, versions|
+      versions.sort!
+      CompactIndex::Gem.new(name, versions)
+    end.tap(&:sort!)
+  end
+
   private
 
   def marshal_load(string)

data/rubygems-generate_index.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-generate_index"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
   s.authors = ["Jim Weirich", "Chad Fowler", "Eric Hodel", "Luis Lavena", "Aaron Patterson", "Samuel Giddins", "André Arko", "Evan Phoenix", "Hiroshi SHIBATA"]
   s.email = ["", "", "drbrain@segment7.net", "luislavena@gmail.com", "aaron@tenderlovemaking.com", "segiddins@segiddins.me", "andre@arko.net", "evan@phx.io", "hsbt@ruby-lang.org"]
 
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
     "CODE_OF_CONDUCT.md"
   ]
 
-  s.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
+  s.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
   s.required_rubygems_version = Gem::Requirement.new(">= 0")
 
   s.add_dependency "compact_index", "~> 0.14.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-generate_index
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jim Weirich
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-26 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compact_index
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="