sneakers-queue-migrator 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b21432931960e830cbb956ab0e53406657147d9674f495ef74237f114e6fc3
-  data.tar.gz: aa60dd0d5714f56410240567c0a63da1fa937eefd6d3ad706bdb8a6b35cd2bdc
+  metadata.gz: 3f6310a0f4c1fd3d40da61e88ac1ff46b49be61a4aeede428ca17e51e4ac8478
+  data.tar.gz: de28bac5ed191aa132fb76571ce7cb1467830fbb633d86147e7ab3847c20fda2
 SHA512:
-  metadata.gz: af7f10c370532ceb2f76d908bd86fc5d5743cb1c6b491de59ef2eb3fd6749b19ccd6da1a44368c398f51281ce6440e81abd3aa6fb5d3a2f7110de84d5507b99a
-  data.tar.gz: 772f61353f22feea63646cebe38eaf2c6f0c2864a0041b74f54a6eba88cbf01a2c569780b3ac379899c61b6d8137253187e1376f02bfeeac53bf0a707f9241af
+  metadata.gz: e3e08dc7579b5340f53b5b15746d0b2eacde7bb6cba5a75e2700666fdfae67cdeeb14de16a724dfdb7d4683b8736149ad5b5b4139308797fa4613bf355a21e3d
+  data.tar.gz: a754909ef4389c038a081884a24ca9dde93d2804c8be7a0862bf297ffb8da7e0abf16bf111187afc77ab2c7295f3c7570d3077ea75f19440309b5b180ae7f071

data/Gemfile.lock

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

data/lib/sneakers/migrator/version.rb

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

data/lib/sneakers/migrator.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Style/StringConcatenation
 # frozen_string_literal: true
 
 require_relative "migrator/version"
@@ -173,13 +174,16 @@ module Sneakers
       def parse_options_hash_for_file(str)
         return {} unless str
 
-        # 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
+        # First, convert all %w[...] and %i[...] (even multi-line) to YAML arrays
+        code = str.gsub(/%[wi][\[(]((?:.|\n)*?)[\])]/m) do
+          words = ::Regexp.last_match(1).gsub(/#.*$/, '').split(/\s+/).reject(&:empty?)
+          '[' + words.map { |w| '"' + w + '"' }.join(', ') + ']'
         end
+        # Remove comments and blank lines
+        code = code.lines.reject { |l| l.strip.start_with?("#") || l.strip.empty? }.join(" ")
+        # Remove handler: ... and backoff_function: ... (ignore these keys and their values)
+        code = code.gsub(/\bhandler:\s*[^,}]+,?/, "")
+        code = code.gsub(/\bbackoff_function:\s*->\s*\([^)]*\)\s*\{[^}]*\},?/, "")
         # 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 =>
@@ -424,3 +428,5 @@ module Sneakers
     end
   end
 end
+
+# rubocop:enable Style/StringConcatenation

metadata

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