riemann-tools 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c30626ff8ae893a3abef2344ada1099ce648fc14163ca8338fe38bd03c8cd0bd
-  data.tar.gz: 61346e389d5994932ece0dbb9a9a774d8de41ac98b39ca6e18b8a792c9f18470
+  metadata.gz: ecfc9ade5a8ea50dcf495633c6427b14d41b78c04ef436c062491f96f97cbc16
+  data.tar.gz: 4ef67c8726d662c449e545601d3e7fe29d7104edaff39be294ca26e963f8e176
 SHA512:
-  metadata.gz: e82d31bff29ccd83052593ce1ba5d24149a89bd3da70a17d9fba377a85063e51b398a729df56d1ad32381d878bd8de60d53d455c5914a3fafb775a4387317e8b
-  data.tar.gz: f4382aba3f0c7d47437f7214a884434b747e334369605f87c51316b04ba7eeb8ee5bc5cecb33ad289b6909937c1319fa3f25602db6006a56a8665ba3ba7fe420
+  metadata.gz: 1d6b3a8872ffd2f8e73415f1108cb853d04ddf5fcf4fa0a9de81701f993d286f6b9337f3448d54d56d6da4f50f5d2582d29c1d4da18be418dcb5e5b1addd3eab
+  data.tar.gz: 8753726be6f187c0d88cbc8cf08eea6df9d4d5d5996e6d0ac44c5fc7bfe5d5dc648e9c191f9d0691f780d6b5e4a60ef75176f3ead1803e97e1a107e67234eb9c

data/.github/workflows/codeql-analysis.yml

@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -69,4 +69,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v1.10.0](https://github.com/riemann/riemann-tools/tree/v1.10.0) (2024-01-13)
+
+[Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.9.1...v1.10.0)
+
+**Implemented enhancements:**
+
+- Add support for options with spaces to `riemann-wrapper` [\#280](https://github.com/riemann/riemann-tools/pull/280) ([smortex](https://github.com/smortex))
+
 ## [v1.9.1](https://github.com/riemann/riemann-tools/tree/v1.9.1) (2023-12-08)
 
 [Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.9.0...v1.9.1)
@@ -21,10 +29,6 @@
 
 - Fix `riemann-haproxy` with Ruby 3.0+ [\#273](https://github.com/riemann/riemann-tools/pull/273) ([smortex](https://github.com/smortex))
 
-**Merged pull requests:**
-
-- Bump actions/checkout from 3 to 4 [\#271](https://github.com/riemann/riemann-tools/pull/271) ([dependabot[bot]](https://github.com/apps/dependabot))
-
 ## [v1.8.2](https://github.com/riemann/riemann-tools/tree/v1.8.2) (2023-05-22)
 
 [Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.8.1...v1.8.2)

data/Rakefile

@@ -7,7 +7,7 @@ require 'github_changelog_generator/task'
 GitHubChangelogGenerator::RakeTask.new :changelog do |config|
   config.user = 'riemann'
   config.project = 'riemann-tools'
-  config.exclude_labels = ['skip-changelog']
+  config.exclude_labels = %w[dependencies skip-changelog]
   config.future_release = "v#{Riemann::Tools::VERSION}"
 end
 

data/bin/riemann-wrapper

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+require 'strscan'
+
 Process.setproctitle($PROGRAM_NAME)
 
 def camelize(subject)
@@ -15,6 +17,42 @@ def constantize(subject)
   Object.const_get(subject)
 end
 
+# Split on blanks unless quoted or escaped:
+# "--foo --bar=bar --baz='baz baz'\ baz" #=> ["--foo", "--bar=bar", "--baz=baz baz baz"]
+def split_options(options)
+  res = []
+
+  return res unless options
+
+  current = ''
+  s = StringScanner.new(options)
+  until s.eos?
+    if s.scan(/\s+/)
+      res << current
+      current = ''
+    elsif s.scan(/\\./)
+      current += s.matched[1]
+    elsif s.scan(/['"]/)
+      match = s.matched
+      loop do
+        if s.scan(match)
+          break
+        elsif s.scan(/\\./)
+          current += s.matched[1]
+        else
+          current += s.getch
+        end
+      end
+    else
+      current += s.getch
+    end
+  end
+
+  res << current unless current.empty?
+
+  res
+end
+
 def read_flags(argv)
   res = []
 
@@ -80,10 +118,14 @@ if ARGV.size == 1
   require 'yaml'
   config = YAML.safe_load(File.read(ARGV[0]))
 
-  commandline = config['options']
-  config['tools'].each { |tool| commandline << " -- #{tool['name']} #{tool['options']}" }
+  arguments = split_options(config['options'])
+  config['tools'].each do |tool|
+    arguments << '--'
+    arguments << tool['name']
+    arguments += split_options(tool['options'])
+  end
 
-  ARGV.replace(commandline.split)
+  ARGV.replace(arguments)
 end
 
 argv = ARGV.dup

data/lib/riemann/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Riemann
   module Tools # :nodoc:
-    VERSION = '1.9.1'
+    VERSION = '1.10.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2024-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json