dtas 0.0.0 → 0.1.I

data/test/test_process.rb

@@ -0,0 +1,33 @@
+# -*- encoding: binary -*-
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net>
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require './test/helper'
+require 'dtas/process'
+class TestProcess < Minitest::Unit::TestCase
+  include DTAS::Process
+
+  def test_qx_env
+    assert_equal "WORLD\n", qx({"HELLO" => "WORLD"}, 'echo $HELLO')
+  end
+
+  def test_qx_err
+    err = "/dev/null"
+    assert_equal "", qx('echo HELLO >&2', err: err)
+    assert_equal "/dev/null", err
+  end
+
+  def test_qx_err_str
+    s = ""
+    assert_equal "", qx('echo HELLO >&2', err_str: s)
+    assert_equal "HELLO\n", s
+  end
+
+  def test_qx_raise
+    assert_raises(RuntimeError) { qx('false') }
+  end
+
+  def test_qx_no_raise
+    status = qx('false', no_raise: true)
+    refute status.success?, status.inspect
+  end
+end

data/test/test_rg_integration.rb

@@ -28,23 +28,20 @@ class TestRgIntegration < Minitest::Unit::TestCase
     dump_pid = Tempfile.new(%w(dump .pid))
     default_pid = default_sink_pid(s)
     dump_cmd = "echo $$ > #{dump_pid.path}; sox $SOXFMT - #{dumper.path}"
-    s.send("sink ed dump active=true command='#{dump_cmd}'", Socket::MSG_EOR)
-    assert_equal("OK", s.readpartial(666))
+    s.req_ok("sink ed dump active=true command='#{dump_cmd}'")
 
     # start playback!
-    s.send("enq \"#{pluck.path}\"", Socket::MSG_EOR)
-    assert_equal "OK", s.readpartial(666)
+    s.req_ok("enq \"#{pluck.path}\"")
 
     # wait for playback to start
     yaml = cur = nil
     Timeout.timeout(5) do
       begin
-        s.send("current", Socket::MSG_EOR)
-        cur = YAML.load(yaml = s.readpartial(1666))
+        cur = YAML.load(yaml = s.req("current"))
       end while cur["current_offset"] == 0 && sleep(0.01)
     end
 
-    assert_nil cur["current"]["env"]["RGFX"]
+    assert_empty cur["current"]["env"]["RGFX"]
 
     assert_equal DTAS::Format.new.rate * len, cur["current_expect"]
 
@@ -52,12 +49,11 @@ class TestRgIntegration < Minitest::Unit::TestCase
     pid = read_pid_file(dump_pid)
 
     check_gain = proc do |expect, mode|
-      s.send("rg mode=#{mode}", Socket::MSG_EOR)
-      assert_equal "OK", s.readpartial(666)
+      s.req_ok("rg mode=#{mode}")
       Timeout.timeout(5) do
         begin
-          s.send("current", Socket::MSG_EOR)
-          cur = YAML.load(yaml = s.readpartial(3666))
+          yaml = s.req("current")
+          cur = YAML.load(yaml)
         end while cur["current"]["env"]["RGFX"] !~ expect && sleep(0.01)
       end
       assert_match expect, cur["current"]["env"]["RGFX"]
@@ -68,40 +64,28 @@ class TestRgIntegration < Minitest::Unit::TestCase
     check_gain.call(%r{vol 1\.3}, "track_peak")
     check_gain.call(%r{vol 1\.0}, "album_peak")
 
-    s.send("rg preamp+=1", Socket::MSG_EOR)
-    assert_equal "OK", s.readpartial(666)
-    s.send("rg", Socket::MSG_EOR)
-    rg = YAML.load(yaml = s.readpartial(3666))
+    s.req_ok("rg preamp+=1")
+    rg = YAML.load(yaml = s.req("rg"))
     assert_equal 1, rg["preamp"]
 
-    s.send("rg preamp-=1", Socket::MSG_EOR)
-    assert_equal "OK", s.readpartial(666)
-    s.send("rg", Socket::MSG_EOR)
-    rg = YAML.load(yaml = s.readpartial(3666))
+    s.req_ok("rg preamp-=1")
+    rg = YAML.load(yaml = s.req("rg"))
     assert_nil rg["preamp"]
 
