Skip to content

Commit 31fa9dd

Browse files
committed
➕ version_gem & certs
1 parent de31059 commit 31fa9dd

8 files changed

+124
-47
lines changed

CHANGELOG.md

+18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
4+
Since version 3.0.0, the format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6+
7+
## [Unreleased]
8+
### Added
9+
### Changed
10+
### Fixed
11+
### Removed
12+
13+
## 3.0.0
14+
3831 relevant lines, 3510 lines covered and 321 lines missed. ( 91.62% )
15+
1228 total branches, 1070 branches covered and 158 branches missed. ( 87.13% )
16+
### Fixed
17+
- Compatibility with Ruby 2.7+
18+
### Removed
19+
- Support for Ruby < 2.7
220

321
## 2.9.2
422

Gemfile.lock

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
PATH
22
remote: .
33
specs:
4-
ruby-openid (2.9.2)
4+
ruby-openid2 (3.0.0)
5+
version_gem (~> 1.1, >= 1.1.4)
56

67
GEM
78
remote: https://rubygems.org/
@@ -34,8 +35,7 @@ GEM
3435
rainbow (3.1.1)
3536
rake (13.2.1)
3637
regexp_parser (2.9.2)
37-
rexml (3.3.6)
38-
strscan
38+
rexml (3.3.7)
3939
rspec-block_is_expected (1.0.6)
4040
rubocop (1.64.1)
4141
json (~> 2.3)
@@ -119,7 +119,6 @@ GEM
119119
standard-custom (>= 1.0.2, < 2)
120120
standard-performance (>= 1.3.1, < 2)
121121
version_gem (>= 1.1.4, < 3)
122-
strscan (3.1.0)
123122
terminal-table (3.0.2)
124123
unicode-display_width (>= 1.1.1, < 3)
125124
unicode-display_width (2.5.0)
@@ -143,7 +142,7 @@ DEPENDENCIES
143142
rubocop-lts (~> 18.2, >= 18.2.1)
144143
rubocop-minitest (~> 0.36)
145144
rubocop-packaging (~> 0.5, >= 0.5.2)
146-
ruby-openid!
145+
ruby-openid2!
147146
standard (>= 1.35.1)
148147
webrick (~> 1.8)
149148
yard (~> 0.9, >= 0.9.34)

certs/pboling.pem

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIEgDCCAuigAwIBAgIBATANBgkqhkiG9w0BAQsFADBDMRUwEwYDVQQDDAxwZXRl
3+
ci5ib2xpbmcxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkW
4+
A2NvbTAeFw0yMzA5MjAxNzMwMjhaFw0yNDA5MTkxNzMwMjhaMEMxFTATBgNVBAMM
5+
DHBldGVyLmJvbGluZzEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPy
6+
LGQBGRYDY29tMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA+a9UvHo3
7+
84k96WgU5Kk5HB+cLZs/modjorsTfqY67MJF5nNvAoqcKTUBW4uG+Zpfnm3jaDO5
8+
GxhJEIZWfndYzycHT2KMVQ1uTP82ba8ZaKrPlPIafkbui3mdds47qsmqHiblKERg
9+
U532lkwfqHDlJwE7OBZQ59EwWWLynlT/yAUHpOBbqIuHKUxdpmBI+sIjrZcD1e05
10+
WmjkO6fwIdC5oM757aoPxIgXD587VOViH11Vkm2doskj4T8yONtwVHlcrrhJ9Bzd
11+
/zdp6vEn7GZQrABvpOlqwWxQ72ZnFhJe/RJZf6CXOPOh69Ai0QKYl2a1sYuCJKS3
12+
nsBnxXJINEEznjR7rZjNUmYD+CZqfjzgPqedRxTlASe7iA4w7xZOqMDzcuhNwcUQ
13+
tMEH6BTktxKP3jXZPXRfHCf6s+HRVb6vezAonTBVyydf5Xp5VwWkd6cwm+2BzHl5
14+
7kc/3lLxKMcsyEUprAsk8LdHohwZdC267l+RS++AP6Cz6x+nB3oGob19AgMBAAGj
15+
fzB9MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQCSSas60GqqMjt
16+
xR7LoY1gucEvtzAhBgNVHREEGjAYgRZwZXRlci5ib2xpbmdAZ21haWwuY29tMCEG
17+
A1UdEgQaMBiBFnBldGVyLmJvbGluZ0BnbWFpbC5jb20wDQYJKoZIhvcNAQELBQAD
18+
ggGBAMl9ifcw5p+PdvB7dCPoNKoVdp/2LbC9ztETHuYL2gUMJB6UoS3o9c/piSuR
19+
V3ZMQaijmNu6ms1bWAtJ66LjmYrVflJtf9yp31Kierr9LpisMSUx2qbMOHGa8d2Z
20+
vCUWPF8E9Cg0mP3GAyZ6qql8jDh/anUKeksPXqJvNxNPDu2DVYsa/IWdl96whzS4
21+
Bl7SwB1E7agps40UcshCSKaVDOU0M+XN6SrnJMElnBic+KSAkBkVFbzS0BE4ODZM
22+
BgE6nYzQ05qhuvbE+oGdACTlemNtDDWCh0uw+7x0q2PocGIDU5zsPn/WNTkCXPmB
23+
CHGvqDNWq4M7ncTKAaS2XExgyb7uPdq9fKiOW8nmH+zCiGzJXzBWwZlKf7L4Ht9E
24+
a3f0e5C+zvee9Z5Ng9ciyfav9/fcXgYt5MjoBv27THr5XfBhgOCIHSYW2tqJmWKi
25+
KuxrfYrN+9HvMdm+nZ6TypmKftHY3Gj+/uu+g8Icm/zrvTWAEE0mcJOkfrIoNPJb
26+
pF8dMA==
27+
-----END CERTIFICATE-----

