konjac 0.2.6.3 → 0.2.6.4

data/lib/konjac/cli.rb

@@ -12,8 +12,8 @@ module Konjac
 
     class << self
       # A list of valid subcommands
-      SUB_COMMANDS = ["add", "edit", "export", "import", "language", "suggest",
-        "translate"]
+      SUB_COMMANDS = ["add", "edit", "export", "import", "language", "list",
+        "suggest", "translate", "use"]
 
       # The banner to displaying when requesting help through the command line
       BANNER = <<-eos
@@ -48,7 +48,7 @@ eos
 
         # Get subcommand
         cmd = ARGV.shift
-        ARGV << "-h" if ARGV.empty?
+        ARGV << "-h" if ARGV.empty? && cmd != "list"
         sc_banner = BANNER % [I18n.t(cmd, :scope => :subcommands), cmd, "%s", "\n"]
         cmd_opts = case cmd
           when "add"
@@ -59,7 +59,7 @@ eos
               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
+                :default => Config.dictionary, :multi => true
               opt :help, I18n.t(:help, :scope => :opts)
             end
             Dictionary.add_word opts
@@ -79,25 +79,17 @@ eos
               opt :force, I18n.t(:force, :scope => :opts), :default => false,
                 :short => :y
               opt :using, I18n.t(:using, :scope => :opts), :type => :string,
-                :default => "dict", :multi => true
+                :default => Config.dictionary, :multi => true
               opt :help, I18n.t(:help, :scope => :opts)
             end
-            if ARGV == ["doc"]
-              system File.join(File.dirname(__FILE__), "..", "applescripts", "konjac_word_export")
-            else
-              Word.export_tags ARGV, opts
-            end
+            Word.export_tags ARGV, opts
           when "import"
             opts = Trollop::options do
               banner sc_banner % I18n.t(:filenames_arg)
               opt :output, I18n.t(:output, :scope => :opts), :type => :string
               opt :help, I18n.t(:help, :scope => :opts)
             end
-            if ARGV == ["doc"]
-              system File.join(File.dirname(__FILE__), "..", "applescripts", "konjac_word_import")
-            else
-              Word.import_tags ARGV, opts
-            end
+            Word.import_tags ARGV, opts
           when "language"
             Trollop::options do
               banner sc_banner % I18n.t(:word_arg)
@@ -105,13 +97,21 @@ eos
             end
             Config.language = ARGV[0]
             Config.save
+          when "list"
+            Trollop::options do
+              banner sc_banner % I18n.t(:word_arg)
+              opt :help, I18n.t(:help, :scope => :opts)
+            end
+            Config.list.each do |line|
+              puts line
+            end
           when "suggest"
             opts = Trollop::options do
               banner sc_banner % I18n.t(:word_arg)
               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
+                :default => Config.dictionary, :multi => true
               opt :use_cache, I18n.t(:use_cache, :scope => :opts),
                 :default => false, :short => :c
               opt :help, I18n.t(:help, :scope => :opts)
@@ -129,7 +129,7 @@ eos
               opt :force, I18n.t(:force, :scope => :opts), :default => false,
                 :short => :y
               opt :using, I18n.t(:using, :scope => :opts), :type => :string,
-                :default => "dict", :multi => true
+                :default => Config.dictionary, :multi => true
               opt :use_cache, I18n.t(:use_cache, :scope => :opts),
                 :default => false, :short => :c
               opt :word, I18n.t(:word, :scope => :opts), :default => false
@@ -137,6 +137,12 @@ eos
             end
             result = translate(ARGV, opts)
             puts result if opts[:word]
+          when "use"
+            Trollop::options do
+              banner sc_banner % I18n.t(:word_arg)
+              opt :help, I18n.t(:help, :scope => :opts)
+            end
+            Config.use ARGV[0]
           else
             if global_opts[:quiet]
               raise SystemExit

data/lib/konjac/config.rb

@@ -18,6 +18,38 @@ module Konjac
         save
       end
 
+      # Lists the dictionaries available in <tt>~/.konjac/*.yml</tt>
+      def list
+        lines = []
+        current_found = false
+        Dir[File.expand_path("~/.konjac/*.yml")].each do |dict|
+          name = File.basename(dict, ".*")
+          unless name == "config"
+            current_found = true
+            lines << "%s %s" % [current?(name) ? "***" : "   ", name]
+          end
+        end
+        lines << "*** %s" % dictionary unless current_found
+        lines
+      end
+
+      # The current dictionary
+      def dictionary
+        @config[:dict] || "dict"
+      end
+
+      # Determines whether the specified name of a dictionary is the one
+      # currently set as the default
+      def current?(dict)
+        dict == dictionary
+      end
+
+      # Specifies the name of the dictionary to use
+      def use(dict)
+        @config[:dict] = dict.to_s unless dict.to_s == "config"
+        save
+      end
+
       # The current interface language
       def language
         I18n.locale

data/lib/konjac/utils.rb

@@ -45,6 +45,7 @@ module Konjac
       def parse_files(files, opts = {})
         opts = { :extension => nil, :directory => nil }.merge opts
         files = [files] unless files.is_a?(Array)
+        search_text = files.join(" ")
         parsed_files = []
         while !files.empty?
           file = files.shift
@@ -56,6 +57,7 @@ module Konjac
           end
           parsed_files += Dir.glob(File.expand_path(file))
         end
+        puts I18n.t(:no_match) % search_text if parsed_files.empty?
         parsed_files.uniq
       end
 

data/lib/konjac/version.rb

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

data/lib/konjac/word.rb

@@ -7,6 +7,7 @@ module Konjac
       # Word}[http://office.microsoft.com/en-us/word/] 2003+ document
       def import_tags(files, opts = {})
         sub_files = Utils.parse_files(files)
