Skip to content

Fixes #39269 - Fix dependency issues for foreman_webhooks #100

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

Merged
adamruzicka merged 3 commits into from
Apr 28, 2026
+8 −24
Merged

Fixes #39269 - Fix dependency issues for foreman_webhooks #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
498cff3
Fixes #39269 - Fix dependency issues for foreman_webhooks
ofedoren Apr 28, 2026
3d96cd2
Refs #39269 - Drop rdoc dependency
ofedoren Apr 28, 2026
5190add
Refs #39269 - Apply rubocop findings
ofedoren Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ concurrency:
jobs:
rubocop:
name: Rubocop
uses: theforeman/actions/.github/workflows/rubocop.yml@v0
uses: theforeman/actions/.github/workflows/rubocop.yml@v1
Copy link
Copy Markdown
Member Author

@ofedoren ofedoren Apr 28, 2026

Choose a reason for hiding this comment

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

Damn, we should've revisited those in other PRs :/

with:
command: bundle exec rubocop --parallel --format github

test:
name: Ruby
needs: rubocop
uses: theforeman/actions/.github/workflows/foreman_plugin.yml@v0
uses: theforeman/actions/.github/workflows/foreman_plugin.yml@v1
with:
plugin: foreman_webhooks
2 changes: 1 addition & 1 deletion .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ inherit_gem:
- default.yml

AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0

Metrics:
Enabled: false
Expand Down
3 changes: 3 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
source 'https://rubygems.org'

gemspec

gem 'rake'
gem 'theforeman-rubocop', '~> 0.1.2', require: false, groups: %i[development rubocop]
15 changes: 0 additions & 15 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,6 @@ begin
rescue LoadError
puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
end
begin
require 'rdoc/task'
rescue LoadError
require 'rdoc/rdoc'
require 'rake/rdoctask'
RDoc::Task = Rake::RDocTask
end

RDoc::Task.new(:rdoc) do |rdoc|
rdoc.rdoc_dir = 'rdoc'
rdoc.title = 'ForemanWebhooks'
rdoc.options << '--line-numbers'
rdoc.rdoc_files.include('README.rdoc')
rdoc.rdoc_files.include('lib/**/*.rb')
end

APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)

Expand Down
2 changes: 1 addition & 1 deletion app/models/webhook.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Webhook < ApplicationRecord

graphql_type 'ForemanWebhooks::Types::Webhook'

EVENT_POSTFIX = ".#{Foreman::Observable::DEFAULT_NAMESPACE}"
EVENT_POSTFIX = ".#{Foreman::Observable::DEFAULT_NAMESPACE}".freeze

DEFAULT_PAYLOAD_TEMPLATE = 'Webhook Template - Payload Default'

Expand Down
6 changes: 1 addition & 5 deletions foreman_webhooks.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,10 @@ Gem::Specification.new do |s|
s.summary = 'Configure webhooks for Foreman.'
s.description = 'Plugin for Foreman that allows to configure Webhooks.'

s.required_ruby_version = '>= 2.7.0'
s.required_ruby_version = '>= 3.0', '< 4'

s.files = Dir['{app,config,db,lib,webpack}/**/*'] + ['LICENSE', 'Rakefile', 'README.md', 'package.json'] + \
# .mo files are compiled; .po are sources; .edit.po are temporary files
Dir['locale/*/LC_MESSAGES/*.mo'] + Dir["locale/*/#{s.name}.po"]
s.test_files = Dir['test/**/*'] + Dir['webpack/**/__tests__/*.js']

s.add_development_dependency 'rake'
s.add_development_dependency 'rdoc'
s.add_development_dependency 'theforeman-rubocop', '~> 0.1.0'
end
Loading