logaling-command 0.1.7 → 0.1.8

data/.travis.yml

@@ -5,11 +5,5 @@ notifications:
 language: ruby
 rvm:
   - 1.9.3
-install:
-  - echo "deb http://packages.groonga.org/ubuntu/ $(lsb_release --short --codename) universe" | sudo tee /etc/apt/sources.list.d/groonga.list
-  - sudo apt-get update
-  - sudo apt-get -y --allow-unauthenticated install groonga-keyring
-  - sudo apt-get -y purge zeromq
-  - sudo apt-get update
-  - sudo apt-get -y install groonga libgroonga-dev
-  - bundle install
+before_install:
+  - curl https://raw.github.com/groonga/groonga/master/data/travis/setup.sh | sh

data/CHANGES

@@ -1,3 +1,11 @@
+= 0.1.8 / 2012-08-30
+
+* 個人用途で logaling-command を使いたい時のために用語集を単体で作れるようにしました。
+
+* 既存の用語集を元にして用語集を作成できる loga copy を用意しました。
+
+* 訳語が定まっていない不完全な用語を loga show --annotation で確認できるようにしました。
+
 = 0.1.7 / 2012-07-30
 
 * Travis CI に対応しました。

data/lib/logaling/command/application.rb

@@ -54,7 +54,8 @@ module Logaling::Command
         '-U' => :unregister,
         '-L' => :list,
         '-s' => :show,
-        '-v' => :version
+        '-v' => :version,
+        '-c' => :copy
 
     class_option "glossary",        type: :string, aliases: "-g"
     class_option "source-language", type: :string, aliases: "-S"
@@ -64,24 +65,35 @@ module Logaling::Command
 
     desc 'new [PROJECT NAME] [SOURCE LANGUAGE] [TARGET LANGUAGE(optional)]', 'Create .logaling'
     method_option "no-register", type: :boolean, default: false
+    method_option "personal", type: :boolean, default: false
     def new(project_name, source_language, target_language=nil)
-      unless File.exist?(logaling_config_path)
-        FileUtils.mkdir_p(File.join(logaling_config_path, "glossary"))
-
-        config = Logaling::Config.new("glossary" => project_name, "source-language" => source_language)
-        config.merge!("target-language" => target_language) if target_language
-        config.save(File.join(logaling_config_path, "config"))
-
-        unless options["no-register"]
-          @dotfile_path = options["logaling-config"] ? options["logaling-config"] : Logaling::Project.find_dotfile
-          @project_config_path = File.join(@dotfile_path, 'config')
-          @config.load(@project_config_path)
-          register_and_index
+      unless options['personal']
+        unless File.exist?(logaling_config_path)
+          FileUtils.mkdir_p(File.join(logaling_config_path, "glossary"))
+
+          config = Logaling::Config.new("glossary" => project_name, "source-language" => source_language)
+          config.merge!("target-language" => target_language) if target_language
+          config.save(File.join(logaling_config_path, "config"))
+
+          unless options["no-register"]
+            @dotfile_path = options["logaling-config"] || Logaling::Project.find_dotfile
+            @project_config_path = File.join(@dotfile_path, 'config')
+            @config.load(@project_config_path)
+            register_and_index
+          end
+          say "Successfully created #{logaling_config_path}"
+        else
+          say "#{logaling_config_path} already exists."
         end
-        say "Successfully created #{logaling_config_path}"
       else
-        say "#{logaling_config_path} already exists."
+        raise Logaling::CommandFailed, "[TARGET-LANGUAGE] is required when you use '--personal'" unless target_language
+        personal_project = @repository.create_personal_project(project_name, source_language, target_language)
+        say "Successfully created #{personal_project.path}"
       end
+    rescue Logaling::CommandFailed => e
+      say e.message
+    rescue Logaling::GlossaryAlreadyRegistered => e
+      say e.message
     end
 
     desc 'import', 'Import external glossary'
@@ -176,6 +188,7 @@ module Logaling::Command
       check_logaling_home_exists
       project = @repository.find_project(@config.glossary)
       raise Logaling::ProjectNotFound unless project
+      raise Logaling::ProjectNotFound if project.class.name == 'Logaling::ImportedProject'
       glossary = project.glossary(@config.source_language, @config.target_language)
       if glossary.bilingual_pair_exists?(source_term, target_term)
         raise Logaling::TermError, "term '#{source_term}: #{target_term}' already exists in '#{@config.glossary}'"
@@ -296,6 +309,7 @@ module Logaling::Command
 
     desc 'show', 'Show terms in glossary.'
     method_option "no-pager", type: :boolean, default: false
+    method_option "annotation", type: :string, aliases: "-A"
     def show
       required_options = {
         "glossary" => "input glossary name '-g <glossary name>'",
@@ -304,10 +318,9 @@ module Logaling::Command
       }
       @config.check_required_option(required_options)
       check_logaling_home_exists
-      project = @repository.find_project(@config.glossary)
-      raise Logaling::ProjectNotFound unless project
-      glossary = project.glossary(@config.source_language, @config.target_language)
-      terms = glossary.terms
+      glossary = @repository.find_glossary(@config.glossary, @config.source_language, @config.target_language)
+      raise Logaling::GlossaryNotFound unless glossary
+      terms = glossary.terms(options["annotation"])
       unless terms.empty?
         run_pager
         terms.each do |term|
@@ -321,7 +334,7 @@ module Logaling::Command
       end
     rescue Logaling::CommandFailed, Logaling::GlossaryDBNotFound => e
       say e.message
-    rescue Logaling::ProjectNotFound
+    rescue Logaling::GlossaryNotFound
       say "glossary <#{@config.glossary}> not found."
       say "Try 'loga list' and confirm glossary name."
     end
@@ -334,8 +347,13 @@ module Logaling::Command
       projects = @repository.projects
       unless projects.empty?
         run_pager
-        projects.each do |project|
-          printf("  %s\n", project.name)
+        # 用語集の一覧といいつつプロジェクトの一覧を出していて、
+        # かつ個人用のプロジェクトと .logaling によるプロジェクトで
+        # プロジェクトとして表現しているスコープが異なっているために、
+        # 重複した名前のプロジェクトが表示されるケースが存在する
+        #TODO 表示する情報の単位を整理後に見直す
+        projects.map(&:name).uniq.each do |project_name|
+          printf("  %s\n", project_name)
         end
       else
         "There is no registered glossary."
@@ -344,6 +362,23 @@ module Logaling::Command
       say e.message
     end
 
+    desc 'copy [GLOSSARY NAME] [SOURCE LANGUAGE] [TARGET LANGUAGE] [NEW GLOSSARY NAME] [NEW SOURCE LANGUAGE] [NEW TARGET LANGUAGE]', 'Copy personal glossary'
+    def copy(project_name, source_language, target_language, new_project_name, new_source_language, new_target_language)
+      check_logaling_home_exists
+
+      src_glossary = @repository.find_glossary(project_name, source_language, target_language)
+      unless src_glossary
+        raise Logaling::GlossaryNotFound, "Can't found #{project_name}.#{source_language}.#{target_language}"
+      end
+
+      dest_project = @repository.create_personal_project(new_project_name, new_source_language, new_target_language)
+      dest_glossary = dest_project.glossary(new_source_language, new_target_language)
+
+      dest_glossary.merge!(src_glossary)
+    rescue Logaling::CommandFailed, Logaling::GlossaryAlreadyRegistered, Logaling::GlossaryNotFound => e
+      say e.message
+    end
+
     private
     def error(msg)
       STDERR.puts(msg)

data/lib/logaling/command/version.rb

@@ -17,6 +17,6 @@
 
 module Logaling
   module Command
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/lib/logaling/glossary.rb

@@ -17,6 +17,7 @@
 module Logaling
   class Glossary
     SUPPORTED_FILE_TYPE = %w(yml tsv csv)
+    SUPPORTED_ANNOTATION = %w(wip)
 
     attr_reader :name, :source_language, :target_language
 
@@ -27,12 +28,13 @@ module Logaling
       @project = project
     end
 
-    def terms
+    def terms(annotation_word=nil)
       raise Logaling::GlossaryDBNotFound unless File.exist?(@project.glossary_db_path)
       index
       terms = []
+      filter_option = annotation_word ? '@' + annotation_word : annotation_word
       Logaling::GlossaryDB.open(@project.glossary_db_path, "utf8") do |db|
-        terms = db.translation_list(self)
+        terms = db.translation_list(self, filter_option)
       end
       terms
     end
@@ -75,6 +77,16 @@ module Logaling
       end
     end
 
