Skip to content

Commit 2662884

Browse files
committed
Switch to Github actions
1 parent 7abb01d commit 2662884

File tree

9 files changed

+74
-62
lines changed

9 files changed

+74
-62
lines changed

.github/workflows/rubocop.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: RuboCop
2+
3+
on:
4+
push:
5+
branches: ["**"]
6+
pull_request:
7+
8+
jobs:
9+
rubocop:
10+
name: Lint
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
17+
- name: Install system dependencies
18+
run: sudo apt-get install -y libsystemd-dev
19+
20+
- name: Setup Ruby
21+
uses: ruby/setup-ruby@v1
22+
with:
23+
ruby-version: '3.4'
24+
bundler-cache: true
25+
26+
- name: Run RuboCop
27+
run: bundle exec rubocop

.github/workflows/ruby.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: ["**"]
6+
pull_request:
7+
8+
jobs:
9+
test:
10+
name: Ruby ${{ matrix.ruby }}
11+
runs-on: ubuntu-latest
12+
continue-on-error: ${{ matrix.ruby == '2.0.0' }}
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
ruby: [3.1, 3.2, 3.3, 3.4]
17+
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
22+
- name: Install system dependencies
23+
run: sudo apt-get install -y libsystemd-dev
24+
25+
- name: Setup Ruby ${{ matrix.ruby }}
26+
uses: ruby/setup-ruby@v1
27+
with:
28+
ruby-version: ${{ matrix.ruby }}
29+
bundler-cache: true
30+
31+
- name: Test
32+
run: bundle exec rspec

.rubocop.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
AllCops:
22
Exclude:
33
- "spec/**/*"
4-
- "vendor/**/*"
5-
TargetRubyVersion: 2.5
4+
TargetRubyVersion: 3.1
65
SuggestExtensions: false
76
NewCops: enable
87

@@ -18,5 +17,5 @@ Style:
1817
Naming:
1918
Enabled: false
2019

21-
Lint/EndAlignment:
20+
Layout/EndAlignment:
2221
Enabled: false

.travis.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

Gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@ source "https://rubygems.org"
22

33
# Specify your gem's dependencies in journald-logger.gemspec
44
gemspec
5+
6+
# Development depemdencies
7+
gem "rspec"
8+
gem "rubocop"
9+
gem "simplecov"

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# journald-logger
22

3+
[![CI](https://github.com/theforeman/journald-logger/actions/workflows/ruby.yml/badge.svg)](https://github.com/theforeman/journald-logger/actions/workflows/ruby.yml)
4+
[![RuboCop](https://github.com/theforeman/journald-logger/actions/workflows/rubocop.yml/badge.svg)](https://github.com/theforeman/journald-logger/actions/workflows/rubocop.yml)
5+
36
A Logger drop-in replacement that logs directly to systemd-journal with some additional features
47

58
## Usage
@@ -96,7 +99,7 @@ begin
9699
rescue => e
97100
logger.exception e # log exception with LOG_ERR level by default
98101
logger.exception e, severity: Logger::WARN # use Logger severity
99-
logger.exception e, priority: Journald::LOG_ALERT # use Syslog priority
102+
logger.exception e, priority: Journald::LOG_ALERT # use Syslog priority
100103
end
101104
```
102105

Rakefile

Lines changed: 0 additions & 33 deletions
This file was deleted.

journald-logger.gemspec

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
lib = File.expand_path("../lib", __FILE__)
2-
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
3-
require "journald/modules/version"
1+
require_relative "lib/journald/modules/version"
42

53
Gem::Specification.new do |spec|
64
spec.name = "journald-logger"
@@ -12,19 +10,11 @@ Gem::Specification.new do |spec|
1210
spec.license = "MIT"
1311

1412
spec.files = `git ls-files -z`.split("\x0")
15-
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
1613
spec.require_paths = ["lib"]
1714

18-
spec.required_ruby_version = ">= 2.5.0"
15+
spec.required_ruby_version = ">= 3.1.0"
1916

20-
spec.add_runtime_dependency "journald-native", "~> 1.0"
21-
22-
spec.add_development_dependency "bundler"
23-
spec.add_development_dependency "rake"
24-
spec.add_development_dependency "rspec"
25-
spec.add_development_dependency "rubocop"
26-
spec.add_development_dependency "rufo"
27-
spec.add_development_dependency "simplecov"
17+
spec.add_dependency "journald-native", "~> 1.0"
2818

2919
spec.metadata['rubygems_mfa_required'] = 'true'
3020
end

lib/journald/modules/loggable.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def add(severity, message = nil, progname = nil)
4545
add(severity_value, nil, progname, &block)
4646
end
4747

48-
define_method("#{severity_key}?".to_sym) do
48+
define_method(:"#{severity_key}?") do
4949
priority = severity_to_priority(severity_value)
5050
self.min_priority >= priority
5151
end

0 commit comments

Comments
 (0)