rubygems-generate_index 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da6310d5d5600fe3490703c52845ad1b568ebeeea8d72defcfd291293428a0d0
-  data.tar.gz: ce577d33831eecb43d11b25940969d410b30a38eb11fec05029f07fed660f715
+  metadata.gz: 82af697178bb3e3bf31889eb4dd281986463afd2035cd32bfbb5bff1c6113b47
+  data.tar.gz: 70d622fb94c8f117b1d8dfe3ade55f20fe8658301406e41d0ac8901e84dd9152
 SHA512:
-  metadata.gz: 76b07b7b54e7de30771df6717f6fd7a5a48ca9b188e43b12e2193fc5d7a9e294eb54e02e6dc2e4b614624881e128d2bae2cd7dbe928b9f797c2c8a44c73e1e52
-  data.tar.gz: 2e24c72bc4692ebd46fd4176fe71363fe9b56d8e0b45bbe8aeca8852b64448d64682ee9972595d602766eeb78a999139da5d69f21e51545f464b10edc5acf540
+  metadata.gz: ea4ddc9ee10815cd5487082873f0e6b9a86448678cc4ccdeb3ab4c2aca1991af7881ad84a4a3b19651b95f34c13fc504b6d7a4cbb1b51ec9b371943fcd2d7b7f
+  data.tar.gz: dc547750ade62331fe4adab8999425a0348801f50410413a0d619c03d32186117c39d82e1f6cf89503efe050f51e7d6174d673a56eefb255f2f5716659946463

data/Gemfile

@@ -5,12 +5,12 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in rubygems-generate_index.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
+gem "rake", "~> 13.2"
+gem "rubocop", "~> 1.21"
+gem "rubocop-performance", "~> 1.19"
+gem "rubocop-rake", "~> 0.6.0"
 gem "test-unit", "~> 3.0"
-install_if -> { RUBY_VERSION >= "2.7" } do
-  gem "rubocop", "~> 1.21"
-  gem "rubocop-performance", "~> 1.19"
-end
+
 install_if -> { Gem::VERSION < "3.2.0" } do
   gem "builder", "~> 3.2"
 end

data/Manifest.txt

@@ -1,10 +1,14 @@
 CODE_OF_CONDUCT.md
 Gemfile
-Gemfile.lock
 LICENSE.txt
 MIT.txt
 Manifest.txt
 README.md
+lib/compact_index.rb
+lib/compact_index/dependency.rb
+lib/compact_index/gem.rb
+lib/compact_index/gem_version.rb
+lib/compact_index/versions_file.rb
 lib/rubygems/commands/generate_index_command.rb
 lib/rubygems/indexer.rb
 lib/rubygems_plugin.rb

data/lib/compact_index/dependency.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module CompactIndex
+  Dependency = Struct.new(:gem, :version, :platform, :checksum) do
+    def version_and_platform
+      if platform.nil? || platform == "ruby"
+        version
+      else
+        "#{version}-#{platform}"
+      end
+    end
+  end
+end

data/lib/compact_index/gem.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module CompactIndex
+  Gem = Struct.new(:name, :versions) do
+    def <=>(other)
+      name <=> other.name
+    end
+  end
+end

data/lib/compact_index/gem_version.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module CompactIndex
+  GemVersion = Struct.new(:number, :platform, :checksum, :info_checksum,
+                          :dependencies, :ruby_version, :rubygems_version) do
+    def number_and_platform
+      if platform.nil? || platform == "ruby"
+        number
+      else
+        "#{number}-#{platform}"
+      end
+    end
+
+    def <=>(other)
+      number_comp = number <=> other.number
+
+      if number_comp.zero?
+        [number, platform].compact <=> [other.number, other.platform].compact
+      else
+        number_comp
+      end
+    end
+
+    def to_line
+      line = "#{number_and_platform} #{deps_line}|checksum:#{checksum}"
+      line << ",ruby:#{ruby_version_line}" if ruby_version && ruby_version != ">= 0"
+      line << ",rubygems:#{rubygems_version_line}" if rubygems_version && rubygems_version != ">= 0"
+      line
+    end
+
+    private
+
+    def ruby_version_line
+      join_multiple(ruby_version)
+    end
+
+    def rubygems_version_line
+      join_multiple(rubygems_version)
+    end
+
+    def deps_line
+      return "" if dependencies.nil?
+
+      dependencies.map do |d|
+        [d[:gem], join_multiple(d.version_and_platform)].join(":")
+      end.join(",")
+    end
+
+    def join_multiple(requirements)
+      requirements = requirements.split(", ")
+      requirements.sort!
+      requirements.join("&")
+    end
+  end
+end

data/lib/compact_index/versions_file.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require "time"
+require "date"
+require "digest"
+
+module CompactIndex
+  class VersionsFile
+    def initialize(file = nil)
+      @path = file || "/versions.list"
+    end
+
+    def contents(gems = nil, args = {})
+      gems = calculate_info_checksums(gems) if args.delete(:calculate_info_checksums) { false }
+
+      raise ArgumentError, "Unknown options: #{args.keys.join(', ')}" unless args.empty?
+
+      File.read(@path).tap do |out|
+        out << gem_lines(gems) if gems
+      end
+    end
+
+    def updated_at
+      created_at_header(@path) || Time.at(0).utc.to_datetime
+    end
+
+    def create(gems, timestamp = Time.now.iso8601)
+      gems.sort!
+
+      File.open(@path, "w") do |io|
+        io.write "created_at: #{timestamp}\n---\n"
+        io.write gem_lines(gems)
+      end
+    end
+
+    private
+
+    def gem_lines(gems)
+      gems.reduce(+"") do |lines, gem|
+        version_numbers = gem.versions.map(&:number_and_platform).join(",")
+        lines << gem.name <<
+          " " << version_numbers <<
+          " #{gem.versions.last.info_checksum}\n"
+      end
+    end
+
+    def calculate_info_checksums(gems)
+      gems.each do |gem|
+        info_checksum = Digest::MD5.hexdigest(CompactIndex.info(gem[:versions]))
+        gem[:versions].last[:info_checksum] = info_checksum
+      end
+    end
+
+    def created_at_header(path)
+      return unless File.exist? path
+
+      File.open(path) do |file|
+        file.each_line do |line|
+          line.match(/created_at: (.*)\n|---\n/) do |match|
+            return match[1] && DateTime.parse(match[1])
+          end
+        end
+      end
+
+      nil
+    end
+  end
+end

