dtas 0.14.2 → 0.15.0

data/README

@@ -43,7 +43,7 @@ Users of dtas-player will also be interested in the following scripts:
 
 All scripts have some documentation in the Documentation/ directory or
 manpages distributed with the gem.  Documentation is also available on
-http://dtas.80x24.org/$COMMAND.txt in plain-text form.
+https://80x24.org/dtas/$COMMAND.txt in plain-text form.
 
 dtas exposes no public APIs outside of command-line and YAML text.  dtas is
 aimed at users familiar with the *nix command-line and editing text files.
@@ -66,7 +66,7 @@ the git(7) suite for generating and sending patches.  Please format
 pull requests with the git-request-pull(1) script (also distributed
 with git(7)) and send them via email to <dtas-all@nongnu.org>.
 
-See http://www.git-scm.com/ for more information on git.
+See https://www.git-scm.com/ for more information on git.
 
 ## Contact
 
@@ -77,16 +77,17 @@ appreciated.
 Please send plain-text mail to the list at <dtas-all@nongnu.org>\
 HTML mail will not be read.  dtas is for GUI-phobes, by GUI-phobes.\
 Mailing list archives available at <ftp://lists.gnu.org/dtas-all>
-or <http://80x24.org/dtas-all/>
+or <https://80x24.org/dtas-all/>
 No subscription is necessary to post to the mailing list.
 You may also read via:
 NNTP: <nntp://news.public-inbox.org/inbox.comp.audio.dtas>
-Atom: <http://80x24.org/dtas-all/new.atom>
+	<nntp://news.gmane.org/gmane.comp.audio.dtas.general>
+Atom: <https://80x24.org/dtas-all/new.atom>
 
 ## Copyright
 
 Copyright 2013-2016 all contributors <dtas-all@nongnu.org>\
-License: GPL-3.0+ <http://www.gnu.org/licenses/gpl-3.0.txt>
+License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 
 dtas is copyrighted Free Software by all contributors, see logs
 in revision control for names and email addresses of all of them.

data/Rakefile

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>.
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'tempfile'
 include Rake::DSL
@@ -42,7 +42,7 @@ def tags
   fp.puts "Unreleased" unless fp.size > 0
   fp.puts "# COPYRIGHT"
   fp.puts "Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>"
-  fp.puts "License: GPL-3.0+ <http://www.gnu.org/licenses/gpl-3.0.txt>"
+  fp.puts "License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>"
   fp.rewind
   assert_equal fp.read, File.read("NEWS") rescue nil
   fp.chmod 0644
@@ -52,8 +52,8 @@ def tags
 desc 'prints news as an Atom feed'
 task 'NEWS.atom' do
   require 'builder' # gem install builder
-  url_base = 'http://dtas.80x24.org/'
-  cgit_url = 'http://80x24.org/dtas.git/'
+  url_base = 'https://80x24.org/dtas/'
+  cgit_url = 'https://80x24.org/dtas.git/'
   new_tags = tags[0,10]
   x = Builder::XmlMarkup.new
   x.instruct! :xml, encoding: 'UTF-8', version: '1.0'
@@ -98,7 +98,7 @@ def tags
   files = []
 
   # git-set-file-times is distributed with rsync,
-  # Also available at: http://yhbt.net/git-set-file-times
+  # Also available at: https://yhbt.net/git-set-file-times
   # on Debian systems: /usr/share/doc/rsync/scripts/git-set-file-times.gz
   sh("git", "set-file-times", "Documentation", "examples", *top)
   make = ENV['MAKE'] || 'make'

data/TODO

@@ -6,4 +6,4 @@
 # COPYRIGHT
 
 Copyright 2013-2016 all contributors <dtas-all@nongnu.org>\
-License: GPL-3.0+ <http://www.gnu.org/licenses/gpl-3.0.txt>
+License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>

data/bin/dtas-archive

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2015-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 usage = "#$0 SOURCE DESTINATION"
 
@@ -133,7 +133,7 @@
         next
       end
 
-      stats_out = "#{output.sub(/\.[\.]+\z/, '')}.stats" if stats
+      stats_out = "#{output.sub(/\.[^\.]+\z/, '')}.stats" if stats
 
       if dry_run || !silent
         names = job.map { |x| Shellwords.escape(x) }

data/bin/dtas-console

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 #
 # Note: no idea what I'm doing, especially w.r.t. curses

data/bin/dtas-ctl

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'dtas/unix_client'
 

data/bin/dtas-cueedit

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'tempfile'
 require 'dtas/xs'

data/bin/dtas-enq

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'dtas/unix_client'
 c = DTAS::UNIXClient.new

data/bin/dtas-mlib

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2015-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 usage = "#$0 [-d DATABASE-URI] ACTION [ARGS]"
 Thread.abort_on_exception = $stderr.sync = $stdout.sync = true

data/bin/dtas-msinkctl

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'yaml'
 require 'dtas/unix_client'

data/bin/dtas-partstats

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 # TODO
 # - option parsing: sox effects, stats effect options

data/bin/dtas-player

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 Thread.abort_on_exception = $stderr.sync = $stdout.sync = true
 require 'yaml'

data/bin/dtas-readahead

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2015-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 #
 # Really janky readahead script.  Requires dtas-player to be
@@ -133,6 +133,7 @@ def do_ra(fp, pos, w)
 end
 
 def do_open(path)
+  return unless path # could be a command
   if path =~ /\.ya?ml\z/
     File.open(path) do |fp|
       buf = fp.read(4)
@@ -149,8 +150,8 @@ def do_open(path)
   File.open(path)
 end
 
+work = {}
 begin
-  work = {}
   cur_pid = nil
   @todo_ra = @max_ra
   t0 = DTAS.now
@@ -158,14 +159,19 @@ def do_open(path)
   cur = YAML.load(c.req('current'))
   while @todo_ra > 0 && fp.nil?
     if current = cur['current']
-      track = current['infile'].freeze
-      work[track] ||= fp = do_open(track)
+      track = current['infile']
+      break unless track.kind_of?(String)
+      track.freeze
+      fp = work[track] ||= do_open(track)
       cur_pid = current['pid']
       if fp
         pos = expand_pid(cur_pid).map do |pid|
           seek_to_cur_pos(pid, fp)
         end.compact.max
-        pos and fp = do_ra(fp, pos, w)
+        if pos
+          fp = do_ra(fp, pos, w)
+          work.delete_if { |_, io| io.closed? }
+        end
       end
     else
       break
@@ -174,12 +180,14 @@ def do_open(path)
     # queue has priority, work on it, first
     queue = YAML.load(c.req('queue cat'))
     while @todo_ra > 0 && track = queue.shift
+      next unless track.kind_of?(String)
       fp = nil
       begin
-        work[track] ||= fp = do_open(track)
+        fp = work[track] ||= do_open(track)
       rescue SystemCallError
       end
       fp = do_ra(fp, 0, w) if fp
+      work.delete_if { |_, io| io.closed? }
     end
     break if @todo_ra <= 0
 
@@ -192,10 +200,11 @@ def do_open(path)
       fp = nil
       track = c.req("tl get #{cid}").sub!(/\A1 \d+=/, '').freeze
       begin
-        work[track] ||= fp = do_open(track)
+        fp = work[track] ||= do_open(track)
       rescue SystemCallError
       end
       fp = do_ra(fp, 0, w) if fp
+      work.delete_if { |_, io| io.closed? }
       if @todo_ra > 0 && fp.nil? && ids[idx += 1].nil?
         idx = repeat == 'true' ? 0 : nil
       end
@@ -210,7 +219,9 @@ def do_open(path)
     timeout = 5 - elapsed
     timeout = 0 if timeout < 0
   else
-    timeout = nil
+    work.each_value(&:close).clear
+    fp.close if fp && !fp.closed?
+    fp = timeout = nil
   end
   r = wait_read(w, timeout)
   p w.res_wait if r

data/bin/dtas-sinkedit

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'optparse'
 require 'dtas/edit_client'

data/bin/dtas-sourceedit

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'optparse'
 require 'dtas/edit_client'

data/bin/dtas-splitfx

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'yaml'
 require 'optparse'

data/bin/dtas-tl

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 # encoding: binary
 # WARNING: totally unstable API, use dtas-ctl for scripting (but the protocol

data/bin/dtas-xdelay

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 USAGE = "Usage: #$0 [-x FREQ] [-l] /dev/fd/LO /dev/fd/HI DELAY [DELAY ...]"
 require 'optparse'

data/dtas-linux.gemspec

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 #
 # this just declares dependencies to make gem installation a little easier
 # for Linux users
@@ -12,7 +12,7 @@
                   "via tee(), splice() and eventfd() on Linux"
   s.email = %q{e@80x24.org}
   s.files = []
-  s.homepage = 'http://dtas.80x24.org/'
+  s.homepage = 'https://80x24.org/dtas/'
   s.add_dependency(%q<dtas>)
   s.add_dependency(%q<io_splice>, '~> 4')
   s.add_dependency(%q<sleepy_penguin>, '~> 3')

data/dtas-mpris.gemspec

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-2.0+ or later <http://www.gnu.org/licenses/gpl-2.0.txt>
+# License: GPL-2.0+ or later <https://www.gnu.org/licenses/gpl-2.0.txt>
 # This is GPL-2.0+ instead of GPL-3.0+ because ruby-dbus is LGPL-2.1 (only)
 Gem::Specification.new do |s|
   s.name = %q{dtas-mpris}
@@ -11,7 +11,7 @@
     "This is currently a dummy package as dtas-mpris is not implemented"
   s.email = %q{e@80x24.org}
   s.files = []
-  s.homepage = 'http://dtas.80x24.org/'
+  s.homepage = 'https://80x24.org/dtas/'
   s.add_dependency(%q<dtas>)
   s.add_dependency(%q<ruby-dbus>)
   s.licenses = 'GPL-2.0+'

data/dtas.gemspec

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 Gem::Specification.new do |s|
   manifest = File.read('.gem-manifest').split(/\n/)
   s.name = %q{dtas}
@@ -10,7 +10,7 @@
   s.email = %q{e@80x24.org}
   s.executables = manifest.grep(%r{\Abin/}).map { |s| s.sub(%r{\Abin/}, "") }
   s.files = manifest
-  s.homepage = 'http://dtas.80x24.org/'
+  s.homepage = 'https://80x24.org/dtas/'
   s.licenses = "GPL-3.0+"
   s.required_ruby_version = '>= 1.9.3'
 end

data/lib/dtas.rb

@@ -1,9 +1,9 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 
 # DTAS currently exposes no public API for Ruby programmers.
-# See http://dtas.80x24.org/ for more info.
+# See https://80x24.org/dtas/ for more info.
 module DTAS
 
   # try to use the monotonic clock in Ruby >= 2.1, it is immune to clock
@@ -24,6 +24,19 @@ def self.now # :nodoc:
   def self.null # :nodoc:
     @null ||= File.open('/dev/null', 'r+')
   end
+
+  # String#-@ will deduplicate strings when Ruby 2.5 is released (Dec 2017)
+  # https://bugs.ruby-lang.org/issues/13077
+  if RUBY_VERSION.to_f >= 2.5
+    def self.dedupe_str(str)
+      -str
+    end
+  else
+    # Ruby 2.1 - 2.4, noop for older Rubies
+    def self.dedupe_str(str)
+      eval "#{str.inspect}.freeze"
+    end
+  end
   # :startdoc:
 end
 

data/lib/dtas/buffer.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'io/wait'
 require_relative '../dtas'

data/lib/dtas/buffer/read_write.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'io/nonblock'
 require_relative '../../dtas'

data/lib/dtas/buffer/splice.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'io/nonblock'
 require 'io/splice'
@@ -10,7 +10,6 @@
 module DTAS::Buffer::Splice # :nodoc:
   MAX_AT_ONCE = 4096 # page size in Linux
   MAX_AT_ONCE_1 = 65536
-  MAX_SIZE = File.read("/proc/sys/fs/pipe-max-size").to_i
   F_MOVE = IO::Splice::F_MOVE
 
   def buffer_size

data/lib/dtas/command.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative 'serialize'
 require 'shellwords'

data/lib/dtas/compat_onenine.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 
 # Make Ruby 1.9.3 look like Ruby 2.0.0 to us
 # This exists for Debian wheezy users using the stock Ruby 1.9.3 install.

data/lib/dtas/cue_index.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../dtas'
 

data/lib/dtas/disclaimer.rb

@@ -1,6 +1,6 @@
 # :enddoc:
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 DTAS_PROGNAME = File.basename($0)
 DTAS_DISCLAIMER = <<EOF

data/lib/dtas/edit_client.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'tempfile'
 require 'yaml'