pheme 5.3.2 → 5.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77a30e7fac2b5c5aa90bf4fc13aac18169470060e7105f8dcb0e13bf8a7adbaf
-  data.tar.gz: 6ebb0656d54fa11bda6975e3a493149a7f1dcd615020328b0552f7a6e466f5e2
+  metadata.gz: 219b35c7c69ba33d474d1063586cc0d357a4ab129b84eb80a9d9229570680a15
+  data.tar.gz: 3dce2f5202292466c7f4653e2b68928121a7b9aa5ba0c51375d01d0575159510
 SHA512:
-  metadata.gz: f9131f7f06ecdd87284efacf909143c0b4d597acbde113b8a490e883e30b76c4119d768122354675f41a133a2211670c2d2ceec12e702b9f6f3d333f83ce0cfd
-  data.tar.gz: c2c99f93d207374bc785821995afc6a7f9be87a56018006de904746740b21408f44360d6a8509714d8a5df0199fa8c5d66edae9e72c3881e79dd7f2024f47831
+  metadata.gz: e76e2a025181932da7cb730fa624e2ff101a5e48bf565bec1b1e75448ee59c3a92b16c79444014ca1ef202db0cfb944f03214afdffcb13b8bc62ca6e54d5764a
+  data.tar.gz: db2eced35f5b27bd0db443aaaa7825008c25dd06b2c3a4c4c2173435f92ace7dbf056e48604cdb0d2b0b2f76ab94a8ea26a733f939d338523253c0e3f4e9afd4

data/.github/workflows/default.yaml

@@ -0,0 +1,15 @@
+---
+name: Default
+
+on:
+  push:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build_and_publish:
+    name: Build and Publish
+    uses: wealthsimple/public-github-workflows/.github/workflows/ruby-gem-build.yaml@main
+    secrets: inherit

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-01-02 17:53:08 UTC using RuboCop version 1.59.0.
+# on 2024-06-14 14:59:19 UTC using RuboCop version 1.64.1.
 # 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
@@ -11,10 +11,18 @@
 Metrics/AbcSize:
   Max: 20
 
+# Offense count: 2
+# Configuration parameters: AllowedPatterns.
+# AllowedPatterns: ^expect_, ^assert_
+RSpec/NoExpectationExample:
+  Exclude:
+    - 'spec/logger_spec.rb'
+    - 'spec/queue_poller_spec.rb'
+
 # Offense count: 9
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
-# Include: **/*_spec*rb*, **/spec/**/*
-RSpec/FilePath:
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
+RSpec/SpecFilePathFormat:
   Exclude:
     - 'spec/configuration_spec.rb'
     - 'spec/logger_spec.rb'
@@ -26,16 +34,6 @@ RSpec/FilePath:
     - 'spec/topic_publisher_spec.rb'
     - 'spec/version_spec.rb'
 
-# Offense count: 14
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: have_received, receive
-RSpec/MessageSpies:
-  Exclude:
-    - 'spec/message_handler_spec.rb'
-    - 'spec/queue_poller_spec.rb'
-    - 'spec/rollbar_spec.rb'
-    - 'spec/topic_publisher_spec.rb'
-
 # Offense count: 2
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:

data/CHANGELOG.md

@@ -1,10 +1,20 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 5.3.2 - 2024-06-27
+## Unreleased
+
+## 5.3.4 - 2024-06-14
+### Changed
+- Updated dependencies
+
+## 5.3.3 - 2024-06-14
+### Changed
+- Updated dependencies
+
+## 5.3.2 - 2024-05-27
 ### Changed
 - Updated dependencies
 
@@ -165,7 +175,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Updated dependencies
 
-### 5.0.4 - 2022-04-01
+## 5.0.4 - 2022-04-01
 ### Changed
 - Updated workflows
 
@@ -242,17 +252,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Migrate CI from CircleCI to GitHub Actions
 
 ## 4.0.3 - 2021-03-08
+### Changed
 - Update documentation to include instructions on directly publishing to SQS
 
 ## 4.0.2 - 2020-12-17
+### Changed
 - Bump local dev version, rubocop fixes, add backstage catalog file + sonarqube project settings
 
 ## 4.0.1 - 2020-03-23
-### Fixes
+### Fixed
 - Fixes 4.0.0. Instead of expecting message attributes in the message from `poll`, retrieves them from the right place.
 
 ## 4.0.0 - 2020-03-18
