gem_server_conformance 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc996f39ef2b36f10b6888858981fff19bb5a06e547981643d3a8486a24b2aeb
-  data.tar.gz: da7ab819c31d6e1d1c6915f91cc2b31148a7cd19747ad45d9fa0d4905bfef38f
+  metadata.gz: e786fdd6d0c53669a1dae6ada4c2944a8ef76b3eefc9b1d063a7b028cd74794c
+  data.tar.gz: 73bd34809a32bcacfda221a7fa0def504ae0c6b84e032230ec281e8265adf496
 SHA512:
-  metadata.gz: 1ce259e3b57721291668320ecf6f547809aceb5f41d7f5dce41624724d38fad03011c839e749cc4b369630a435683d65e91d0d3b07e277a7a9c2dc4806930ea4
-  data.tar.gz: 14ba296d864bebcdb5b4d0d5f857def2d33d3285b76f74816e2736afd828a1117660829e87bd5a8fc11917c58e4223d5062b5667c18b8592da94b786bc1f3d24
+  metadata.gz: 5af656dcb9dd845788e1b19a6b6260a05e7b4c80cfc8574562f6f05e4b3d8e1fc580faaf266df8354943be60a955e416ad45812457853ad711db5f1bc17a5ba3
+  data.tar.gz: 9518b5752df1559976fc7a7ebd8a2b8f933a2e1d4654e1f2dec406e80fd606b40ab9b70c44971b6ba58a5f6611a35f8242d237094689e173bac59c8ff41825c3

data/lib/gem_server_conformance/server.rb

@@ -112,6 +112,11 @@ module GemServerConformance
 
     def push(gem)
       package = Gem::Package.new(StringIO.new(gem))
+      begin
+        package.spec
+      rescue Gem::Package::FormatError, Psych::SyntaxError => e
+        return [400, {}, ["Invalid gem: #{e.message}"]]
+      end
       log "Pushed #{package.spec.full_name}"
       if @versions.any? { |v| v.package.spec.full_name == package.spec.full_name }
         return [409, {}, ["Conflict: #{package.spec.full_name} already exists"]]

data/lib/gem_server_conformance/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GemServerConformance
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/gem_server_conformance_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe GemServerConformance do # rubocop:disable RSpec/EmptyExampleGroup
 
   before(:all) do
     Gem.configuration.verbose = false
+    Gem::DefaultUserInteraction.ui = Gem::SilentUI.new
     ENV["SOURCE_DATE_EPOCH"] = "0"
   end
 
@@ -61,12 +62,162 @@ RSpec.describe GemServerConformance do # rubocop:disable RSpec/EmptyExampleGroup
                                     } do
     pushed_gem("a-1.0.0")
 
