dtas 0.3.0 → 0.4.0

data/test/helper.rb

@@ -1,6 +1,8 @@
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 $stdout.sync = $stderr.sync = Thread.abort_on_exception = true
+require 'thread'
+WAIT_ALL_MTX = Mutex.new
 
 # fork-aware coverage data gatherer, see also test/covshow.rb
 if ENV["COVERAGE"]
@@ -46,13 +48,24 @@ gem 'minitest'
 require 'minitest/autorun'
 require "tempfile"
 
+Testcase = begin
+  Minitest::Test
+rescue NameError
+  Minitest::Unit::TestCase
+end
+
 FIFOS = []
-at_exit { FIFOS.each { |(pid,path)| File.unlink(path) if $$ == pid } }
 def tmpfifo
   tmp = Tempfile.new(%w(dtas-test .fifo))
   path = tmp.path
   tmp.close!
   assert system(*%W(mkfifo #{path})), "mkfifo #{path}"
+
+  if FIFOS.empty?
+    at_exit do
+      FIFOS.each { |(pid,_path)| File.unlink(_path) if $$ == pid }
+    end
+  end
   FIFOS << [ $$, path ]
   path
 end

data/test/player_integration.rb

@@ -74,8 +74,10 @@ module PlayerIntegration
   end
 
   def teardown
-    Process.kill(:TERM, @pid) if @pid
-    Process.waitall
+    if @pid
+      Process.kill(:TERM, @pid)
+      Process.waitpid2(@pid)
+    end
     refute File.exist?(@sock_path)
     @state_tmp.close!
     @out.close! if @out
@@ -92,7 +94,7 @@ module PlayerIntegration
   def tmp_noise(len = 5)
     noise = Tempfile.open(%w(junk .sox))
     cmd = %W(sox -R -n -r44100 -c2 #{noise.path} synth #{len} pluck)
-    assert system(*cmd), cmd
+    assert system(*cmd), cmd.inspect
     [ noise, len ]
   end
 

data/test/test_buffer.rb

@@ -4,7 +4,7 @@ require './test/helper'
 require 'stringio'
 require 'dtas/buffer'
 
-class TestBuffer < Minitest::Unit::TestCase
+class TestBuffer < Testcase
   def teardown
     @to_close.each { |io| io.close unless io.closed? }
   end
@@ -118,6 +118,8 @@ class TestBuffer < Minitest::Unit::TestCase
     assert_equal :wait_readable, buf.broadcast([a[1], b[1]])
     assert_equal 5, buf.bytes_xfer
 
+    return unless b[1].respond_to?(:pipe_size)
+
     b[1].nonblock = true
     b[1].write('*' * b[1].pipe_size)
     buf.wr.write "BYE"
@@ -175,7 +177,7 @@ class TestBuffer < Minitest::Unit::TestCase
     buf.wr.write "HELLO"
     assert_equal tmp, buf.broadcast(tmp)
     assert_equal [a[1], b[1]], tmp
-  end
+  end if IO.method_defined?(:pipe_size)
 
   def test_serialize
     buf = new_buffer

data/test/test_env.rb

@@ -0,0 +1,55 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require_relative 'helper'
+require 'dtas/process'
+class TestEnv < Testcase
+  include DTAS::Process
+  def setup
+    @orig = ENV.to_hash
+  end
+
+  def teardown
+    ENV.clear
+    ENV.update(@orig)
+  end
+
+  def test_expand
+    ENV["HELLO"] = 'HIHI'
+    expect = { "BLAH" => "HIHI/WORLD" }
+    opts = {}
+
+    env = { "BLAH" => "$HELLO/WORLD" }
+    assert_equal(expect, env_expand(env, opts))
+
+    env = { "BLAH" => "${HELLO}/WORLD" }
+    assert_equal(expect, env_expand(env, opts))
+
+    env = { "BLAH" => "$(echo $HELLO)/WORLD" }
+    assert_equal(expect, env_expand(env, opts))
+
+    env = { "BLAH" => "`echo $HELLO/WORLD`" }
+    assert_equal(expect, env_expand(env, opts))
+
+    env = { "BLAH" => "HIHI/WORLD" }
+    assert_equal(expect, env_expand(env, opts))
+
+    # disable expansion
+    env = expect = { "BLAH" => "`echo $HELLO/WORLD`" }
+    assert_equal(expect, env_expand(env, expand: false))
+
+    # numeric expansion always happens
+    env = { "BLAH" => 1 }
+    assert_equal({"BLAH"=>"1"}, env_expand(env, expand: false))
+    env = { "BLAH" => 1 }
+    assert_equal({"BLAH"=>"1"}, env_expand(env, {}))
+
+    expect = { "BLAH" => nil }
+    env = expect.dup
+    assert_equal expect, env_expand(env, expand:false)
+    assert_equal expect, env_expand(env, expand:true)
+
+    # recursive expansion
+    res = env_expand({"PATH"=>"$PATH"}, expand: true)
+    assert_equal ENV["PATH"], res["PATH"]
+  end
+end

data/test/test_format.rb

@@ -4,7 +4,7 @@ require './test/helper'
 require 'tempfile'
 require 'dtas/format'
 
-class TestFormat < Minitest::Unit::TestCase
+class TestFormat < Testcase
   def test_initialize
     fmt = DTAS::Format.new
     assert_equal %w(-ts32 -c2 -r44100), fmt.to_sox_arg

data/test/test_format_change.rb

@@ -2,7 +2,7 @@
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/player_integration'
 require 'tmpdir'
-class TestFormatChange < Minitest::Unit::TestCase
+class TestFormatChange < Testcase
   include PlayerIntegration
 
   def test_format_change

data/test/test_player.rb

@@ -4,7 +4,7 @@ require './test/helper'
 require 'tempfile'
 require 'dtas/player'
 
-class TestPlayer < Minitest::Unit::TestCase
+class TestPlayer < Testcase
   def setup
     @player = nil
     tmp = Tempfile.new(%w(dtas-player-test .sock))

data/test/test_player_client_handler.rb

@@ -3,7 +3,7 @@
 require './test/helper'
 require 'dtas/player'
 
-class TestPlayerClientHandler < Minitest::Unit::TestCase
+class TestPlayerClientHandler < Testcase
   class MockIO < Array
     alias emit push
   end

data/test/test_player_integration.rb

@@ -1,7 +1,7 @@
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/player_integration'
-class TestPlayerIntegration < Minitest::Unit::TestCase
+class TestPlayerIntegration < Testcase
   include PlayerIntegration
 
   def test_cmd_rate
@@ -124,7 +124,8 @@ class TestPlayerIntegration < Minitest::Unit::TestCase
   def test_sink_env
     s = client_socket
     tmp = Tempfile.new(%w(env .txt))
-    s.req_ok("sink ed default active=true command='echo -$FOO- > #{tmp.path}'")
+    s.req_ok("sink ed default active=true " \
+             "command='echo -$FOO- > #{tmp.path}; cat >/dev/null'")
 
     s.req_ok("sink ed default env.FOO=BAR")
     s.req_ok(["enq-cmd", "echo HI"])

data/test/test_process.rb

@@ -2,7 +2,7 @@
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'dtas/process'
-class TestProcess < Minitest::Unit::TestCase
+class TestProcess < Testcase
   include DTAS::Process
 
   def test_encoding

data/test/test_rg_integration.rb

@@ -1,20 +1,20 @@
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/player_integration'
-class TestRgIntegration < Minitest::Unit::TestCase
+class TestRgIntegration < Testcase
   include PlayerIntegration
 
   def tmp_pluck(len = 5)
     pluck = Tempfile.open(%w(pluck .flac))
     cmd = %W(sox -R -n -r44100 -c2 -C0 #{pluck.path} synth #{len} pluck)
-    assert system(*cmd), cmd
+    assert system(*cmd), cmd.inspect
     cmd = %W(metaflac
              --set-tag=REPLAYGAIN_TRACK_GAIN=-2
              --set-tag=REPLAYGAIN_ALBUM_GAIN=-3.0
              --set-tag=REPLAYGAIN_TRACK_PEAK=0.666
              --set-tag=REPLAYGAIN_ALBUM_PEAK=0.999
              #{pluck.path})
-    assert system(*cmd), cmd
+    assert system(*cmd), cmd.inspect
     [ pluck, len ]
   end
 
@@ -40,7 +40,7 @@ class TestRgIntegration < Minitest::Unit::TestCase
       end while cur["current_offset"] == 0 && sleep(0.01)
     end
 
-    assert_empty cur["current"]["env"]["RGFX"]
+    assert_nil cur["current"]["env"]["RGFX"]
 
     assert_equal DTAS::Format.new.rate * len, cur["current_expect"]
 
@@ -119,7 +119,6 @@ class TestRgIntegration < Minitest::Unit::TestCase
       "REPLAYGAIN_ALBUM_GAIN" => "-3.0",
       "REPLAYGAIN_TRACK_PEAK" => "0.666",
       "REPLAYGAIN_ALBUM_PEAK" => "0.999",
-      "REPLAYGAIN_REFERENCE_LOUDNESS" => nil
     }
     assert_equal expect, rg
   end

data/test/test_rg_state.rb

@@ -3,7 +3,7 @@
 require './test/helper'
 require 'dtas/rg_state'
 
-class TestRGState < Minitest::Unit::TestCase
+class TestRGState < Testcase
 
   def test_rg_state
     rg = DTAS::RGState.new

data/test/test_sink.rb

@@ -4,7 +4,7 @@ require './test/helper'
 require 'dtas/sink'
 require 'yaml'
 
-class TestSink < Minitest::Unit::TestCase
+class TestSink < Testcase
   def test_serialize_reload
     sink = DTAS::Sink.new
     sink.name = "DAC"

data/test/test_sink_pipe_size.rb

@@ -3,7 +3,7 @@
 begin
   require 'io/splice'
   require './test/player_integration'
-  class TestSinkPipeSizeIntegration < Minitest::Unit::TestCase
+  class TestSinkPipeSizeIntegration < Testcase
     include PlayerIntegration
 
     def test_sink_pipe_size_integration

data/test/test_sink_tee_integration.rb

@@ -1,7 +1,7 @@
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/player_integration'
-class TestSinkTeeIntegration < Minitest::Unit::TestCase
+class TestSinkTeeIntegration < Testcase
   include PlayerIntegration
 
   def test_tee_integration

data/test/test_source_av.rb

@@ -4,7 +4,7 @@ require './test/helper'
 require 'dtas/source/av'
 require 'tempfile'
 
-class TestSourceAv < Minitest::Unit::TestCase
+class TestSourceAv < Testcase
   def teardown
     @tempfiles.each { |tmp| tmp.close! }
   end

data/test/test_source_sox.rb

@@ -4,7 +4,7 @@ require './test/helper'
 require 'dtas/source/sox'
 require 'tempfile'
 
-class TestSource < Minitest::Unit::TestCase
+class TestSource < Testcase
   def teardown
     @tempfiles.each { |tmp| tmp.close! }
   end

data/test/test_splitfx.rb

@@ -0,0 +1,79 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require 'yaml'
+require 'dtas/splitfx'
+require 'thread'
+require_relative 'helper'
+
+class TestSplitfx < Testcase
+  def test_t2s
+    sfx = DTAS::SplitFX.new
+    sfx.instance_eval do
+      @infmt = DTAS::Format.load("rate"=>44100)
+    end
+    assert_equal 118554000, sfx.t2s_cdda('44:48.3')
+    assert_equal 118554030, sfx.t2s('44:48.3')
+  end
+
+  def test_example
+    hash = YAML.load(File.read("examples/splitfx.sample.yml"))
+    sfx = DTAS::SplitFX.new
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        # create a guitar pluck
+        cmd = '(for n in E2 A2 D3 G3 B3 E4; do '\
+               'sox -n -ts32 -c2 -r44100 - synth 4 pluck $n; done ) | ' \
+               'sox -ts32 -c2 -r44100 - foo.flac'
+        assert system(cmd), cmd.inspect
+        sfx.import(hash, {})
+        opts = { jobs: nil, silent: true }
+
+        # ensure default FLAC target works
+        WAIT_ALL_MTX.synchronize { sfx.run("flac", opts) }
+        expect = %w(1.flac 2.flac foo.flac)
+        assert_equal expect, Dir["*.flac"].sort
+
+        # compare results with expected output
+        res_cmd = "sox 1.flac 2.flac -ts32 -c2 -r44100 result.s32"
+        res_pid = fork { exec res_cmd }
+        exp_cmd = "sox foo.flac -ts32 -c2 -r44100 expect.s32 trim 4"
+        exp_pid = fork { exec exp_cmd }
+        _, s = Process.waitpid2(res_pid)
+        assert s.success?, "#{res_cmd}: #{s.inspect}"
+        _, s = Process.waitpid2(exp_pid)
+        assert s.success?, "#{exp_cmd}: #{s.inspect}"
+        cmp = "cmp result.s32 expect.s32"
+        assert system(cmp), cmp
+
+        # try Ogg Opus, use opusenc/opusdec for now since that's available
+        # in Debian 7.0 (sox.git currently has opusfile support, but that
+        # hasn't made it into Debian, yet)
+        if `which opusenc 2>/dev/null`.size > 0 &&
+           `which opusdec 2>/dev/null`.size > 0
+          err = $stderr.dup
+          begin
+            $stderr.reopen("/dev/null", "a")
+            WAIT_ALL_MTX.synchronize { sfx.run("opusenc", opts) }
+          ensure
+            $stderr.reopen(err)
+          end
+
+          # ensure opus lengths match flac ones, we decode using opusdec
+          # since sox does not yet have opus support in Debian 7.0
+          %w(1 2).each do |nr|
+            cmd = "opusdec #{nr}.opus #{nr}.wav 2>/dev/null"
+            assert system(cmd), cmd
+            assert_equal `soxi -D #{nr}.flac`, `soxi -D #{nr}.wav`
+          end
+        end
+
+        # ensure 16/44.1kHz FLAC works (CDDA-like)
+        File.unlink('1.flac', '2.flac')
+        WAIT_ALL_MTX.synchronize { sfx.run("flac-cdda", opts) }
+        %w(1 2).each do |nr|
+          assert_equal `soxi -D #{nr}.flac`, `soxi -D #{nr}.wav`
+        end
+      end
+    end
+  end
+end

data/test/test_tracklist.rb

@@ -0,0 +1,76 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require_relative 'helper'
+require 'dtas/tracklist'
+class TestTracklist < Testcase
+  def test_tl_add_tracks
+    tl = DTAS::Tracklist.new
+    tl.add_track("/foo.flac")
+    assert_equal(%w(/foo.flac), tl.instance_variable_get(:@list))
+
+    oids = tl.tracks
+    assert_kind_of Array, oids
+    assert_equal 1, oids.size
+    assert_equal [ [ oids[0], "/foo.flac" ] ], tl.get_tracks(oids)
+
+    tl.add_track("/bar.flac")
+    assert_equal(%w(/bar.flac /foo.flac), tl.instance_variable_get(:@list))
+
+    tl.add_track("/after.flac", oids[0])
+    assert_equal(%w(/bar.flac /foo.flac /after.flac),
+                 tl.instance_variable_get(:@list))
+  end
+
+  def test_add_current
+    tl = DTAS::Tracklist.new
+    tl.instance_variable_get(:@list).replace(%w(a b c d e f g))
+    tl.add_track('/foo.flac', nil, true)
+    assert_equal '/foo.flac', tl.cur_track
+  end
+
+  def test_advance_track
+    tl = DTAS::Tracklist.new
+    tl.instance_variable_get(:@list).replace(%w(a b c d e f g))
+    %w(a b c d e f g).each do |t|
+      assert_equal t, tl.advance_track[0]
+    end
+    assert_nil tl.advance_track
+    tl.repeat = true
+    assert_equal 'a', tl.advance_track[0]
+  end
+
+  def _build_mapping(tl)
+    tracks = tl.get_tracks(tl.tracks)
+    Hash[tracks.map { |(oid,name)| [ name, oid ] }]
+  end
+
+  def test_goto
+    tl = DTAS::Tracklist.new
+    tl.instance_variable_get(:@list).replace(%w(a b c d e f g))
+    mapping = _build_mapping(tl)
+    assert_equal 'f', tl.go_to(mapping['f'])
+    assert_equal 'f', tl.advance_track[0]
+    assert_nil tl.go_to(1 << 128)
+    assert_equal 'g', tl.advance_track[0]
+  end
+
+  def test_remove_track
+    tl = DTAS::Tracklist.new
+    tl.instance_variable_get(:@list).replace(%w(a b c d e f g))
+    mapping = _build_mapping(tl)
+    %w(a b c d e f g).each { |t| assert_kind_of Integer, mapping[t] }
+
+    tl.remove_track(mapping['a'])
+    assert_equal %w(b c d e f g), tl.instance_variable_get(:@list)
+
+    tl.remove_track(mapping['d'])
+    assert_equal %w(b c e f g), tl.instance_variable_get(:@list)
+
+    tl.remove_track(mapping['g'])
+    assert_equal %w(b c e f), tl.instance_variable_get(:@list)
+
+    # it'll be a while before OIDs require >128 bits, right?
+    tl.remove_track(1 << 128)
+    assert_equal %w(b c e f), tl.instance_variable_get(:@list), "no change"
+  end
+end