From c1c68efaedfd3defd1bf2c960517d8f80a895fd5 Mon Sep 17 00:00:00 2001 From: Daniela Lemow Date: Fri, 13 Oct 2023 09:18:41 +1300 Subject: [PATCH 1/9] feat: Update readme --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index df28079..04fd5d6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -# Boost::Styles [![Build Status](https://travis-ci.org/boost/boost-styles.svg?branch=master)](https://travis-ci.org/boost/boost-styles) +# Boost Styles [![Build Status](https://travis-ci.org/boost/boost-styles.svg?branch=master)](https://travis-ci.org/boost/boost-styles) -Shared Boost styles configuration +The Boost Styles Gem is a tool designed to streamline and enforce consistent coding style and linting rules for Boost projects. It simplifies the process of configuring and maintaining linting settings, promoting code quality, readability, and maintainability. + +This ReadMe provides comprehensive information on how to install, configure, and utilize the Boost Styles Gem in your project. ## What's inside? - ✅ Rubocop for Rails From c6943aa742c1111e35f92af082642eea171d01ec Mon Sep 17 00:00:00 2001 From: Daniela Lemow Date: Fri, 13 Oct 2023 09:39:51 +1300 Subject: [PATCH 2/9] feat: Update summary message --- boost-styles.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boost-styles.gemspec b/boost-styles.gemspec index 46d9aa8..3eafa64 100644 --- a/boost-styles.gemspec +++ b/boost-styles.gemspec @@ -10,7 +10,7 @@ Gem::Specification.new do |spec| spec.authors = ['Boost'] spec.email = ['info@boost.co.nz'] - spec.summary = 'Shared Boost styles configuration' + spec.summary = 'Shared Linting configuration for Boost projects' spec.description = 'Centralised gem for all Boost styles configuration (Rubocop, ESLint etc...)' spec.homepage = 'https://github.com/boost/boost-styles' spec.license = 'MIT' From 8b8bd096b29279366f9ac2f3ffeb63a0f2de13d4 Mon Sep 17 00:00:00 2001 From: Daniela Lemow Date: Fri, 13 Oct 2023 09:40:13 +1300 Subject: [PATCH 3/9] feat: Add github workflow --- .github/workflows/main.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..8e00a05 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,34 @@ +name: Ruby CI + +on: + pull_request: + push: + branches: + - main + + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + name: Ruby ${{ matrix.ruby }} + strategy: + matrix: + ruby: + - '2.5.1' + - '2.6.5' + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + + - name: Install Bundler + run: gem install bundler -v 2.1.4 + + - name: Install dependencies + run: bundle install \ No newline at end of file From 834e1fcb6bc1cbda67e48ef38119d748b60cb4f6 Mon Sep 17 00:00:00 2001 From: Daniela Lemow Date: Fri, 13 Oct 2023 09:48:37 +1300 Subject: [PATCH 4/9] feat: Remove old travis workflow --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 47bf128..0000000 --- a/.travis.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -sudo: false -language: ruby -cache: bundler -rvm: - - 2.5.1 - - 2.6.5 -before_install: gem install bundler -v 2.1.4 From eeed1d4c18e26d3e49ef46f11219c9c0093af448 Mon Sep 17 00:00:00 2001 From: Daniela Lemow Date: Fri, 13 Oct 2023 09:52:55 +1300 Subject: [PATCH 5/9] fix: Fix syntax in workflow file --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e00a05..6e93592 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,6 @@ name: Ruby CI on: - pull_request: push: branches: - main From 209ca9b971232bde335f6e1e6a811e225ca43717 Mon Sep 17 00:00:00 2001 From: Daniela Lemow Date: Fri, 13 Oct 2023 10:38:49 +1300 Subject: [PATCH 6/9] feat: Generate new Gemfile.lock --- Gemfile.lock | 254 +++++++++++++++++++++++++++------------------------ 1 file changed, 135 insertions(+), 119 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 69676f9..278743c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,143 +11,158 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.0.3.1) - actionpack (= 6.0.3.1) + actioncable (6.0.6.1) + actionpack (= 6.0.6.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.1) - actionpack (= 6.0.3.1) - activejob (= 6.0.3.1) - activerecord (= 6.0.3.1) - activestorage (= 6.0.3.1) - activesupport (= 6.0.3.1) + actionmailbox (6.0.6.1) + actionpack (= 6.0.6.1) + activejob (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) mail (>= 2.7.1) - actionmailer (6.0.3.1) - actionpack (= 6.0.3.1) - actionview (= 6.0.3.1) - activejob (= 6.0.3.1) + actionmailer (6.0.6.1) + actionpack (= 6.0.6.1) + actionview (= 6.0.6.1) + activejob (= 6.0.6.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.1) - actionview (= 6.0.3.1) - activesupport (= 6.0.3.1) + actionpack (6.0.6.1) + actionview (= 6.0.6.1) + activesupport (= 6.0.6.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.1) - actionpack (= 6.0.3.1) - activerecord (= 6.0.3.1) - activestorage (= 6.0.3.1) - activesupport (= 6.0.3.1) + actiontext (6.0.6.1) + actionpack (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) nokogiri (>= 1.8.5) - actionview (6.0.3.1) - activesupport (= 6.0.3.1) + actionview (6.0.6.1) + activesupport (= 6.0.6.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.1) - activesupport (= 6.0.3.1) + activejob (6.0.6.1) + activesupport (= 6.0.6.1) globalid (>= 0.3.6) - activemodel (6.0.3.1) - activesupport (= 6.0.3.1) - activerecord (6.0.3.1) - activemodel (= 6.0.3.1) - activesupport (= 6.0.3.1) - activestorage (6.0.3.1) - actionpack (= 6.0.3.1) - activejob (= 6.0.3.1) - activerecord (= 6.0.3.1) - marcel (~> 0.3.1) - activesupport (6.0.3.1) + activemodel (6.0.6.1) + activesupport (= 6.0.6.1) + activerecord (6.0.6.1) + activemodel (= 6.0.6.1) + activesupport (= 6.0.6.1) + activestorage (6.0.6.1) + actionpack (= 6.0.6.1) + activejob (= 6.0.6.1) + activerecord (= 6.0.6.1) + marcel (~> 1.0) + activesupport (6.0.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - ast (2.4.1) + ast (2.4.2) builder (3.2.4) - concurrent-ruby (1.1.6) + concurrent-ruby (1.2.2) crass (1.0.6) - diff-lcs (1.3) - erubi (1.9.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - haml (5.1.2) - temple (>= 0.8.0) + date (3.3.3) + diff-lcs (1.5.0) + erubi (1.12.0) + globalid (1.1.0) + activesupport (>= 5.0) + haml (6.1.4) + temple (>= 0.8.2) + thor tilt - haml_lint (0.35.0) - haml (>= 4.0, < 5.2) + haml_lint (0.45.0) + haml (>= 4.0, < 6.2) + parallel (~> 1.10) rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) - i18n (1.8.3) + i18n (1.14.1) concurrent-ruby (~> 1.0) - loofah (2.5.0) + loofah (2.21.4) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + net-imap + net-pop + net-smtp + marcel (1.0.2) method_source (1.0.0) - mimemagic (0.3.5) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.1) - nio4r (2.5.2) - nokogiri (1.10.9) - mini_portile2 (~> 2.4.0) - parallel (1.19.1) - parser (2.7.1.3) - ast (~> 2.4.0) - rack (2.2.2) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (6.0.3.1) - actioncable (= 6.0.3.1) - actionmailbox (= 6.0.3.1) - actionmailer (= 6.0.3.1) - actionpack (= 6.0.3.1) - actiontext (= 6.0.3.1) - actionview (= 6.0.3.1) - activejob (= 6.0.3.1) - activemodel (= 6.0.3.1) - activerecord (= 6.0.3.1) - activestorage (= 6.0.3.1) - activesupport (= 6.0.3.1) + mini_mime (1.1.5) + minitest (5.20.0) + net-imap (0.3.7) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.4.0) + net-protocol + nio4r (2.5.9) + nokogiri (1.13.10-x86_64-darwin) + racc (~> 1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + racc (1.7.1) + rack (2.2.8) + rack-test (2.1.0) + rack (>= 1.3) + rails (6.0.6.1) + actioncable (= 6.0.6.1) + actionmailbox (= 6.0.6.1) + actionmailer (= 6.0.6.1) + actionpack (= 6.0.6.1) + actiontext (= 6.0.6.1) + actionview (= 6.0.6.1) + activejob (= 6.0.6.1) + activemodel (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) bundler (>= 1.3.0) - railties (= 6.0.3.1) + railties (= 6.0.6.1) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) - loofah (~> 2.3) - railties (6.0.3.1) - actionpack (= 6.0.3.1) - activesupport (= 6.0.3.1) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (6.0.6.1) + actionpack (= 6.0.6.1) + activesupport (= 6.0.6.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) - rainbow (3.0.0) - rake (13.0.1) - regexp_parser (1.7.1) - rexml (3.2.4) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + rainbow (3.1.1) + rake (13.0.6) + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.3) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) rubocop (0.85.1) parallel (~> 1.10) parser (>= 2.7.0.1) @@ -157,39 +172,40 @@ GEM rubocop-ast (>= 0.0.3) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.0.3) - parser (>= 2.7.0.1) - rubocop-performance (1.6.1) - rubocop (>= 0.71.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-performance (1.7.1) + rubocop (>= 0.82.0) rubocop-rails (2.6.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 0.82.0) - rubocop-rspec (1.40.0) + rubocop-rspec (1.41.0) rubocop (>= 0.68.1) - ruby-progressbar (1.10.1) - sprockets (4.0.2) + ruby-progressbar (1.13.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) + rack (>= 2.2.4, < 4) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) sysexits (1.2.0) - temple (0.8.2) - thor (1.0.1) + temple (0.10.3) + thor (1.2.2) thread_safe (0.3.6) - tilt (2.0.10) - tzinfo (1.2.7) + tilt (2.3.0) + timeout (0.4.0) + tzinfo (1.2.11) thread_safe (~> 0.1) - unicode-display_width (1.7.0) - websocket-driver (0.7.2) + unicode-display_width (1.8.0) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.3.0) + zeitwerk (2.6.12) PLATFORMS - ruby + x86_64-darwin-22 DEPENDENCIES boost-styles! @@ -199,4 +215,4 @@ DEPENDENCIES rspec (~> 3.0) BUNDLED WITH - 2.1.4 + 2.3.7 From b30e67c6b8036f125d5cc8e98f3bf160fbfe849a Mon Sep 17 00:00:00 2001 From: Daniela Lemow Date: Fri, 13 Oct 2023 10:45:20 +1300 Subject: [PATCH 7/9] feat: Remove ruby version from CI build --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6e93592..ebd17a1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,6 @@ jobs: strategy: matrix: ruby: - - '2.5.1' - '2.6.5' steps: From c47169ab68f424a0df21a4afd73875c9c6be7666 Mon Sep 17 00:00:00 2001 From: Daniela Lemow Date: Fri, 13 Oct 2023 10:46:11 +1300 Subject: [PATCH 8/9] feat: Update CI bundler version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ebd17a1..07c1195 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: ruby-version: ${{ matrix.ruby }} - name: Install Bundler - run: gem install bundler -v 2.1.4 + run: gem install bundler -v 2.3.7git - name: Install dependencies run: bundle install \ No newline at end of file From b6a225e69b8d259212b953e2ee6e4aab58fa94b4 Mon Sep 17 00:00:00 2001 From: Daniela Lemow Date: Fri, 13 Oct 2023 10:47:35 +1300 Subject: [PATCH 9/9] fix: Remove mistype --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 07c1195..bf5c4ea 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: ruby-version: ${{ matrix.ruby }} - name: Install Bundler - run: gem install bundler -v 2.3.7git + run: gem install bundler -v 2.3.7 - name: Install dependencies run: bundle install \ No newline at end of file