diarize-ruby 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60c12288c00918b56f6a0280ff4d85905c615809
-  data.tar.gz: d0cd4559dc7a36d7805f53cdfe6bf2fa2f8e4325
+  metadata.gz: 36e00b3c5b5a169cc746f0cf140e3d1fbb5e2055
+  data.tar.gz: d082d84e13a307504f5fac7916549d3d201a5415
 SHA512:
-  metadata.gz: 1c3487810b743160c4b1d2731c47162d9374f2294a4c3b498a88597d04a6735f477c9cc16302afefd6d8522cb88880203a83395a0783d5d9cd2920592c187019
-  data.tar.gz: d2e48414dd62f61683098f781cca16ad346f7645b3e6aecc1129c1df22cfae1615e177f00a398210dfbf124049a8d02bdf16c234a11b6fc2114dc29952de0175
+  metadata.gz: 0d44decde02e7d5f74e4dac4247c9e2ff1f5d95f169112f1b34108c3e510be74f68d393705135e76d93719da6ea09539ff9ee46aed235d82c5fe6e3e2909acaf
+  data.tar.gz: f15c9b16585f52566e532d8417b23cb946629fda36db1d0b6de189cb6be0004a5893c0816a34b1acd636c63bde375e237e9871697001116cae3694e08ef207e0

data/.gitignore

@@ -13,6 +13,7 @@
 *.so
 *.o
 *.a
+*.pid
 mkmf.log
 *.pstore
 log/

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [v0.3.6] - 2016-11-16
+
+- Add pidfile option to diarize server command (--pidfile, -P)
+- Change diarize option port (--port, -p)
+
 ## [v0.3.5] - 2016-11-16
 
 - Refactor server interface to build_audio

data/bin/diarize

@@ -57,22 +57,10 @@ arguments :strict
 
 #-v, --verbose
 desc 'Print more verbose output'
-switch [:v, :verbose]
-
-#-H, --host HOSTNAME
-desc 'Host, e.g. "www.example.com"'
-default_value 'localhost'
-arg_name 'HOSTNAME'
-flag [:H, :host]
-
-#-P, --port PORT
-desc 'Port number'
-default_value 9999
-arg_name 'PORT'
-flag [:P, :port]
+switch [:verbose, :v]
 
 desc 'start console'
-command [:c, :console] do |console|
+command [:console, :c] do |console|
   console.action do |global_options, options, args|
     require 'irb'
 
@@ -81,7 +69,8 @@ command [:c, :console] do |console|
   end
 end
 
-command [:r, :remote] do |remote|
+desc 'use remote server'
+command [:remote, :r] do |remote|
   remote.command [:a, :audio] do |audio|
     audio.desc 'diarize remote audio segments FILENAME'
     audio.arg_name 'FILENAME', :multiple
@@ -107,7 +96,8 @@ command [:r, :remote] do |remote|
   end
 end
 
-command [:a, :audio] do |audio|
+desc 'audio file'
+command [:audio, :a] do |audio|
   audio.desc 'diarize audio segments FILENAME'
   audio.arg_name 'FILENAME', :multiple
   audio.command [:se, :segment, :segments] do |segments|
@@ -132,7 +122,7 @@ command [:a, :audio] do |audio|
 end
 
 desc 'start server'
-command [:s, :server] do |server|
+command [:server, :s] do |server|
   server.action do |global_options, options, args|
     merged_options = options.merge(global_options)
     argv = merged_options.reject {|k, v| !k.is_a?(String)}
@@ -141,41 +131,45 @@ command [:s, :server] do |server|
     argv = argv.to_a.flatten
 
     uri = "druby://#{merged_options[:host]}:#{merged_options[:port]}"
-    $stdout.puts "Drb server"
+    $stdout.puts "DRb server"
     $stdout.puts "diarize-ruby #{Diarize::VERSION}"
     $stdout.puts "Arguments: #{argv.inspect}" if global_options[:verbose]
+    if merged_options[:pidfile]
+      $stdout.puts "Pidfile '#{merged_options[:pidfile]}' (#{$$})"
+    end
     $stdout.puts "Listening on #{uri}, CTRL+C to stop"
     server = Diarize::Server.new
     DRb.start_service(uri, server)
     DRb.thread.join
   end
 
-  #-H, --host HOSTNAME
-  server.desc 'Host, e.g. "www.example.com"'
+  #-h, --host HOSTNAME
+  server.desc 'Host, e.g. "localhost"'
   server.default_value 'localhost'
   server.arg_name 'HOSTNAME'
-  server.flag [:H, :host]
+  server.flag [:h, :host]
 
-  #-P, --port PORT
+  #-p, --port PORT
   server.desc 'Port number'
   server.default_value 9999
   server.arg_name 'PORT'
-  server.flag [:P, :port]
+  server.flag [:p, :port]
+
+  #-P, --pidfile PIDFILE
+  server.desc 'PID file'
+  server.arg_name 'PIDFILE'
+  server.flag [:P, :pidfile]
 end
 
 pre do |global, command, options, args|
-  # Pre logic here
-  # Return true to proceed; false to abort and not call the
-  # chosen command
-  # Use skips_pre before a command to skip this block
-  # on that command only
+  if command.name == :server
+    File.write(options[:pidfile], $$) if options[:pidfile]
+  end
   true
 end
 
-post do |global,command,options,args|
-  # Post logic here
-  # Use skips_post before a command to skip this
-  # block on that command only
+post do |global, command, options, args|
+  true
 end
 
 on_error do |exception|
@@ -186,6 +180,6 @@ end
 
 begin
   exit run(ARGV)
-rescue
+rescue UncaughtThrowError
   $stdout.puts "Bye."
 end

data/lib/diarize/version.rb

@@ -1,3 +1,3 @@
 module Diarize
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/test/version_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class VersionTest < Test::Unit::TestCase
+
+  def test_current_version
+    assert_equal "0.3.6", Diarize::VERSION
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diarize-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Yves Raimond
@@ -163,6 +163,7 @@ files:
 - test/speaker_test.rb
 - test/super_vector_test.rb
 - test/test_helper.rb
+- test/version_test.rb
 homepage: https://github.com/chinshr/diarize-ruby
 licenses:
 - GNU Affero General Public License version 3
@@ -198,3 +199,4 @@ test_files:
 - test/speaker_test.rb
 - test/super_vector_test.rb
 - test/test_helper.rb
+- test/version_test.rb