amqp-client 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0abeedd581cdc09eac6afaf690fb8a50fbaef0146e4c22be43d7cad90d8d9b6
-  data.tar.gz: 16161d756ce7d68ba24debc60eda941243bb951cd17262f1c148ef1039595e88
+  metadata.gz: 8cfb2dd354eeb33334cf6848b168f2a0caa486b40cefcce924910a16a77ffa4f
+  data.tar.gz: 7a7896809e27539ab3395b833038c5b328298c9cf6a25aeff7f706e05657e995
 SHA512:
-  metadata.gz: 272c099f3158572304b30bbf67227343ce5456b90e5b4a08ccaf9c2da0f9b3a42ffb02913431b7d98cc0b7f1d5d36ef2c61bd492cdabf4411b0d2f941c616f04
-  data.tar.gz: a2000478882d0e630d88fb67e09675b087981498ac9a5b7f7a80f69a092c082415530156136cca1fa2e1bf88874468437fd3dbc600ee354110fb0c6af59e1373
+  metadata.gz: c8d0c1797b3b8a81fbe33a154bb255c452f09d925fdeafdfc03fdbb3342b116d7875d6166f7e9b948232f09d69c16179e0270c752b3afdd955d4ad6fca3b6cd1
+  data.tar.gz: 47c518dee777f61435e748045fb7cfebf808ac5ed9cd53813081b222a9abc81b82f85f436482b25dba1dcd10a96c1d1f9bbf4b5266fc90ece48307b61f03ccfb

data/.github/workflows/main.yml

@@ -39,7 +39,14 @@ jobs:
       with:
         bundler-cache: true
         ruby-version: ${{ matrix.ruby }}
+    - name: Run tests (excluding TLS tests) (JRuby)
+      if: ${{ matrix.ruby == 'jruby' }}
+      continue-on-error: ${{ matrix.allow-failure || false }}
+      run: bundle exec rake
+      env:
+        JAVA_OPTS: "-Djava.net.preferIPv4Stack=true"
     - name: Run tests (excluding TLS tests)
+      if: ${{ matrix.ruby != 'jruby' }}
       continue-on-error: ${{ matrix.allow-failure || false }}
       run: bundle exec rake
       env:

data/.github/workflows/release.yml

@@ -12,6 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       id-token: write # for trusted publishing
+      contents: write # for creating releases
     steps:
       - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
@@ -24,3 +25,30 @@ jobs:
       - run: gem build *.gemspec
       - run: gem install *.gem
       - run: gem push *.gem
