Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump dependencies and CI Ruby versions #493

Merged
merged 6 commits into from
Nov 21, 2022
Merged

Bump dependencies and CI Ruby versions #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
368ffdc
Stop testing with EOL Ruby versions
ashmaroli Nov 20, 2022
732e430
Add `rss` gem as development dependency
ashmaroli Nov 20, 2022
388f891
Drop `behance` as a development dependency
ashmaroli Nov 20, 2022
f21cce4
Load dev dependencies only as necessary
ashmaroli Nov 21, 2022
2f28490
Bump dependency versions
ashmaroli Nov 21, 2022
2173c04
Remove commented-out line in test helper
ashmaroli Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ jobs:
fail-fast: false
matrix:
ruby_version:
- 2.5
- 2.7
- "2.7"
- "3.0"
- "3.1"
steps:
- uses: actions/checkout@v2
with:
Expand Down
13 changes: 7 additions & 6 deletions jekyll-import.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,30 @@ Gem::Specification.new do |s|
# runtime dependencies
s.add_runtime_dependency("jekyll", ">= 3.7", "< 5.0")
s.add_runtime_dependency("nokogiri", "~> 1.0")
s.add_runtime_dependency("reverse_markdown", "~> 1.0")
s.add_runtime_dependency("reverse_markdown", "~> 2.1")

# development dependencies
s.add_development_dependency("bundler")
s.add_development_dependency("rake", "~> 12.0")
s.add_development_dependency("rake", "~> 13.0")
s.add_development_dependency("rdoc", "~> 6.3.0")

# test dependencies:
s.add_development_dependency("redgreen", "~> 1.2")
s.add_development_dependency("rr", "~> 1.0")
s.add_development_dependency("rubocop-jekyll", "~> 0.11.0")
s.add_development_dependency("shoulda", "~> 3.5")
s.add_development_dependency("shoulda", "~> 4.0")
s.add_development_dependency("simplecov", "~> 0.7")
s.add_development_dependency("simplecov-gem-adapter", "~> 1.0")

# migrator dependencies:
s.add_development_dependency("behance", "~> 0.3")
# s.add_development_dependency("behance", "~> 0.3") # uses outdated dependencies
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we move this to the Gemfile and add a Ruby version check or just wait until someone comes around and tries to add tests for the Behance importer?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shall wait for someone to add tests for the Behance importer or at minimum report a bug or some other issue with the Behance importer..
I'm not keen on moving dev_deps to Gemfile (for this project) because the Rubygems dev_deps listing may serve as secondary documentation for users.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. Commenting this out removes it from the dev deps anyway, so I'm not sure it's of much use here.

s.add_development_dependency("hpricot", "~> 0.8")
s.add_development_dependency("htmlentities", "~> 4.3")
s.add_development_dependency("mysql2", "~> 0.3")
s.add_development_dependency("open_uri_redirections", "~> 0.2")
s.add_development_dependency("pg", "~> 0.12")
s.add_development_dependency("sequel", "~> 3.42")
s.add_development_dependency("pg", "~> 1.0")
s.add_development_dependency("rss", "~> 0.2")
s.add_development_dependency("sequel", "~> 5.62")
s.add_development_dependency("sqlite3", "~> 1.3")
s.add_development_dependency("unidecode", "~> 1.0")

Expand Down
2 changes: 0 additions & 2 deletions test/helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ class Test::Unit::AssertionFailedError < ActiveSupport::TestCase::Assertion
require File.expand_path("../lib/jekyll-import.rb", __dir__)
include JekyllImport

JekyllImport::Importer.subclasses.each(&:require_deps)

# Send STDERR into the void to suppress program output messages
# STDERR.reopen(test(?e, '/dev/null') ? '/dev/null' : 'NUL:')

Expand Down
3 changes: 3 additions & 0 deletions test/test_blogger_importer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
require "tempfile"
require "tmpdir"

Importers::Blogger.require_deps

class TestBloggerImporter < Test::Unit::TestCase

should "requires source option" do
assert_raise(RuntimeError) do
Importers::Blogger.validate({})
Expand Down
2 changes: 2 additions & 0 deletions test/test_csv.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

require "helper"

Importers::CSV.require_deps

class TestCSVImporter < Test::Unit::TestCase
sample_row = [
"My Title",
Expand Down
2 changes: 2 additions & 0 deletions test/test_jrnl_importer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
require "helper"
require "time"

Importers::Jrnl.require_deps

class TestJrnlMigrator < Test::Unit::TestCase
context "jrnl" do
setup do
Expand Down
2 changes: 2 additions & 0 deletions test/test_mt_importer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
require "helper"
require "date"

Importers::MT.require_deps

class TestMTMigrator < Test::Unit::TestCase
def stub_entry_row(overrides = {})
now = DateTime.now
Expand Down
2 changes: 2 additions & 0 deletions test/test_roller_importer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
require "helper"
require "htmlentities"

Importers::Roller.require_deps

class TestRollerImporter < Test::Unit::TestCase
should "clean slashes from slugs" do
test_title = "blogs part 1/2"
Expand Down
3 changes: 2 additions & 1 deletion test/test_tumblr_importer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
require "helper"
require "json"

Importers::Tumblr.require_deps

class TestTumblrImporter < Test::Unit::TestCase
context "A Tumblr blog" do
setup do
Importers::Tumblr.require_deps
@jsonPayload = <<~PAYLOAD
{
"tumblelog" : {
Expand Down
2 changes: 2 additions & 0 deletions test/test_wordpress_importer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
require "helper"
require "htmlentities"

Importers::WordPress.require_deps

class TestWordpressMigrator < Test::Unit::TestCase
should "clean slashes from slugs" do
test_title = "blogs part 1/2"
Expand Down
2 changes: 2 additions & 0 deletions test/test_wordpressdotcom_importer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
require "helper"

Importers::WordpressDotCom.require_deps

class TestWordpressDotComMigrator < Test::Unit::TestCase
should "clean slashes from slugs" do
test_title = "blogs part 1/2"
Expand Down