oidc-test 0.8.12 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50d77c3bd27cccbc5baf01ec407067a0847389c1cda9c25e2a0c614e4762422c
-  data.tar.gz: 614d40f64514f5165f46c1217a46f712a766d6a4fb39200d42fb38046addc444
+  metadata.gz: '0128ce5ab176c0e6f2117e6404ab318768b4008c3024bd22cc3bf41f019c87bd'
+  data.tar.gz: 89307a3a2014c34283c24c9a9813a553b66449a9aa0d30b4af4931daddc749c6
 SHA512:
-  metadata.gz: cac40bcb0d6a02568bc8c81391d69f4b7d2a1d16827e6cbf17faef05cf9fe89d13a9a0930e6164caee64d8a45f44af3fffa037d6aaf78e7082343de73160cd64
-  data.tar.gz: 6275e9e76d6003accab302391f6b2e75fb879200b80bfca8da1fb099ca0093d0e565ee533136db9dbbb08b7575626edd914782548af38ecacba39c4bbef70908
+  metadata.gz: 825c9c39b0374bff999712a0c1840291d367759e8806c95f7c47b7543d1646ab3ab4d70e210501a9551eaee54ee4957e5be6ab724c29fc49198f2d3feac30f57
+  data.tar.gz: cffdae8f2c1f572839c2254a600eec7e0b24a9ee618f3103efbd90295f4a18754bb7582b9051ea3ea323a4f4064047706ca5d459096485a27d437c783780978e

data/Gemfile

@@ -5,12 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in oidc-test.gemspec
 gemspec
 
+gem "racc"
 gem "rake", "~> 13.0"
-
 gem "rspec", "~> 3.0"
-
 gem "rubocop", "~> 1.21"
-
-gem "racc"
-
-gem "sigstore", "~> 0.1.1"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oidc-test (0.8.12)
+    oidc-test (0.8.13)
 
 GEM
   remote: https://rubygems.org/
@@ -9,21 +9,9 @@ GEM
     ast (2.4.2)
     diff-lcs (1.5.0)
     json (2.6.3)
-    net-http (0.5.0)
-      uri
     parallel (1.22.1)
     parser (3.2.2.0)
       ast (~> 2.4.1)
-    protobug (0.1.0)
-    protobug_googleapis_field_behavior_protos (0.1.0)
-      protobug (= 0.1.0)
-      protobug_well_known_protos (= 0.1.0)
-    protobug_sigstore_protos (0.1.0)
-      protobug (= 0.1.0)
-      protobug_googleapis_field_behavior_protos (= 0.1.0)
-      protobug_well_known_protos (= 0.1.0)
-    protobug_well_known_protos (0.1.0)
-      protobug (= 0.1.0)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.0.6)
@@ -55,12 +43,7 @@ GEM
     rubocop-ast (1.28.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
-    sigstore (0.1.1)
-      net-http
-      protobug_sigstore_protos (~> 0.1.0)
-      uri
     unicode-display_width (2.4.2)
-    uri (1.0.2)
 
 PLATFORMS
   ruby
@@ -71,7 +54,6 @@ DEPENDENCIES
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 1.21)
-  sigstore (~> 0.1.1)
 
 BUNDLED WITH
    2.5.10

data/Rakefile

@@ -1,66 +1,5 @@
 # frozen_string_literal: true
 
