logaling-command 0.1.3 → 0.1.4

data/CHANGES

@@ -1,3 +1,13 @@
+= 0.1.4 / 2012-03-29
+
+* インデックス時にオフラインインデックスを利用することで速度が改善されました。（groonga >= 2.0.0）
+
+* --logaling-home に存在しない path を渡すと例外があがってしまう不具合を修正しました。
+
+* windows で import 実行時に CSV読み込みエラーが起こる不具合を修正しました。
+
+* windows でインストール直後に コマンドを実行してもエラーが起こる不具合を修正しました。
+
 = 0.1.3 / 2012-02-29
 
 * Mozilla Japan プロジェクトの対訳用語集をインポートできるようにしました。(kdmsnr さん)

data/lib/logaling/command/application.rb

@@ -17,6 +17,7 @@
 
 require 'thor'
 require 'rainbow'
+require 'pathname'
 require "logaling/repository"
 require "logaling/glossary"
 require "logaling/config"
@@ -92,6 +93,8 @@ module Logaling::Command
         @repository.import(Logaling::ExternalGlossary.get(external_glossary))
         @repository.index
       end
+    rescue Logaling::CommandFailed => e
+      say e.message
     rescue Logaling::ExternalGlossaryNotFound
       say "'#{external_glossary}' can't find in import list."
       say "Try 'loga import --list' and confirm import list."
@@ -124,17 +127,25 @@ module Logaling::Command
       say "#{@config.glossary} is not yet registered."
     end
 
-    desc 'config [KEY] [VALUE] [--global(optional)]', 'Set config.'
-    method_option "global", type: :boolean, default: false
-    def config(key, value)
-      config_path = options["global"] ? File.join(@logaling_home, "config") : @project_config_path
-      config = Logaling::Config.load(config_path)
-      config.add(key, value)
-      config.save(config_path)
-      say "Successfully set config."
-    rescue Logaling::CommandFailed => e
-      say e.message
-    end
+   desc 'config [KEY] [VALUE] [--global(optional)]', 'Set config.'
+   method_option "global", type: :boolean, default: false
+   def config(key, value)
+     if options["global"]
+       unless File.exist?(@logaling_home)
+         FileUtils.mkdir_p(@logaling_home) rescue raise Logaling::CommandFailed, "Imput existing directory as logaling-home."
+       end
+       config_path = File.join(@logaling_home, "config")
+     else
+       raise Logaling::CommandFailed, "Can't found .logaling" unless @project_config_path
+       config_path = @project_config_path
+     end
+     config = Logaling::Config.load(config_path)
+     config.add(key, value)
+     config.save(config_path)
+     say "Successfully set config."
+   rescue Logaling::CommandFailed => e
+     say e.message
+   end
 
     desc 'add [SOURCE TERM] [TARGET TERM] [NOTE(optional)]', 'Add term to glossary.'
     def add(source_term, target_term, note='')
@@ -144,6 +155,7 @@ module Logaling::Command
         "target-language" => "input target-language code '-T <target-language code>'"
       }
       @config.check_required_option(required_options)
+      check_logaling_home_exists
       @repository.index
 
       if @repository.bilingual_pair_exists?(source_term, target_term, @config.glossary)
@@ -153,6 +165,8 @@ module Logaling::Command
       glossary.add(source_term, target_term, note)
     rescue Logaling::CommandFailed, Logaling::TermError => e
       say e.message
+    rescue Logaling::GlossaryNotFound => e
+      say "Try 'loga new or register' first."
     end
 
     desc 'delete [SOURCE TERM] [TARGET TERM(optional)] [--force(optional)]', 'Delete term.'
@@ -164,6 +178,7 @@ module Logaling::Command
         "target-language" => "input target-language code '-T <target-language code>'"
       }
       @config.check_required_option(required_options)
+      check_logaling_home_exists
 
       if target_term
         glossary.delete(source_term, target_term)
@@ -184,6 +199,7 @@ module Logaling::Command
         "target-language" => "input target-language code '-T <target-language code>'"
       }
       @config.check_required_option(required_options)
+      check_logaling_home_exists
       @repository.index
 
       if @repository.bilingual_pair_exists_and_has_same_note?(source_term, new_target_term, note, @config.glossary)
@@ -203,6 +219,7 @@ module Logaling::Command
     method_option "no-color", type: :boolean, default: false
     method_option "dictionary", type: :boolean, default: false, aliases: "--dict"
     def lookup(source_term)
+      check_logaling_home_exists
       @repository.index
       terms = @repository.lookup(source_term, glossary, options["dictionary"])
       unless terms.empty?
@@ -243,6 +260,7 @@ module Logaling::Command
         "target-language" => "input target-language code '-T <target-language code>'"
       }
       @config.check_required_option(required_options)
+      check_logaling_home_exists
       @repository.index
       terms = @repository.show_glossary(glossary)
       unless terms.empty?
@@ -264,6 +282,7 @@ module Logaling::Command
     desc 'list', 'Show glossary list.'
     method_option "no-pager", type: :boolean, default: false
     def list
+      check_logaling_home_exists
       @repository.index
       glossaries = @repository.list
       unless glossaries.empty?
@@ -280,6 +299,10 @@ module Logaling::Command
     end
 
     private
+    def windows?
+      RUBY_PLATFORM =~ /win32|mingw32/i
+    end
+
     def glossary
       @glossary ||= Logaling::Glossary.new(@config.glossary, @config.source_language, @config.target_language, @logaling_home)
     end
@@ -292,12 +315,12 @@ module Logaling::Command
     def find_dotfile
       dir = Dir.pwd
       searched_path = []
-      while(dir) do
+      loop do
         path = File.join(dir, '.logaling')
         if File.exist?(path)
           return path
         else
-          if dir != "/"
+          unless Pathname.new(dir).root?
             searched_path << dir
             dir = File.dirname(dir)
           else
@@ -318,7 +341,7 @@ module Logaling::Command
     # http://nex-3.com/posts/73-git-style-automatic-paging-in-ruby
     def run_pager
       return if options["no-pager"]
-      return if ::RUBY_PLATFORM =~ /win32/
+      return if windows?
       return unless STDOUT.tty?
 
       read, write = IO.pipe
@@ -353,6 +376,12 @@ module Logaling::Command
       display_string
     end
 
+    def check_logaling_home_exists
+      unless File.exist?(@logaling_home)
+        raise Logaling::CommandFailed, "Imput existing directory as logaling-home."
+      end
+    end
+
     def printer(source_string, target_string, note=nil,
                 glossary_name, max_str_size, i, last)
       case options["output"]

data/lib/logaling/command/version.rb

@@ -17,6 +17,6 @@
 
 module Logaling
   module Command
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/lib/logaling/glossary.rb

@@ -53,7 +53,7 @@ module Logaling
 
       def load_glossary_csv(path, sep=",")
         glossary = []
-        CSV.open(path, "r",  {:col_sep => sep}) do |csv|
+        CSV.open(path, "r:utf-8",  {:col_sep => sep}) do |csv|
           csv.each do |row|
             glossary << {"source_term" => row[0], "target_term" => row[1], "note" => ""} if row.size >= 2
           end
@@ -76,6 +76,8 @@ module Logaling
       glossary = Glossary.load_glossary(source_path)
       glossary << build_term(source_term, target_term, note)
       dump_glossary(glossary)
+    rescue
+      raise GlossaryNotFound
     end
 
     def update(source_term, target_term, new_target_term, note)

data/lib/logaling/glossary_db.rb

@@ -69,6 +69,8 @@ module Logaling
     end
 
     def index_glossary(glossary, glossary_name, glossary_source, source_language, target_language, indexed_at)
+      delete_terms if offline_index?
+
       deindex_glossary(glossary_name, glossary_source)
 
       add_glossary_source(glossary_source, indexed_at)
@@ -79,6 +81,8 @@ module Logaling
         note = term['note']
         add_translation(glossary_name, glossary_source, source_language, target_language, source_term, target_term, note)
       end
+
+      create_terms if offline_index?
     end
 
     def lookup(source_term, glossary_source=nil)
@@ -267,6 +271,27 @@ module Logaling
       records.expression.close
     end
 
+    def delete_terms
+      if Groonga['terms']
+        Groonga::Schema.define do |schema|
+          schema.remove_table("terms")
+        end
+      end
+    end
+
+    def create_terms
+      Groonga::Schema.define do |schema|
+        schema.create_table("terms",
+                            :type => :patricia_trie,
+                            :key_type => "ShortText",
+                            :key_normalize => true,
+                            :default_tokenizer => "TokenBigram") do |table|
+          table.index("translations.source_term")
+          table.index("translations.target_term")
+        end
+      end
+    end
+
     def add_translation(glossary_name, glossary_source, source_language, target_language, source_term, target_term, note)
       Groonga["translations"].add(:glossary => glossary_name,
                                   :glossary_source => glossary_source,
@@ -314,16 +339,8 @@ module Logaling
           table.text("target_term")
           table.text("note")
         end
-
-        schema.create_table("terms",
-                            :type => :patricia_trie,
-                            :key_type => "ShortText",
-                            :key_normalize => true,
-                            :default_tokenizer => "TokenBigram") do |table|
-          table.index("translations.source_term")
-          table.index("translations.target_term")
-        end
       end
+      create_terms
     end
 
     def remove_schema
@@ -396,5 +413,10 @@ module Logaling
     def add_config(conf_key, conf_value)
       Groonga["configurations"].add(:conf_key => conf_key, :conf_value => conf_value)
     end
+
+    def offline_index?
+      # use online index if LOGALING_OFFLINE_INDEX=no
+      ENV["LOGALING_OFFLINE_INDEX"] != "no"
+    end
   end
 end

data/lib/logaling/repository.rb

@@ -32,6 +32,8 @@ module Logaling
       else
         raise GlossaryAlreadyRegistered, register_name
       end
+    rescue
+      raise Logaling::CommandFailed, "Failed register #{register_name} to #{logaling_projects_path}."
     end
 
     def unregister(register_name)
@@ -48,6 +50,8 @@ module Logaling
       Dir.chdir(cache_path) do
         glossary.import
       end
+    rescue
+      raise Logaling::CommandFailed, "Failed import #{glossary.class.name} to #{cache_path}."
     end
 
     def lookup(source_term, glossary_source, dictionary=false)

data/spec/logaling/command_spec.rb

@@ -28,7 +28,7 @@ describe Logaling::Command::Application do
   let(:repository) { Logaling::Repository.new(logaling_home) }
 
   before do
-    FileUtils.remove_entry_secure(File.join(logaling_home, 'projects', 'spec'), true)
+    FileUtils.rm_rf(File.join(logaling_home, 'projects', 'spec'))
   end
 
   describe '#new' do
@@ -89,7 +89,7 @@ describe Logaling::Command::Application do
 
     context "when can not find .logaling" do
       before(:all) do
-        FileUtils.remove_entry_secure(logaling_config, true)
+        FileUtils.rm_rf(logaling_config)
         @stdout = capture(:stdout) {command.register}
       end
 
@@ -122,7 +122,7 @@ describe Logaling::Command::Application do
 
     context "when can not find .logaling" do
       before do
-        #FileUtils.remove_entry_secure(logaling_config, true)
+        #FileUtils.rm_rf(logaling_config)
       end
 
       context "and call without option" do
@@ -217,7 +217,40 @@ describe Logaling::Command::Application do
       end
 
       after do
-        FileUtils.remove_entry_secure(global_config, true)
+        FileUtils.rm_rf(global_config)
+      end
+    end
+
+    context 'when logaling_home not exists' do
+      context 'with argument "target-language"' do
+        before do
+          command.new('spec', 'en')
+          FileUtils.rm_rf(@logaling_home)
+          command.config("target-language", "fr")
+        end
+
+        it 'should overwrite target-language' do
+          should include "--target-language fr"
+        end
+      end
+
+      context 'with argument "--global" and "target-language"' do
+        before do
+          command.options = base_options.merge("global" => true)
+          command.new('spec', 'en')
+          FileUtils.rm_rf(@logaling_home)
+          command.config("target-language", "ja")
+        end
+
+        subject { File.read(global_config) }
+
+        it 'should create {logaling_home}/config and write target-language' do
+          should include "--target-language ja"
+        end
+
+        after do
+          FileUtils.rm_rf(global_config)
+        end
       end
     end
   end
@@ -281,7 +314,7 @@ describe Logaling::Command::Application do
       end
 
       after do
-        FileUtils.remove_entry_secure(global_config, true)
+        FileUtils.rm_rf(global_config)
       end
     end
   end
@@ -393,8 +426,8 @@ describe Logaling::Command::Application do
 
         context "and called with '--force=true'" do
           before do
-            FileUtils.remove_entry_secure(logaling_config, true)
-            FileUtils.remove_entry_secure(File.join(logaling_home, 'projects', 'spec'), true)
+            FileUtils.rm_rf(logaling_config)
+            FileUtils.rm_rf(File.join(logaling_home, 'projects', 'spec'))
             command.options = base_options.merge("force" => true)
             command.new('spec', 'en', 'ja')
             command.add('term', '用語1', '備考')
@@ -437,7 +470,7 @@ describe Logaling::Command::Application do
     end
 
     after do
-      FileUtils.remove_entry_secure(csv_path, true)
+      FileUtils.rm_rf(csv_path)
     end
   end
 
@@ -472,7 +505,7 @@ describe Logaling::Command::Application do
   end
 
   after do
-    FileUtils.remove_entry_secure(logaling_config, true)
-    FileUtils.remove_entry_secure(File.join(logaling_home, 'projects', 'spec'), true)
+    FileUtils.rm_rf(logaling_config)
+    FileUtils.rm_rf(File.join(logaling_home, 'projects', 'spec'))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logaling-command
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000Z
+date: 2012-03-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2154467460 !ruby/object:Gem::Requirement
+  requirement: &2154363820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2154467460
+  version_requirements: *2154363820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154466980 !ruby/object:Gem::Requirement
+  requirement: &2154363340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,10 +36,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154466980
+  version_requirements: *2154363340
 - !ruby/object:Gem::Dependency
   name: rroonga
-  requirement: &2154466500 !ruby/object:Gem::Requirement
+  requirement: &2154362860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -47,10 +47,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154466500
+  version_requirements: *2154362860
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &2154466120 !ruby/object:Gem::Requirement
+  requirement: &2154362480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -58,10 +58,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154466120
+  version_requirements: *2154362480
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2154465660 !ruby/object:Gem::Requirement
+  requirement: &2154362020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,10 +69,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154465660
+  version_requirements: *2154362020
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154465240 !ruby/object:Gem::Requirement
+  requirement: &2154361600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -80,10 +80,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154465240
+  version_requirements: *2154361600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156056340 !ruby/object:Gem::Requirement
+  requirement: &2154361180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -91,10 +91,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156056340
+  version_requirements: *2154361180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156055920 !ruby/object:Gem::Requirement
+  requirement: &2154360760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -102,7 +102,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156055920
+  version_requirements: *2154360760
 description: A command line interface for logaling.
 email:
 - koji.shimada@enishi-tech.com