jekyll-indico 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d07e0cc35ca21aab0d8b934a3e4dbc4ce9754f9b381e018a9030ec74c09291db
-  data.tar.gz: ceb2b86e65b6d40da965925abd98ab1b07830e255daf67ef2dce019d9da1e0c6
+  metadata.gz: 772fa536fed11533f53b2d2e643a4ffd3c9443d93bf6a546185aa9c5d70a0f5a
+  data.tar.gz: f4558987c3f3d9a2c62c13bec9617088318b63ec3667ab8b3aa24a085a7ca429
 SHA512:
-  metadata.gz: f0c639bf38480127762ab82011e4953a57b8f11f4e16bb484750690eabeef6ce2fb3f5a109f64336938555c8e1db059eac09d6881ccfdb4810fedd411b565038
-  data.tar.gz: 4fc89a0896dfdf28f3719e5ea7775a1080912fd221361600da28531175ce570885b060c1542ffb979af03ad0360f68807ff643d7fc17634df23baa3f434d03d4
+  metadata.gz: 3973f9788e6afc35aaf231fec4c3b813d6f37f010e20ade8fa0c739f02b3caa7658ba5bc1bcda2856e5376bbe404c03b9ae1c6695b3978e0ac1950905eefcdf6
+  data.tar.gz: '042863f213053df58b317bea185d459493d3a9ae56553cd61ccf8bdcb78b1530af50af4f752df5ff4752f2dc551a3c7a7ad97ced47aecdadf86918a228eb85d3'

data/.github/workflows/ci.yml

@@ -7,15 +7,24 @@ on:
     branches:
       - main
 
+concurrency:
+  group: test-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.6, 3.1]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - uses: ruby/setup-ruby@v1
       with:
+        ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
 
     - name: Style checking

data/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.1.0
+  rev: v4.2.0
   hooks:
   - id: check-added-large-files
   - id: mixed-line-ending
@@ -11,7 +11,7 @@ repos:
   - id: check-yaml
 
 - repo: https://github.com/Lucas-C/pre-commit-hooks
-  rev: v1.1.11
+  rev: v1.1.13
   hooks:
   - id: remove-crlf
   - id: forbid-tabs

data/.ruby-version

@@ -1 +1 @@
-2.6.6
+2.6.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-indico (0.6.0)
+    jekyll-indico (0.6.1)
       jekyll (>= 3.8, < 5.0)
 
 GEM
@@ -11,7 +11,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     colorator (1.1.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
@@ -20,9 +20,9 @@ GEM
     ffi (1.15.5)
     forwardable-extended (2.6.0)
     http_parser.rb (0.8.0)
-    i18n (1.9.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.1)
+    jekyll (4.2.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -37,11 +37,11 @@ GEM
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
       terminal-table (~> 2.0)
-    jekyll-sass-converter (2.1.0)
+    jekyll-sass-converter (2.2.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
@@ -50,47 +50,47 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.2.0)
+    regexp_parser (2.3.1)
     rexml (3.2.5)
     rouge (3.28.0)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.25.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.28.2)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.8.0)
+    rubocop-rspec (2.10.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     safe_yaml (1.0.5)
@@ -101,7 +101,7 @@ GEM
     unicode-display_width (1.8.0)
 
 PLATFORMS
-  x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -114,4 +114,4 @@ DEPENDENCIES
   rubocop-rspec (~> 2.2)
 
 BUNDLED WITH
-   2.3.6
+   2.3.13

data/exe/jekyll-indico-cache

@@ -18,10 +18,14 @@ end.parse!
 puts "Reading #{options[:config]}"
 
 config = YAML.safe_load(File.read(options[:config]))
-meeting_ids = JekyllIndico::Meetings.meeting_ids(config)
-base_url = JekyllIndico::Meetings.base_url(config)
+meeting_ids = config.dig('indico', 'ids')
+base_url = config.dig('indico', 'url')
 data_path = config.dig('indico', 'data') || 'indico'
 
+raise MissingURL, 'indico: url: MISSING from your config!' unless base_url
+raise MissingIDs, 'indico: ids: MISSING from your config!' unless meeting_ids
+raise MissingIDs, 'indico: ids: must be a hash!' unless meeting_ids.is_a?(Hash)
+
 JekyllIndico.cache(base_url, meeting_ids, data_path) do |name, number|
   puts "Accessing #{number} for #{name}"
 end

data/lib/jekyll-indico/core.rb

@@ -71,8 +71,8 @@ module JekyllIndico
 
       req = Net::HTTP::Get.new(uri)
       if ENV['INDICO_TOKEN']
-        req['Authorization'] = "Bearer #{ENV['INDICO_TOKEN']}"
-      elsif ENV['INDICO_SECRET_KEY'] || ENV['INDICO_API_KEY']
+        req['Authorization'] = "Bearer #{ENV.fetch('INDICO_TOKEN', nil)}"
+      elsif ENV.fetch('INDICO_SECRET_KEY', nil) || ENV.fetch('INDICO_API_KEY', nil)
         raise Error, 'Use INDICO_TOKEN with a new-style token'
       end
 

data/lib/jekyll-indico/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllIndico
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-indico
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Henry Schreiner
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: Read and/or cache indico meeting lists for Jekyll