acappella 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c26718b7718d6472e64e75621286167b823032f
-  data.tar.gz: e3a6ba550d871c0f72201076259f83ffc2735caa
+  metadata.gz: fb789efe1546c8327f8f9bf712dd7099109a9cfa
+  data.tar.gz: 60001dbdc4f4646ff4ce93222f7cbe388d3d138e
 SHA512:
-  metadata.gz: 42e20dbc440f230aeb6326acc213ceaf5d8fa430ae9145baa48f5b36b8c6e62efdbadfc3d56df21ad9fad354cc487ca031ebfdf7acbf1ff1900ae9bed41656d4
-  data.tar.gz: 73774fa65942d583a13e8d878fb5c8b3c354f55ea5ab5722c2f4558e8a411c07c55a9b7903c72f72e47855c1dbb0fdb0bfafcd326163a43ebff120f5ef93c23b
+  metadata.gz: 75acf468845b8b6726310c2041dec46ffa56b91fc01bfe8432401dc853546aa8b24e1ce15323a6598f67e5b8170e357770feff9fc60a09c1170d33f90c378085
+  data.tar.gz: 88309aacfce2c3f477b2ae75951e4fd7cda277783e3e8260e11b1e1a8737243efd67419f34077165520f7e9de79849cc856dba210bf0b2ee86abcdbd81535981

data/README.md

@@ -10,22 +10,23 @@ $ gem install acappella
 
 ## USAGE
 
-1. Please perform the following in server side terminal.
+### 1. Please perform the following in server side terminal.
 
 ```
 $ acappella-server
-acappella 0.0.1 starting on druby://localhost:8989
+acappella 0.1.0 starting on druby://localhost:8989
 Run `acappella-server --help` for more startup options
 Ctrl-C to shutdown server
 ```
 
-2. Please perform the following in client side terminal.
+### 2. Please perform the following in client side terminal.
 
 ```
 $ acappella-client
 Connect to druby://localhost:8989
+Run `acappella-client --help` for more startup options
 Ctrl-D to exit
-> words you want to talk'
+> words you want to talk
 ```
 
 Server speak characters that client was typing.

data/bin/acappella-client

@@ -6,7 +6,8 @@ $:.unshift(lib_path)
 require 'acappella'
 require 'readline'
 
-options = ACappella::OptionParser.parse(ARGV) rescue exit(false)
+option_parser = ACappella::OptionParser.new
+options = option_parser.parse!(ARGV) rescue exit(false)
 
 client = ACappella::Client.new(options)
 

data/bin/acappella-server

@@ -5,8 +5,19 @@ $:.unshift(lib_path)
 
 require 'acappella'
 
-options = ACappella::OptionParser.parse(ARGV) rescue exit(false)
+option_parser = ACappella::OptionParser.new
+option_parser.add_option('-v', '--voice=VAL')
 
-server = ACappella::Server.new(options)
+options = option_parser.parse!(ARGV) rescue exit(false)
+
+begin
+  server = ACappella::Server.new(options)
+rescue ACappella::VoiceTypeError => e
+  quoted_voice_names = ACappella::VoiceType::VOICE_VARIATIONS.map {|v| "'#{v}'" }
+
+  puts "#{e.message} --voice=VAL accepts #{quoted_voice_names.join(', ')}."
+
+  exit(false)
+end
 
 server.start

data/lib/acappella.rb

@@ -7,3 +7,4 @@ require 'acappella/set_list'
 require 'acappella/singer'
 require 'acappella/songwriter'
 require 'acappella/version'
+require 'acappella/voice_type'

data/lib/acappella/option_parser.rb

@@ -2,19 +2,33 @@ require 'optparse'
 
 module ACappella
   class OptionParser
-    def self.parse(argv)
-      opt = ::OptionParser.new
+    def initialize
+      @opt = ::OptionParser.new
 
-      options = {}
+      @options = {}
 
-      opt.on('-h', '--host=VAL') {|v| options[:host] = v }
-      opt.on('-p', '--port=VAL') {|v| options[:port] = v }
+      @added_options = []
+    end
+
+    def add_option(short, long, desc = '')
+      @added_options << [short, long, desc]
+    end
+
+    def parse!(argv)
+      @opt.on('-h', '--host=VAL') {|v| @options[:host] = v }
+      @opt.on('-p', '--port=VAL') {|v| @options[:port] = v }
+
+      @added_options.each do |added_option|
+        short, long, desc = added_option
+
+        @opt.on(short, long, desc) {|v| @options[:voice] = v }
+      end
 
-      opt.parse!(argv)
+      @opt.parse!(argv)
 
-      options
+      @options
     rescue ::OptionParser::MissingArgument => e
-      puts opt.help
+      puts @opt.help
 
       raise e
     end

data/lib/acappella/server.rb

@@ -6,6 +6,7 @@ module ACappella
     def initialize(options = {})
       host = options[:host] || 'localhost'
       port = options[:port] || '8989'
+      voice = options[:voice] || ACappella::VoiceType::DEFAULT_VOICE
 
       @uri = URI.parse("druby://#{host}:#{port}").to_s
 
@@ -13,7 +14,7 @@ module ACappella
 
       @songwriter = Songwriter.new(@set_list)
 
-      @singer = Singer.new
+      @singer = Singer.new(voice)
     end
 
     def start

data/lib/acappella/set_list.rb

@@ -4,8 +4,8 @@ module ACappella
       @songs = []
     end
 
-    def request(lyrics)
-      @songs << lyrics
+    def request(song)
+      @songs << song
     end
 
     def next_song

data/lib/acappella/singer.rb

@@ -1,17 +1,31 @@
+require 'shellwords'
+
 module ACappella
   class Singer
+    def initialize(voice)
+      raise ACappella::VoiceTypeError.new("can't sing voice.") unless valid_voice?(voice)
+
+      @voice = voice
+    end
+
     def sing(lyrics)
       logging(lyrics)
 
-      system('say', lyrics)
+      shellescaped_args = [@voice, lyrics].shelljoin
+
+      system("say -v #{shellescaped_args}")
     end
 
     private
 
+    def valid_voice?(voice)
+      ACappella::VoiceType::VOICE_VARIATIONS.include?(voice)
+    end
+
     def logging(lyrics)
-      sung_at = Time.now.strftime('%Y-%m-%d %H:%M:%S')
+      sang_at = Time.now.strftime('%Y-%m-%d %H:%M:%S')
 
-      puts [sung_at, lyrics].join("\t")
+      puts [sang_at, lyrics].join("\t")
     end
   end
 end

data/lib/acappella/version.rb

@@ -1,3 +1,3 @@
 module ACappella
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/lib/acappella/voice_type.rb

@@ -0,0 +1,15 @@
+module ACappella
+  class VoiceTypeError < StandardError; end
+
+  class VoiceType
+    DEFAULT_VOICE = 'Bruce'
+
+    FEMALE_VOICES = %w(Agnes Kathy Princess Vicki Victoria)
+    MALE_VOICES = %w(Bruce Fred Junior Ralph)
+    NOVELTY_VOICES = [
+     'Albert', 'Bad News', 'Bahh', 'Bells', 'Boing', 'Bubbles', 'Cellos', 'Deranged', 'Good News', 'Hysterical', 'Pipe Organ', 'Trinoids', 'Whisper', 'Zarvox'
+    ]
+
+    VOICE_VARIATIONS = FEMALE_VOICES + MALE_VOICES + NOVELTY_VOICES
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acappella
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Koichi ITO
@@ -31,6 +31,7 @@ files:
 - lib/acappella/singer.rb
 - lib/acappella/songwriter.rb
 - lib/acappella/version.rb
+- lib/acappella/voice_type.rb
 homepage: http://github.com/koic/acappella
 licenses:
 - MIT