diff --git a/.rubocop.yml b/.rubocop.yml index 17d94ba..4754df2 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,39 +1,80 @@ -# Metrics AllCops: - TargetRubyVersion: 2.4 + TargetRubyVersion: 2.7 +# ~~~ Layout ~~~ +Layout/EmptyLinesAroundAttributeAccessor: + Enabled: true Layout/HashAlignment: Include: - 'lib/**/*.rb' Layout/LineLength: Include: - 'lib/**/*.rb' +Layout/SpaceAroundMethodCallOperator: + Enabled: true +# ~~~ Lint ~~~ +Lint/DeprecatedOpenSSLConstant: + Enabled: true +Lint/DuplicateElsifCondition: + Enabled: true +Lint/MixedRegexpCaptureTypes: + Enabled: true Lint/RaiseException: Enabled: true -Lint/StructNewOverride: +Lint/StructNewOverride : Enabled: true +# ~~~ Metrics ~~~ Metrics/AbcSize: Enabled: false +Metrics/BlockNesting: + Exclude: + - 'bin/*' Metrics/ClassLength: Max: 200 Metrics/CyclomaticComplexity: Enabled: false -Metrics/BlockNesting: - Exclude: - - 'bin/*' Metrics/MethodLength: - Max: 25 + Max: 30 Metrics/PerceivedComplexity: Max: 10 +# ~~~ Style ~~~ +Style/AccessorGrouping: + Enabled: false # for yard +Style/ArrayCoercion: + Enabled: true +Style/BisectedAttrAccessor: + Enabled: false # for yard +Style/CaseLikeIf: + Enabled: true Style/ClassVars: Enabled: false Style/Documentation: Enabled: false +Style/ExponentialNotation: + Enabled: true +Style/FormatStringToken: + Enabled: false # https://github.com/rubocop-hq/rubocop/issues/7944 +Style/HashAsLastArrayItem: + Enabled: true Style/HashEachMethods: Enabled: true +Style/HashLikeCase: + Enabled: true Style/HashTransformKeys: Enabled: true Style/HashTransformValues: Enabled: true +Style/RedundantAssignment: + Enabled: true +Style/RedundantFetchBlock: + Enabled: true +Style/RedundantFileExtensionInRequire: + Enabled: true +Style/RedundantRegexpCharacterClass: + Enabled: true +Style/RedundantRegexpEscape: + Enabled: true Style/RedundantReturn: Enabled: false +Style/SlicingWithRange: + Enabled: true diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 24ba9a3..0000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.7.0 diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..a9e31a4 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +ruby 2.7.1 diff --git a/Gemfile.lock b/Gemfile.lock index f10e5db..0079b33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - ctf-party (1.2.0) + ctf-party (1.2.1) GEM remote: https://rubygems.org/ diff --git a/LICENSE.txt b/LICENSE.txt index 766ff9e..f2d6c48 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,7 @@ The MIT License (MIT) -Copyright (c) 2019 Alexandre ZANNI +Copyright (c) 2020-2020 Alexandre ZANNI +Copyright (c) 2019-2020 Alexandre ZANNI at Orange Cyberdefense Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 4ce5b5b..54e954a 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ # ctf-party [![Gem Version](https://badge.fury.io/rb/ctf-party.svg)](https://badge.fury.io/rb/ctf-party) -![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/Orange-Cyberdefense/ctf-party) -[![GitHub forks](https://img.shields.io/github/forks/Orange-Cyberdefense/ctf-party)](https://github.com/Orange-Cyberdefense/ctf-party/network) -[![GitHub stars](https://img.shields.io/github/stars/Orange-Cyberdefense/ctf-party)](https://github.com/Orange-Cyberdefense/ctf-party/stargazers) -[![GitHub license](https://img.shields.io/github/license/Orange-Cyberdefense/ctf-party)](https://github.com/Orange-Cyberdefense/ctf-party/blob/master/LICENSE.txt) +![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/noraj/ctf-party) +[![GitHub forks](https://img.shields.io/github/forks/noraj/ctf-party)](https://github.com/noraj/ctf-party/network) +[![GitHub stars](https://img.shields.io/github/stars/noraj/ctf-party)](https://github.com/noraj/ctf-party/stargazers) +[![GitHub license](https://img.shields.io/github/license/noraj/ctf-party)](https://github.com/noraj/ctf-party/blob/master/LICENSE.txt) [![Rawsec's CyberSecurity Inventory](https://inventory.rawsec.ml/img/badges/Rawsec-inventoried-FF5050_flat.svg)](https://inventory.rawsec.ml/tools.html#ctf-party) [![Packaging status](https://repology.org/badge/vertical-allrepos/ruby:ctf-party.svg)](https://repology.org/project/ruby:ctf-party/versions) -![](https://orange-cyberdefense.github.io/ctf-party/_media/logo.png) +![](https://noraj.github.io/ctf-party/_media/logo.png) ## What it is @@ -51,8 +51,8 @@ myvar.to_b64! ## References -Homepage / Documentation: https://orange-cyberdefense.github.io/ctf-party/ +Homepage / Documentation: https://noraj.github.io/ctf-party/ ## Author -Made by Alexandre ZANNI ([@noraj](https://github.com/noraj)), pentester from Orange Cyberdefense. +Made by Alexandre ZANNI ([@noraj](https://pwn.by/noraj/)). diff --git a/ctf_party.gemspec b/ctf_party.gemspec index c561588..ade56e6 100644 --- a/ctf_party.gemspec +++ b/ctf_party.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.name = 'ctf-party' s.version = Version::VERSION s.platform = Gem::Platform::RUBY - s.date = '2020-02-03' + s.date = '2020-07-13' s.summary = 'A library to enhance and speed up script/exploit writing'\ ' for CTF players' s.description = 'A library to enhance and speed up script/exploit writing'\ @@ -16,7 +16,7 @@ Gem::Specification.new do |s| ' code patterns.' s.authors = ['Alexandre ZANNI'] s.email = 'alexandre.zanni@engineer.com' - s.homepage = 'https://orange-cyberdefense.github.io/ctf-party/' + s.homepage = 'https://noraj.github.io/ctf-party/' s.license = 'MIT' s.files = Dir['lib/**/*.rb'] + Dir['bin/*'] + ['LICENSE.txt'] @@ -26,14 +26,14 @@ Gem::Specification.new do |s| s.metadata = { 'yard.run' => 'yard', - 'bug_tracker_uri' => 'https://github.com/Orange-Cyberdefense/ctf-party/issues', - 'changelog_uri' => 'https://github.com/Orange-Cyberdefense/ctf-party/blob/master/docs/CHANGELOG.md', - 'documentation_uri' => 'https://orange-cyberdefense.github.io/ctf-party/', - 'homepage_uri' => 'https://orange-cyberdefense.github.io/ctf-party/', - 'source_code_uri' => 'https://github.com/Orange-Cyberdefense/ctf-party/' + 'bug_tracker_uri' => 'https://github.com/noraj/ctf-party/issues', + 'changelog_uri' => 'https://github.com/noraj/ctf-party/blob/master/docs/CHANGELOG.md', + 'documentation_uri' => 'https://noraj.github.io/ctf-party/', + 'homepage_uri' => 'https://noraj.github.io/ctf-party/', + 'source_code_uri' => 'https://github.com/noraj/ctf-party/' } - s.required_ruby_version = '~> 2.4' + s.required_ruby_version = '~> 2.7' s.add_development_dependency('bundler', '~> 2.1') s.add_development_dependency('commonmarker', '~> 0.20') # for GMF support in YARD diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 19c224f..e2e9872 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [1.2.1] + +- lib: code lint +- repo: From from [Orange-Cyberdefense/rabid](https://github.com/Orange-Cyberdefense/rabid) to [noraj/rabid](https://github.com/noraj/rabid/) +- dependencies: update +- rubocop: new rules for new cops +- deprecation: now requires ruby 2.7+ instead of 2.4+ + ## [1.2.0] - new hexadecimal methods: diff --git a/docs/README.md b/docs/README.md index 124efc3..79546b7 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,10 +1,10 @@ # ctf-party [![Gem Version](https://badge.fury.io/rb/ctf-party.svg)](https://badge.fury.io/rb/ctf-party) -![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/Orange-Cyberdefense/ctf-party) -[![GitHub forks](https://img.shields.io/github/forks/Orange-Cyberdefense/ctf-party)](https://github.com/Orange-Cyberdefense/ctf-party/network) -[![GitHub stars](https://img.shields.io/github/stars/Orange-Cyberdefense/ctf-party)](https://github.com/Orange-Cyberdefense/ctf-party/stargazers) -[![GitHub license](https://img.shields.io/github/license/Orange-Cyberdefense/ctf-party)](https://github.com/Orange-Cyberdefense/ctf-party/blob/master/LICENSE.txt) +![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/noraj/ctf-party) +[![GitHub forks](https://img.shields.io/github/forks/noraj/ctf-party)](https://github.com/noraj/ctf-party/network) +[![GitHub stars](https://img.shields.io/github/stars/noraj/ctf-party)](https://github.com/noraj/ctf-party/stargazers) +[![GitHub license](https://img.shields.io/github/license/noraj/ctf-party)](https://github.com/noraj/ctf-party/blob/master/LICENSE.txt) [![Rawsec's CyberSecurity Inventory](https://inventory.rawsec.ml/img/badges/Rawsec-inventoried-FF5050_flat.svg)](https://inventory.rawsec.ml/tools.html#ctf-party) ## What it is @@ -46,8 +46,8 @@ myvar.to_b64! ## References -Homepage / Documentation: https://orange-cyberdefense.github.io/ctf-party/ +Homepage / Documentation: https://noraj.github.io/ctf-party/ ## Author -Made by Alexandre ZANNI ([@noraj](https://github.com/noraj)), pentester from Orange Cyberdefense. +Made by Alexandre ZANNI ([@noraj](https://pwn.by/noraj/)). diff --git a/docs/_coverpage.md b/docs/_coverpage.md index 87c3556..6739f0d 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -4,7 +4,7 @@ A Ruby library to enhance and speed up script/exploit writing for CTF players. -[GitHub](https://github.com/Orange-Cyberdefense/ctf-party/) +[GitHub](https://github.com/noraj/ctf-party/) [Get Started](pages/quick-start?id=quick-start) ![color](#ffffff) diff --git a/docs/_navbar.md b/docs/_navbar.md index 6f38692..d2ca940 100644 --- a/docs/_navbar.md +++ b/docs/_navbar.md @@ -1,3 +1,3 @@ - [Home](/) -- [Doc](https://orange-cyberdefense.github.io/ctf-party/yard/) -- [Source](https://github.com/Orange-Cyberdefense/ctf-party/) +- [Doc](https://noraj.github.io/ctf-party/yard/) +- [Source](https://github.com/noraj/ctf-party/) diff --git a/docs/index.html b/docs/index.html index 186f8a1..df5cab0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -13,7 +13,7 @@