+    @ctx.it "has the exact contents as expected" do
+      allow(RSpec::Support::ObjectFormatter.default_instance).to receive(:prepare_for_inspection).and_call_original
+      allow(RSpec::Support::ObjectFormatter.default_instance)
+        .to receive(:prepare_for_inspection).with(an_instance_of(String)) { |s| s }
+      io = StringIO.new(@gem_a_1_0_0.contents)
+      io.binmode
+      package = Gem::Package.new(io)
+      actual = []
+
+      presence = proc do |x|
+        x if x && !x.empty?
+      end
+
+      dump_tar = proc do |tar_io, into = actual|
+        Gem::Package::TarReader.new(tar_io) do |gem|
+          gem.each do |entry|
+            body = entry.read
+            extra = nil
+            if entry.full_name.end_with?(".gz")
+              extra = Zlib::GzipReader.wrap(StringIO.new(body)) do |gz|
+                magic, compression_method, flags, mtime, compression, os_id = body.unpack("H4ccVcC")
+                {
+                  magic: magic, compression_method: compression_method, flags: flags, mtime: mtime,
+                  compression: compression, os_id: os_id, comment: presence[gz.comment], crc: gz.crc,
+                  orig_name: presence[gz.orig_name]
+                }.compact
+              end
+              body = Zlib.gunzip(body)
+            end
+            body = dump_tar[StringIO.new(body), []] if entry.full_name.end_with?(".tar.gz")
+
+            into << {
+              header: entry.header.instance_variables.to_h do |ivar|
+                        [ivar.to_s.tr("@", "").to_sym, entry.header.instance_variable_get(ivar)]
+                      end,
+              body: body,
+              extra: extra
+            }.compact
+          end
+        end
+        into
+      end
+      package.gem.with_read_io(&dump_tar)
+      expected_gz_extra = { compression: 2, compression_method: 8, crc: 0, flags: 0, magic: "1f8b", mtime: 0,
+                            os_id: 3 }
+      expect(actual).to eq(
+        [{ body: <<~YAML,
+          --- !ruby/object:Gem::Specification
+          name: a
+          version: !ruby/object:Gem::Version
+            version: 1.0.0
+          platform: ruby
+          authors:
+          - Conformance
+          bindir: bin
+          cert_chain: []
+          date: 2024-07-09 00:00:00.000000000 Z
+          dependencies: []
+          executables: []
+          extensions: []
+          extra_rdoc_files: []
+          files: []
+          licenses: []
+          metadata: {}
+          rdoc_options: []
+          require_paths:
+          - lib
+          required_ruby_version: !ruby/object:Gem::Requirement
+            requirements:
+            - - ">="
+              - !ruby/object:Gem::Version
+                version: '0'
+          required_rubygems_version: !ruby/object:Gem::Requirement
+            requirements:
+            - - ">="
+              - !ruby/object:Gem::Version
+                version: '0'
+          requirements: []
+          rubygems_version: 3.5.11
+          specification_version: 4
+          summary: Conformance test
+          test_files: []
+        YAML
+           header: { checksum: 5894,
+                     devmajor: 0,
+                     devminor: 0,
+                     empty: false,
+                     gid: 0,
+                     gname: "wheel",
+                     linkname: "",
+                     magic: "ustar",
+                     mode: 292,
+                     mtime: 0,
+                     name: "metadata.gz",
+                     prefix: "",
+                     size: 318,
+                     typeflag: "0",
+                     uid: 0,
+                     uname: "wheel",
+                     version: 0 },
+           extra: expected_gz_extra },
+         { body: [],
+           header: { checksum: 5834,
+                     devmajor: 0,
+                     devminor: 0,
+                     empty: false,
+                     gid: 0,
+                     gname: "wheel",
+                     linkname: "",
+                     magic: "ustar",
+                     mode: 292,
+                     mtime: 0,
+                     name: "data.tar.gz",
+                     prefix: "",
+                     size: 35,
+                     typeflag: "0",
+                     uid: 0,
+                     uname: "wheel",
+                     version: 0 },
+           extra: expected_gz_extra },
+         { body: <<~YAML,
+           ---
+           SHA256:
+             metadata.gz: 5a1eb70f836c830856bd6ff54ae48916e6f5f297608012575884131c74089b36
+             data.tar.gz: 6578c1623326a8b876f84c946634f7208ce54f23a75fa5775b44469ddb08a8e7
+           SHA512:
+             metadata.gz: 26dbf51d174890d592f13c0bccc6638e02e34f603684e9df7320508f777bf9da5061dd13f8262eef47ddcc0d975e33a9eead945de9544bbb4fd9358cfda0f026
+             data.tar.gz: ea28bfbb44a5ca539ed7b50c492c0a5aa6cce60f7babad5c65cb2aca5c100ac350fb28eeb1c4ae32c8cf22c2724595b946e1cb12f521eeaf0a7246a26aad00a0
+         YAML
+           header: { checksum: 6506,
+                     devmajor: 0,
+                     devminor: 0,
+                     empty: false,
+                     gid: 0,
+                     gname: "wheel",
+                     linkname: "",
+                     magic: "ustar",
+                     mode: 292,
+                     mtime: 0,
+                     name: "checksums.yaml.gz",
+                     prefix: "",
+                     size: 295,
+                     typeflag: "0",
+                     uid: 0,
+                     uname: "wheel",
+                     version: 0 },
+           extra: expected_gz_extra }]
+      )
+    end
+
     request :get_versions, compact_index: true do
       it { is_expected.to be_valid_compact_index_reponse }
 
       it {
         is_expected.to have_body(
-          parent_response.body + "a 1.0.0 8761412e66a014fe80723e251d96be29\n"
+          parent_response.body + "a 1.0.0 443730449deef440bd299e19554793f0\n"
         )
       }
     end
@@ -75,7 +226,7 @@ RSpec.describe GemServerConformance do # rubocop:disable RSpec/EmptyExampleGroup
       it { is_expected.to be_ok }
       it { is_expected.to have_body(<<~INFO) }
         ---
-        1.0.0 |checksum:2dfc054a348d36faae6e98e8c0222a76c07cfa0620b3c47acb154cb3d2de149b
+        1.0.0 |checksum:9bc2cb93a200173fcd556c6c674bb4cdbce9b284e5dea0be9c21ee801f38b821
       INFO
       it { is_expected.to have_header("content-type").with_value("text/plain; charset=utf-8") }
     end
@@ -152,15 +303,15 @@ RSpec.describe GemServerConformance do # rubocop:disable RSpec/EmptyExampleGroup
     request :get_versions, compact_index: true do
       it { is_expected.to be_valid_compact_index_reponse }
       it { is_expected.to have_body(parent_response.body + <<~BODY) }
-        a 0.0.1 22428c91ad748146bec818307104ed33
-        b 1.0.0.pre 688f5cdf79887aff5d87c86f36cfe063
+        a 0.0.1 8ffe0a0dda27362c6f916d3941a5726e
+        b 1.0.0.pre f0d229a9323895e2e1c85f496b5f10b5
       BODY
     end
 
     request :get_info, "a", compact_index: true do
       it { is_expected.to be_valid_compact_index_reponse }
       it { is_expected.to have_body(parent_response.body + <<~INFO) }
-        0.0.1 |checksum:5e25d516b8c19c9d26ef95efad565c2097865a0d3dba5ef3fade650a2e690b35
+        0.0.1 |checksum:a2bee9c1c6b2ab54a19c4d4644663eda25c2326bebe0eb9f9c097a2a11fd6203
       INFO
     end
 
@@ -168,7 +319,7 @@ RSpec.describe GemServerConformance do # rubocop:disable RSpec/EmptyExampleGroup
       it { is_expected.to be_valid_compact_index_reponse }
       it { is_expected.to have_body(<<~INFO) }
         ---
-        1.0.0.pre a:< 1.0.0&>= 0.1.0|checksum:3f97419b7c35257f7aab3ae37521ab64ef8ec7646ef55b9f6a5e41d479bc128c,ruby:>= 2.0,rubygems:>= 2.0
+        1.0.0.pre a:< 1.0.0&>= 0.1.0|checksum:4096fbca288dcf4b4cea8bbebdea5d10d6b3f4fd2ff3c13124852854d5d7d24b,ruby:>= 2.0,rubygems:>= 2.0
       INFO
     end
 
@@ -268,18 +419,18 @@ RSpec.describe GemServerConformance do # rubocop:disable RSpec/EmptyExampleGroup
     request :get_versions, compact_index: true do
       it { is_expected.to be_valid_compact_index_reponse }
       it { is_expected.to have_body(parent_response.body + <<~BODY) }
-        a 0.2.0 7a7528379bbd1e0420ea7f1305ba526a
-        a 0.2.0-x86-mingw32 17f9c2882d6f0a244f8bba2df1d14107
-        a 0.2.0-java ca5c12bc8ba4457ada41c71bee282bfb
+        a 0.2.0 66fab29417d3142772e0f2467b92d684
+        a 0.2.0-x86-mingw32 fd6d38ccbc3556b4426c65fceed9c717
+        a 0.2.0-java 704774b40118bdb16676deee38a99030
       BODY
     end
 
     request :get_info, "a", compact_index: true do
       it { is_expected.to be_valid_compact_index_reponse }
       it { is_expected.to have_body(parent_response.body + <<~INFO) }
-        0.2.0 |checksum:a1753a0e8b6f0515a15e9cfa4ea143e36de235525f6f68c4ff45c4ae70be072f
-        0.2.0-x86-mingw32 |checksum:e330e73d0dec030107c5656bbe89aecae738ba483471bf87f1bd943093fc9f27
-        0.2.0-java |checksum:897332272ac159bf200a690dae5039df1e60355124848f2a6f889563311421f4
+        0.2.0 |checksum:6f2d3eb31a402d2be7c7d51d52e22ba9c86ca7b0641a3debfb3deadedc19301f
+        0.2.0-x86-mingw32 |checksum:d2bb53926789434de893cf0a7a872bd887440f6e4edfec15626961d5431aad8a
+        0.2.0-java |checksum:63ed6f9d68ebfea869389a9227c8c041b9ed7a0ea68dbe37ee12aaa17406c524
       INFO
     end
 
@@ -323,8 +474,8 @@ RSpec.describe GemServerConformance do # rubocop:disable RSpec/EmptyExampleGroup
       it { is_expected.to have_body(<<~BODY) }
         created_at: 1990-01-01T01:08:00Z
         ---
-        a 0.0.1,0.2.0,0.2.0-x86-mingw32,0.2.0-java ca5c12bc8ba4457ada41c71bee282bfb
-        b 1.0.0.pre 688f5cdf79887aff5d87c86f36cfe063
+        a 0.0.1,0.2.0,0.2.0-x86-mingw32,0.2.0-java 704774b40118bdb16676deee38a99030
+        b 1.0.0.pre f0d229a9323895e2e1c85f496b5f10b5
       BODY
     end
   end
