* [PATCH] process: implement array expansion to preserve spaces
@ 2015-05-18 0:21 7% Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2015-05-18 0:21 UTC (permalink / raw)
To: dtas-all; +Cc: Eric Wong
This can make it easier to specify mcompand parameters in
socks, as those require separate levels of parameter parsing
and require quoting in shell.
---
lib/dtas/process.rb | 39 +++++++++++++++++++++++++++++++--------
test/test_env.rb | 16 ++++++++++++++++
2 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/lib/dtas/process.rb b/lib/dtas/process.rb
index 8c5e8e9..f5f9a9e 100644
--- a/lib/dtas/process.rb
+++ b/lib/dtas/process.rb
@@ -1,6 +1,7 @@
# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
require 'io/wait'
+require 'shellwords'
require_relative '../dtas'
require_relative 'xs'
@@ -23,6 +24,7 @@ module DTAS::Process # :nodoc:
# expand common shell constructs based on environment variables
# this is order-dependent, but Ruby 1.9+ hashes are already order-dependent
+ # This recurses
def env_expand(env, opts)
env = env.dup
if false == opts.delete(:expand)
@@ -31,19 +33,40 @@ module DTAS::Process # :nodoc:
end
else
env.each do |key, val|
- case val
- when Numeric # stringify numeric values to simplify users' lives
- env[key] = val.to_s
- when /[\`\$]/ # perform variable/command expansion
- tmp = env.dup
- tmp.delete(key)
- val = qx(tmp, "echo #{val}", expand: false)
- env[key] = val.chomp
+ case val = env_expand_i(env, key, val)
+ when Array
+ val.flatten!
+ env[key] = Shellwords.join(val)
end
end
end
end
+ def env_expand_i(env, key, val)
+ case val
+ when Numeric # stringify numeric values to simplify users' lives
+ env[key] = val.to_s
+ when /[\`\$]/ # perform variable/command expansion
+ tmp = env.dup
+ tmp.delete(key)
+ tmp.each do |k,v|
+ # best effort, this can get wonky
+ tmp[k] = Shellwords.join(v.flatten) if Array === v
+ end
+ val = qx(tmp, "echo #{val}", expand: false)
+ env[key] = val.chomp
+ when Array
+ env[key] = env_expand_ary(env, key, val)
+ else
+ val
+ end
+ end
+
+ # warning, recursion:
+ def env_expand_ary(env, key, val)
+ val.map { |v| env_expand_i(env.dup, key, v) }
+ end
+
# for long-running processes (sox/play/ecasound filters)
def dtas_spawn(env, cmd, opts)
opts = { close_others: true, pgroup: true }.merge!(opts)
diff --git a/test/test_env.rb b/test/test_env.rb
index bd7961d..6b36f32 100644
--- a/test/test_env.rb
+++ b/test/test_env.rb
@@ -52,4 +52,20 @@ class TestEnv < Testcase
res = env_expand({"PATH"=>"$PATH"}, expand: true)
assert_equal ENV["PATH"], res["PATH"]
end
+
+ def test_ary
+ ENV['HELLO'] = 'HIHI'
+ ENV['PAATH'] = '/usr/local/bin:/usr/bin:/bin'
+ env = { 'BLAH' => [ '$HELLO/WORLD', '$PAATH', '$(echo hello world)' ] }
+ res = env_expand(env, expand: true)
+ exp = [ "HIHI/WORLD", ENV['PAATH'], 'hello world' ]
+ assert_equal exp, Shellwords.split(res['BLAH'])
+ env = {
+ 'BLAH' => [ '$(echo hello world)' ],
+ 'MOAR' => [ '$BLAH', 'OMG HALP SPACES' ]
+ }
+ res = env_expand(env, expand: true)
+ exp = ["hello\\ world", "OMG HALP SPACES"]
+ assert_equal exp, Shellwords.split(res['MOAR'])
+ end
end
--
EW
^ permalink raw reply related [relevance 7%]
* [ANN] dtas 0.12.0 - duct tape audio suite for *nix
@ 2015-12-14 4:03 4% Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2015-12-14 4:03 UTC (permalink / raw)
To: ruby-talk; +Cc: dtas-all
Free Software command-line tools for audio playback, mastering, and
whatever else related to audio. dtas follows the worse-is-better
philosophy and acts as duct tape to combine existing command-line tools
for flexibility and ease-of-development. dtas is currently implemented
in Ruby (and some embedded shell), but may use other languages in the
future.
Changes: dtas 0.12.0 - many player updates
Notable additions for dtas-player music listeners.
dtas-ctl queue cat - display the internal queue
dtas-tl shuffle [true|false] - toggle tracklist shuffle
dtas-tl edit - open tracklist in an editor
see dtas-tl(1) manpage for more details on this:
http://dtas.80x24.org/dtas-tl.txt
The player tracklist now uses sequential track IDs instead of Ruby
object IDs, so it should be easier to use existing commands such as
"dtas-tl goto" and "dtas-tl remove"
For people using dtas-player for applying real-time effects to
splitfx YAML files, dtas-player can now watch for changes in scripts
specified in the "command" field of the splitfx YAML file.
Previously, dtas-player could only read the splitfx YAML file
itself. This requires GNU/Linux and the sleepy_penguin RubyGem
installed.
dtas-splitfx also learned some switches to allow easier
interoperability with other processing tools:
-p/--sox-pipe - identical to the sox(1) option
-t/--trim - only expose part of the track, useful when
combined with the above -p switch
See http://dtas.80x24.org/dtas-splitfx.txt for more details.
There's also some work-in-progress stuff that's not well documented
at the moment. As with anything pre-1.0, expect the possibility
of incompatible changes.
Since I'm not good at designing protocols, I've also started working
on mpd compatibility layer to allow using the normal music playback
stuff with more clients (some of the clients I actually like, unlike
the seemingly GUI-only landscape of MPRIS :P).
Of course, dtas-player itself has most the capabilities of a
Unix shell; and those capabilities will certainly not be available
to mpd or MPRIS clients.
64 changes since dtas 0.11.0
INSTALL: update documentation for 0.11.0 release
splitfx: fix lossy output with player command is in use
splitfx: fix non-generic, user-specified targets
use monotonic clock on Ruby 2.1+
dtas-splitfx: no arguments for quiet and --no-dither
dtas-splitfx: support --trim argument
process: implement array expansion to preserve spaces
splitfx: show correct command for output
splitfx: remove support for encoding opus
dtas-console: bind "o" to display time in absolute seconds
splitfx: avoid double-truncation with user command
source/splitfx: allow watching extra external scripts
splitfx: drop unnecessary variable
splitfx: documentation for subclasses
splitfx: simplify output display
dtas-splitfx: comment describing -j (nothing) as infinite
dtas-*edit: fix inotify watch invocations
splitfx: allow -p/--sox-pipe option
splitfx: ensure rate is an integer
splitfx: set OUTFMT correctly for subenv if command is set
favor recv and recv_nonblock over recvmsg variants
parse_time: pass through numeric types
parse_freq: trivial new module for parsing frequencies
use a common /dev/null
player: add "queue cat" command
dtas-readahead: new script for -player users on Linux
dtas-readahead: avoid polling on pause
dtas-cueedit: escape path to temporary file
dtas-readahead: make executable
gemspec: use SPDX-compatible license
README: add link to NNTP and Atom feeds
player: cleanup command dispatch
dtas-archive: allow specifying SoX compression factor
gemspec: duplicate frozen string for older Rubygems
allow building the gem without pandoc
introduce dtas-mlib for music library functions
dtas-mlib: add dump support for debugging
tracklist: use lower number unique track IDs
tracklist: do not mutate @list when serializing
tracklist: avoid needlessly building a hash for track IDs
tracklist: shuffle support
tracklist: support limiting maximum tracklist size
player: refactor and document tracklist interface
player: tl (repeat|shuffle|max) and trim swap values
tracklist: fixup idempotent "tl shuffle false"
switch to exception-free non-blocking I/O
add .gitattributes for Ruby method detection
mlib: remove non-existent entries
mlib: add stats support
mlib: no kwargs for 1.9.3 compatibility
mlib: add find/search functionality based on mpd
mlib: split out the output format from the library
mlib: remove kwargs harder
player: reduce I/O priority of connected clients
mlib: SYSTEM_DEFAULT handlers for SIGINT and SIGPIPE
player: support "tl clear" internally
test_unixserver: remove test for element limit
player: dump state file asynchronously when requested
parse_time: enable frozen_string_literal
unix_accepted: enable checking for readability after emit
tracklist: swap functionality
player: show "tracklist" hash with summary info with "current"
dtas-tl: learn an "edit" sub command
doc: document additions to tracklist handling
* homepage: http://dtas.80x24.org/README
* http://dtas.80x24.org/INSTALL
* http://dtas.80x24.org/dtas-player.txt
* http://dtas.80x24.org/NEWS
* git clone git://80x24.org/dtas
* dtas-all@nongnu.org (plain-text only, no HTML mail, please)
* mailing list archives http://80x24.org/dtas-all/
--
EW
^ permalink raw reply [relevance 4%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-05-18 0:21 7% [PATCH] process: implement array expansion to preserve spaces Eric Wong
2015-12-14 4:03 4% [ANN] dtas 0.12.0 - duct tape audio suite for *nix Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/dtas.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).