Merge pull request #7 from github/ruby3

Upgrade to ruby 3(.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,44 +1,52 @@
 PATH
   remote: .
   specs:
-    entitlements-gitrepo-auditor-plugin (0.1.1)
-      entitlements (= 0.1.8)
+    entitlements-gitrepo-auditor-plugin (0.2.0)
+      contracts (= 0.17)
+      entitlements (= 0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      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)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.0)
     hashdiff (1.0.1)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.6.2)
-    minitest (5.15.0)
+    minitest (5.16.3)
     net-ldap (0.17.1)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     optimist (3.0.0)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    public_suffix (4.0.7)
-    rack (2.2.3.1)
+    public_suffix (5.0.0)
+    rack (2.2.4)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.5.0)
@@ -65,7 +73,7 @@ GEM
       rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
     rubocop-github (0.17.0)
       rubocop
@@ -74,22 +82,26 @@ GEM
     rubocop-performance (1.13.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.14.2)
+    rubocop-rails (2.15.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
     ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     rugged (0.27.5)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
     simplecov (0.16.1)
       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.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
     vcr (4.0.0)
     webmock (3.4.2)
       addressable (>= 2.3.6)
@@ -98,10 +110,8 @@ GEM
 
 PLATFORMS
   ruby
-  x86_64-darwin-19
 
 DEPENDENCIES
-  contracts-rspec (= 0.1.0)
   entitlements-gitrepo-auditor-plugin!
   rake (= 13.0.6)
   rspec (= 3.8.0)
@@ -111,9 +121,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.1.1
+0.2.0

entitlements-gitrepo-auditor-plugin.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/github/entitlements-gitrepo-auditor-plugin"
   s.executables = %w[]
 
-  s.add_dependency "entitlements", "0.1.8"
+  s.add_dependency "entitlements", "0.2.0"
+  s.add_dependency "contracts", "0.17"
 
-  s.add_development_dependency "contracts-rspec", "= 0.1.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"
@@ -23,7 +23,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-gitrepo-auditor-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/unit/spec_helper.rb

@@ -20,7 +20,6 @@
 
 require "base64"
 require "contracts"
-require "contracts/rspec"
 require "json"
 require "rspec"
 require "rspec/support"
@@ -35,18 +34,6 @@
 require_relative "../../lib/entitlements/auditor/gitrepo"
 require_relative "../../lib/entitlements/util/gitrepo"
 
-SimpleCov.formatters = [
-  SimpleCov::Formatter::HTMLFormatter,
-  SimpleCov::Formatter::ERBFormatter
-]
-SimpleCov.start do
-  # don't show specs as missing coverage for themselves
-  add_filter "/spec/"
-
-  # don't analyze coverage for gems
-  add_filter "/vendor/gems/"
-end
-
 def fixture(path)
   File.expand_path(File.join("fixtures", path.sub(%r{\A/+}, "")), File.dirname(__FILE__))
 end
@@ -127,6 +114,19 @@ module MyLetDeclarations
   let(:logger) { Entitlements.dummy_logger }
 end
 
+module Contracts
+  module RSpec
+    module Mocks
+      def instance_double(klass, *args)
+        super.tap do |double|
+          allow(double).to receive(:is_a?).with(klass).and_return(true)
+          allow(double).to receive(:is_a?).with(ParamContractError).and_return(false)
+        end
+      end
+    end
+  end
+end
+
 RSpec.configure do |config|
   config.include Contracts::RSpec::Mocks
   config.include MyLetDeclarations