-    s.send("rg preamp=2", Socket::MSG_EOR)
-    assert_equal "OK", s.readpartial(666)
-    s.send("rg", Socket::MSG_EOR)
-    rg = YAML.load(yaml = s.readpartial(3666))
+    s.req_ok("rg preamp=2")
+    rg = YAML.load(yaml = s.req("rg"))
     assert_equal 2, rg["preamp"]
 
-    s.send("rg preamp-=0.3", Socket::MSG_EOR)
-    assert_equal "OK", s.readpartial(666)
-    s.send("rg", Socket::MSG_EOR)
-    rg = YAML.load(yaml = s.readpartial(3666))
+    s.req_ok("rg preamp-=0.3")
+    rg = YAML.load(yaml = s.req("rg"))
     assert_equal 1.7, rg["preamp"]
 
-    s.send("rg preamp-=-0.3", Socket::MSG_EOR)
-    assert_equal "OK", s.readpartial(666)
-    s.send("rg", Socket::MSG_EOR)
-    rg = YAML.load(yaml = s.readpartial(3666))
+    s.req_ok("rg preamp-=-0.3")
+    rg = YAML.load(yaml = s.req("rg"))
     assert_equal 2.0, rg["preamp"]
 
-    s.send("rg preamp-=+0.3", Socket::MSG_EOR)
-    assert_equal "OK", s.readpartial(666)
-    s.send("rg", Socket::MSG_EOR)
-    rg = YAML.load(yaml = s.readpartial(3666))
+    s.req_ok("rg preamp-=+0.3")
+    rg = YAML.load(yaml = s.req("rg"))
     assert_equal 1.7, rg["preamp"]
 
     dethrottle_decoder(s)
@@ -114,4 +98,30 @@ class TestRgIntegration < Minitest::Unit::TestCase
 
     stop_playback(default_pid, s)
   end
