bps-google-api 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48eb103dafe0d57e7032a72e648f7cf085e2526c53f5d2d18e9122eeec620eea
-  data.tar.gz: e9505e457d101da12a86cd758d2e124b335cfb5271e2f84404816cbd7d74e8d1
+  metadata.gz: e7937e55313beccedf580def65fe7e6b041144f86220aa4279d283d61b07d2c8
+  data.tar.gz: 8379c2d08a286369deef102cf842a711a9d6fb38f3c73d5cc112995bf0b14267
 SHA512:
-  metadata.gz: 62a8efa1c192691cf326063b4c9ee19d296b3d6c8953d02d535b449d0cfe78e560965f237993c7aa7728d6748bf91fa40aaa29f3aa924475d92044dd06141f23
-  data.tar.gz: 781131026cb28c330afada70929b2d6564e79620d4dcc87472788e8d6c887461b37d4741f921e8fd3959b039b4a040009f230e217687481c5cb1cc0c9510cef0
+  metadata.gz: 9f03d2238a56f6aebbc125b5e7ff06bcc9e6351a83e33fc16d43d2e45dc6f5559f6ce114fac73ae3e5078c873564565180db6e0c3deeb5c5e163cef91cf5b431
+  data.tar.gz: a3850bff8d52700c87543af69de468478fe69a7a2e726ee7deaed7202962056454f4b53e88426730b618c0589ed655b8a048b202a5740f878662f9e6de1a203d

data/.rubocop.yml

@@ -37,6 +37,7 @@ Metrics/LineLength:
   Max: 100
 Metrics/MethodLength:
   Enabled: true
+  Max: 15
 Metrics/ClassLength:
   Enabled: true
   Max: 125

data/Gemfile.lock

@@ -1,25 +1,20 @@
 PATH
   remote: .
   specs:
-    bps-google-api (0.5.0)
+    bps-google-api (0.6.0)
       exp_retry (~> 0.0.13)
       fileutils (~> 1.2)
-      google-api-client (~> 0.23)
+      google-apis-admin_directory_v1 (~> 0.40)
+      google-apis-calendar_v3 (~> 0.27)
+      google-apis-groupssettings_v1 (~> 0.13)
       ruby-progressbar (~> 1.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.1)
+    addressable (2.8.3)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.0)
-    concurrent-ruby (1.2.2)
     declarative (0.0.20)
     diff-lcs (1.3)
     docile (1.3.2)
@@ -47,11 +42,11 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    fileutils (1.7.0)
-    gems (1.2.0)
-    google-api-client (0.53.0)
-      google-apis-core (~> 0.1)
-      google-apis-generator (~> 0.1)
+    fileutils (1.7.1)
+    google-apis-admin_directory_v1 (0.40.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-calendar_v3 (0.27.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
@@ -61,14 +56,8 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-discovery_v1 (0.14.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-generator (0.12.0)
-      activesupport (>= 5.0)
-      gems (~> 1.2)
+    google-apis-groupssettings_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-      google-apis-discovery_v1 (~> 0.5)
-      thor (>= 0.20, < 2.a)
     googleauth (1.1.3)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
@@ -77,14 +66,11 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     httpclient (2.8.3)
-    i18n (1.12.0)
-      concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.3)
     json (2.3.1)
     jwt (2.7.0)
     memoist (0.16.2)
     mini_mime (1.1.2)
-    minitest (5.15.0)
     multi_json (1.15.0)
     multipart-post (2.3.0)
     os (1.1.4)
@@ -131,14 +117,10 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    thor (1.2.1)
     trailblazer-option (0.1.2)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (1.6.0)
     webrick (1.8.1)
-    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby

data/bps-google-api.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name          = 'bps-google-api'
-  s.version       = '0.5.0'
-  s.date          = '2023-03-13'
+  s.version       = '0.6.0'
+  s.date          = '2023-04-08'
   s.summary       = 'Configured Google API'
   s.description   = 'A configured Google API wrapper.'
   s.homepage      = 'http://rubygems.org/gems/bps-google-api'
@@ -15,10 +15,12 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_runtime_dependency 'exp_retry',         '~> 0.0.13'
-  s.add_runtime_dependency 'fileutils',         '~> 1.2'
-  s.add_runtime_dependency 'google-api-client', '~> 0.23'
-  s.add_runtime_dependency 'ruby-progressbar',  '~> 1.10'
+  s.add_runtime_dependency 'exp_retry',                      '~> 0.0.13'
+  s.add_runtime_dependency 'fileutils',                      '~> 1.2'
+  s.add_runtime_dependency 'google-apis-calendar_v3',        '~> 0.27'
+  s.add_runtime_dependency 'google-apis-groupssettings_v1',  '~> 0.13'
+  s.add_runtime_dependency 'google-apis-admin_directory_v1', '~> 0.40'
+  s.add_runtime_dependency 'ruby-progressbar',               '~> 1.10'
 
   s.add_development_dependency 'rspec',     '~> 3.8',  '>= 3.8.0'
   s.add_development_dependency 'rubocop',   '~> 0.71', '>= 0.71.0'

data/lib/google_api/calendar/clear_test_calendar.rb

@@ -7,9 +7,10 @@ class GoogleAPI
         raise Google::Apis::RateLimitError, '(Rate Limit Exceeded)' if error
 
         @verbose = verbose
-        Google::Apis.logger.level = Logger::WARN
-        choose_page_token(page_token)
-        loop_over_pages(ENV['GOOGLE_CALENDAR_ID_TEST'], page_limit: page_limit)
+        quietly do
+          choose_page_token(page_token)
+          loop_over_pages(ENV['GOOGLE_CALENDAR_ID_TEST'], page_limit: page_limit)
+        end
         puts '*** Cleared all events!' if @verbose
       rescue Google::Apis::RateLimitError
         puts "\n\n*** Google::Apis::RateLimitError (Rate Limit Exceeded)" if @verbose
@@ -19,6 +20,15 @@ class GoogleAPI
 
     private
 
+      def quietly
+        old_level = Google::Apis.logger.level
+        Google::Apis.logger.level = Logger::WARN
+
+        yield
+
+        Google::Apis.logger.level = old_level
+      end
+
       def choose_page_token(page_token)
         last_token = Calendar.last_token_path
         @page_token ||= File.read(last_token) if File.exist?(last_token)

data/spec/lib/google_api/calendar_spec.rb

@@ -86,13 +86,19 @@ RSpec.describe GoogleAPI::Calendar do
     context 'with multiple pages' do
       let(:calendar) { subject.class.api }
 
-      before do
-        allow(calendar).to receive(:call).and_return(
-          Google::Apis::CalendarV3::Events.new(items: [Google::Apis::CalendarV3::Event], next_page_token: 'abc'),
-          Google::Apis::CalendarV3::Events.new(items: [Google::Apis::CalendarV3::Event], next_page_token: nil)
-        )
+      let(:events) do
+        [
+          Google::Apis::CalendarV3::Events.new(
+            items: [Google::Apis::CalendarV3::Event], next_page_token: 'abc'
+          ),
+          Google::Apis::CalendarV3::Events.new(
+            items: [Google::Apis::CalendarV3::Event], next_page_token: nil
+          )
+        ]
       end
 
+      before { allow(calendar).to receive(:call).and_return(events) }
+
       it 'returns the array of all events from list_all when paginated' do
         expect(calendar).to receive(:call).twice
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bps-google-api
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exp_retry
@@ -39,19 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: google-apis-calendar_v3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.27'
+- !ruby/object:Gem::Dependency
+  name: google-apis-groupssettings_v1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: google-apis-admin_directory_v1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.40'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement