konjac 0.2.8 → 0.2.8.1

data/lib/konjac/cli.rb

@@ -90,15 +90,10 @@ eos
             Office.import_tags ARGV, opts
           when "install"
             Trollop::options do
-              banner sc_banner % I18n.t(:word_arg)
+              banner sc_banner % I18n.t(:script_arg)
               opt :help, I18n.t(:help, :scope => :opts)
             end
-            case ARGV[0]
-            when "dictionaries", "dict", "dictionary"
-              Installer.install_dictionaries
-            when "vim"
-              Installer.install_vim
-            end
+            Installer.run :install, ARGV[0].dup
           when "language"
             Trollop::options do
               banner sc_banner % I18n.t(:word_arg)
@@ -148,15 +143,10 @@ eos
             puts result if opts[:word]
           when "update"
             Trollop::options do
-              banner sc_banner % I18n.t(:word_arg)
+              banner sc_banner % I18n.t(:script_arg)
               opt :help, I18n.t(:help, :scope => :opts)
             end
-            case ARGV[0]
-            when "dictionaries", "dict", "dictionary"
-              Installer.update_dictionaries
-            when "vim"
-              Installer.update_vim
-            end
+            Installer.run :update, ARGV[0].dup
           when "use"
             Trollop::options do
               banner sc_banner % I18n.t(:word_arg)

data/lib/konjac/installer.rb

@@ -6,10 +6,34 @@ module Konjac
     YML_GIT = "git://github.com/brymck/konjac_yml.git"
 
     class << self
+      # Parses the provided command and script to install or update plugins and
+      # dictionary files
+      def run(command, script)
+        case script.to_sym
+        when :dictionaries, :dict, :dictionary
+          script = "dictionaries"
+        when :vim
+          script = "vim"
+        else
+          puts I18n.t(:script_not_found, :scope => :scripts) % script
+          return 
+        end
+
+        case command.to_sym
+        when :install, :update
+          # Build a command
+          __send__ [command, script].join("_")
+        else
+          puts I18n.t(:command_not_found, :scope => :scripts) % command
+        end
+      end
+      
       # Install the supplementary {Vim plugin}[https://github.com/brymck/konjac_vim]
       def install_vim
+        return update_vim if has_pathogen? && vim_installed?
+
+        print I18n.t(:installing, :scope => :scripts) % I18n.t(:vim_script, :scope => :scripts)
         if has_pathogen?
-          return update_vim if vim_installed?
 
           system File.join(File.dirname(__FILE__), "..", "bash", "install_vim")
         else
@@ -19,6 +43,7 @@ module Konjac
             FileUtils.remove_entry_secure dir
           end
         end
+        puts I18n.t(:done, :scope => :scripts)
       end
 
       # Install the supplementary {dictionaries}[https://github.com/brymck/konjac_yml]
@@ -26,6 +51,7 @@ module Konjac
         if dictionaries_installed?
           update_dictionaries
         else
+          print I18n.t(:installing, :scope => :scripts) % I18n.t(:dictionaries, :scope => :scripts)
           Dir.chdir(konjac_home) do
             g = Git.clone(YML_GIT, ".dictionaries", :name => ".dictionaries",
               :path => konjac_home)
@@ -33,13 +59,16 @@ module Konjac
               FileUtils.cp_r Dir.glob("*.yml"), konjac_home
             end
           end
+          puts I18n.t(:done, :scope => :scripts)
         end
       end
 
       # Update the supplementary {Vim plugin}[https://github.com/brymck/konjac_vim]
       def update_vim
         if has_pathogen? && vim_installed?
+          print I18n.t(:updating, :scope => :scripts) % I18n.t(:vim_script, :scope => :scripts)
           system File.join(File.dirname(__FILE__), "..", "bash", "update_vim")
+          puts I18n.t(:done, :scope => :scripts)
         else
           install_vim
         end
@@ -48,11 +77,13 @@ module Konjac
       # Update the supplementary {dictionaries}[https://github.com/brymck/konjac_yml]
       def update_dictionaries
         if dictionaries_installed?
+          print I18n.t(:installing, :scope => :scripts) % I18n.t(:dictionaries, :scope => :scripts)
           g = Git.open(File.join(konjac_home, ".dictionaries"))
           g.pull
           g.chdir do
             FileUtils.cp_r Dir.glob("*.yml"), konjac_home
           end
+          puts I18n.t(:done, :scope => :scripts)
         else
           install_dictionaries
         end

data/lib/konjac/version.rb

@@ -1,4 +1,4 @@
 module Konjac
   # The current version number of Konjac
-  VERSION = "0.2.8"
+  VERSION = "0.2.8.1"
 end

data/lib/locales/en.yml

@@ -1,11 +1,14 @@
 en:
   banner: Konjac is a Ruby command-line utility for translating files using a YAML wordlist
+  command_not_found: "Command not found: %s"
   filenames_arg: <filenames>+
   filenames_or_word_arg: <filenames>+ OR <text>
   me: Bryan McKelvey
   no_match: "No files matching \"%s\" found!"
   options: options
   overwrite: "Overwrite %s? (y/n [n]) "
+  script_arg: dictionaries|vim
+  script_not_found: "Script not found: %s"
   subcommand: subcommand
   unknown_subcommand: "Unknown subcommand: %s"
   usage: "Usage:"
@@ -18,24 +21,30 @@ en:
     force: Automatically overwrite files
     from: The language from which to translate
     help: Show this message
-    install: Install supplementary scripts
     original: The untranslated original text
     output: The name of the output file
     prompt: Prompt before overwriting a file
     quiet: Suppress error messages
     to: The language into which to translate
     translation: The translated text
-    update: Update supplementary scripts
     using: The names of dictionaries to use
     use_cache: Use cached dictionary
     version: Print version and exit
     word: Translate a word or phrase
+  scripts:
+    installing: "Installing %s... "
+    updating: "Updating %s... "
+    vim_script: "Vim script"
+    dictionaries: "dictionaries"
+    done: "done!"
   subcommands:
     add: Add a definition to translation memory
     export: Export text tags from a .doc or .docx file
     import: Import text tags into a .doc or .docx file
+    install: Install supplementary scripts
     language: Sets the default language
     list: List available dictionaries
     suggest: Suggest similar words using fuzzy matching
     translate: Translate a file, word or phrase
+    update: Update supplementary scripts
     use: Choose a default dictionary

data/lib/locales/ja.yml

@@ -1,11 +1,14 @@
 ja:
   banner: KonjacはYAML辞書でファイルを翻訳するRubyのコマンドライン・ユーティリティです。
+  command_not_found: "コマンドは見つかりません：%s"
   filenames_arg: <ファイル名>+
   filenames_or_word_arg: <ファイル名>+ または <テキスト>
   me: ブライアン・マッケルビー
   no_match: "「%s」をマッチするファイルは存在しません。"
   options: オプション
   overwrite: "%sを上書きしますか。 (y/n [n]) "
+  script_arg: dictionaries|vim
+  script_not_found: "スクリプトは見つかりません：%s"
   subcommand: サブコマンド
   unknown_subcommand: 不明なサブコマンド：%s
   usage: 使い方：
@@ -18,24 +21,30 @@ ja:
     force: 自動にファイルを上書きする
     from: ソース言語
     help: このメッセージを表示する
-    install: スクリプトなどをインストールする
     original: ソーステキスト
     output: 出力ファイル名
     prompt: ファイルをする場合に警告する
     quiet: エラーメッセージを抑止する
     to: ターゲット言語
     translation: ターゲットテキスト
-    update: スクリプトなどをアップデートする
     using: 使用したい辞書の名前
     use_cache: キャッシュした翻訳メモリを適用する
     version: バーションを表示し終了する
     word: 文字列を翻訳する
+  scripts:
+    installing: "%sをインストールしています... "
+    updating: "%sを更新しています... "
+    vim_script: "Vimのプラグイン"
+    dictionaries: "辞書"
+    done: "終了！"
   subcommands:
     add: 翻訳メモリに定義を追加する
     export: .docまたは.docxファイルからタグを抽出する
     import: .docまたは.docxファイルにタグをインポートする
+    install: スクリプトなどをインストールする
     language: 言語を設定する
     list: 使用できる辞書を表示する
     suggest: ファジーマッチングで似た言葉をサジェストする
     translate: ファイル・文字列を翻訳する
+    update: スクリプトなどをアップデートする
     use: デフォルト辞書を選択する

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amatch
-  requirement: &70315284595940 !ruby/object:Gem::Requirement
+  requirement: &70162410461600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315284595940
+  version_requirements: *70162410461600
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70315284623080 !ruby/object:Gem::Requirement
+  requirement: &70162410460900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315284623080
+  version_requirements: *70162410460900
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70315284622660 !ruby/object:Gem::Requirement
+  requirement: &70162410481360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315284622660
+  version_requirements: *70162410481360
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70315284622240 !ruby/object:Gem::Requirement
+  requirement: &70162410480940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315284622240
+  version_requirements: *70162410480940
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70315284621820 !ruby/object:Gem::Requirement
+  requirement: &70162410480520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315284621820
+  version_requirements: *70162410480520
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70315284621380 !ruby/object:Gem::Requirement
+  requirement: &70162410480100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315284621380
+  version_requirements: *70162410480100
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70315284620960 !ruby/object:Gem::Requirement
+  requirement: &70162410479660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315284620960
+  version_requirements: *70162410479660
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70315284620540 !ruby/object:Gem::Requirement
+  requirement: &70162410479240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315284620540
+  version_requirements: *70162410479240
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70315284620120 !ruby/object:Gem::Requirement
+  requirement: &70162410478820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315284620120
+  version_requirements: *70162410478820
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70315284619700 !ruby/object:Gem::Requirement
+  requirement: &70162410478400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315284619700
+  version_requirements: *70162410478400
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70315284619260 !ruby/object:Gem::Requirement
+  requirement: &70162410477960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315284619260
+  version_requirements: *70162410477960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70315284618760 !ruby/object:Gem::Requirement
+  requirement: &70162410477460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315284618760
+  version_requirements: *70162410477460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70315284618240 !ruby/object:Gem::Requirement
+  requirement: &70162410476940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315284618240
+  version_requirements: *70162410476940
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com