+        return if sub_files.empty?
         sub_files.each do |sub_file|
           case File.extname(sub_file)
           when ".doc"
@@ -68,6 +69,7 @@ module Konjac
         end
 
         sub_files = Utils.parse_files(files)
+        return if sub_files.empty?
         sub_files.each do |sub_file|
           case File.extname(sub_file)
           when ".doc"

data/lib/locales/en.yml

@@ -3,6 +3,7 @@ en:
   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]) "
   subcommand: subcommand
@@ -29,9 +30,11 @@ en:
     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
+    edit: Edit the tags file for a .doc or .docx file
+    export: Export text tags from a .doc or .docx file
+    import: Import text tags into a .doc or .docx file
     language: Sets the default language
+    list: List available dictionaries
     suggest: Suggest similar words using fuzzy matching
     translate: Translate a file, word or phrase
+    use: Choose a default dictionary

data/lib/locales/ja.yml

@@ -3,6 +3,7 @@ ja:
   filenames_arg: <ファイル名>+
   filenames_or_word_arg: <ファイル名>+ または <テキスト>
   me: ブライアン・マッケルビー
+  no_match: "「%s」をマッチするファイルは存在しません。"
   options: オプション
   overwrite: "%sを上書きしますか。 (y/n [n]) "
   subcommand: サブコマンド
@@ -29,9 +30,11 @@ ja:
     word: 文字列を翻訳する
   subcommands:
     add: 翻訳メモリに定義を追加する
-    edit: .docxファイルに当たるタグファイルを編集する
-    export: .docxファイルからタグを抽出する
-    import: .docxファイルにタグをインポートする
+    edit: .docまたは.docxファイルに当たるタグファイルを編集する
+    export: .docまたは.docxファイルからタグを抽出する
+    import: .docまたは.docxファイルにタグをインポートする
     language: 言語を設定する
-    suggest: Suggest similar words
+    list: List available dictionaries
+    suggest: ファジーマッチングで似た言葉をサジェストする
     translate: ファイル・文字列を翻訳する
+    use: Choose a default dictionary

data/spec/config_spec.rb

@@ -10,32 +10,44 @@ describe Konjac::Config do
     @env_language = ENV["LANG"]
   end
 
+  # Restore the original configuration file
   after :all do
     FileUtils.mv @backup_path, @config_path if File.exists?(@backup_path)
     ENV["LANG"] = @env_language || ""
   end
 
-  before :each do
-    File.open(@config_path, "w") do |file|
-      file.puts "--- {}"
+  describe "when the configuration file is blank" do
+    # Create a new configuration file before each test
+    before :each do
+      File.open(@config_path, "w") do |file|
+        file.puts "--- {}"
+      end
     end
-  end
 
-  it "should default to English when no system language is found" do
-    ENV["LANG"] = ""
-    Konjac::Config.load
-    Konjac::Config.language.should == :en
-  end
+    it "should default to English when no system language is found" do
+      ENV["LANG"] = ""
+      Konjac::Config.load
+      Konjac::Config.language.should == :en
+    end
 
-  it "should default to English when specified" do
-    ENV["LANG"] = "en"
-    Konjac::Config.load
-    Konjac::Config.language.should == :en
-  end
+    it "should default to English when specified" do
+      ENV["LANG"] = "en"
+      Konjac::Config.load
+      Konjac::Config.language.should == :en
+    end
 
-  it "should default to a foreign language when specified" do
-    ENV["LANG"] = "ja"
-    Konjac::Config.load
-    Konjac::Config.language.should == :ja
+    it "should default to a foreign language when specified" do
+      ENV["LANG"] = "ja"
+      Konjac::Config.load
+      Konjac::Config.language.should == :ja
+    end
+
+    it "should default to dict as the default dictionary" do
+      Konjac::Config.dictionary.should == "dict"
+    end
+
+    it "should list the available dictionaries, including dict as default" do
+      Konjac::Config.list.should include "*** dict"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.2.6.3
+  version: 0.2.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amatch
-  requirement: &70209462561300 !ruby/object:Gem::Requirement
+  requirement: &70357977450520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209462561300
+  version_requirements: *70357977450520
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70209462560880 !ruby/object:Gem::Requirement
+  requirement: &70357977450100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209462560880
+  version_requirements: *70357977450100
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70209462560440 !ruby/object:Gem::Requirement
+  requirement: &70357977449680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209462560440
+  version_requirements: *70357977449680
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70209462560000 !ruby/object:Gem::Requirement
+  requirement: &70357977449240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209462560000
+  version_requirements: *70357977449240
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70209462559580 !ruby/object:Gem::Requirement
+  requirement: &70357977448760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209462559580
+  version_requirements: *70357977448760
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70209462580140 !ruby/object:Gem::Requirement
+  requirement: &70357977448180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209462580140
+  version_requirements: *70357977448180
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70209462579580 !ruby/object:Gem::Requirement
+  requirement: &70357977447620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209462579580
+  version_requirements: *70357977447620
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70209462578660 !ruby/object:Gem::Requirement
+  requirement: &70357977463360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209462578660
+  version_requirements: *70357977463360
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70209462577640 !ruby/object:Gem::Requirement
+  requirement: &70357977462680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209462577640
+  version_requirements: *70357977462680
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70209462577220 !ruby/object:Gem::Requirement
+  requirement: &70357977462080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209462577220
+  version_requirements: *70357977462080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70209462576800 !ruby/object:Gem::Requirement
+  requirement: &70357977461460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209462576800
+  version_requirements: *70357977461460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70209462576200 !ruby/object:Gem::Requirement
+  requirement: &70357977460780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209462576200
+  version_requirements: *70357977460780
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com