From 343b0ace138c532c3ced16f028fe898aafbbf4d2 Mon Sep 17 00:00:00 2001 From: KW Kwan Date: Thu, 30 Oct 2025 13:38:37 +0800 Subject: [PATCH 1/2] Adjust require order for proper dependency loading --- bin/console | 2 +- exe/relaton | 2 +- lib/relaton-cli.rb | 12 +++++++----- lib/relaton/cli.rb | 3 +-- spec/spec_helper.rb | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/bin/console b/bin/console index d135bf0..54a8dbe 100755 --- a/bin/console +++ b/bin/console @@ -1,7 +1,7 @@ #!/usr/bin/env ruby require "bundler/setup" -require "relaton/cli" +require "relaton-cli" # You can add fixtures and/or initialization code here to make experimenting # with your gem easier. You can also use a different console, if you like. diff --git a/exe/relaton b/exe/relaton index 1476ffe..218878f 100755 --- a/exe/relaton +++ b/exe/relaton @@ -15,6 +15,6 @@ class Gem::Specification def this; self; end end -require "relaton/cli" +require "relaton-cli" Relaton::Cli.start(ARGV) diff --git a/lib/relaton-cli.rb b/lib/relaton-cli.rb index c45729e..f1a8af9 100644 --- a/lib/relaton-cli.rb +++ b/lib/relaton-cli.rb @@ -1,10 +1,12 @@ -require_relative "relaton/bibcollection" -require_relative "relaton/bibdata" -require_relative "relaton/element_finder" -# require_relative "relaton/xml_document" -require_relative "relaton/cli/yaml_convertor" +require "relaton" module Relaton module Cli end end + +require_relative "relaton/bibcollection" +require_relative "relaton/bibdata" +require_relative "relaton/element_finder" +require_relative "relaton/cli/yaml_convertor" +require_relative "relaton/cli" \ No newline at end of file diff --git a/lib/relaton/cli.rb b/lib/relaton/cli.rb index 86a5574..b07ea42 100644 --- a/lib/relaton/cli.rb +++ b/lib/relaton/cli.rb @@ -1,7 +1,6 @@ require "thor" require "thor/hollaback" -require "relaton" -require "relaton/cli/version" +require_relative "cli/version" require_relative "cli/util" require_relative "cli/command" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c3daff2..d53bc72 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -3,7 +3,7 @@ Dir["./spec/support/**/*.rb"].sort.each { |f| require f } -require "relaton/cli" +require "relaton-cli" require "rspec/html" RSpec.configure do |config| From 42f2f62b179c7d83cd8b532e8348ee932c71a0c4 Mon Sep 17 00:00:00 2001 From: KW Kwan Date: Thu, 30 Oct 2025 13:39:04 +0800 Subject: [PATCH 2/2] Add openssl as an explicit gem to fix SSL verification issues in GHA --- relaton-cli.gemspec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/relaton-cli.gemspec b/relaton-cli.gemspec index 5ee50c7..009044f 100644 --- a/relaton-cli.gemspec +++ b/relaton-cli.gemspec @@ -24,6 +24,9 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "liquid", "~> 5" spec.add_runtime_dependency "relaton", "~> 1.20.0" + # https://github.com/rails/rails/issues/55886 + # add openssl as an explicit gem to fix SSL verification issues in GHA. + spec.add_runtime_dependency "openssl" spec.add_runtime_dependency "thor" spec.add_runtime_dependency "thor-hollaback" end