+    def merge!(glossary)
+      glossary.terms.each do |term|
+        add(term[:source_term], term[:target_term], term[:note])
+      end
+    end
+
+    def initialize_glossary_source
+      glossary_source.initialize_source
+    end
+
     def to_s
       [@name, @source_language, @target_language].join('.')
     end

data/lib/logaling/glossary_db.rb

@@ -168,13 +168,22 @@ module Logaling
       struct_result(records, snippet)
     end
 
-    def translation_list(glossary, order='ascending')
+    def translation_list(glossary, filter_option, order='ascending')
       records_raw = Groonga["translations"].select do |record|
-        [
-          record.glossary == glossary.name,
-          record.source_language == glossary.source_language,
-          record.target_language == glossary.target_language
-        ]
+        if filter_option
+          [
+            record.glossary == glossary.name,
+            record.source_language == glossary.source_language,
+            record.target_language == glossary.target_language,
+            record.note =~ filter_option
+          ]
+        else
+          [
+            record.glossary == glossary.name,
+            record.source_language == glossary.source_language,
+            record.target_language == glossary.target_language
+          ]
+        end
       end
 
       records = records_raw.sort([

data/lib/logaling/glossary_sources/glossary_yaml_source.rb

@@ -34,7 +34,7 @@ module Logaling::GlossarySources
     end
 
     def add(source_term, target_term, note)
-      dump_glossary_source([]) unless File.exist?(source_path)
+      initialize_source unless File.exist?(source_path)
 
       glossary_source = self.load
       glossary_source << build_term(source_term, target_term, note)
@@ -88,6 +88,10 @@ module Logaling::GlossarySources
       end
     end
 
+    def initialize_source
+      dump_glossary_source([])
+    end
+
     private
     def build_term(source_term, target_term, note)
       note ||= ''

data/lib/logaling/project.rb

@@ -72,6 +72,10 @@ module Logaling
       end
     end
 
+    def has_glossary?(source_language, target_language)
+      glossaries.any? {|glossary| glossary.to_s == [name, source_language, target_language].join('.') }
+    end
+
     private
     def all_glossary_source_path
       Dir.glob(File.join(glossary_source_path, "*"))
@@ -87,5 +91,36 @@ module Logaling
       name, source_language, target_language, type = File.basename(@path).split(/\./)
       [GlossarySource.create(@path, glossary(source_language, target_language))]
     end
+
+    def glossary_source_path
+      File.dirname(@path)
+    end
+  end
+
+  class PersonalProject < Project
+    def self.create(root_path, glossary_name, source_language, target_language)
+      project_name = [glossary_name, source_language, target_language, 'yml'].join('.')
+      project_path = File.join(root_path, project_name)
+      project = PersonalProject.new(project_path)
+      project.initialize_glossary(source_language, target_language)
+      project
+    end
+
+    def name
+      File.basename(@path).split(/\./).first
+    end
+
+    def glossary_sources
+      name, source_language, target_language, type = File.basename(@path).split(/\./)
+      [GlossarySource.create(@path, glossary(source_language, target_language))]
+    end
+
+    def glossary_source_path
+      File.dirname(@path)
+    end
+
+    def initialize_glossary(source_language, target_language)
+      glossary(source_language, target_language).initialize_glossary_source
+    end
   end
 end

data/lib/logaling/repository.rb

@@ -44,6 +44,13 @@ module Logaling
       FileUtils.rm_rf(project.path, :secure => true)
     end
 
+    def create_personal_project(project_name, source_language, target_language)
+      if glossary_exists?(project_name, source_language, target_language)
+        raise Logaling::GlossaryAlreadyRegistered, "The glossary '#{project_name}' already exists."
+      end
+      PersonalProject.create(personal_glossary_root_path, project_name, source_language, target_language)
+    end
+
     def import(glossary_source)
       FileUtils.mkdir_p(cache_path)
       Dir.chdir(cache_path) do
@@ -82,6 +89,9 @@ module Logaling
       projects = registered_project_paths.map do |project_path|
         Logaling::Project.new(project_path, self)
       end
+      projects += personal_glossary_paths.map do |personal_glossary_path|
+        Logaling::PersonalProject.new(personal_glossary_path, self)
+      end
       projects += imported_glossary_paths.map do |imported_project_path|
         Logaling::ImportedProject.new(imported_project_path, self)
       end
@@ -121,6 +131,13 @@ module Logaling
       project = projects.detect{|project| project.name == project_name}
     end
 
+    def find_glossary(project_name, source_language, target_language)
+      project = projects.detect do |project|
+        project.name == project_name and project.has_glossary?(source_language, target_language)
+      end
+      project ? project.glossary(source_language, target_language) : nil
+    end
+
     def logaling_db_home
       File.join(@path, "db")
     end
@@ -130,6 +147,10 @@ module Logaling
       File.join(@path, "projects")
     end
 
+    def personal_glossary_root_path
+      File.join(@path, "personal")
+    end
+
     def cache_path
       File.join(@path, "cache")
     end
@@ -138,8 +159,16 @@ module Logaling
       Dir[File.join(logaling_projects_path, "*")]
     end
 
+    def personal_glossary_paths
+      Dir[File.join(personal_glossary_root_path, "*")]
+    end
+
     def imported_glossary_paths
       Dir[File.join(cache_path, "*")]
     end
+
+    def glossary_exists?(project_name, source_language, target_language)
+      not find_glossary(project_name, source_language, target_language).nil?
+    end
   end
 end

data/spec/logaling/command_spec.rb

@@ -463,7 +463,7 @@ describe Logaling::Command::Application do
     context 'when .logaling exists' do
       before do
         command.options = base_options.merge("no-pager" => true)
-        @stdout = capture(:stdout) {command.show}
+        @stdout = capture(:stdout) { command.show }
       end
 
       it 'should show translation list' do
@@ -477,6 +477,49 @@ describe Logaling::Command::Application do
     end
   end
 
+  describe "#show with annotation option" do
+    before do
+      command.new('spec', 'en', 'ja')
+      command.add("spec-test2", "スペックてすと2", "@wip")
+      command.add("spec-test", "スペックてすと1", "備考")
+    end
+
+    context 'when glossary contains annotated word' do
+      before do
+        command.options = base_options.merge("no-pager" => true)
+        command.options.merge!("annotation" => "wip")
+        @stdout = capture(:stdout) { command.show }
+      end
+
+      it 'should show annotated word' do
+        @stdout.should include "スペックてすと2"
+      end
+
+      context 'after annotation removed' do
+        before do
+          command.options = base_options.clone
+          command.update("spec-test2", "スペックてすと2", "スペックてすと2", "")
+        end
+
+        it 'should not show annotated word' do
+          @stdout.should_not include "スペックてすと1"
+        end
+      end
+    end
+
+    context 'when glossary does not contain annotated word' do
+      before do
+        command.options = base_options.merge("no-pager" => true)
+        command.options.merge!("annotation" => "wip")
+        @stdout = capture(:stdout) { command.show }
+      end
+
+      it 'should not show un-annotated word' do
+        @stdout.should_not include "スペックてすと1"
+      end
+    end
+  end
+
   describe '#list' do
     before do
       command.new('spec', 'en', 'ja')
@@ -508,8 +551,38 @@ describe Logaling::Command::Application do
     end
   end
 
+  describe '#copy' do
+    let(:copied_glossary_path) { File.join(logaling_home, 'personal', 'spec.en.fr.yml') }
+    before do
+      command.new('spec', 'en', 'ja')
+      command.add('spec logaling', 'すぺっくろがりん')
+    end
+
+    context 'when new glossary does not exist' do
+      before do
+        command.copy('spec', 'en', 'ja', 'spec', 'en', 'fr')
+        @yaml = YAML::load_file(copied_glossary_path).find{|h| h["source_term"] == "spec logaling" }
+      end
+
+      it 'should copy from original glossary' do
+        @yaml.should == {"source_term"=>"spec logaling", "target_term"=>"すぺっくろがりん", "note"=>""}
+      end
+    end
+
+    context 'when same glossary exists in glossary list' do
+      before do
+        @stdout = capture(:stdout) {command.copy('spec', 'en', 'ja', 'spec', 'en', 'ja')}
+      end
+
+      it 'should not copy glossary' do
+        @stdout.should include "already exists"
+      end
+    end
+  end
+
   after do
     FileUtils.rm_rf(logaling_config)
     FileUtils.rm_rf(File.join(logaling_home, 'projects', 'spec'))
+    FileUtils.rm_rf(File.join(logaling_home, 'personal'))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logaling-command
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor