dtas 0.7.0 → 0.8.0

data/lib/dtas/unix_server.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'socket'
 require_relative '../dtas'
@@ -99,7 +99,13 @@ class DTAS::UNIXServer # :nodoc:
 
   def run_once
     # give IO.select one-shot behavior, snapshot and replace the watchlist
-    r = IO.select(@readers.keys, @writers.keys) or return
+    begin
+      r = IO.select(@readers.keys, @writers.keys) or return
+    rescue IOError
+      # this only happens when sinks error out
+      @writers.delete_if { |io| io.to_io.closed? }
+      retry
+    end
     @hot_read = r[0]
     r[1].each do |io|
       @writers.delete(io)

data/lib/dtas/util.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'
 

data/lib/dtas/writable_iter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'
 

data/lib/dtas/xs.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'
 require 'shellwords'
@@ -9,6 +9,6 @@ require 'shellwords'
 # again, filesystems can use any byte value in names except '\0'.
 module DTAS::XS # :nodoc:
   def xs(ary)
-    Shellwords.join(ary.map { |s| s.b })
+    Shellwords.join(ary.map(&:b))
   end
 end

data/perl/dtas-graph

@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 use strict;
 use Graph::Easy; # for ASCII-art graphs

data/test/covshow.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 #
 # this works with the __covmerge method in test/helper.rb

data/test/helper.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> 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'
@@ -25,6 +25,12 @@ if ENV["COVERAGE"]
       # filter out stuff that's not in our project
       COVMATCH =~ filename or next
 
+      # For compatibility with https://bugs.ruby-lang.org/issues/9508
+      # TODO: support those features if that gets merged into mainline
+      unless Array === counts
+        counts = counts[:lines]
+      end
+
       merge = prev[filename] || []
       merge = merge
       counts.each_with_index do |count, i|
@@ -44,14 +50,21 @@ if ENV["COVERAGE"]
   at_exit { __covmerge }
 end
 
-gem 'minitest'
+begin
+  gem 'minitest'
+rescue LoadError
+end
 require 'minitest/autorun'
 require "tempfile"
 
 Testcase = begin
   Minitest::Test
 rescue NameError
-  Minitest::Unit::TestCase
+  begin
+    Minitest::Unit::TestCase # minitest 4
+  rescue
+    MiniTest::Unit::TestCase # minitest 3
+  end
 end
 
 FIFOS = []
@@ -86,3 +99,11 @@ class Dir
     end
   end
 end unless Dir.respond_to?(:mktmpdir)
+
+def guitar_pluck(outfile)
+  outfile =~ %r{\A[\w\./-]+\z} or raise ArgumentError, "bad chars"
+  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 - #{outfile}"
+  assert_equal(true, system(cmd), cmd)
+end

data/test/player_integration.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'dtas/player'

data/test/test_buffer.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'stringio'

data/test/test_env.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative 'helper'
 require 'dtas/process'

data/test/test_format.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'tempfile'

data/test/test_format_change.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/player_integration'
 require 'tmpdir'

data/test/test_player.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'tempfile'

data/test/test_player_client_handler.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'dtas/player'

data/test/test_player_integration.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/player_integration'
 class TestPlayerIntegration < Testcase

data/test/test_process.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'dtas/process'

data/test/test_rg_integration.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/player_integration'
 class TestRgIntegration < Testcase

data/test/test_rg_state.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'dtas/rg_state'

data/test/test_sink.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'dtas/sink'

data/test/test_sink_pipe_size.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 begin
   require 'io/splice'

data/test/test_sink_tee_integration.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/player_integration'
 class TestSinkTeeIntegration < Testcase

data/test/test_source_av.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'dtas/source/av'

data/test/test_source_sox.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'dtas/source/sox'

data/test/test_splitfx.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'yaml'
 require 'dtas/splitfx'
@@ -20,11 +20,7 @@ class TestSplitfx < Testcase
     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
+        guitar_pluck("foo.flac")
         sfx.import(hash, {})
         opts = { jobs: nil, silent: true }
 