-require "bundler/gem_helper"
-
-module Bundler
-  class GemHelper
-    prepend(Module.new do
-      def install
-        super
-
-        task "release:attest" => "build" do
-          Bundler.ui.confirm "Attesting? #{attest?}"
-          attest if attest?
-        end
-
-        task "release:rubygem_push" => "release:attest"
-      end
-
-      def build_gem
-        @build_gem_path = super
-      end
-
-      def rubygem_push(path)
-        return super unless attest?
-
-        cmd = [{ "RUBYOPT" => "-r#{File.expand_path("tasks/rubygems_patch.rb", __dir__)} #{ENV["RUBYOPT"]}",
-                 "gem_attestation_path" => "#{path}.sigstore.json" }, *gem_command, "push", path]
-        cmd << "--key" << gem_key if gem_key
-        cmd << "--host" << allowed_push_host if allowed_push_host
-        sh_with_input(cmd)
-        Bundler.ui.confirm "Pushed #{name} #{version} to #{gem_push_host}"
-      end
-    end)
-
-    def attest?
-      return true if %w[y yes true on 1].include?(ENV["gem_attest"])
-      return false if %w[n no nil false off 0].include?(ENV["gem_attest"])
-
-      ENV["ACTIONS_ID_TOKEN_REQUEST_URL"] && ENV["ACTIONS_ID_TOKEN_REQUEST_TOKEN"]
-    end
-
-    def attest
-      Bundler.ui.confirm "Signing #{@build_gem_path}..."
-      sh [Gem.ruby, "-S", "gem", "install", "sigstore"]
-      sh [Gem.ruby, "-rnet/http", "-rsigstore", "-rsigstore/signer", "-e", <<~RUBY, @build_gem_path]
-        file = ARGV.first
-        jwt = Net::HTTP.get_response(
-          URI(ENV.fetch("ACTIONS_ID_TOKEN_REQUEST_URL") + "&audience=sigstore"),
-          { "Authorization" => "bearer \#{ENV.fetch("ACTIONS_ID_TOKEN_REQUEST_TOKEN")}" },
-          &:value
-        ).body.then { JSON.parse(_1).fetch("value") }
-
-        contents = File.binread(file)
-        bundle = Sigstore::Signer.new(jwt:, trusted_root: Sigstore::TrustedRoot.production).sign(contents)
-
-        json = "\#{file}.sigstore.json"
-        File.binwrite(json, bundle.to_json)
-        puts "Signed \#{file}, wrote \#{json}"
-      RUBY
-    end
-  end
-end
-
 require "bundler/gem_tasks"
 
 Bundler::GemHelper.tag_prefix = ENV["TAG_PREFIX"] if ENV["TAG_PREFIX"]

data/lib/oidc/test/version.rb

@@ -2,6 +2,6 @@
 
 module Oidc
   module Test
-    VERSION = "0.8.12"
+    VERSION = "0.8.13"
   end
 end

data/tasks/rubygems_patch.rb

@@ -1,18 +1,46 @@
 # frozen_string_literal: true
 
+return unless defined?(Gem)
+
 require "rubygems/commands/push_command"
 
 Gem::Commands::PushCommand.prepend(Module.new do
   def send_push_request(name, args)
-    return super unless ENV["gem_attestation_path"]
+    return super if options[:attestations]&.any? || @host != "https://rubygems.org"
+
+    begin
+      send_push_request_with_attestation(name, args)
+    rescue StandardError => e
+      alert_warning "Failed to push with attestation, retrying without attestation.\n#{e.full_message}"
+      super
+    end
+  end
 
-    rubygems_api_request(*args, scope: get_push_scope) do |request|
-      request.set_form([
-                         ["gem", Gem.read_binary(name), { filename: name, content_type: "application/octet-stream" }],
-                         ["attestations", "[#{Gem.read_binary(ENV["gem_attestation_path"])}]",
-                          { content_type: "application/json" }]
-                       ], "multipart/form-data")
-      request.add_field "Authorization", api_key
+  def send_push_request_with_attestation(name, args)
+    attestation = attest!(name)
+    if options[:attestations]
+      options[:attestations] << attestation
+      send_push_request(name, args)
+    else
+      rubygems_api_request(*args, scope: get_push_scope) do |request|
+        request.set_form([
+                           ["gem", Gem.read_binary(name), { filename: name, content_type: "application/octet-stream" }],
+                           ["attestations", "[#{Gem.read_binary(attestation)}]", { content_type: "application/json" }]
+                         ], "multipart/form-data")
+        request.add_field "Authorization", api_key
+      end
     end
   end
+
+  def attest!(name)
+    require "open3"
+    bundle = "#{name}.sigstore.json"
+    out, st = Open3.capture2e(
+      Gem.ruby, "-S", "gem", "exec",
+      "sigstore-cli:0.2.1", "sign", name, "--bundle", bundle
+    )
+    raise Gem::Exception, "Failed to sign gem:\n\n#{out}" unless st.success?
+
+    bundle
+  end
 end)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oidc-test
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.13
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-14 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: