ratproto 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f6ecf6b20c9235a6f792aedbe3d555e8387d788dbe1bb7e8ae65850a8de34b6
-  data.tar.gz: 9f6b2dd26064ae1bc1ed8e854c2f0fd1c193672556e99c3ec78df5eab9ba50e9
+  metadata.gz: 7ba70d80557249c2c85eeb1e185f1cc0261800b4d3a0aa07f2cf6b777fdd512e
+  data.tar.gz: a722e3c61aca7f8827b682885fed4b7fddaef19eaa48b8d8635d82911dc489ff
 SHA512:
-  metadata.gz: 0e0326c6bba6787261b88668a0a5877f0a68eaff5146bdfd769a404271f050f200decf652546855cadd2f9f8040190f4d26ff65e867fcb1e1bacbd3148237db8
-  data.tar.gz: fee5cf28d9a8cf5a64dcf06fae08db2f467832c0ed56327010c31a3bb71c2e0159e2ec8cda2f14aa6df4848eba76751d67563d3f3a83e71f38a36cdac9c92c87
+  metadata.gz: 3334b2e69f3a8b4dcb1bc09781ff49d8884125c629b028c8a3b16f5428a341f9a6b0c03390631f77a57b88f40b121a69e5441eba119685d43b892e53d38ee560
+  data.tar.gz: 15c356cacc4116c3d2cf142677c538eeb9691e108a1fde6f807267ae8de96cb12aec845d42199a73da2e4db9b43a9ab347d4cab801a9008c53bf6c7c4b02e47e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.3.2] - 2026-07-30
+
+- `stream`: filter by record operation type using `-o`
+- `stream`: disable all commit messages and leave account messages by passing `-c -`
+- `stream` & `stream-labels`: disable status messages using `-q`
+
 ## [0.3.1] - 2026-07-30
 
 - added polyfill of `Hash#except` for Ruby 2.6

data/lib/ratproto/commands/stream.rb

@@ -9,6 +9,8 @@ require_relative 'base'
 module RatProto
   module Commands
     class Stream < Base
+      OPERATION_TYPES = %w[create update delete].freeze
+
       banner 'Stream events from a relay or PDS firehose'
 
       parameter 'SERVICE', 'relay, PDS or Jetstream hostname'
@@ -26,21 +28,25 @@ module RatProto
       option ['-d', '--did'], 'DID[,DID...]', 'filter events by DID (comma-separated or repeated)',
              multivalued: true, attribute_name: :did_values
 
-      option ['-c', '--collection'], 'NSID[,NSID...]', 'filter events by collection (comma-separated or repeated)',
+      option ['-c', '--collection'], 'NSID[,NSID...]',
+             "filter events by collection (comma-separated or repeated; pass '-' to skip all and only print account events)",
              multivalued: true, attribute_name: :collection_values
 
-      option ['-a', '--[no-]account'], :flag, 'print account status events (default: enabled unless filtering by collection)'
+      option ['-o', '--operation'], 'ACTION[,ACTION...]',
+             'filter events by operation (create, update or delete; comma-separated or repeated)',
+             multivalued: true, attribute_name: :operation_values
+
+      option ['-a', '--[no-]account'], :flag,
+             'print account status events (default: enabled unless filtering by collection or operation)'
+
+      option ['-q', '--quiet'], :flag, 'disable status messages'
       option ['-s', '--print-cursor'], :flag, 'only print current cursor (seq)'
 
 
       def execute
         require 'skyfall'
 
-        @dids = comma_separated(did_values, '-d/--did')
-        @collections = comma_separated(collection_values, '-c/--collection')
-
-        @dids = (@dids.length > 0) ? @dids.map { |did| map_argument_to_did(did) } : nil
-        @collections = (@collections.length > 0) ? @collections.map { |collection| validate_nsid(collection) } : nil
+        prepare_filters
 
         @sky = build_stream
         configure_interrupt_handler
@@ -63,6 +69,40 @@ module RatProto
 
       private
 
