Skip to content

Commit

Permalink
Merge pull request #29 from learningtapestry/fix-require-downloaders
Browse files Browse the repository at this point in the history
 Drop Ruby < 3.2
  • Loading branch information
paranoicsan authored Jul 7, 2023
2 parents 733d6eb + b61cf0a commit d0d2d13
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 50 deletions.
35 changes: 16 additions & 19 deletions .github/workflows/rubocop-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,22 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 3.2.1

- name: Intall legacy bundler version
run: gem install bundler -v 1.17.3
- name: Install specific bundler version
run: gem install bundler -v 2.4.6

# This step is not necessary if you add the gem to your Gemfile
- name: Install Code Scanning integration
run: bundle _1.17.3_ add code-scanning-rubocop --skip-install

- name: Install dependencies
run: bundle _1.17.3_ install

- name: Rubocop run
run: |
bash -c "
bundle exec rubocop --require code_scanning --format CodeScanning::SarifFormatter -o rubocop.sarif
[[ $? -ne 2 ]]
"
- name: Upload Sarif output
uses: github/codeql-action/upload-sarif@v1
- name: Cache gems
uses: actions/cache@v1
with:
sarif_file: rubocop.sarif
path: vendor/bundle
key: ${{ runner.os }}-rubocop-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-rubocop-
- name: Install gems
run: |
bundle config path vendor/bundle
bundle config set without 'default doc job cable storage ujs test db'
bundle install --jobs 4 --retry 3
- name: Run RuboCop
run: bundle exec rubocop --parallel
12 changes: 4 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
/.bundle/
/.bundle
/.yardoc
/_yardoc/
/coverage/
/doc/
/pkg/
/spec/reports/
/tmp/
/_yardoc

# Ignore IDE specific files
.idea/
/.idea

# Misc
.DS_Store
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ AllCops:
- db/schema.rb
- node_modules/**/*
NewCops: enable
TargetRubyVersion: 2.6
TargetRubyVersion: 3.2

Layout/LineLength:
Max: 120
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased](https://github.com/learningtapestry/lcms-engine/compare/v0.4.4...HEAD)
## [Unreleased](https://github.com/learningtapestry/lcms-engine/compare/v0.5.0...HEAD)

## [0.5.0](https://github.com/learningtapestry/lt-lcms/compare/v0.4.4...v0.5.0) - 2023-07-07

### Added

-

## [0.4.4](https://github.com/learningtapestry/lt-lcms/compare/v0.4.3...v0.4.4) - 2021-07-16

Expand Down
43 changes: 24 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ GEM
i18n (1.8.10)
concurrent-ruby (~> 1.0)
iniparse (1.5.0)
json (2.6.3)
jwt (2.2.3)
language_server-protocol (3.17.0.3)
lt-google-api (0.2.4)
google-api-client (~> 0.46)
googleauth (~> 0.14)
Expand All @@ -88,39 +90,42 @@ GEM
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.1.1)
nokogiri (1.11.7-x86_64-darwin)
nokogiri (1.15.3-x86_64-linux)
racc (~> 1.4)
os (1.1.1)
overcommit (0.58.0)
childprocess (>= 0.6.3, < 5)
iniparse (~> 1.4)
rexml (~> 3.2)
parallel (1.20.1)
parser (3.0.1.1)
parallel (1.23.0)
parser (3.2.2.3)
ast (~> 2.4.1)
racc
public_suffix (4.0.6)
racc (1.5.2)
rainbow (3.0.0)
racc (1.7.1)
rainbow (3.1.1)
rake (13.0.3)
regexp_parser (2.1.1)
regexp_parser (2.8.1)
representable (3.1.1)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.5)
rubocop (0.93.1)
rubocop (1.54.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 2.7.1.5)
parser (>= 3.2.2.3)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8)
rexml
rubocop-ast (>= 0.6.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.7.0)
parser (>= 3.0.1.1)
ruby-progressbar (1.11.0)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
signet (0.15.0)
Expand All @@ -133,19 +138,19 @@ GEM
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
uber (0.1.0)
unicode-display_width (1.7.0)
unicode-display_width (2.4.2)
webrick (1.7.0)
zeitwerk (2.4.2)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
bundler (~> 1.16)
lt-lcms!
overcommit (~> 0.57)
rake (~> 13.0)
rubocop (~> 0.93.1)
rubocop (~> 1.54)

BUNDLED WITH
1.17.3
2.4.6
5 changes: 5 additions & 0 deletions lib/lt/lcms/lesson/downloader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ module Downloader
end

require 'lt/lcms/lesson/downloader/base'
require 'lt/lcms/lesson/downloader/gdoc'
require 'lt/lcms/lesson/downloader/gslide'
require 'lt/lcms/lesson/downloader/gspreadsheet'
require 'lt/lcms/lesson/downloader/pdf'
require 'lt/lcms/lesson/uploader/gdoc'
4 changes: 2 additions & 2 deletions lt-lcms.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
spec.description = ''
spec.license = 'Apache-2.0'

spec.required_ruby_version = '>= 2.6'
spec.required_ruby_version = '>= 3.2'

# Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
# to allow pushing to a single host or delete this section to allow pushing to any host.
Expand All @@ -42,5 +42,5 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
spec.add_development_dependency 'bundler', '~> 1.16'
spec.add_development_dependency 'overcommit', '~> 0.57'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rubocop', '~> 0.93.1'
spec.add_development_dependency 'rubocop', '~> 1.54'
end

0 comments on commit d0d2d13

Please sign in to comment.