Skip to content

Commit

Permalink
Merge pull request #61 from bastelfreak/rubocop
Browse files Browse the repository at this point in the history
voxpupuli-rubocop: Use 2.x
  • Loading branch information
bastelfreak authored Oct 5, 2023
2 parents c681ce0 + 19039a8 commit f8d3dc5
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 44 deletions.
42 changes: 1 addition & 41 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2023-05-09 13:16:12 UTC using RuboCop version 1.50.2.
# on 2023-10-05 19:25:42 UTC using RuboCop version 1.54.2.
# 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
# versions of RuboCop, may require this file to be generated again.

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
Performance/StringInclude:
Exclude:
- 'lib/voxpupuli/release/rake_tasks.rb'

# Offense count: 1
# Configuration parameters: AllowedConstants.
Style/Documentation:
Expand All @@ -28,40 +22,6 @@ Style/EmptyElse:
Exclude:
- 'lib/voxpupuli/release/rake_tasks.rb'

# Offense count: 6
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: always, always_true, never
Style/FrozenStringLiteralComment:
Exclude:
- 'Gemfile'
- 'Rakefile'
- 'lib/voxpupuli/release.rb'
- 'lib/voxpupuli/release/rake_tasks.rb'
- 'lib/voxpupuli/release/version.rb'
- 'voxpupuli-release.gemspec'

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
Style/LineEndConcatenation:
Exclude:
- 'lib/voxpupuli/release/rake_tasks.rb'

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: literals, strict
Style/MutableConstant:
Exclude:
- 'lib/voxpupuli/release/version.rb'

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: Mode.
Style/StringConcatenation:
Exclude:
- 'lib/voxpupuli/release/rake_tasks.rb'

# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
Expand Down
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

source ENV['GEM_SOURCE'] || 'https://rubygems.org'

gemspec
Expand Down
2 changes: 2 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

$LOAD_PATH.unshift File.expand_path('lib', __dir__)
require 'voxpupuli/release/version'

Expand Down
2 changes: 2 additions & 0 deletions lib/voxpupuli/release.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# frozen_string_literal: true

require 'voxpupuli/release/rake_tasks'
require 'voxpupuli/release/version'
6 changes: 4 additions & 2 deletions lib/voxpupuli/release/rake_tasks.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'puppet_blacksmith/rake_tasks'

class GCGConfig
Expand Down Expand Up @@ -53,7 +55,7 @@ def self.future_release
m = Blacksmith::Modulefile.new
v = m.version
unless v.match?(/^\d+\.\d+\.\d+$/)
raise "Refusing to release an RC or build-release (#{v}).\n" +
raise "Refusing to release an RC or build-release (#{v}).\n" \
'Please set a semver *release* version.'
end

Expand Down Expand Up @@ -142,7 +144,7 @@ def self.future_release

# Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715
require 'rbconfig'
unless RbConfig::CONFIG['host_os'].match?(/windows/)
unless RbConfig::CONFIG['host_os'].include?('windows')
puts 'Fixing line endings...'
log.gsub!("\r\n", "\n")
end
Expand Down
2 changes: 2 additions & 0 deletions lib/voxpupuli/release/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module Voxpupuli
module Release
VERSION = '3.0.0'
Expand Down
4 changes: 3 additions & 1 deletion voxpupuli-release.gemspec
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

$LOAD_PATH.unshift File.expand_path('lib', __dir__)
require 'voxpupuli/release/version'

Expand All @@ -20,5 +22,5 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'puppet-strings', '~> 4'
s.add_runtime_dependency 'rake', '~> 13.0', '>= 13.0.6'

s.add_development_dependency 'voxpupuli-rubocop', '~> 1.2'
s.add_development_dependency 'voxpupuli-rubocop', '~> 2.0.0'
end

0 comments on commit f8d3dc5

Please sign in to comment.