-### Breaking Changes
+### Changed
 - Add the ability for SQS to receive message attributes
 - `handle` function of `QueuePoller` now takes a third parameter `message_attributes`
 - blocks or `MessageHandler`s passed to `QueuePoller` can use this `message_attributes`
@@ -298,6 +310,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## 2.0.1 - 2019-01-03
 ### Changed
 - add internal gem spec to test standard gem behavior, reduces unnecessary copy and pasting
+
 ### Fixed
 - namespace for the VERSION constant was incorrectly set to Ws::Ws
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pheme (5.3.2)
+    pheme (5.3.4)
       activesupport (>= 4)
       aws-sdk-sns (~> 1.1)
       aws-sdk-sqs (~> 1.3)
@@ -11,7 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.3)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -25,17 +25,17 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.930.0)
-    aws-sdk-core (3.196.1)
+    aws-partitions (1.944.0)
+    aws-sdk-core (3.197.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-sns (1.75.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-sns (1.77.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.74.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-sqs (1.76.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -44,12 +44,12 @@ GEM
     bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     diff-lcs (1.5.1)
     docile (1.4.0)
     drb (2.2.1)
-    git (2.0.0)
+    git (2.1.1)
       activesupport (>= 5.0)
       addressable (~> 2.8)
       process_executer (~> 1.1)
@@ -60,23 +60,26 @@ GEM
     json (2.7.2)
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
-    minitest (5.23.0)
+    minitest (5.23.1)
     mutex_m (0.2.0)
-    parallel (1.24.0)
-    parser (3.3.1.0)
+    parallel (1.25.1)
+    parse_a_changelog (1.3.0)
+      treetop (~> 1.6)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
+    polyglot (0.3.5)
     process_executer (1.1.0)
     public_suffix (5.0.5)
-    racc (1.7.3)
-    rack (3.0.11)
+    racc (1.8.0)
+    rack (3.1.3)
     rainbow (3.1.1)
     rake (13.2.1)
     rchardet (1.8.0)
     regexp_parser (2.9.2)
     resource-struct (0.4.0)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.0)
+      strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -85,7 +88,7 @@ GEM
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-its (1.3.0)
@@ -97,7 +100,7 @@ GEM
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.63.5)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -110,10 +113,8 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
     rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
@@ -122,13 +123,8 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rspec (2.29.2)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.0.1)
+      rubocop (~> 1.61)
     rubocop-vendor (0.13.0)
       rubocop
     ruby-progressbar (1.13.0)
@@ -139,10 +135,10 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     smarter_csv (1.10.3)
-    standard (1.36.0)
+    standard (1.37.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.63.0)
+      rubocop (~> 1.64.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.4)
     standard-custom (1.0.2)
@@ -156,11 +152,14 @@ GEM
       rubocop-rails (~> 2.23.1)
     strscan (3.1.0)
     thor (1.3.1)
+    treetop (1.6.12)
+      polyglot (~> 0.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
-    ws-style (7.4.4)
-      rubocop-rspec (>= 2.2.0)
+    ws-style (7.5.0)
+      rubocop-factory_bot (>= 2.26.0)
+      rubocop-rspec (>= 3.0.0)
       rubocop-vendor (>= 0.11)
       standard (>= 1.30.1)
       standard-custom (>= 1.0.2)
@@ -173,6 +172,7 @@ DEPENDENCIES
   bundler
   bundler-audit
   git
+  parse_a_changelog
   pheme!
   rake
   rspec

data/lib/pheme/version.rb

@@ -1,3 +1,3 @@
 module Pheme
-  VERSION = '5.3.2'.freeze
+  VERSION = '5.3.4'.freeze
 end

data/pheme.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'git'
+  s.add_development_dependency "parse_a_changelog"
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-collection_matchers'

data/spec/support/example_queue_poller.rb

@@ -1,6 +1,6 @@
 class ExampleQueuePoller < Pheme::QueuePoller
-  def initialize(queue_url: 'http://mock_url.test', **kwargs)
-    super(queue_url: queue_url, **kwargs)
+  def initialize(queue_url: 'http://mock_url.test', **)
+    super
   end
 
   def handle(message, metadata, message_attributes)

data/spec/version_spec.rb

@@ -1,35 +1,87 @@
 require 'git'
+require 'parse_a_changelog'
 
-describe Pheme do
+RSpec.describe 'a published gem' do # rubocop:disable RSpec/DescribeClass
   def get_version(git, branch = 'HEAD')
     git.grep('VERSION = ', 'lib/*/version.rb', { object: branch }).
       map { |_sha, matches| matches.first[1] }.
-      filter_map { |version_string| parse_version(version_string) }.
+      filter_map { |str| parse_version(str) }.
       first
+  rescue Git::GitExecuteError
+    # Catches failures for branch name being master
+    nil
   end
 
   def parse_version(string)
     string.match(/VERSION = ['"](.*)['"]/)[1]
   end
 
+  def main_branch
+    @main_branch ||=
+      if git.branches['origin/main']
+        'origin/main'
+      elsif git.branches['origin/master']
+        'origin/master'
+      else
+        raise StandardError,
+          <<~ERROR
+            Couldn't determine main branch.
+            Does 'origin/main' or 'origin/master' need to be fetched?
+          ERROR
+      end
+  end
+
+  def needs_version_bump?
+    base = git.merge_base(main_branch, 'HEAD').first&.sha
+    base ||= main_branch
+    git.diff(base, 'HEAD').any? { |diff|
+      not_gemfile?(diff) && not_dotfile?(diff) && not_docs?(diff) && not_spec?(diff)
+    }
+  end
+
+  def not_gemfile?(diff)
+    ['Gemfile', 'Gemfile.lock'].exclude?(diff.path)
+  end
+
+  def not_docs?(diff)
+    !diff.path.end_with?('.md')
+  end
+
+  def not_spec?(diff)
+    !diff.path.start_with?('spec/')
+  end
+
+  def not_dotfile?(diff)
+    # Ignore dotfiles, like .gitignore and CI files like .github/...
+    !diff.path.start_with?('.')
+  end
+
+  let(:git) { Git.open('.') }
+  let(:head_version) { get_version(git, 'HEAD') }
+
   it 'has a version number' do
-    git = Git.open('.')
-    head_version = get_version(git, 'HEAD')
     expect(head_version).not_to be_nil
   end
 
-  it 'has a bumped version' do
-    git = Git.open('.')
-    main_version = get_version(git, 'origin/main')
+  it 'has a bumped version committed' do
+    main_version = get_version(git, main_branch)
     skip('first time publishing, no need to compare versions') if main_version.nil?
 
-    is_main_branch = git.current_branch == 'main'
+    is_main_branch = git.current_branch == main_branch
     skip('already on main branch, no need to compare versions') if is_main_branch
 
-    head_version = get_version(git, 'HEAD')
-    puts "head_version " + head_version
-    raise 'no version.rb file found on the current branch' if head_version.nil?
+    skip('Diff only contains non-code changes, no need to bump version') unless needs_version_bump?
 
     expect(Gem::Version.new(head_version)).to be > Gem::Version.new(main_version)
   end
+
+  it 'has a CHANGELOG.md file' do
+    expect(File).to exist('CHANGELOG.md')
+  end
+
+  it 'has changelog entry for current version' do
+    parser = ParseAChangelog.parse('CHANGELOG.md')
+    versions = parser.elements[2].elements.map { |element| element.elements[1].text_value }
+    expect(versions.first).to include(head_version)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pheme
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.3.4
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-28 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parse_a_changelog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +229,7 @@ extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
 - ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/workflows/main.yml"
+- ".github/workflows/default.yaml"
 - ".github/workflows/stale.yml"
 - ".gitignore"
 - ".rspec"

data/.github/workflows/main.yml

@@ -1,58 +0,0 @@
----
-name: Pipeline
-on:
-  push:
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        ruby-version: [3.1.4, 3.2.3, 3.3.0]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Set up Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-          ruby-version: ${{ matrix.ruby-version }}
-      - name: Lint
-        run: bundle exec rubocop
-      - name: Test
-        run: bundle exec rspec
-
-  # Separate `release` job from `build`, as we only want release to be run once
-  # and not run for each ruby version in the matrix:
-  release:
-    name: Release
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
-    needs: build
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-      - name: Release the gem
-        run: |
-          mkdir -p ~/.gem
-          cat << EOF > ~/.gem/credentials
-          ---
-          :github: Bearer ${GITHUB_TOKEN}
-          :rubygems_api_key: ${RUBYGEMS_API_KEY}
-          EOF
-          chmod 0600 ~/.gem/credentials
-          git config user.email "noreply@wealthsimple.com"
-          git config user.name "Wolfbot"
-          bundle exec rake release
-        env:
-          RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}