Merge pull request #8 from github/ruby3

Upgrade to ruby3(.1.2)

Author: rick

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
 
       - uses: ruby/setup-ruby@8029ebd6e5bd8f4e0d6f7623ea76a01ec5b1010d # [email protected]
         with:
-          ruby-version: 2.7.5
+          ruby-version: 3.1.2
           bundler-cache: true
 
       - name: rubocop

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
 
       - uses: ruby/setup-ruby@8029ebd6e5bd8f4e0d6f7623ea76a01ec5b1010d # [email protected]
         with:
-          ruby-version: 2.7.5
+          ruby-version: 3.1.2
           bundler-cache: true
 
       - name: rspec tests

.ruby-version

@@ -1 +1 @@
-2.7.5
+3.1.2

Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    entitlements-github-plugin (0.0.2)
-      entitlements (= 0.1.8)
-      faraday (>= 1, < 3)
+    entitlements-github-plugin (0.2.0)
+      contracts (= 0.17.0)
+      faraday (~> 2.0)
       faraday-retry (~> 2.0)
       octokit (~> 4.25)
 
@@ -19,16 +19,16 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     concurrent-ruby (1.1.9)
-    contracts (0.16.0)
-    contracts-rspec (0.1.0)
+    contracts (0.17)
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
     docile (1.4.0)
-    entitlements (0.1.8)
+    entitlements (0.2.0)
       concurrent-ruby (= 1.1.9)
-      contracts (= 0.16.0)
-      net-ldap (~> 0.17.0)
+      faraday (~> 2.0)
+      net-ldap (~> 0.17)
+      octokit (~> 4.18)
       optimist (= 3.0.0)
     faraday (2.5.2)
       faraday-net_http (>= 2.0, < 3.1)
@@ -100,8 +100,8 @@ GEM
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-erb (0.1.1)
-      simplecov
+    simplecov-erb (1.0.1)
+      simplecov (< 1.0)
     simplecov-html (0.10.2)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
@@ -114,10 +114,9 @@ GEM
 
 PLATFORMS
   ruby
-  x86_64-darwin-20
 
 DEPENDENCIES
-  contracts-rspec (= 0.1.0)
+  entitlements (= 0.2.0)
   entitlements-github-plugin!
   rake (= 13.0.6)
   rspec (= 3.8.0)
@@ -127,9 +126,9 @@ DEPENDENCIES
   rubocop-performance (= 1.13.3)
   rugged (= 0.27.5)
   simplecov (= 0.16.1)
-  simplecov-erb (= 0.1.1)
+  simplecov-erb (= 1.0.1)
   vcr (= 4.0.0)
   webmock (= 3.4.2)
 
 BUNDLED WITH
-   2.3.9
+   2.3.19

VERSION

@@ -1 +1 @@
-0.0.2
+0.2.0

entitlements-github-plugin.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/github/entitlements-github-plugin"
   s.executables = %w[]
 
-  s.add_dependency "entitlements", "0.1.8"
-  s.add_dependency "faraday", "< 3", ">= 1"
+  s.add_dependency "contracts", "= 0.17.0"
+  s.add_dependency "faraday", "~> 2.0"
   s.add_dependency "faraday-retry", "~> 2.0"
   s.add_dependency "octokit", "~> 4.25"
 
-  s.add_development_dependency "contracts-rspec", "= 0.1.0"
+  s.add_development_dependency "entitlements", "0.2.0"
   s.add_development_dependency "rake", "= 13.0.6"
   s.add_development_dependency "rspec", "= 3.8.0"
   s.add_development_dependency "rspec-core", "= 3.8.0"
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rubocop-performance", "= 1.13.3"
   s.add_development_dependency "rugged", "= 0.27.5"
   s.add_development_dependency "simplecov", "= 0.16.1"
-  s.add_development_dependency "simplecov-erb", "= 0.1.1"
+  s.add_development_dependency "simplecov-erb", "= 1.0.1"
   s.add_development_dependency "vcr", "= 4.0.0"
   s.add_development_dependency "webmock", "3.4.2"
 end

spec/acceptance/Dockerfile.entitlements-github-plugin

@@ -1,4 +1,4 @@
-FROM ruby:2.7.5-buster
+FROM ruby:3.1-slim
 LABEL maintainer="GitHub Security Ops <[email protected]>"
 ENV HOME /root
 ENV RELEASE=buster
@@ -9,7 +9,12 @@ WORKDIR /data/entitlements
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     build-essential \
     cmake \
-    ldap-utils
+    gcc \
+    git \
+    ldap-utils \
+    make \
+    iputils-ping \
+    pkg-config
 
 # Install bundler
 RUN gem install bundler

spec/acceptance/github-server/Dockerfile

@@ -1,6 +1,17 @@
-FROM ruby:2.4.4
+FROM ruby:3.1-slim
 LABEL maintainer="GitHub Security Ops <[email protected]>"
 
+# Install dependency packages for bootstrapping and running...
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    build-essential \
+    cmake \
+    gcc \
+    git \
+    ldap-utils \
+    make \
+    iputils-ping \
+    pkg-config
+
 # Install gems
 ENV APP_HOME /app
 ENV HOME /root

spec/acceptance/github-server/web.rb

@@ -394,4 +394,4 @@ def graphql_pending_query(query)
   end
 end
 
-Rack::Handler::WEBrick.run FakeGitHubApi, webrick_options
+Rack::Handler::WEBrick.run FakeGitHubApi, **webrick_options

spec/unit/entitlements/backend/github_org/provider_spec.rb

@@ -13,7 +13,7 @@
 
   let(:provider_config) { config.merge(base: config[:ou]).map { |k, v| [k.to_s, v] }.to_h }
 
-  let(:github) { Entitlements::Backend::GitHubOrg::Service.new(config) }
+  let(:github) { Entitlements::Backend::GitHubOrg::Service.new(**config) }
 
   let(:subject) { described_class.new(config: provider_config) }