lib/openid.rb

+7
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,16 @@
1212
# implied. See the License for the specific language governing
1313
# permissions and limitations under the License.
1414

15+
# External Libraries
16+
require "version_gem"
17+
1518
module OpenID
1619
end
1720

1821
require "openid/version"
1922
require "openid/consumer"
2023
require "openid/server"
24+
25+
OpenID::Version.class_eval do
26+
extend VersionGem::Basic
27+
end

lib/openid/fetchers.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def self.fetcher_use_env_http_proxy
120120
end
121121

122122
class StandardFetcher
123-
USER_AGENT = "ruby-openid/#{OpenID::VERSION} (#{RUBY_PLATFORM})"
123+
USER_AGENT = "ruby-openid/#{OpenID::Version::VERSION} (#{RUBY_PLATFORM})"
124124

125125
REDIRECT_LIMIT = 5
126126
TIMEOUT = ENV["RUBY_OPENID_FETCHER_TIMEOUT"] || 60

lib/openid/version.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
module OpenID
2-
VERSION = "2.9.2"
2+
module Version
3+
VERSION = "3.0.0"
4+
end
35
end

ruby-openid.gemspec

-40
This file was deleted.

ruby-openid2.gemspec

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Get the GEMFILE_VERSION without *require* "my_gem/version", for code coverage accuracy
2+
# See: https://github.com/simplecov-ruby/simplecov/issues/557#issuecomment-825171399
3+
load "lib/openid/version.rb"
4+
gem_version = OpenID::Version::VERSION
5+
OpenID::Version.send(:remove_const, :VERSION)
6+
7+
Gem::Specification.new do |spec|
8+
spec.name = "ruby-openid2"
9+
spec.version = gem_version
10+
11+
# See CONTRIBUTING.md
12+
spec.cert_chain = [ENV.fetch("GEM_CERT_PATH", "certs/#{ENV.fetch("GEM_CERT_USER", ENV["USER"])}.pem")]
13+
spec.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $PROGRAM_NAME.end_with?("gem")
14+
15+
spec.authors = ["JanRain, Inc", "Peter Boling"]
16+
spec.email = "[email protected]"
17+
spec.homepage = "https://github.com/VitalConnectInc/#{spec.name}"
18+
spec.summary = "A library for consuming and serving OpenID identities."
19+
20+
# Specify which files should be added to the gem when it is released.
21+
spec.files = Dir[
22+
# Splats (alphabetical)
23+
"lib/**/*.rb",
24+
# Files (alphabetical)
25+
"CHANGELOG.md",
26+
"CODE_OF_CONDUCT.md",
27+
"CONTRIBUTING.md",
28+
"LICENSE.txt",
29+
"README.md",
30+
"SECURITY.md"
31+
]
32+
spec.executables = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
33+
spec.licenses = ["Ruby", "Apache Software License 2.0"]
34+
spec.require_paths = ["lib"]
35+
spec.required_ruby_version = ">= 2.7.0"
36+
37+
spec.metadata["homepage_uri"] = spec.homepage
38+
spec.metadata["source_code_uri"] = "#{spec.homepage}/tree/v#{spec.version}"
39+
spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md"
40+
spec.metadata["bug_tracker_uri"] = "#{spec.homepage}/issues"
41+
spec.metadata["documentation_uri"] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}"
42+
spec.metadata["wiki_uri"] = "#{spec.homepage}/wiki"
43+
spec.metadata["rubygems_mfa_required"] = "true"
44+
45+
spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.4")
46+
47+
spec.add_development_dependency("minitest", ">= 5")
48+
spec.add_development_dependency("rake", ">= 13")
49+
spec.add_development_dependency("rexml", "~> 3.2")
50+
spec.add_development_dependency("webrick", "~> 1.8")
51+
52+
# Coverage
53+
spec.add_development_dependency("kettle-soup-cover", "~> 1.0", ">= 1.0.2")
54+
55+
# Linting
56+
spec.add_development_dependency("rubocop-lts", "~> 18.2", ">= 18.2.1")
57+
spec.add_development_dependency("rubocop-minitest", "~> 0.36")
58+
spec.add_development_dependency("rubocop-packaging", "~> 0.5", ">= 0.5.2")
59+
spec.add_development_dependency("standard", ">= 1.35.1")
60+
61+
# Documentation
62+
spec.add_development_dependency("yard", "~> 0.9", ">= 0.9.34")
63+
spec.add_development_dependency("yard-junk", "~> 0.0")
64+
end

0 commit comments

Comments
 (0)