Merge pull request #10 from github/pin_octokit

Upgrade octokit to resolve authentication issue with graphql

Author: DanHoerst

Gemfile.lock

@@ -1,61 +1,59 @@
 PATH
   remote: .
   specs:
-    entitlements-github-plugin (0.0.1)
-      concurrent-ruby (= 1.1.9)
-      contracts (= 0.16.0)
-      faraday (>= 0.17.3, < 0.18)
-      net-ldap (~> 0.17.0)
-      octokit (~> 4.18)
-      optimist (= 3.0.0)
+    entitlements-github-plugin (0.0.2)
+      entitlements (= 0.1.8)
+      faraday (>= 1, < 3)
+      faraday-retry (~> 2.0)
+      octokit (~> 4.25)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.6)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    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)
     crack (0.4.5)
       rexml
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    entitlements (0.1.7)
+    entitlements (0.1.8)
       concurrent-ruby (= 1.1.9)
       contracts (= 0.16.0)
-      faraday (>= 0.17.3, < 0.18)
       net-ldap (~> 0.17.0)
-      octokit (~> 4.18)
       optimist (= 3.0.0)
-    faraday (0.17.4)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.5.2)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.0)
+    faraday-retry (2.0.0)
+      faraday (~> 2.0)
     hashdiff (1.0.1)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.5.1)
-    minitest (5.15.0)
-    multipart-post (2.1.1)
-    net-ldap (0.17.0)
-    octokit (4.21.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    json (2.6.2)
+    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.6)
-    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.4.0)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -79,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
@@ -88,39 +86,38 @@ 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.8.2)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      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-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)
       crack (>= 0.3.2)
       hashdiff
-    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
-  x86_64-darwin-19
+  x86_64-darwin-20
 
 DEPENDENCIES
   contracts-rspec (= 0.1.0)
-  entitlements (= 0.1.7)
   entitlements-github-plugin!
   rake (= 13.0.6)
   rspec (= 3.8.0)

VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

entitlements-github-plugin.gemspec

@@ -12,15 +12,12 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/github/entitlements-github-plugin"
   s.executables = %w[]
 
-  s.add_dependency "concurrent-ruby", "= 1.1.9"
-  s.add_dependency "contracts", "= 0.16.0"
-  s.add_dependency "faraday", ">= 0.17.3", "< 0.18"
-  s.add_dependency "net-ldap", "~> 0.17.0"
-  s.add_dependency "octokit", "~> 4.18"
-  s.add_dependency "optimist", "= 3.0.0"
+  s.add_dependency "entitlements", "0.1.8"
+  s.add_dependency "faraday", "< 3", ">= 1"
+  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.1.7"
   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"

spec/unit/entitlements/service/github_spec.rb

@@ -338,7 +338,7 @@
     it "logs and returns raw text for JSON parsing error" do
       answer = "mor chicken mor rewardz!"
       stub_request(:post, "https://github.fake/api/v3/graphql").to_return(status: 200, body: answer)
-      expect(logger).to receive(:error).with("JSON::ParserError 809: unexpected token at 'mor chicken mor rewardz!': \"mor chicken mor rewardz!\"")
+      expect(logger).to receive(:error).with("JSON::ParserError 859: unexpected token at 'mor chicken mor rewardz!': \"mor chicken mor rewardz!\"")
       response = subject.send(:graphql_http_post_real, "nonsense")
       expect(response).to eq(code: 500, data: { "body" => "mor chicken mor rewardz!" })
     end