data/lib/compact_index.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# Vendored from https://github.com/rubygems/compact_index v0.15.0
+
+require_relative "compact_index/gem"
+require_relative "compact_index/gem_version"
+require_relative "compact_index/dependency"
+
+require_relative "compact_index/versions_file"
+
+module CompactIndex
+  def self.names(gem_names)
+    gem_names.join("\n").prepend("---\n") << "\n"
+  end
+
+  def self.versions(versions_file, gems = nil, args = {})
+    versions_file.contents(gems, args)
+  end
+
+  def self.info(versions)
+    versions.inject(+"---\n") do |output, version|
+      output << version.to_line << "\n"
+    end
+  end
+end

data/lib/rubygems/indexer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "compact_index"
+require_relative "../compact_index"
 require "rubygems"
 require "rubygems/package"
 require "tmpdir"
@@ -216,7 +216,7 @@ class Gem::Indexer
 
     Gem.time "Generated compact index files" do
       info_dir = File.join(@directory, "info")
-      FileUtils.mkdir_p info_dir, :mode => 0o700
+      FileUtils.mkdir_p info_dir
 
       gems.each do |gem|
         info = CompactIndex.info(gem.versions)
@@ -450,7 +450,7 @@ class Gem::Indexer
 
     if @build_compact
       Gem.time "Updated compact index files" do
-        files += update_compact_index released, @dest_directory, @directory
+        files += update_compact_index specs, @dest_directory, @directory
       end
     end
 
@@ -574,7 +574,7 @@ class Gem::Indexer
         spec.platform.to_s,
         checksum,
         nil, # info_checksum
-        spec.dependencies.map {|d| CompactIndex::Dependency.new(d.name, d.requirement.to_s) },
+        spec.runtime_dependencies.map {|d| CompactIndex::Dependency.new(d.name, d.requirement.to_s) },
         spec.required_ruby_version&.to_s,
         spec.required_rubygems_version&.to_s
       )

data/rubygems-generate_index.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-generate_index"
-  s.version = "1.1.2"
+  s.version = "1.2.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"]
 
@@ -28,6 +28,4 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
   s.required_rubygems_version = Gem::Requirement.new(">= 0")
-
-  s.add_dependency "compact_index", "~> 0.15.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-generate_index
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Jim Weirich
@@ -13,26 +13,10 @@ authors:
 - André Arko
 - Evan Phoenix
 - Hiroshi SHIBATA
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: compact_index
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.0
-description: 
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 email:
 - ''
 - ''
@@ -46,19 +30,23 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
+- CODE_OF_CONDUCT.md
 - LICENSE.txt
 - MIT.txt
 - Manifest.txt
 - README.md
-- CODE_OF_CONDUCT.md
 files:
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - MIT.txt
 - Manifest.txt
 - README.md
+- lib/compact_index.rb
+- lib/compact_index/dependency.rb
+- lib/compact_index/gem.rb
+- lib/compact_index/gem_version.rb
+- lib/compact_index/versions_file.rb
 - lib/rubygems/commands/generate_index_command.rb
 - lib/rubygems/indexer.rb
 - lib/rubygems_plugin.rb
@@ -71,7 +59,6 @@ metadata:
   homepage_uri: https://github.com/rubygems/rubygems-generate_index
   source_code_uri: https://github.com/rubygems/rubygems-generate_index
   changelog_uri: https://github.com/rubygems/rubygems-generate_index
-post_install_message: 
 rdoc_options:
 - "--main"
 - README.md
@@ -89,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Generates the index files for a gem server directory
 test_files: []

data/Gemfile.lock

@@ -1,66 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rubygems-generate_index (1.1.2)
-      compact_index (~> 0.15.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    base64 (0.1.1)
-    builder (3.2.4)
-    compact_index (0.15.0)
-    json (2.6.3)
-    json (2.6.3-java)
-    language_server-protocol (3.17.0.3)
-    parallel (1.23.0)
-    parser (3.2.2.3)
-      ast (~> 2.4.1)
-      racc
-    power_assert (2.0.3)
-    racc (1.7.1)
-    racc (1.7.1-java)
-    rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.1)
-    rexml (3.2.6)
-    rubocop (1.56.3)
-      base64 (~> 0.1.1)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.2.2.3)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-performance (1.19.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.13.0)
-    test-unit (3.6.1)
-      power_assert
-    unicode-display_width (2.4.2)
-
-PLATFORMS
-  arm64-darwin
-  arm64-linux
-  java
-  ruby
-  x64-linux
-
-DEPENDENCIES
-  builder (~> 3.2)
-  rake (~> 13.0)
-  rubocop (~> 1.21)
-  rubocop-performance (~> 1.19)
-  rubygems-generate_index!
-  test-unit (~> 3.0)
-
-BUNDLED WITH
-   2.4.22