Merge branch 'main' into allow-ignoring-expirations

Author: DanHoerst

.github/workflows/acceptance.yml

@@ -45,7 +45,7 @@ jobs:
 
             # If the diff file is not empty, it has changes.
             [ -s diff.txt ] && echo "::set-output name=has_change::true" || echo "::set-output name=has_change::false"
-  
+
       - name: set has_change to true for push to main/master
         if: github.event_name == 'push'
         run: echo "::set-output name=has_change::true"
@@ -54,10 +54,16 @@ jobs:
     needs: changes
     runs-on: ubuntu-latest
     name: runner / acceptance-tests
+    strategy:
+      matrix:
+        ruby: [ '2.7.5', '3.1.2' ]
     permissions:
       contents: read
 
     steps:
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
 
       # If source files were not changed, we don't need the acceptance test suite
       - name: bypass

.github/workflows/lint.yml

@@ -10,18 +10,18 @@ jobs:
   rubocop:
     name: runner / rubocop
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.7.5', '3.1.2' ]
     permissions:
       contents: read
 
     steps:
       - name: Check out code
         uses: actions/checkout@v2
 
-      # https://github.com/ruby/setup-ruby/releases/tag/v1.87.0
-      - uses: ruby/setup-ruby@cf1a6dd2d8563b59c7007e381836fd252ab2ac5b
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.5
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-
-      - name: rubocop
-        run: bundle exec rubocop -c .rubocop.yml lib/ spec/
+      - run: bundle exec rubocop -c .rubocop.yml lib/ spec/

.github/workflows/test.yml

@@ -10,18 +10,18 @@ jobs:
   rubocop:
     name: runner / rspec
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.7.5', '3.1.2' ]
     permissions:
       contents: read
 
     steps:
       - name: Check out code
         uses: actions/checkout@v2
 
-      # https://github.com/ruby/setup-ruby/releases/tag/v1.87.0
-      - uses: ruby/setup-ruby@cf1a6dd2d8563b59c7007e381836fd252ab2ac5b
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.5
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-
-      - name: rspec tests
-        run: script/test -d
+      - run: script/test -d

.rubocop.yml

@@ -4,9 +4,14 @@ inherit_gem:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.7.5
+  TargetRubyVersion: 3.1.2
   Exclude:
     - 'bin/*'
     - 'spec/acceptance/fixtures/**/*'
     - 'spec/unit/fixtures/**/*'
     - 'vendor/gems/**/*'
+    - 'lib/contracts-ruby2/**/*'
+    - 'lib/contracts-ruby3/**/*'
+
+Style/HashSyntax:
+  EnforcedShorthandSyntax: either

.ruby-version

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

Gemfile.lock

@@ -1,44 +1,59 @@
 PATH
   remote: .
   specs:
-    entitlements-app (0.1.8)
+    entitlements-app (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)
 
 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)
     crack (0.4.5)
       rexml
+    debug (1.6.2)
+      irb (>= 1.3.6)
+      reline (>= 0.3.1)
     diff-lcs (1.5.0)
     docile (1.4.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)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.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)
+    reline (0.3.1)
+      io-console (~> 0.5)
     rexml (3.2.5)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -62,7 +77,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
@@ -71,22 +86,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)
@@ -97,6 +116,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  debug (> 1.0.0)
   entitlements-app!
   rake (= 13.0.6)
   rspec (= 3.8.0)
@@ -106,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.15
+   2.3.19

VERSION

@@ -1 +1 @@
-0.1.8
+0.2.0

bin/deploy-entitlements

@@ -2,11 +2,20 @@
 
 ENV["BUNDLE_GEMFILE"] = File.expand_path("../Gemfile", File.dirname(__FILE__))
 require "bundler/setup"
+require "ruby_version_check"
+
+# Note that contracts.ruby has two specific ruby-version specific libraries, which we have vendored into lib/
+if RubyVersionCheck.ruby_version2?
+  $LOAD_PATH.unshift(File.expand_path(File.join(__dir__, "../lib/contracts-ruby2/lib")))
+else
+  $LOAD_PATH.unshift(File.expand_path(File.join(__dir__, "../lib/contracts-ruby3/lib")))
+end
+
 require "contracts"
 
 # We don't need Contract outside of normal development
 VALID = [true, nil]
-class Contract
+class Contract < Contracts::Decorator
   def self.valid?(arg, contract)
     VALID
   end

entitlements-app.gemspec

@@ -11,13 +11,14 @@ Gem::Specification.new do |s|
   s.files = Dir.glob("lib/**/*") + %w[bin/deploy-entitlements VERSION]
   s.homepage = "https://github.com/github/entitlements-app"
   s.executables = %w[deploy-entitlements]
-  s.required_ruby_version = '~> 2.0'
 
   s.add_dependency "concurrent-ruby", "= 1.1.9"
-  s.add_dependency "contracts", "= 0.16.0"
-  s.add_dependency "net-ldap", "~> 0.17.0"
+  s.add_dependency "faraday", "~> 2.0"
+  s.add_dependency "net-ldap", "~> 0.17"
+  s.add_dependency "octokit", "~> 4.18"
   s.add_dependency "optimist", "= 3.0.0"
 
+  s.add_development_dependency "debug", "> 1.0.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 +27,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

lib/contracts-ruby2/.github/workflows/code_style_checks.yaml

@@ -0,0 +1,36 @@
+name: Code Style Checks
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - 'README.md'
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - 'README.md'
+
+jobs:
+  rubocop:
+    name: Rubocop
+    if: "contains(github.event.commits[0].message, '[ci skip]') == false"
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu
+        ruby:
+          - "2.7"
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run Rubocop
+        run: bundle exec rubocop