+
+  def test_rg_env_in_source
+    s = client_socket
+    s.req_ok("rg mode=album_gain")
+    pluck, _ = tmp_pluck
+    cmd = DTAS::Source::Sox::SOX_DEFAULTS["command"]
+    fifo = tmpfifo
+    s.req_ok("source ed sox command='env > #{fifo}; #{cmd}'")
+    s.req_ok("sink ed default command='cat >/dev/null' active=true")
+    s.req_ok(%W(enq #{pluck.path}))
+
+    rg = {}
+    File.readlines(fifo).each do |line|
+      line =~ /\AREPLAYGAIN_/ or next
+      k, v = line.chomp!.split(/=/)
+      rg[k] = v
+    end
+    expect = {
+      "REPLAYGAIN_TRACK_GAIN" => "-2",
+      "REPLAYGAIN_ALBUM_GAIN" => "-3.0",
+      "REPLAYGAIN_TRACK_PEAK" => "0.666",
+      "REPLAYGAIN_ALBUM_PEAK" => "0.999",
+      "REPLAYGAIN_REFERENCE_LOUDNESS" => nil
+    }
+    assert_equal expect, rg
+  end
 end

data/test/test_sink_pipe_size.rb

@@ -0,0 +1,20 @@
+# -*- encoding: binary -*-
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net>
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+begin
+  require 'io/splice'
+  require './test/player_integration'
+  class TestSinkPipeSizeIntegration < Minitest::Unit::TestCase
+    include PlayerIntegration
+
+    def test_sink_pipe_size_integration
+      s = client_socket
+      default_sink_pid(s)
+      s.req_ok("sink ed default pipe_size=0x1000")
+      s.req_ok("sink ed default pipe_size=0x10000")
+      assert_match %r{\AERR }, s.req("sink ed default pipe_size=")
+      s.req_ok("sink ed default pipe_size=4096")
+    end if IO.method_defined?(:pipe_size=)
+  end
+rescue LoadError
+end

data/test/test_sink_tee_integration.rb

@@ -15,11 +15,9 @@ class TestSinkTeeIntegration < Minitest::Unit::TestCase
     cmd = "echo $$ > #{tee_pid.path}; " \
           "cat /dev/fd/a > #{ajunk.path} & " \
           "cat /dev/fd/b > #{bjunk.path}; wait"
-    s.send("sink ed split active=true command='#{cmd}'", Socket::MSG_EOR)
-    assert_equal("OK", s.readpartial(666))
+    s.req_ok("sink ed split active=true command='#{cmd}'")
     pluck = "sox -n $SOXFMT - synth 3 pluck | tee #{orig.path}"
-    s.send("enq-cmd \"#{pluck}\"", Socket::MSG_EOR)
-    assert_equal "OK", s.readpartial(666)
+    s.req_ok("enq-cmd \"#{pluck}\"")
 
     wait_files_not_empty(tee_pid)
     pid = read_pid_file(tee_pid)

data/test/{test_source.rb → test_source_av.rb}

@@ -2,10 +2,10 @@
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
-require 'dtas/source'
+require 'dtas/source/av'
 require 'tempfile'
 
-class TestSource < Minitest::Unit::TestCase
+class TestSourceAv < Minitest::Unit::TestCase
   def teardown
     @tempfiles.each { |tmp| tmp.close! }
   end
@@ -31,10 +31,10 @@ class TestSource < Minitest::Unit::TestCase
     return if `which metaflac`.strip.size == 0
     tmp = new_file('flac') or return
 
-    source = DTAS::Source.new(tmp.path)
     x(%W(metaflac --set-tag=FOO=BAR #{tmp.path}))
     x(%W(metaflac --add-replay-gain #{tmp.path}))
-    assert_equal source.comments["FOO"], "BAR"
+    source = DTAS::Source::Av.new.try(tmp.path)
+    assert_equal source.comments["FOO"], "BAR", source.inspect
     rg = source.replaygain
     assert_kind_of DTAS::ReplayGain, rg
     assert_in_delta 0.0, rg.track_peak.to_f, 0.00000001
@@ -48,8 +48,6 @@ class TestSource < Minitest::Unit::TestCase
     a = new_file('mp3') or return
     b = new_file('mp3') or return
 
-    source = DTAS::Source.new(a.path)
-
     # redirect stdout to /dev/null temporarily, mp3gain is noisy
     File.open("/dev/null", "w") do |null|
       old_out = $stdout.dup
@@ -62,6 +60,7 @@ class TestSource < Minitest::Unit::TestCase
       end
     end
 
+    source = DTAS::Source::Av.new.try(a.path)
     rg = source.replaygain
     assert_kind_of DTAS::ReplayGain, rg
     assert_in_delta 0.0, rg.track_peak.to_f, 0.00000001
@@ -71,32 +70,33 @@ class TestSource < Minitest::Unit::TestCase
   end
 
   def test_offset
-    tmp = new_file('sox') or return
-    source = DTAS::Source.new(*%W(#{tmp.path} 5s))
+    tmp = new_file('flac') or return
+    source = DTAS::Source::Av.new.try(*%W(#{tmp.path} 5s))
     assert_equal 5, source.offset_samples
 
-    source = DTAS::Source.new(*%W(#{tmp.path} 1:00:00.5))
+    source = DTAS::Source::Av.new.try(*%W(#{tmp.path} 1:00:00.5))
     expect = 1 * 60 * 60 * 44100 + (44100/2)
     assert_equal expect, source.offset_samples
 
-    source = DTAS::Source.new(*%W(#{tmp.path} 1:10.5))
+    source = DTAS::Source::Av.new.try(*%W(#{tmp.path} 1:10.5))
     expect = 1 * 60 * 44100 + (10 * 44100) + (44100/2)
     assert_equal expect, source.offset_samples
 
-    source = DTAS::Source.new(*%W(#{tmp.path} 10.03))
+    source = DTAS::Source::Av.new.try(*%W(#{tmp.path} 10.03))
     expect = (10 * 44100) + (44100 * 3/100.0)
     assert_equal expect, source.offset_samples
   end
 
   def test_offset_us
-    tmp = new_file('sox') or return
-    source = DTAS::Source.new(*%W(#{tmp.path} 441s))
+    tmp = new_file('flac') or return
+    source = DTAS::Source::Av.new.try(*%W(#{tmp.path} 441s))
     assert_equal 10000.0, source.offset_us
 
-    source = DTAS::Source.new(*%W(#{tmp.path} 22050s))
+    source = DTAS::Source::Av.new.try(*%W(#{tmp.path} 22050s))
     assert_equal 500000.0, source.offset_us
 
-    source = DTAS::Source.new(tmp.path, '1')
+    source = DTAS::Source::Av.new.try(tmp.path, '1')
     assert_equal 1000000.0, source.offset_us
   end
-end
+end unless `which avconv 2>/dev/null` =~ /avconv/ &&
+           `which avprobe 2>/dev/null` =~ /avprobe/

data/test/test_source_sox.rb

@@ -0,0 +1,115 @@
+# -*- encoding: binary -*-
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net>
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require './test/helper'
+require 'dtas/source/sox'
+require 'tempfile'
+
+class TestSource < Minitest::Unit::TestCase
+  def teardown
+    @tempfiles.each { |tmp| tmp.close! }
+  end
+
+  def setup
+    @tempfiles = []
+  end
+
+  def x(cmd)
+    system(*cmd)
+    assert $?.success?, cmd.inspect
+  end
+
+  def new_file(suffix)
+    tmp = Tempfile.new(%W(tmp .#{suffix}))
+    @tempfiles << tmp
+    cmd = %W(sox -r 44100 -b 16 -c 2 -n #{tmp.path} trim 0 1)
+    return tmp if system(*cmd)
+    nil
+  end
+
+  def test_flac
+    return if `which metaflac`.strip.size == 0
+    tmp = new_file('flac') or return
+
+    source = DTAS::Source::Sox.new.try(tmp.path)
+    x(%W(metaflac --set-tag=FOO=BAR #{tmp.path}))
+    x(%W(metaflac --add-replay-gain #{tmp.path}))
+    assert_equal source.comments["FOO"], "BAR"
+    rg = source.replaygain
+    assert_kind_of DTAS::ReplayGain, rg
+    assert_in_delta 0.0, rg.track_peak.to_f, 0.00000001
+    assert_in_delta 0.0, rg.album_peak.to_f, 0.00000001
+    assert_operator rg.album_gain.to_f, :>, 1
+    assert_operator rg.track_gain.to_f, :>, 1
+  end
+
+  def test_mp3gain
+    return if `which mp3gain`.strip.size == 0
+    a = new_file('mp3') or return
+    b = new_file('mp3') or return
+
+    source = DTAS::Source::Sox.new.try(a.path)
+
+    # redirect stdout to /dev/null temporarily, mp3gain is noisy
+    File.open("/dev/null", "w") do |null|
+      old_out = $stdout.dup
+      $stdout.reopen(null)
+      begin
+        x(%W(mp3gain -q #{a.path} #{b.path}))
+      ensure
+        $stdout.reopen(old_out)
+        old_out.close
+      end
+    end
+
+    rg = source.replaygain
+    assert_kind_of DTAS::ReplayGain, rg
+    assert_in_delta 0.0, rg.track_peak.to_f, 0.00000001
+    assert_in_delta 0.0, rg.album_peak.to_f, 0.00000001
+    assert_operator rg.album_gain.to_f, :>, 1
+    assert_operator rg.track_gain.to_f, :>, 1
+  end
+
+  def test_offset
+    tmp = new_file('sox') or return
+    source = DTAS::Source::Sox.new.try(*%W(#{tmp.path} 5s))
+    assert_equal 5, source.offset_samples
+
+    source = DTAS::Source::Sox.new.try(*%W(#{tmp.path} 1:00:00.5))
+    expect = 1 * 60 * 60 * 44100 + (44100/2)
+    assert_equal expect, source.offset_samples
+
+    source = DTAS::Source::Sox.new.try(*%W(#{tmp.path} 1:10.5))
+    expect = 1 * 60 * 44100 + (10 * 44100) + (44100/2)
+    assert_equal expect, source.offset_samples
+
+    source = DTAS::Source::Sox.new.try(*%W(#{tmp.path} 10.03))
+    expect = (10 * 44100) + (44100 * 3/100.0)
+    assert_equal expect, source.offset_samples
+  end
+
+  def test_offset_us
+    tmp = new_file('sox') or return
+    source = DTAS::Source::Sox.new.try(*%W(#{tmp.path} 441s))
+    assert_equal 10000.0, source.offset_us
+
+    source = DTAS::Source::Sox.new.try(*%W(#{tmp.path} 22050s))
+    assert_equal 500000.0, source.offset_us
+
+    source = DTAS::Source::Sox.new.try(tmp.path, '1')
+    assert_equal 1000000.0, source.offset_us
+  end
+
+  def test_format_from_file
+    Tempfile.open(%w(tmp .wav)) do |tmp|
+      # generate an empty file with 1s of audio
+      cmd = %W(sox -r 96000 -b 24 -c 2 -n #{tmp.path} trim 0 1)
+      system(*cmd)
+      assert $?.success?, "#{cmd.inspect} failed: #$?"
+      fmt = DTAS::Source::Sox.new.try(tmp.path).format
+      assert_equal 96000, fmt.rate
+      assert_equal 2, fmt.channels
+      tmp.unlink
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtas
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.1.I
 platform: ruby
 authors:
 - Eric Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-25 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 description: '["Free Software command-line tools for audio playback, mastering, and\nwhatever
   else related to audio.  dtas follows the worse-is-better\nphilosophy and acts as
   duct tape to combine existing command-line tools\nfor flexibility and ease-of-development.  dtas
@@ -71,7 +71,6 @@ extra_rdoc_files:
 - Documentation/troubleshooting.txt
 files:
 - .gitignore
-- .rsync_doc
 - COPYING
 - Documentation/.gitignore
 - Documentation/GNUmakefile
@@ -113,6 +112,7 @@ files:
 - lib/dtas/command.rb
 - lib/dtas/compat_onenine.rb
 - lib/dtas/disclaimer.rb
+- lib/dtas/edit_client.rb
 - lib/dtas/format.rb
 - lib/dtas/pipe.rb
 - lib/dtas/player.rb
@@ -126,9 +126,14 @@ files:
 - lib/dtas/sigevent/pipe.rb
 - lib/dtas/sink.rb
 - lib/dtas/source.rb
-- lib/dtas/source/command.rb
+- lib/dtas/source/av.rb
+- lib/dtas/source/av_ff_common.rb
+- lib/dtas/source/cmd.rb
 - lib/dtas/source/common.rb
-- lib/dtas/source/mp3.rb
+- lib/dtas/source/ff.rb
+- lib/dtas/source/file.rb
+- lib/dtas/source/mp3gain.rb
+- lib/dtas/source/sox.rb
 - lib/dtas/state_file.rb
 - lib/dtas/unix_accepted.rb
 - lib/dtas/unix_client.rb
@@ -147,11 +152,14 @@ files:
 - test/test_player.rb
 - test/test_player_client_handler.rb
 - test/test_player_integration.rb
+- test/test_process.rb
 - test/test_rg_integration.rb
 - test/test_rg_state.rb
 - test/test_sink.rb
+- test/test_sink_pipe_size.rb
 - test/test_sink_tee_integration.rb
-- test/test_source.rb
+- test/test_source_av.rb
+- test/test_source_sox.rb
 - test/test_unixserver.rb
 - test/test_util.rb
 - NEWS
@@ -183,24 +191,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: dtas
-rubygems_version: 2.0.3
+rubygems_version: 2.1.0.rc.1
 signing_key: 
 specification_version: 4
 summary: dtas
 test_files:
 - test/test_util.rb
+- test/test_process.rb
 - test/test_sink_tee_integration.rb
 - test/test_unixserver.rb
-- test/test_source.rb
+- test/test_source_av.rb
+- test/test_source_sox.rb
 - test/test_player.rb
 - test/test_format_change.rb
 - test/test_rg_integration.rb
 - test/test_buffer.rb
+- test/test_sink_pipe_size.rb
 - test/test_format.rb
 - test/test_player_integration.rb
 - test/test_player_client_handler.rb