@@ -334,14 +485,14 @@ RSpec.describe GemServerConformance do # rubocop:disable RSpec/EmptyExampleGroup
     request :get_versions, compact_index: true do
       it { is_expected.to be_valid_compact_index_reponse }
       it { is_expected.to have_body(parent_response.body + <<~BODY) }
-        a 0.3.0 6263c53d5a23dfe0339a3ebae0fed8da
+        a 0.3.0 6d832e39a3fcc2e49f17db8023b3db31
       BODY
     end
 
     request :get_info, "a", compact_index: true do
       it { is_expected.to be_valid_compact_index_reponse }
       it { is_expected.to have_body(parent_response.body + <<~INFO) }
-        0.3.0 |checksum:40f19de3ce5c3fc5930fbc5dc3a08cd0b31572852d4885b37a19039bad7d9784
+        0.3.0 |checksum:896df5352ce069a200e283d04bf2cbadcc5f779de5a0bb31074a406b3642a8a3
       INFO
     end
 
@@ -372,7 +523,7 @@ RSpec.describe GemServerConformance do # rubocop:disable RSpec/EmptyExampleGroup
 
     request :get_versions, compact_index: true do
       it { is_expected.to be_valid_compact_index_reponse }
-      it { is_expected.to have_body(parent_response.body + "a -0.2.0 1fdcc4d621638a6ba75d8ed88b09f97a\n") }
+      it { is_expected.to have_body(parent_response.body + "a -0.2.0 474751e9d427e559781d7e222b368085\n") }
     end
 
     request :get_info, "a", compact_index: true do
@@ -381,7 +532,7 @@ RSpec.describe GemServerConformance do # rubocop:disable RSpec/EmptyExampleGroup
       it {
         is_expected.to have_body(
           parent_response.body.lines.tap do |lines|
-            lines.delete("0.2.0 |checksum:a1753a0e8b6f0515a15e9cfa4ea143e36de235525f6f68c4ff45c4ae70be072f\n")
+            lines.delete("0.2.0 |checksum:6f2d3eb31a402d2be7c7d51d52e22ba9c86ca7b0641a3debfb3deadedc19301f\n")
           end.join
         )
       }
@@ -409,15 +560,15 @@ RSpec.describe GemServerConformance do # rubocop:disable RSpec/EmptyExampleGroup
       it { is_expected.to have_body(<<~VERSIONS) }
         created_at: 1990-01-01T02:10:00Z
         ---
-        a 0.0.1,0.2.0-x86-mingw32,0.2.0-java,0.3.0 1fdcc4d621638a6ba75d8ed88b09f97a
-        b 1.0.0.pre 688f5cdf79887aff5d87c86f36cfe063
+        a 0.0.1,0.2.0-x86-mingw32,0.2.0-java,0.3.0 474751e9d427e559781d7e222b368085
+        b 1.0.0.pre f0d229a9323895e2e1c85f496b5f10b5
       VERSIONS
     end
   end
   .then "after yanking a missing gem", before:
     lambda { |_|
       yank_gem(RequestHelpers::MockGem.new(name: "missing", version: "1.0.0"), expected_to: be_not_found)
-    } do
+    } do # rubocop:disable RSpec/ReturnFromStub
     nil
   end
 end

data/spec/support/request_helpers.rb

@@ -8,6 +8,49 @@ module RequestHelpers
     base.attr_reader :last_response
   end
 
+  module SpecificationToYamlNormalization
+    class CoderWrapper < SimpleDelegator
+      def add(key, value)
+        value = "3.5.11" if key == "rubygems_version"
+        return if value.nil?
+
+        super
+      end
+    end
+
+    def encode_with(coder)
+      super(CoderWrapper.new(coder))
+    end
+  end
+
+  module PackageGzipToConsistentOS
+    class IOWrapper < SimpleDelegator
+      def write(str)
+        str[9] = "\x03".b if str.size == 10 && str.start_with?("\x1f\x8b".b)
+        super
+      end
+    end
+
+    def gzip_to(io, &blk)
+      super(IOWrapper.new(io), &blk)
+    end
+  end
+
+  ::Gem::Dependency.class_eval do
+    if Gem::Dependency.method_defined?(:to_yaml_properties)
+      prepend(
+        Module.new do
+          def to_yaml_properties
+            expected = %i[@name @requirement @type @prerelease @version_requirements]
+            actual = super
+
+            (expected & actual) + (actual - expected)
+          end
+        end
+      )
+    end
+  end
+
   def build_gem(name, version, platform: nil)
     spec = Gem::Specification.new do |s|
       s.name = name
