termit 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4537bfa028218580e77d2d3776c94678c90be432
-  data.tar.gz: 085aed266a94a21e8a2a728354af7178e7a22e84
+  metadata.gz: e30065a5242cf4e4aa3768265c44ecac3b8b2f2d
+  data.tar.gz: 546fcbe56d7a5f9ad22490545013650f440c9a31
 SHA512:
-  metadata.gz: 3366fa5030a8aa6a33f7844bbf18e199b38cc23ce479ae72d6491362496b082a7ff52f2cbb09b3eb915d0fa890d51de66f9d1358f8091c641d61c7791c7d80a5
-  data.tar.gz: 177665e7477889fc95d7fed634945e864646f4d5d689a26b4f703649d7f2407e14624a8556f84830dc9c7692ccda73e412472628c2f61b14579888177cf6dd09
+  metadata.gz: 54db1363b236b0d1720b875e4406a49b51ce6492c4155e6db6fdca7f26eb241f9afdd8c19d8cafdfd3768a90d3806b91671d580fdf3639ba28f5e047faa519eb
+  data.tar.gz: 3d4bf47dcea58ee04569bcd82061883fc7dfdeb3ff22208f566ca099322a327ee6a275d1238999be313d2138aa167c5c9dbfe3a2daa392d053555b709adbafd5

data/README.md

@@ -1,7 +1,7 @@
 #Termit [![Build Status](https://travis-ci.org/pawurb/termit.png)](https://travis-ci.org/pawurb/termit) [![Gem Version](https://badge.fury.io/rb/termit.png)](http://badge.fury.io/rb/termit)
 
 
-Termit is an easy way to use Google Translate in your terminal. It does not use paid Google Translate API but instead it headlessly browses www.translate.google.com and parses the response.
+Termit is an easy way to use Google Translate in your terminal.
 
 ## Installation
 ```ruby
@@ -31,9 +31,9 @@ termit fr ru qui est votre papa?
 ```
 #### Speech synthesis
 
-Specify a **-t** (talk) flag to use speech synthesis:
+Specify a **-t** (talk) flag to use speech synthesis (requires mpg123):
 ``` ruby
-termit en zh "hey cowboy where is your horse?" -v
+termit en zh "hey cowboy where is your horse?" -t
 => "嘿，牛仔是你的马在哪里？" #and a chinese voice says something about a horse
 ```
 
@@ -64,7 +64,7 @@ To find all available language codes visit www.translate.google.com. Choose lang
 
 Works with Ruby 1.9.2 and higher.
 
-To use speech synthesis (yes it talks) you need to have mpg123 installed.
+To use speech synthesis you need to have mpg123 installed.
 
 For Ubuntu:
 
@@ -74,11 +74,13 @@ For MacOSX:
 
     brew install mpg123
 
+## Status
 
+This is my first open-source project for people to use. Any feedback will be appreciated.
 
+You can contact me on: p.urbanek89@gmail.com
 
-Any feedback will be appreciated. You can contact me on: p.urbanek89@gmail.com
-
+Btw. I am looking for a job as a rails developer now and I am willing to relocate.
 
 
 

data/lib/termit/output_manager.rb

@@ -1,12 +1,12 @@
 #encoding: UTF-8
 module Termit
   class OutputManager
-    def display_error_info
-      puts "TERMIT: Wrong data. Example: 'termit en es the cowboy ' => 'el vaquero"
+    def display_error_info_and_quit
+      abort "TERMIT: Wrong data. Example: 'termit en es the cowboy ' => 'el vaquero'"
     end
 
-    def display_help
-      puts    <<-EOS
+    def display_help_and_quit
+      abort    <<-EOS
 =========TERMIT=========
 Usage:
 termit 'source_language' 'target_language' 'text'
@@ -23,8 +23,19 @@ Check docs at: github.com/pawurb/termit
 EOS
     end
 
-    def display_version
-      puts "Termit #{Termit::VERSION}"
+    def display_player_error_and_quit
+      message = "Termit speech synthesis requires mpg123 installed."
+      case Gem::Platform.local.os
+      when "darwin"
+        message << "\nPlease run 'brew install mpg123'"
+      when "linux"
+        message << "\nPlease run 'sudo apt-get install mpg123'"
+      end
+      abort message
+    end
+
+    def display_version_and_quit
+      abort "Termit #{Termit::VERSION}"
     end
 
     def display_translation text
@@ -36,5 +47,6 @@ EOS
       print '=> Synonyms: '
       puts synonyms
     end
+
   end
 end

data/lib/termit/speech_synthesizer.rb

@@ -1,6 +1,10 @@
 #encoding: UTF-8
 module Termit
   class SpeechSynthesizer
+    extend ::Delegation
+    @output_manager = Termit::OutputManager.new
+    delegate :display_player_error_and_quit, to: @output_manager
+
     def initialize options
       check_sound_player
       @text = options[:text]
@@ -16,8 +20,8 @@ module Termit
 
     def check_sound_player
       unless system 'which mpg123 > /dev/null'
-        raise "Termit speech synthesis requires mpg123 installed"
+        display_player_error_and_quit
       end
     end
-  end
+ end
 end

data/lib/termit/user_input_parser.rb

@@ -4,14 +4,14 @@ module Termit
     extend ::Delegation
     @output_manager = Termit::OutputManager.new
 
-    delegate :display_error_info, :display_help, :display_version, to: @output_manager
+    delegate :display_error_info_and_quit, :display_help_and_quit, :display_version_and_quit, to: @output_manager
+
     def initialize user_input
       @user_input = user_input
       quit_if_required
       validate_user_input
     rescue ArgumentError
-      display_error_info
-      exit
+      display_error_info_and_quit
     end
 
     def options
@@ -44,14 +44,8 @@ module Termit
     end
 
     def quit_if_required
-      if @user_input.index("-h") || @user_input.empty?
-        display_help
-        exit
-      end
-      if @user_input.index("-v")
-        display_version
-        exit
-      end
+      display_help_and_quit if @user_input.index("-h") || @user_input.empty?
+      display_version_and_quit if @user_input.index("-v")
     end
   end
 end

data/lib/termit/version.rb

@@ -1,3 +1,3 @@
 module Termit
-  VERSION = "2.0.5"
+  VERSION = "2.0.6"
 end

data/spec/termit/output_manager_spec.rb

@@ -6,22 +6,25 @@ describe Termit::OutputManager do
   describe "instance_methods" do
     describe "display_error_info_and_quit" do
       it "does what is says" do
-        expect(STDOUT).to receive(:puts).with("TERMIT: Wrong data. Example: 'termit en es the cowboy ' => 'el vaquero")
-        subject.display_error_info
+        expect { subject.display_error_info_and_quit }.to raise_error SystemExit
       end
     end
 
     describe "display_help_and_quit" do
       it "does what is says" do
-        expect(STDOUT).to receive(:puts)
-        subject.display_help
+        expect { subject.display_help_and_quit }.to raise_error SystemExit
       end
     end
 
     describe "display_version_and_quit" do
       it "does what is says" do
-        expect(STDOUT).to receive(:puts).with("Termit #{Termit::VERSION}")
-        subject.display_version
+        expect { subject.display_version_and_quit }.to raise_error SystemExit
+      end
+    end
+
+    describe "display_player_error_and_quit" do
+      it "does what is says" do
+        expect { subject.display_player_error_and_quit }.to raise_error SystemExit
       end
     end
   end

data/spec/termit/speech_synthesizer_spec.rb

@@ -11,10 +11,22 @@ describe Termit::SpeechSynthesizer do
       Termit::SoundResponseHandler.stub(:new) { handler }
     end
 
-    it "executes correct service objects" do
-      Termit::SpeechSynthesizer.any_instance.stub(:check_sound_player) { nil }
-      Termit::SoundResponseHandler.should_receive(:new).with(:binary_sound_file)
-      Termit::SpeechSynthesizer.new(target_lang: :en, text: 'your mother', voice: true).call
+    context "system has mpg123 installed" do
+      it "executes correct service objects" do
+        Termit::SpeechSynthesizer.any_instance.stub(:check_sound_player) { nil }
+        Termit::SoundResponseHandler.should_receive(:new).with(:binary_sound_file)
+        Termit::SpeechSynthesizer.new(target_lang: :en, text: 'your mother', voice: true).call
+      end
+    end
+
+    context "there is no mpq123 installed" do
+      before do
+        Object.any_instance.stub(:system) { nil }
+      end
+      it "executes correct service objects" do
+        Termit::OutputManager.any_instance.should_receive(:display_player_error_and_quit)
+        Termit::SpeechSynthesizer.new(target_lang: :en, text: 'your mother', voice: true).call
+      end
     end
   end
 end

data/spec/termit/user_input_parser_spec.rb

@@ -42,9 +42,6 @@ describe Termit::UserInputParser do
       it "with incorrect language options format raiser error" do
         expect{ Termit::UserInputParser.new ['ang', 'po polski', 'hey cowboy!', '-t'] }.to raise_error SystemExit
       end
-
     end
-
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: termit
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - pawurb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -56,17 +56,17 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! ' Termit is an easy way to use all the Google Translate goodies straight
+description: ' Termit is an easy way to use all the Google Translate goodies straight
   from your terminal. '
 email:
 - p.urbanek89@gmail.com
@@ -119,12 +119,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []