sneakers-queue-migrator 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa500b657d410fd1686b993cdeea8c99b415b8cf502c66b4f29cca6aa9104554
-  data.tar.gz: b46319b9ff9a6b1821aaf63b5895e98df85e1be4b980f8f25a320ceacdb9a003
+  metadata.gz: 07b21432931960e830cbb956ab0e53406657147d9674f495ef74237f114e6fc3
+  data.tar.gz: aa60dd0d5714f56410240567c0a63da1fa937eefd6d3ad706bdb8a6b35cd2bdc
 SHA512:
-  metadata.gz: 600d85156bacd65cd41005f58ee3d41f0343ca3aef7fd8c66556da258d0b8112b9fb6dc41c132b5abc41b3bf2369c1b3ac4db6185660c670e7463c2ca68768fd
-  data.tar.gz: 4a3644e771e0f88f3ee15167e2db7c10ea486b31c84e30a963adf6d122754499fb61f11ffe5db4d29fa3b41fa330aca9b1d57f354959ebd378ee21c465bf4e39
+  metadata.gz: af7f10c370532ceb2f76d908bd86fc5d5743cb1c6b491de59ef2eb3fd6749b19ccd6da1a44368c398f51281ce6440e81abd3aa6fb5d3a2f7110de84d5507b99a
+  data.tar.gz: 772f61353f22feea63646cebe38eaf2c6f0c2864a0041b74f54a6eba88cbf01a2c569780b3ac379899c61b6d8137253187e1376f02bfeeac53bf0a707f9241af

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sneakers-queue-migrator (0.1.4)
+    sneakers-queue-migrator (0.1.5)
       bunny (~> 2.0)
       json (~> 2.0)
 

data/README.md

@@ -36,14 +36,14 @@ Sneakers::Migrator.migrate!(
     amqp_url: 'amqp://user:password@rabbitmq:5672/',
     amqp_api_url: 'http://user:password@rabbitmq:15672',
     subscriber_paths: ['app/workers'],
-    parse_only: false
+    load_with_regex: false
 )
 ```
 
 `amqp_url` - regular bunny connection string
 `amqp_api_url` - url WITH PORT for the management interface
 `subscriber_paths` - array of folders to scan for subscribers
-`parse_only` - `false` requires the files and reflects the arguments, `true` parses the from_queue block with regex
+`load_with_regex` - `false` requires the files and reflects the arguments, `true` parses the from_queue block with regex
 
 ## Development
 

data/lib/sneakers/migrator/version.rb

@@ -2,6 +2,6 @@
 
 module Sneakers
   module Migrator
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/lib/sneakers/migrator.rb

@@ -13,10 +13,10 @@ module Sneakers
 
     class << self
       # Main migration entrypoint
-      def migrate!(amqp_url:, amqp_api_url:, subscriber_paths: [], logger: nil, parse_only: false)
+      def migrate!(amqp_url:, amqp_api_url:, subscriber_paths: [], logger: nil, load_with_regex: false)
         logger ||= $stdout
         # Optionally parse subscribers with regex/static analysis
-        queues = if parse_only
+        queues = if load_with_regex
                    parse_queues_from_files(subscriber_paths, logger)
                  else
                    load_files_to_find_queues(subscriber_paths, logger)
@@ -102,9 +102,10 @@ module Sneakers
             # Multi-line robust extraction for from_queue calls
             src_lines = src.lines
             src_lines.each_with_index do |line, idx|
-              next unless line =~ /from_queue\s+("|')([\w\-:]+)\1\s*,?\s*$/
+              # Match from_queue with or without parentheses, any quote style, and allow whitespace
+              next unless line =~ /from_queue\s*(\(|\s)+(['"])([^'"]+)\2\s*,?/
 
-              queue_name = ::Regexp.last_match(2)
+              queue_name = ::Regexp.last_match(3)
               # Multi-line argument collection: collect all subsequent lines that are more indented than the from_queue line
               from_indent = line[/^\s*/].size
               opts_lines = []
@@ -147,6 +148,7 @@ module Sneakers
                 queues << q
                 seen[q[:name]] = true
               end
+              queues
             end
           end
         end
@@ -173,6 +175,11 @@ module Sneakers
 
         # Remove comments and excessive whitespace
         code = str.gsub(/#.*$/, "").gsub(/\n/, " ").gsub(/\s+/, " ")
+        # Convert Ruby %w[ ... ] and %w( ... ) to array syntax for YAML
+        code = code.gsub(/%w[\[(](.*?)[\])]/) do
+          words = ::Regexp.last_match(1).strip.split(/\s+/)
+          "[" + words.map { |w| "\"#{w}\"" }.join(", ") + "]" # rubocop:disable Style/StringConcatenation
+        end
         # Convert Ruby hashrockets and symbol keys to YAML style, and handle symbol values and numbers with underscores
         yaml_str = code
                    .gsub(/:(\w+)\s*=>/, '"\\1":') # :foo =>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sneakers-queue-migrator
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mike Gane