@@ -65,13 +61,13 @@ class TestSplitfx < Testcase
             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`
+          # 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

data/test/test_tracklist.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative 'helper'
 require 'dtas/tracklist'

data/test/test_trimfx.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'dtas/trimfx'
@@ -45,6 +45,37 @@ class TestTrimFX < Testcase
 
   def test_tfx_effects
     tfx = DTAS::TrimFX.new(%w(trim 1 sox vol -1dB))
-    assert_equal %w(sox $SOXIN $SOXOUT $TRIMFX vol -1dB $FADEFX), tfx.cmd
+    assert_equal %w(sox $SOXIN $SOXOUT $TRIMFX vol -1dB), tfx.cmd
+  end
+
+  def test_schedule_simple
+    fx = [
+      DTAS::TrimFX.new(%w(trim 1 0.3)),
+      DTAS::TrimFX.new(%w(trim 2 0.2)),
+      DTAS::TrimFX.new(%w(trim 0.5 0.5)),
+    ].shuffle
+    ary = DTAS::TrimFX.schedule(fx)
+    assert_operator 1, :==, ary.size
+    assert_equal [ 0.5, 1, 2 ], ary[0].map(&:tbeg)
+    assert_equal [ 0.5, 0.3, 0.2 ], ary[0].map(&:tlen)
+  end
+
+  def test_schedule_overlaps
+    fx = [
+      DTAS::TrimFX.new(%w(trim 1 0.3 sox)),
+      DTAS::TrimFX.new(%w(trim 1.1 0.2 sox)),
+      DTAS::TrimFX.new(%w(trim 0.5 0.5 sox)),
+    ]
+    ary = DTAS::TrimFX.schedule(fx)
+    assert_equal 2, ary.size
+    assert_equal [ 0.5, 1 ], ary[0].map(&:tbeg)
+    assert_equal [ 1.1 ], ary[1].map(&:tbeg)
+
+    ex = DTAS::TrimFX.expand(fx, 10)
+    assert_equal 2, ex.size
+    assert_equal 0, ex[0][0].tbeg
+    assert_equal 3, ex[0].size
+    assert_equal 0, ex[1][0].tbeg
+    assert_equal 3, ex[1].size
   end
 end

data/test/test_unixserver.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'tempfile'

data/test/test_util.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/helper'
 require 'dtas/util'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtas
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - dtas hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Free Software command-line tools for audio playback, mastering, and
@@ -89,7 +89,6 @@ files:
 - lib/dtas/cue_index.rb
 - lib/dtas/disclaimer.rb
 - lib/dtas/edit_client.rb
-- lib/dtas/fadefx.rb
 - lib/dtas/format.rb
 - lib/dtas/parse_time.rb
 - lib/dtas/partstats.rb
@@ -143,7 +142,6 @@ files:
 - test/player_integration.rb
 - test/test_buffer.rb
 - test/test_env.rb
-- test/test_fadefx.rb
 - test/test_format.rb
 - test/test_format_change.rb
 - test/test_player.rb
@@ -182,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: duct tape audio suite for *nix

data/lib/dtas/fadefx.rb

@@ -1,32 +0,0 @@
-# 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 '../dtas'
-require_relative 'parse_time'
-
-class DTAS::FadeFX
-  include DTAS::ParseTime
-  attr_reader :out_prev, :in_main, :out_main, :in_next
-  F = Struct.new(:type, :len)
-
-  def initialize(args)
-    args =~ /\Afade=([^,]*),([^,]*);([^,]*),([^,]*)\z/ or
-      raise ArgumentError, "bad fade format"
-    fades = [ $1, $2, $3, $4 ]
-    %w(out_prev in_main out_main in_next).each do |iv|
-      instance_variable_set("@#{iv}", parse!(fades.shift))
-    end
-  end
-
-  # q - quarter of a sine wave
-  # h - half a sine wave
-  # t - linear (`triangular') slope
-  # l - logarithmic
-  # p - inverted parabola
-  # default is 't' (sox defaults to 'l', but triangular makes more sense
-  # when concatenating
-  def parse!(str)
-    type = "t"
-    str.sub!(/\A([a-z])/, "") and type = $1
-    F[type, parse_time(str)]
-  end
-end

data/test/test_fadefx.rb

@@ -1,18 +0,0 @@
-# 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/fadefx'
-
-class TestFadeFX < Testcase
-  def test_fadefx
-    ffx = DTAS::FadeFX.new("fade=t1,t3.1;l4,t1")
-    assert_equal 't', ffx.out_prev.type
-    assert_equal 1, ffx.out_prev.len
-    assert_equal 't', ffx.in_main.type
-    assert_equal 3.1, ffx.in_main.len
-    assert_equal 'l', ffx.out_main.type
-    assert_equal 4, ffx.out_main.len
-    assert_equal 't', ffx.in_next.type
-    assert_equal 1, ffx.in_next.len
-  end
-end