+      def prepare_filters
+        @dids = comma_separated(did_values, '-d/--did')
+        @collections = comma_separated(collection_values, '-c/--collection')
+        @operations = comma_separated(operation_values, '-o/--operation')
+
+        if @collections.include?('-')
+          if @collections.any? { |collection| collection != '-' }
+            signal_usage_error("'-' cannot be combined with collection names")
+          end
+
+          if @operations.length > 0
+            signal_usage_error("'-c -' cannot be combined with -o/--operation")
+          end
+
+          @no_collections = true
+          @collections = nil
+        elsif @collections.length > 0
+          @collections = @collections.map { |collection| validate_nsid(collection) }
+        else
+          @collections = nil
+        end
+
+        @dids = (@dids.length > 0) ? @dids.map { |did| map_argument_to_did(did) } : nil
+        @operations = (@operations.length > 0) ? @operations.map { |operation| validate_operation(operation) } : nil
+      end
+
+      def validate_operation(operation)
+        if OPERATION_TYPES.include?(operation)
+          operation.to_sym
+        else
+          signal_usage_error("#{operation.inspect} is not a valid operation (expected create, update or delete)")
+        end
+      end
+
       def build_stream
         if jetstream?
           options = {}
@@ -90,10 +130,10 @@ module RatProto
       end
 
       def report_error(error)
-        log "ERROR: #{error.message}"
+        log "ERROR: #{error.message}", true
 
         if !jetstream? && error.message.include?('Unexpected response code')
-          log "If this is a Jetstream server, retry with -j / --jetstream."
+          log "If this is a Jetstream server, retry with -j / --jetstream.", true
         end
       end
 
@@ -107,6 +147,7 @@ module RatProto
       end
 
       def print_commit_message(msg)
+        return if @no_collections
         return if @dids && !@dids.include?(msg.repo)
 
         time = msg.time.getlocal.iso8601
@@ -114,6 +155,7 @@ module RatProto
 
         msg.operations.each do |op|
           next if @collections && !@collections.include?(op.collection)
+          next if @operations && !@operations.include?(op.action)
 
           json = op.raw_record && JSON.generate(op.raw_record.except('$type'))
           puts "[#{time}] (#{msg.seq}) #{msg.repo} #{op.action.inspect} #{op.collection} #{op.rkey} #{json}"
@@ -133,8 +175,8 @@ module RatProto
 
       def show_account_messages?
         if account? == nil
-          # enabled by default if -c is not used
-          @collections.nil?
+          # enabled by default if -c or -o is not used, or if commits were explicitly disabled
+          @no_collections || (@collections.nil? && @operations.nil?)
         else
           # if enabled/disabled explicitly, follow user's choice
           account?
@@ -143,12 +185,16 @@ module RatProto
 
       def configure_interrupt_handler
         trap('SIGINT') do
-          log
+          log nil, true
           log 'Disconnecting...'
           @sky.disconnect
         end
       end
 
+      def log(text = nil, force = false)
+        super(text) unless quiet? && !force
+      end
+
       def print_cursor_and_stop(msg)
         return if @disconnecting
 

data/lib/ratproto/commands/stream_labels.rb

@@ -24,6 +24,7 @@ module RatProto
       option ['-t', '--target'], 'PATTERN', "filter by labelled DID/URI (can be a pattern with '*' as a wildcard; repeatable)",
              multivalued: true, attribute_name: :target_patterns
 
+      option ['-q', '--quiet'], :flag, 'disable status messages'
       option ['-s', '--print-cursor'], :flag, 'only print current cursor (seq)'
 
 
@@ -109,12 +110,16 @@ module RatProto
 
       def configure_interrupt_handler
         trap('SIGINT') do
-          log
+          log nil, true
           log 'Disconnecting...'
           @sky.disconnect
         end
       end
 
+      def log(text = nil, force = false)
+        super(text) unless quiet? && !force
+      end
+
       def print_cursor_and_stop(msg)
         return if @disconnecting
 

data/lib/ratproto/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RatProto
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ratproto
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Kuba Suder