Skip to content

Commit

Permalink
Prepare Release 0.32.2
Browse files Browse the repository at this point in the history
- Update outdated rubocop & Warning Fix
- Fix not working badges in README.md
- Fix Changlog entry in the wring version
- Fix typo after code review
  • Loading branch information
robertcheramy committed Feb 26, 2025
1 parent 4ea37b9 commit 99dcdfe
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2025-02-17 10:13:53 UTC using RuboCop version 1.72.1.
# on 2025-02-26 20:32:58 UTC using RuboCop version 1.73.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
- docker image: update rake build_container to match the tags of GitHub CI (@robertcheramy)

### Fixed
- powerconnect: restore last line of command output, and remove spurious CR characters. Fixes #2692 (@clifcox)
- powerconnect: Remove undesirable inserted blank lines during pagination. Fixes #3413 (@clifcox)
- docker image: remove ubuntu user introduced in noble. Fixes #3336 (@robertcheramy)
- docker image: correct rights under /home/oxidized. Fixes #3336 (@robertcheramy)
Expand Down Expand Up @@ -48,7 +49,6 @@ use oxidized-web, be sure to update your oxidized-web gem to 0.15.0.
- extra/gitdiff-msteams.sh: honor the 28KB size limit and add an optional link to GitHub (@mopi3456)

### Fixed
- powerconnect: restore last line of command output, and remove spurious CR characters. Fixes #2692 (@clifcox)
- tplink: send 'enable' before the enable password. Fixes #3271 (@robertcheramy)
- asyncos: fix prompt for hostnames containing "-" . Fixes #3327 (@robertcheramy)
- sonicos: fix prompt for hostnames containing "-" . Fixes #3333 (@robertcheramy)
Expand Down
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# Oxidized

[![Build Status](https://github.com/ytti/oxidized/actions/workflows/ruby.yml/badge.svg)](https://github.com/ytti/oxidized/actions/workflows/ruby.yml)
[![codecov.io](https://codecov.io/gh/ytti/oxidized/coverage.svg?branch=master)](https://codecov.io/gh/ytti/oxidized?branch=master)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/5a90cb22db6a4d5ea23ad0dfb53fe03a)](https://www.codacy.com/app/ytti/oxidized?utm_source=github.com&utm_medium=referral&utm_content=ytti/oxidized&utm_campaign=Badge_Grade)
[![Code Climate](https://codeclimate.com/github/ytti/oxidized/badges/gpa.svg)](https://codeclimate.com/github/ytti/oxidized)
[![Gem Version](https://badge.fury.io/rb/oxidized.svg)](http://badge.fury.io/rb/oxidized)
[![Join the chat at https://gitter.im/oxidized/Lobby](https://badges.gitter.im/oxidized/Lobby.svg)](https://gitter.im/oxidized/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Expand Down Expand Up @@ -154,7 +151,7 @@ gem install bundler
rake install
```

### Running with Docker od Podman
### Running with Docker or Podman
See [docs/Docker.md](docs/Docker.md)

### Installing Ruby 2.3 using RVM
Expand Down
8 changes: 5 additions & 3 deletions docs/Release.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ If you change some code => Restart the release process at the beginning ;-)
## Make sure the file permissions are correct
Run `bundle exec rake chmod`

## Test !
Test the git code and the container against as much device types and environments as you can.
## Make sure you pass all GitHub CI
They test different ruby versions, the docker build process and codeql.

Do not integrate late PRs into master if they do not fix issues for the release. The must wait for the next release.
## Test !
Test the git code and the container against as much device types and
environments as you can.

## Version numbering
Oxidized versions are nummered like major.minor.patch
Expand Down
7 changes: 2 additions & 5 deletions lib/oxidized/worker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,8 @@ def process_failure(node, job)
end

def cycle_finished?
if @jobs_done > @nodes.count
true
else
@jobs_done.positive? && (@jobs_done % @nodes.count).zero?
end
@jobs_done > @nodes.count ||
(@jobs_done.positive? && (@jobs_done % @nodes.count).zero?)
end

def run_done_hook
Expand Down
2 changes: 1 addition & 1 deletion oxidized.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'mocha', '~> 2.1'
s.add_development_dependency 'pry', '~> 0.15.0'
s.add_development_dependency 'rake', '~> 13.0'
s.add_development_dependency 'rubocop', '~> 1.72.0'
s.add_development_dependency 'rubocop', '~> 1.73.0'
s.add_development_dependency 'rubocop-minitest', '~> 0.37.0'
s.add_development_dependency 'rubocop-rake', '~> 0.7.0'
s.add_development_dependency 'rubocop-sequel', '~> 0.3.3'
Expand Down

0 comments on commit 99dcdfe

Please sign in to comment.