@@ -20,33 +63,20 @@ module RequestHelpers
     end
     yield spec if block_given?
 
+    spec.singleton_class.prepend(SpecificationToYamlNormalization) if Gem.rubygems_version < Gem::Version.new("3.6.0")
+
     package = Gem::Package.new(StringIO.new.binmode)
     package.build_time = Time.utc(1970)
     package.spec = spec
-    package.setup_signer
-    signer = package.instance_variable_get(:@signer)
-    package.gem.with_write_io do |gem_io|
-      Gem::Package::TarWriter.new gem_io do |gem|
-        digests = gem.add_file_signed "metadata.gz", 0o444, signer do |io|
-          package.gzip_to io do |gz_io|
-            yaml = spec.to_yaml
-            yaml.sub!(/^rubygems_version: .*/, "rubygems_version: 3.5.11")
-            gz_io.write yaml
-          end
-        end
-        checksums = package.instance_variable_get(:@checksums)
-        checksums["metadata.gz"] = digests
+    package.singleton_class.prepend(PackageGzipToConsistentOS)
+    package.gem.singleton_class.send(:define_method, :path) { "" }
 
-        digests = gem.add_file_signed "data.tar.gz", 0o444, signer do |io|
-          package.gzip_to io do |gz_io|
-            # no files
-            Gem::Package::TarWriter.new gz_io
-          end
-        end
-        checksums["data.tar.gz"] = digests
+    package.build
 
-        package.add_checksums gem
-      end
+    if ENV["DUMP_BUILD_GEM"]
+      tmp = "build_gem/#{RUBY_ENGINE}/rubygems-#{Gem::VERSION}/#{@time}"
+      FileUtils.mkdir_p(tmp)
+      File.binwrite("#{tmp}/#{spec.full_name}.gem", package.gem.io.string)
     end
 
     MockGem.new(
@@ -118,7 +148,7 @@ module RequestHelpers
       request["Content-Type"] = "application/octet-stream"
       request.add_field "Authorization", Pusher.api_key
     end.tap do
-      expect(last_response).to expected_to
+      expect(last_response).to expected_to, last_response.body
       set_time @time + 60
     end
   end
@@ -224,7 +254,6 @@ module RequestHelpers
     attr_reader :response
 
     def initialize(response)
-      response.body_encoding = Encoding::BINARY
       @response = response
     end
 

data/spec/support/step_helpers.rb

@@ -39,17 +39,6 @@ module StepHelpers
       end
     end
 
-    # class NullReporter
-    #   def self.method_missing(...)
-    #     pp(...)
-    #   end
-
-    #   def self.example_failed(ex)
-    #     pp ex
-    #     puts ex.display_exception.full_message
-    #   end
-    # end
-
     def request(method, *args, **kwargs, &blk)
       name = method.to_s
       name += "(#{args.map(&:inspect).join(", ")})" unless args.empty?
@@ -147,23 +136,38 @@ module StepHelpers
           before(:all) do
             @upstream = ENV.fetch("UPSTREAM", nil)
             unless upstream
+              @upstream_output = Tempfile.create("upstream.out").path
               Bundler.with_original_env do
                 @upstream = "http://localhost:4567"
-                @pid = spawn("ruby", "-rbundler/setup", "lib/gem_server_conformance/server.rb", out: "/dev/null",
-                                                                                                err: "/dev/null")
-                sleep 1
+                @pid = spawn(Gem.ruby, "-rbundler/setup", "lib/gem_server_conformance/server.rb", out: @upstream_output,
+                                                                                                  err: @upstream_output)
+                raise "failed to start server" unless @pid
               end
             end
 
             @all_gems = []
-            set_time Time.utc(1990)
+            retries = 150
+            loop do
+              set_time Time.utc(1990)
+              break
+            rescue Errno::ECONNREFUSED
+              retries -= 1
+              raise "Failed to boot gem_server_conformance/server in under 5 seconds" if retries.zero?
+
+              sleep 0.1
+            else
+              break
+            end
           end
 
           after(:all) do
             if @pid
               Process.kill "TERM", @pid
               Process.wait @pid
+              expect($?).to be_success, "Upstream server failed #{$?.inspect}:\n\n#{File.read(@upstream_output)}"
             end
+          ensure
+            File.unlink @upstream_output if @upstream_output
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem_server_conformance
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec