konjac 0.1.7 → 0.1.8

data/konjac.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_runtime_dependency "i18n"
   s.add_runtime_dependency "nokogiri"
   s.add_runtime_dependency "term-ansicolor"
   s.add_runtime_dependency "trollop"

data/lib/konjac/cli.rb

@@ -1,5 +1,6 @@
 require "term/ansicolor"
 require "trollop"
+require "yaml"
 
 module Konjac
   module CLI
@@ -8,94 +9,108 @@ module Konjac
     end
 
     class << self
-      SUB_COMMANDS = {
-        "add"       => "Add a definition to translation memory",
-        "edit"      => "Edit the tags file for a .docx file",
-        "export"    => "Export text tags from a .docx file",
-        "import"    => "Import text tags into a .docx file",
-        "translate" => "Translate a file according to ~/.konjac/dict.yml"
-      }
+      SUB_COMMANDS = ["add", "edit", "export", "import", "language", "translate"]
       BANNER = <<-eos
+#{Color.bold { Color.underscore { "KONJAC" } }}
+
 #{Color.bold "%s"}
 
-#{Color.bold "Usage:"}
-       konjac %s [#{Color.underscore "options"}] <filenames>+%s
-where [#{Color.underscore "options"}] are:
+#{Color.bold I18n.t :usage}
+       konjac %s [#{Color.underscore I18n.t :options}] <#{I18n.t :filenames}>+%s
+#{I18n.t(:where_options) % Color.underscore(I18n.t(:options))}
 eos
 
       def start
+        ARGV << "-h" if ARGV.empty?
         global_opts = Trollop::options do
-          version "konjac #{Konjac::VERSION} (c) 2012 Bryan McKelvey"
+          version "konjac #{Konjac::VERSION} (c) 2012 " + I18n.t(:me)
           banner BANNER % [
-            "konjac is a Ruby command-line utility for translating files " +
-              "using a YAML wordlist",
-            "[#{Color.underscore "subcommand"}]",
-            "\n\nwhere [#{Color.underscore "subcommand"}] is any one of:\n%s\n" %
-              Konjac::CLI.describe_subcommands
+            I18n.t(:banner),
+            "[#{Color.underscore I18n.t :subcommand}]",
+            "\n\n" + (I18n.t(:where_subcommand) % Color.underscore(I18n.t(:subcommand))) + ("\n%s\n" %
+              Konjac::CLI.describe_subcommands)
           ]
-          opt :dry_run, "Don't actually do anything", :short => "n"
-          opt :quiet, "Suppress error messages"
-          stop_on SUB_COMMANDS.keys
+          opt :dry_run, I18n.t(:dry_run, :scope => :opts), :short => "n"
+          opt :quiet, I18n.t(:quiet, :scope => :opts)
+          opt :version, I18n.t(:version, :scope => :opts)
+          opt :help, I18n.t(:help, :scope => :opts)
+          stop_on SUB_COMMANDS
         end
 
         # Get subcommand
         cmd = ARGV.shift
-        sc_banner = BANNER % [SUB_COMMANDS[cmd], cmd, ""]
+        sc_banner = BANNER % [I18n.t(cmd, :scope => :subcommands), cmd, "\n"]
         cmd_opts = case cmd
           when "add"
             opts = Trollop::options do
               banner sc_banner
-              opt :original, "The original word or phrase", :type => :string
-              opt :translation, "The translated word or phrase", :type => :string, :short => :r
-              opt :from, "The language from which to translate", :type => :string
-              opt :to, "The language into which to translate", :type => :string
-              opt :using, "The names of dictionaries to use", :type => :string,
+              opt :original, I18n.t(:original, :scope => :opts), :type => :string
+              opt :translation, I18n.t(:translation, :scope => :opts), :type => :string, :short => :r
+              opt :from, I18n.t(:from, :scope => :opts), :type => :string
+              opt :to, I18n.t(:to, :scope => :opts), :type => :string
+              opt :using, I18n.t(:using, :scope => :opts), :type => :string,
                 :default => "dict", :multi => true
+              opt :help, I18n.t(:help, :scope => :opts)
             end
             Dictionary.add_word opts
           when "edit"
             Trollop::options do
               banner sc_banner
-              opt :editor, "A command indicating which editor to use (e.g. vi %s)"
+              opt :editor, I18n.t(:editor, :scope => :opts), :type => :string
+              opt :help, I18n.t(:help, :scope => :opts)
             end
             Word.edit_docx_tags ARGV, opts
           when "export"
             opts = Trollop::options do
               banner sc_banner
-              opt :from, "The language from which to translate", :type => :string
-              opt :to, "The language into which to translate", :type => :string
-              opt :using, "The names of dictionaries to use", :type => :string,
+              opt :from, I18n.t(:from, :scope => :opts), :type => :string
+              opt :to, I18n.t(:to, :scope => :opts), :type => :string
+              opt :using, I18n.t(:using, :scope => :opts), :type => :string,
                 :default => "dict", :multi => true
+              opt :help, I18n.t(:help, :scope => :opts)
             end
             Word.export_docx_tags ARGV, opts
           when "import"
             Trollop::options do
               banner sc_banner
+              opt :help, I18n.t(:help, :scope => :opts)
             end
             Word.import_docx_tags ARGV
+          when "language"
+            Trollop::options do
+              banner sc_banner
+              opt :help, I18n.t(:help, :scope => :opts)
+            end
+            Config.language = ARGV[0]
+            Config.save
           when "translate"
             opts = Trollop::options do
               banner sc_banner
-              opt :from, "The language from which to translate", :type => :string
-              opt :to, "The language into which to translate", :type => :string
-              opt :using, "The names of dictionaries to use", :type => :string,
+              opt :from, I18n.t(:from, :scope => :opts), :type => :string
+              opt :to, I18n.t(:to, :scope => :opts), :type => :string
+              opt :using, I18n.t(:using, :scope => :opts), :type => :string,
                 :default => "dict", :multi => true
-              opt :use_cache, "Use cached dictionary", :default => false
-              opt :word, "Translate a word or phrase", :default => false
+              opt :use_cache, I18n.t(:use_cache, :scope => :opts), :default => false
+              opt :word, I18n.t(:word, :scope => :opts), :default => false
+              opt :help, I18n.t(:help, :scope => :opts)
             end
             result = translate(ARGV, opts)
             puts result if opts[:word]
           else
-            Trollop::die "unknown subcommand #{cmd.inspect}"
+            if global_opts[:quiet]
+              raise SystemExit
+            else
+              Trollop::die I18n.t(:unknown_subcommand) % cmd.inspect
+            end
         end
       end
 
       # Describe the subcommands available to the command line interface
       def describe_subcommands
         text = []
-        leftcol_width = SUB_COMMANDS.keys.map(&:length).max
-        SUB_COMMANDS.each do |sc, desc|
-          text << "  %#{leftcol_width}s:   %s" % [sc, desc]
+        leftcol_width = SUB_COMMANDS.map(&:length).max
+        SUB_COMMANDS.each do |sc|
+          text << "  %#{leftcol_width}s:   %s" % [sc, I18n.t(sc, :scope => :subcommands)]
         end
         text.join "\n"
       end

data/lib/konjac/config.rb

@@ -0,0 +1,48 @@
+require "yaml"
+
+module Konjac
+  module Config
+    class << self
+      CONFIG_PATH = File.expand_path("~/.konjac/config.yml")
+
+      def load
+        Utils.verify_file CONFIG_PATH, "--- {}"
+        config = YAML.load_file(CONFIG_PATH)
+        config = {} unless config.is_a?(Hash)
+        @opts = {
+          :language => :en
+        }.merge config
+
+        set_language
+        save
+      end
+
+      def language
+        @opts[:language]
+      end
+
+      def language=(lang)
+        @opts[:language] = Language.find(lang).to_sym || @opts[:language]
+        save
+      end
+
+      def save
+        File.open(CONFIG_PATH, "w") do |file|
+          YAML.dump @opts, file
+        end
+      end
+
+      private
+
+      def set_language
+        I18n.load_path = Dir[File.join(File.dirname(__FILE__), "..", "..", "locales", "*.yml")]
+        I18n.default_locale = :en
+        if I18n.available_locales.include?(@opts[:language])
+          I18n.locale = @opts[:language]
+        else
+          I18n.locale = I18n.default_locale
+        end
+      end
+    end
+  end
+end

data/lib/konjac/utils.rb

@@ -36,6 +36,16 @@ module Konjac
         end
         parsed_files.uniq
       end
+
+      # Verifies that a file exists, writing initial content to it if not
+      def verify_file(path, initial_content = "")
+        unless File.exists?(path)
+          FileUtils.mkdir_p File.dirname(path)
+          File.open(path, "w") do |file|
+            file.puts initial_content
+          end
+        end
+      end
     end
   end
 end

data/lib/konjac/version.rb

@@ -1,3 +1,3 @@
 module Konjac
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/konjac.rb

@@ -1,11 +1,13 @@
 require "konjac/version"
 require "konjac/exception"
 autoload :FileUtils, "fileutils"
+autoload :I18n,      "i18n"
 autoload :Nokogiri,  "nokogiri"
 
 module Konjac
   # Set up autoload for all modules
   autoload :CLI,        "konjac/cli"
+  autoload :Config,     "konjac/config"
   autoload :Dictionary, "konjac/dictionary"
   autoload :Language,   "konjac/language"
   autoload :Tag,        "konjac/tag"
@@ -13,4 +15,6 @@ module Konjac
   autoload :Translator, "konjac/translator"
   autoload :Utils,      "konjac/utils"
   autoload :Word,       "konjac/word"
+
+  Config.load
 end

data/locales/en.yml

@@ -0,0 +1,30 @@
+en:
+  banner: konjac is a Ruby command-line utility for translating files using a YAML wordlist
+  filenames: filenames
+  me: Bryan McKelvey
+  options: options
+  subcommand: subcommand
+  unknown_subcommand: "Unknown subcommand: %s"
+  usage: "Usage:"
+  where_options: "where [%s] are:"
+  where_subcommand: "where [%s] is any one of:"
+  opts:
+    dry_run: Don't actually do anything
+    editor: A command to run to pass the file to an editor (e.g. vi %s)
+    from: The language from which to translate
+    help: Show this message
+    original: The untranslated original text
+    quiet: Suppress error messages
+    to: The language into which to translate
+    translation: The translated text
+    using: The names of dictionaries to use
+    use_cache: Use cached dictionary
+    version: Print version and exit
+    word: Translate a word or phrase
+  subcommands:
+    add: Add a definition to translation memory
+    edit: Edit the tags file for a .docx file
+    export: Export text tags from a .docx file
+    import: Import text tags into a .docx file
+    language: Sets the default language
+    translate: Translate a file, word or phrase

data/locales/ja.yml

@@ -0,0 +1,30 @@
+ja:
+  banner: konjacはYAML辞書でファイルを翻訳するRubyのコマンドライン・ユーティリティです。
+  filenames: ファイル名
+  me: ブライアン・マッケルビー
+  options: オプション
+  subcommand: サブコマンド
+  unknown_subcommand: 不明なサブコマンド：%s
+  usage: 使い方：
+  where_options: "使用できる[%s]は"
+  where_subcommand: "使用できる[%s]は"
+  opts:
+    dry_run: 何もしない
+    editor: 結果ファイルをエディターで開くコマンド（例：vi %s）
+    from: 原文の言語
+    help: このメッセージを表示する
+    original: 翻訳されなかった元の言語の言葉
+    quiet: エラーメッセージを抑止する
+    to: 訳文の言語
+    translation: 翻訳された言葉
+    using: 使用したい辞書の名前
+    use_cache: キャッシュした辞書を使用する
+    version: バーションを表示し終了する
+    word: 文字列を翻訳する
+  subcommands:
+    add: 翻訳メモリに定義を追加する
+    edit: .docxファイルに当たるタグファイルを編集する
+    export: .docxファイルからタグを抽出する
+    import: .docxファイルにタグをインポートする
+    language: 言語を設定する
+    translate: ファイル・文字列を翻訳する

data/spec/cli_spec.rb

@@ -11,7 +11,7 @@ describe CLI do
   end
 
   it "should fail on an invalid subcommand" do
-    set_argv "invalid"
+    set_argv "invalid", "--quiet"
     lambda { CLI.start }.should raise_error SystemExit
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,9 +11,20 @@ bindir: bin
 cert_chain: []
 date: 2012-01-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70296439418000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70296439418000
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70097243365180 !ruby/object:Gem::Requirement
+  requirement: &70296439417580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097243365180
+  version_requirements: *70296439417580
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70097243364620 !ruby/object:Gem::Requirement
+  requirement: &70296439417160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097243364620
+  version_requirements: *70296439417160
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70097243364100 !ruby/object:Gem::Requirement
+  requirement: &70296439416740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097243364100
+  version_requirements: *70296439416740
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70097243363420 !ruby/object:Gem::Requirement
+  requirement: &70296439442300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097243363420
+  version_requirements: *70296439442300
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70097243362760 !ruby/object:Gem::Requirement
+  requirement: &70296439441680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097243362760
+  version_requirements: *70296439441680
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70097243362340 !ruby/object:Gem::Requirement
+  requirement: &70296439441000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097243362340
+  version_requirements: *70296439441000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70097243361900 !ruby/object:Gem::Requirement
+  requirement: &70296439440460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097243361900
+  version_requirements: *70296439440460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70097243361280 !ruby/object:Gem::Requirement
+  requirement: &70296439439480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097243361280
+  version_requirements: *70296439439480
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70097243382540 !ruby/object:Gem::Requirement
+  requirement: &70296439437560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097243382540
+  version_requirements: *70296439437560
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com
@@ -129,6 +140,7 @@ files:
 - konjac.gemspec
 - lib/konjac.rb
 - lib/konjac/cli.rb
+- lib/konjac/config.rb
 - lib/konjac/dictionary.rb
 - lib/konjac/exception.rb
 - lib/konjac/language.rb
@@ -138,6 +150,8 @@ files:
 - lib/konjac/utils.rb
 - lib/konjac/version.rb
 - lib/konjac/word.rb
+- locales/en.yml
+- locales/ja.yml
 - spec/cli_spec.rb
 - spec/dictionary_spec.rb
 - spec/language_spec.rb