aws-google 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a99a98afdd145f3e2077599e0a90c743f215c8ee7e32c3d74fc50d0f670e881
-  data.tar.gz: 451a434fde3537db95a1c58d8989afc9a0a00491c90f90b3d2203f5cc3cf0bdc
+  metadata.gz: 453c973d775146ceca58836c5f0d623b4c129b4d65292ac376c0f3346f2675f0
+  data.tar.gz: ca604dbb401d2ff818a89684abbb3ca8be889735315ab2e5b7568d783fad6c4a
 SHA512:
-  metadata.gz: ed65637fb6d1ce3c527ae90aae5a46a1e1358a7afe411e71eee9dc76d05b34ab3d75a0b2cbe7a7811890a872e1d268e5b23b849e66956091405f43f2c425a9f9
-  data.tar.gz: 4bc5596979411c3d27fea983d592bb7c947aa2375a6e072b433cbbfe24d537ce042a688d4f118b87fd1438c4aa0d3fce039148c8cc79af680b615772a8204a6b
+  metadata.gz: e4fff0d85f95439042e332bd744d2d7243e3d58cd6c0895f18df8f7e0660cc3197013dfc63d81e5ae97a58ba2adfb1ccb83960e7fe3025517535a4779a8832ea
+  data.tar.gz: 5fa075fe56b039726309db3e896548ee792cf982c9f20bf05da3f2da69901bbbd4182f046e50ee943d6b692dd9ec193d6bff6af45d937e2ec7a6b2b8641b99ab

data/.github/workflows/pr-verify.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   # Test on code-dot-org Ruby version
-  test_3_0_5:
+  test_3_1_7:
     runs-on: ubuntu-latest
 
     steps:
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.5
+          ruby-version: 3.1.7
           bundler-cache: true
 
       - name: Install gems

data/.ruby-version

@@ -1 +1 @@
-3.0.5
+3.1.7

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.0.5
+FROM ruby:3.1.7
 
 WORKDIR /app
 

data/README.md

@@ -95,7 +95,7 @@ The extra `credential_process` config line tells AWS to [Source Credentials with
 
 Prerequisites:
 
-* Ruby 3.0.5
+* Ruby 3.1.7
 
 You can have Ruby installed locally, or use Docker and mount this repository into a Ruby container. By using Docker you can avoid conflicts with differing Ruby versions or other installed gems. To run and 'bash' into a Ruby container, install Docker and run the following. See [docker-compose.yml](docker-compose.yml) for details.
 

data/aws-google.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'aws/google/version'
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = '>= 3.0.5'
+  spec.required_ruby_version = '~> 3.0'
   spec.name          = 'aws-google'
   spec.version       = Aws::Google::VERSION
   spec.authors       = ['Will Jordan']
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk-core', '~> 3.211.0'
+  spec.add_dependency 'aws-sdk-core', '~> 3.211'
   spec.add_dependency 'google-apis-core', '~> 0.11.3' # Newest version compatible with code-dot-org's google_drive>googleauth dependency
   spec.add_dependency 'launchy', '~> 3.0.1'
 

data/lib/aws/google/version.rb

@@ -1,5 +1,5 @@
 module Aws
   class Google
-    VERSION = '0.2.2'.freeze
+    VERSION = '0.2.4'.freeze
   end
 end

data/lib/aws/google.rb

@@ -108,24 +108,28 @@ module Aws
     end
 
     def get_oauth_code(client, options)
-      raise 'fallback' unless @port && !@port.zero?
+      raise ArgumentError.new('Missing port for local oauth server') unless @port && !@port.zero?
 
       require 'launchy'
       require 'webrick'
+
       code = nil
       server = WEBrick::HTTPServer.new(
         Port: @port,
         Logger: WEBrick::Log.new(STDOUT, 0),
         AccessLog: []
       )
+
       server.mount_proc '/' do |req, res|
         code = req.query['code']
         res.status = 202
         res.body = 'Login successful, you may close this browser window.'
-        server.stop
+        server.shutdown
       end
+
       trap('INT') { server.shutdown }
       client.redirect_uri = "http://localhost:#{@port}"
+
       silence_output do
         launchy = Launchy.open(client.authorization_uri(options).to_s)
         server_thread = Thread.new do
@@ -134,21 +138,13 @@ module Aws
           ensure server.shutdown
           end
         end
-        while server_thread.alive?
-          raise 'fallback' if !launchy.alive? && !launchy.value.success?
-
-          sleep 0.1
-        end
+        
+        server_thread.join
       end
-      code || raise('fallback')
-    rescue StandardError
-      trap('INT', 'DEFAULT')
-      # Fallback to out-of-band authentication if browser launch failed.
-      client.redirect_uri = 'oob'
-      return ENV['OAUTH_CODE'] if ENV['OAUTH_CODE']
 
-      raise RuntimeError, 'Open the following URL in a browser to get a code,' \
-             "export to $OAUTH_CODE and rerun:\n#{client.authorization_uri(options)}", []
+      code || raise('Local Google Oauth failed to get code')
+    ensure
+      trap('INT', 'DEFAULT')
     end
 
     def refresh

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-google
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Will Jordan
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2025-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.211.0
+        version: '3.211'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.211.0
+        version: '3.211'
 - !ruby/object:Gem::Dependency
   name: google-apis-core
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,6 @@ files:
 - ".github/workflows/pr-verify.yml"
 - ".gitignore"
 - ".ruby-version"
-- ".travis.yml"
 - Dockerfile
 - Gemfile
 - LICENSE.txt
@@ -167,23 +166,23 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.0.5
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.3.27
+signing_key: 
 specification_version: 4
 summary: Use Google OAuth as an AWS credential provider
 test_files: []

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.14.6