+
+      # create GitHub release
+      - name: Extract release notes
+        id: extract_release_notes
+        run: |
+          # Extract version from tag (remove 'v' prefix)
+          VERSION=${GITHUB_REF#refs/tags/v}
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+          # Extract changelog section for this version with better handling
+          if grep -q "## \[$VERSION\]" CHANGELOG.md; then
+            awk "/^## \[$VERSION\]/ {flag=1; next} /^## \[/ && flag {exit} flag && /\S/ {print}" CHANGELOG.md > release_notes.md
+            echo "Release notes extracted for version $VERSION:"
+            cat release_notes.md
+          else
+            echo "No changelog entry found for version $VERSION" > release_notes.md
+            echo "Warning: No changelog entry found for version $VERSION"
+          fi
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          name: Release ${{ steps.extract_release_notes.outputs.version }}
+          body_path: release_notes.md
+          draft: false
+          prerelease: false
+          files: '*.gem'

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [1.2.1] - 2025-09-15
+
+- Added: Convenience methods for creating exchange types: `fanout()`, `direct()`, `topic()`, and `headers()`
+- Added: Support for binding with high level objects (Exchange and Queue objects can now be passed as binding sources)
+- Fixed: Bug where a client without any connection could not be closed properly
+
 ## [1.2.0] - 2025-09-10
 
 - Fixed: `Connection#channel` wasn't thread-safe

data/README.md

@@ -127,12 +127,12 @@ To install this gem onto your local machine, run `bundle exec rake install`.
 
 ### Release Process
 
-The gem uses rake tasks to automate the release process. Make sure your working directory is clean before starting a release.
+The gem uses rake tasks to automate the release preparation process. The actual gem building and publishing is handled automatically by GitHub Actions when a tag is pushed.
 
 #### Quick Release (Patch Version)
 
 ```bash
-rake release:full
+rake release:prepare
 ```
 
 This will:
@@ -141,8 +141,8 @@ This will:
 2. Bump the patch version (e.g., 1.2.0 → 1.2.1)
 3. Update the CHANGELOG.md with the new version and current date
 4. Create a git commit and tag for the release
-5. Build and push the gem to RubyGems
-6. Push commits and tags to the remote repository
+5. Push commits and tags to the remote repository
+6. GitHub Actions will automatically build and publish the gem to RubyGems
 
 #### Custom Version Bump
 
@@ -150,10 +150,10 @@ For minor or major version bumps:
 
 ```bash
 # Minor version bump (e.g., 1.2.0 → 1.3.0)
-rake release:full[minor]
+rake release:prepare[minor]
 
 # Major version bump (e.g., 1.2.0 → 2.0.0)
-rake release:full[major]
+rake release:prepare[major]
 ```
 
 #### Individual Release Steps
@@ -167,11 +167,11 @@ rake release:bump[patch]  # or [minor] or [major]
 # Update changelog with current version
 rake release:changelog
 
-# Create git tag
+# Create git tag with changelog entries
 rake release:tag
 
-# Build and push to RubyGems
-rake release:push
+# Push tag to remote (handles conflicts)
+rake release:push_tag
 ```
 
 #### Manual Release Steps
@@ -182,7 +182,7 @@ If you prefer manual control:
 2. Update the CHANGELOG.md with the new version and release notes
 3. Commit your changes: `git add . && git commit -m "Release X.Y.Z"`
 4. Create and push a tag: `git tag vX.Y.Z && git push origin vX.Y.Z`
-5. Build and push: `rake build && gem push amqp-client-X.Y.Z.gem`
+5. GitHub Actions will automatically build and publish the gem when the tag is pushed
 
 ## Contributing
 

data/Rakefile

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
@@ -31,6 +30,36 @@ def current_version
   content.match(/VERSION = "(.+)"/)[1]
 end
 
+def extract_changelog_for_version(version)
+  changelog = File.read("CHANGELOG.md")
+
+  # Find the section for this version
+  version_pattern = /^## \[#{Regexp.escape(version)}\][^\n]*\n(.*?)(?=^## \[|\z)/m
+  match = changelog.match(version_pattern)
+
+  if match
+    # Clean up the changelog entries
+    entries = match[1].strip
+    # Remove empty lines at the start and end
+    entries.gsub(/\A\s*\n+/, "").gsub(/\n+\s*\z/, "")
+  else
+    "No changelog entries found for version #{version}"
+  end
+end
+
+def push_tag_to_remote(version)
+  # Check if tag exists on remote
+  remote_tag_exists = system("git ls-remote --tags origin | grep -q refs/tags/v#{version}")
+
+  if remote_tag_exists
+    puts "Tag v#{version} already exists on remote. Force pushing updated tag..."
+    system("git push origin v#{version} --force")
+  else
+    puts "Pushing new tag v#{version} to remote..."
+    system("git push origin v#{version}")
+  end
+end
+
 def bump_version(version_type)
   unless %w[major minor patch].include?(version_type)
     puts "Invalid version type. Use: major, minor, or patch"
@@ -87,38 +116,26 @@ def create_git_tag
   system("git add .")
   system("git commit -m 'Release #{version}'")
 
-  # Check if tag already exists and remove it if it does
+  # Check if tag already exists locally and remove it if it does
   if system("git tag -l v#{version} | grep -q v#{version}")
-    puts "Tag v#{version} already exists, removing it..."
+    puts "Tag v#{version} already exists locally, removing it..."
     system("git tag -d v#{version}")
   end
 
-  system("git tag v#{version}")
+  # Extract changelog entries for this version
+  changelog_entries = extract_changelog_for_version(version)
 
-  puts "Created git tag v#{version}"
-end
-
-def push_gem_to_rubygems
-  version = current_version
+  # Create tag message with version and changelog
+  tag_message = "Release #{version}\n\n#{changelog_entries}"
 
-  # Look for gem file in both current directory and pkg directory
-  gem_file = "amqp-client-#{version}.gem"
-  pkg_gem_file = "pkg/amqp-client-#{version}.gem"
+  # Create annotated tag with the changelog
+  system("git", "tag", "-a", "v#{version}", "-m", tag_message)
 
-  if File.exist?(pkg_gem_file)
-    system("gem push #{pkg_gem_file}")
-    puts "Pushed #{pkg_gem_file} to RubyGems"
-  elsif File.exist?(gem_file)
-    system("gem push #{gem_file}")
-    puts "Pushed #{gem_file} to RubyGems"
-  else
-    puts "Gem file #{gem_file} not found in current directory or pkg/. Make sure to build first."
-    exit 1
-  end
+  puts "Created git tag v#{version} with changelog entries"
 end
 
-def full_release_process(version_type)
-  puts "Starting release process..."
+def prepare_release_process(version_type)
+  puts "Preparing release process..."
 
   # Ensure working directory is clean
   unless system("git diff --quiet && git diff --cached --quiet")
@@ -138,16 +155,15 @@ def full_release_process(version_type)
   Rake::Task["release:tag"].invoke
   Rake::Task["release:tag"].reenable
 
-  # Build and push gem
-  Rake::Task["release:push"].invoke
-  Rake::Task["release:push"].reenable
-
   # Push to git
   system("git push origin")
-  system("git push origin --tags")
 
+  # Handle tag push with potential conflicts
   version = current_version
-  puts "Successfully released version #{version}!"
+  push_tag_to_remote(version)
+
+  puts "Successfully prepared release #{version}!"
+  puts "The CI will automatically build and publish the gem when the tag is pushed."
 end
 
 namespace :release do
@@ -166,14 +182,15 @@ namespace :release do
     create_git_tag
   end
 
-  desc "Build and push gem to RubyGems"
-  task push: :build do
-    push_gem_to_rubygems
+  desc "Push tag to remote (handles conflicts)"
+  task :push_tag do
+    version = current_version
+    push_tag_to_remote(version)
   end
 
-  desc "Full release process (bump version, update changelog, tag, build and push)"
-  task :full, [:type] => %i[test rubocop] do |_t, args|
-    full_release_process(args[:type] || "patch")
+  desc "Prepare release (bump version, update changelog, create tag, push to git)"
+  task :prepare, [:type] => %i[test rubocop] do |_t, args|
+    prepare_release_process(args[:type] || "patch")
   end
 end
 

data/lib/amqp/client/exchange.rb

@@ -4,6 +4,8 @@ module AMQP
   class Client
     # High level representation of an exchange
     class Exchange
+      attr_reader :name
+
       # Should only be initialized from the Client
       # @api private
       def initialize(client, name)
@@ -14,7 +16,7 @@ module AMQP
       # Publish to the exchange
       # @param body [String] The message body
       # @param routing_key [String] The routing key of the message,
-      #   the exchange may use this when routing the message to bound queues
+      #   the exchange may use this when routing the message to bound queues (defaults to empty string)
       # @param properties [Properties]
       # @option properties [String] content_type Content type of the message body
       # @option properties [String] content_encoding Content encoding of the body
@@ -30,28 +32,30 @@ module AMQP
       # @option properties [String] user_id Can be used to verify that this is the user that published the message
       # @option properties [String] app_id Can be used to indicates which app that generated the message
       # @return [Exchange] self
-      def publish(body, routing_key, **properties)
+      def publish(body, routing_key = "", **properties)
         @client.publish(body, @name, routing_key, **properties)
         self
       end
 
       # Bind to another exchange
-      # @param exchange [String] Name of the exchange to bind to
-      # @param binding_key [String] Binding key on which messages that match might be routed (depending on exchange type)
+      # @param source [String, Exchange] Name of the exchange to bind to, or the exchange object itself
+      # @param binding_key [String] Binding key on which messages that match might be routed (defaults to empty string)
       # @param arguments [Hash] Message headers to match on (only relevant for header exchanges)
       # @return [Exchange] self
-      def bind(exchange, binding_key, arguments: {})
-        @client.exchange_bind(@name, exchange, binding_key, arguments: arguments)
+      def bind(source, binding_key = "", arguments: {})
+        source = source.is_a?(String) ? source : source.name
+        @client.exchange_bind(@name, source, binding_key, arguments: arguments)
         self
       end
 
       # Unbind from another exchange
-      # @param exchange [String] Name of the exchange to unbind from
-      # @param binding_key [String] Binding key which the queue is bound to the exchange with
+      # @param source [String, Exchange] Name of the exchange to unbind from, or the exchange object itself
+      # @param binding_key [String] Binding key which the queue is bound to the exchange with (defaults to empty string)
       # @param arguments [Hash] Arguments matching the binding that's being removed
       # @return [Exchange] self
-      def unbind(exchange, binding_key, arguments: {})
-        @client.exchange_unbind(@name, exchange, binding_key, arguments: arguments)
+      def unbind(source, binding_key = "", arguments: {})
+        source = source.is_a?(String) ? source : source.name
+        @client.exchange_unbind(@name, source, binding_key, arguments: arguments)
         self
       end
 

data/lib/amqp/client/queue.rb

@@ -4,6 +4,8 @@ module AMQP
   class Client
     # Queue abstraction
     class Queue
+      attr_reader :name
+
       # Should only be initialized from the Client
       # @api private
       def initialize(client, name)
@@ -35,21 +37,23 @@ module AMQP
       end
 
       # Bind the queue to an exchange
-      # @param exchange [String] Name of the exchange to bind to
+      # @param exchange [String, Exchange] Name of the exchange to bind to, or the exchange object itself
       # @param binding_key [String] Binding key on which messages that match might be routed (depending on exchange type)
       # @param arguments [Hash] Message headers to match on (only relevant for header exchanges)
       # @return [self]
       def bind(exchange, binding_key, arguments: {})
+        exchange = exchange.is_a?(String) ? exchange : exchange.name
         @client.bind(@name, exchange, binding_key, arguments: arguments)
         self
       end
 
       # Unbind the queue from an exchange
-      # @param exchange [String] Name of the exchange to unbind from
+      # @param exchange [String, Exchange] Name of the exchange to unbind from, or the exchange object itself
       # @param binding_key [String] Binding key which the queue is bound to the exchange with
       # @param arguments [Hash] Arguments matching the binding that's being removed
       # @return [self]
       def unbind(exchange, binding_key, arguments: {})
+        exchange = exchange.is_a?(String) ? exchange : exchange.name
         @client.unbind(@name, exchange, binding_key, arguments: arguments)
         self
       end

data/lib/amqp/client/version.rb

@@ -3,6 +3,6 @@
 module AMQP
   class Client
     # Version of the client library
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/lib/amqp/client.rb

@@ -83,6 +83,8 @@ module AMQP
       return if @stopped
 
       @stopped = true
+      return unless @connq.size.positive?
+
       conn = @connq.pop
       conn.close
       nil
@@ -115,6 +117,12 @@ module AMQP
     end
 
     # Declare an exchange and return a high level Exchange object
+    # @param name [String] Name of the exchange
+    # @param type [String] Type of the exchange, one of "direct", "fanout", "topic", "headers" or custom exchange type
+    # @param durable [Boolean] If true the exchange will survive broker restarts
+    # @param auto_delete [Boolean] If true the exchange will be deleted when the last queue is unbound
+    # @param internal [Boolean] If true the exchange will not accept directly published messages
+    # @param arguments [Hash] Custom arguments such as alternate-exchange etc.
     # @return [Exchange]
     # @example
     #   amqp = AMQP::Client.new.start
@@ -130,6 +138,42 @@ module AMQP
       end
     end
 
+    # Declare a fanout exchange and return a high level Exchange object
+    # @param name [String] Name of the exchange (defaults to "amq.fanout")
+    # @see {#exchange} for other parameters
+    # @return [Exchange]
+    def fanout(name = "amq.fanout", **kwargs)
+      exchange(name, "fanout", **kwargs)
+    end
+
+    # Declare a direct exchange and return a high level Exchange object
+    # @param name [String] Name of the exchange (defaults to "" for the default direct exchange)
+    # @see {#exchange} for other parameters
+    # @return [Exchange]
+    def direct(name = "", **kwargs)
+      return exchange(name, "direct", **kwargs) unless name.empty?
+
+      @exchanges.fetch(name) do
+        @exchanges[name] = Exchange.new(self, name)
+      end
+    end
+
+    # Declare a topic exchange and return a high level Exchange object
+    # @param name [String] Name of the exchange (defaults to "amq.topic")
+    # @see {#exchange} for other parameters
+    # @return [Exchange]
+    def topic(name = "amq.topic", **kwargs)
+      exchange(name, "topic", **kwargs)
+    end
+
+    # Declare a headers exchange and return a high level Exchange object
+    # @param name [String] Name of the exchange (defaults to "amq.headers")
+    # @see {#exchange} for other parameters
+    # @return [Exchange]
+    def headers(name = "amq.headers", **kwargs)
+      exchange(name, "headers", **kwargs)
+    end
+
     # @!endgroup
     # @!group Publish
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amqp-client
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - CloudAMQP