logaling-command 0.1.2 → 0.1.3

data/spec/logaling/command_spec.rb

@@ -17,31 +17,33 @@
 
 require File.join(File.dirname(__FILE__), "..", "spec_helper")
 
-describe Logaling::Command do
-  let(:base_options) { {"glossary"=>"spec", "source-language"=>"en", "target-language"=>"ja"} }
-  let(:command) { Logaling::Command.new([], base_options) }
-  let(:glossary_path) { Logaling::Glossary.build_path('spec', 'en', 'ja') }
-  let(:target_project_path) { File.join(LOGALING_HOME, "projects", "spec") }
-  let(:repository) { Logaling::Repository.new(LOGALING_HOME) }
+describe Logaling::Command::Application do
+  let(:logaling_home) { @logaling_home }
+  let(:logaling_config) { File.join(File.dirname(__FILE__), "..", "tmp", ".logaling") }
+  let(:base_options) { {"glossary"=>"spec", "source-language"=>"en", "target-language"=>"ja", "logaling-config" => logaling_config} }
+  let(:command) { Logaling::Command::Application.new([], base_options) }
+  let(:glossary) { Logaling::Glossary.new('spec', 'en', 'ja', logaling_home) }
+  let(:glossary_path) { glossary.source_path }
+  let(:target_project_path) { File.join(logaling_home, "projects", "spec") }
+  let(:repository) { Logaling::Repository.new(logaling_home) }
 
   before do
-    FileUtils.remove_entry_secure(Logaling::Command::LOGALING_CONFIG, true)
-    FileUtils.remove_entry_secure(File.join(LOGALING_HOME, 'projects', 'spec'), true)
+    FileUtils.remove_entry_secure(File.join(logaling_home, 'projects', 'spec'), true)
   end
 
   describe '#new' do
     before do
-      @project_counts = Dir[File.join(LOGALING_HOME, "projects", "*")].size
+      @n_projects = Dir[File.join(logaling_home, "projects", "*")].size
     end
 
     context 'when .logaling already exists' do
       before do
-        FileUtils.mkdir_p(Logaling::Command::LOGALING_CONFIG)
+        command.new('spec', 'en', 'ja')
         @stdout = capture(:stdout) { command.new('spec', 'en', 'ja') }
       end
 
       it 'print message \"<.logaling path> already exists.\"' do
-        @stdout.should == "#{Logaling::Command::LOGALING_CONFIG} already exists.\n"
+        @stdout.should include "#{logaling_config} already exists.\n"
       end
     end
 
@@ -52,12 +54,12 @@ describe Logaling::Command do
         end
 
         it 'should create .logaling' do
-          File.exist?(Logaling::Command::LOGALING_CONFIG).should be_true
+          File.should be_exist(logaling_config)
         end
 
         it 'should register .logaling as project' do
-          File.exist?(target_project_path).should be_true
-          Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts + 1
+          File.should be_exist(target_project_path)
+          Dir[File.join(logaling_home, "projects", "*")].size.should == @n_projects + 1
         end
       end
 
@@ -68,12 +70,12 @@ describe Logaling::Command do
         end
 
         it 'should create .logaling' do
-          File.exist?(Logaling::Command::LOGALING_CONFIG).should be_true
+          File.should be_exist(logaling_config)
         end
 
         it 'should not register .logaling as project' do
-          File.exist?(target_project_path).should be_false
-          Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts
+          File.should_not be_exist(target_project_path)
+          Dir[File.join(logaling_home, "projects", "*")].size.should == @n_projects
         end
       end
     end
@@ -82,17 +84,17 @@ describe Logaling::Command do
   describe '#register' do
     before do
       sleep(1)
-      @project_counts = Dir[File.join(LOGALING_HOME, "projects", "*")].size
+      @n_projects = Dir[File.join(logaling_home, "projects", "*")].size
     end
 
     context "when can not find .logaling" do
       before(:all) do
-        FileUtils.remove_entry_secure(Logaling::Command::LOGALING_CONFIG, true)
+        FileUtils.remove_entry_secure(logaling_config, true)
         @stdout = capture(:stdout) {command.register}
       end
 
       it 'register nothing' do
-        Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts
+        Dir[File.join(logaling_home, "projects", "*")].size.should == @n_projects
       end
 
       it "print message \"Try 'loga new' first.\"" do
@@ -107,29 +109,25 @@ describe Logaling::Command do
       end
 
       it 'register .logaling as project' do
-        File.exist?(target_project_path).should be_true
-        Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts + 1
-      end
-
-      after do
-        FileUtils.remove_entry_secure(Logaling::Command::LOGALING_CONFIG, true)
+        File.should be_exist(target_project_path)
+        Dir[File.join(logaling_home, "projects", "*")].size.should == @n_projects + 1
       end
     end
   end
 
   describe '#unregister' do
     before do
-      @project_counts = Dir[File.join(LOGALING_HOME, "projects", "*")].size
+      @n_projects = Dir[File.join(logaling_home, "projects", "*")].size
     end
 
     context "when can not find .logaling" do
       before do
-        FileUtils.remove_entry_secure(Logaling::Command::LOGALING_CONFIG, true)
+        #FileUtils.remove_entry_secure(logaling_config, true)
       end
 
       context "and call without option" do
         before do
-          command.options = base_options.merge("glossary" => nil)
+          base_options["glossary"] = nil
           @stdout = capture(:stdout) {command.unregister}
         end
 
@@ -144,7 +142,7 @@ describe Logaling::Command do
           @stdout = capture(:stdout) {command.unregister}
         end
         it 'should unregister symlink' do
-          Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts
+          Dir[File.join(logaling_home, "projects", "*")].size.should == @n_projects
         end
       end
     end
@@ -158,8 +156,8 @@ describe Logaling::Command do
         end
 
         it 'unregister .logaling' do
-          File.exist?(target_project_path).should be_false
-          Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts
+          File.should_not be_exist(target_project_path)
+          Dir[File.join(logaling_home, "projects", "*")].size.should == @n_projects
         end
       end
 
@@ -178,8 +176,8 @@ describe Logaling::Command do
   end
 
   describe '#config' do
-    let(:project_config) { File.join(Logaling::Command::LOGALING_CONFIG, 'config') }
-    let(:global_config) { File.join(LOGALING_HOME, 'config') }
+    let(:project_config) { File.join(logaling_config, 'config') }
+    let(:global_config) { File.join(logaling_home, 'config') }
 
     subject { File.read(project_config) }
 
@@ -214,7 +212,7 @@ describe Logaling::Command do
 
       subject { File.read(global_config) }
 
-      it 'should create LOGALING_HOME/config and write target-language' do
+      it 'should create {logaling_home}/config and write target-language' do
         should include "--target-language ja"
       end
 
@@ -225,12 +223,9 @@ describe Logaling::Command do
   end
 
   describe '#add' do
-    before do
-      command.new('spec', 'en', 'ja')
-    end
-
     context 'with arguments have only bilingual pair' do
       before do
+        command.new('spec', 'en', 'ja')
         command.add("spec", "テスト")
       end
 
@@ -247,6 +242,7 @@ describe Logaling::Command do
 
     context 'with arguments have bilingual pair and note' do
       before do
+        command.new('spec', 'en', 'ja')
         command.add("spec", "テスト", "備考")
       end
 
@@ -262,28 +258,25 @@ describe Logaling::Command do
     end
 
     context 'project config does not have TARGET-LANGUAGE' do
-      let(:command2) { Logaling::Command.new([], {}) }
-      let(:global_config) { File.join(LOGALING_HOME, 'config') }
+      let(:global_config) { File.join(logaling_home, 'config') }
+      let(:base_options) { {"glossary"=>"spec", "source-language"=>"en", "output" => "terminal", "logaling-config" => logaling_config} }
       before do
-        FileUtils.remove_entry_secure(Logaling::Command::LOGALING_CONFIG, true)
-        command2.new('spec2', 'en')
+        # create global config file
         FileUtils.touch(global_config)
-        File.open(global_config, "w") do |f| 
-          f.puts "--target-language fr"
-        end
+        File.open(global_config, "w"){|f| f.puts "--target-language fr"}
+        command.new('spec', 'en')
       end
 
       context 'but global config have it' do
         before do
-          command2.add('config test', '設定ファイルのテスト')
-          @stdout = capture(:stdout) {command2.lookup("config")}
+          command.add('test-logaling', '設定ファイルのテスト')
+          command.options = base_options.merge("no-pager" => true)
+          @stdout = capture(:stdout) {command.lookup("test-logaling")}
         end
 
         it "should use global config's TARGET-LANGUAGE" do
-          @stdout.should include "config"
-          @stdout.should include "test"
+          @stdout.should include "test-logaling"
           @stdout.should include "設定ファイルのテスト"
-          @stdout.should include "(spec2)"
         end
       end
 
@@ -295,7 +288,6 @@ describe Logaling::Command do
 
   describe "#update" do
     before do
-      FileUtils.remove_entry_secure(File.join(LOGALING_HOME, "db", "index_at"), true)
       command.new('spec', 'en', 'ja')
       command.add("spec", "テスト", "備考")
     end
@@ -335,6 +327,7 @@ describe Logaling::Command do
 
   describe '#lookup' do
     before do
+      command.options = base_options.merge("output" => "terminal", "no-pager" => true)
       command.new('spec', 'en', 'ja')
       command.add("spec", "スペック", "備考")
     end
@@ -355,33 +348,34 @@ describe Logaling::Command do
   describe "#delete" do
     before do
       command.new('spec', 'en', 'ja')
-      command.add('spec', 'スペック', '備考')
-      command.add('user', 'ユーザ', '備考')
+      command.add('spec', 'スペックろがりん', '備考')
       command.add('test', 'てすと1', '備考')
       command.add('test', 'てすと2', '備考')
     end
 
     context 'with arguments exist term' do
       before do
-        command.delete('spec', 'スペック')
+        command.delete('spec', 'スペックろがりん')
+        command.options = base_options.merge("no-pager" => true)
         @stdout = capture(:stdout) {command.lookup("spec")}
       end
 
       it 'should delete the term' do
-        @stdout.should_not include "spec : スペック # 備考"
+        @stdout.should_not include "スペックろがりん"
       end
     end
 
     context 'without target_term' do
       context 'only 1 bilingual pair exist' do
-      before do
-        command.delete('user')
-        @stdout = capture(:stdout) {command.lookup("user")}
-      end
+        before do
+          command.delete('spec')
+          command.options = base_options.merge("no-pager" => true)
+          @stdout = capture(:stdout) {command.lookup("spec")}
+        end
 
-      it 'should delete the term' do
-        @stdout.should_not include "user : ユーザ # 備考"
-      end
+        it 'should delete the term' do
+          @stdout.should_not include "スペックろがりん"
+        end
       end
 
       context 'some bilingual pair exist' do
@@ -391,25 +385,28 @@ describe Logaling::Command do
           end
 
           it "should print usage" do
-            @stdout.should == "There are duplicate terms in glossary.\n" +
-            "If you really want to delete, please put `loga delete [SOURCE_TERM] --force`\n" +
-            " or `loga delete [SOURCE_TERM] [TARGET_TERM]`\n"
+            @stdout.should include "There are duplicate terms in glossary."
+            @stdout.should include "loga delete [SOURCE_TERM] --force"
+            @stdout.should include "loga delete [SOURCE_TERM] [TARGET_TERM]"
           end
         end
 
         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)
             command.options = base_options.merge("force" => true)
             command.new('spec', 'en', 'ja')
             command.add('term', '用語1', '備考')
             command.add('term', '用語2', '備考')
             command.delete("term")
+            command.options = base_options.merge("no-pager" => true)
             @stdout = capture(:stdout) {command.lookup("term")}
           end
 
           it 'should delete bilingual pairs' do
-            @stdout.should_not include "term : 用語1 # 備考"
-            @stdout.should_not include "term : 用語2 # 備考"
+            @stdout.should_not include "用語1"
+            @stdout.should_not include "用語2"
           end
         end
       end
@@ -420,37 +417,22 @@ describe Logaling::Command do
     let(:csv_path) { File.join(File.dirname(glossary_path), "spec.ja.en.csv") }
     before do
       command.new('spec', 'en', 'ja')
-      command.add("spec", "スペック", "備考")
       command.add("spec-test", "スペックてすと", "備考")
-      command.add("spec-test-test", "スペックてすとてすと", "備考")
 
       FileUtils.mkdir_p(File.dirname(glossary_path))
       FileUtils.touch(csv_path)
-      File.open(csv_path, "w"){|f| f.puts "test_logaling,テスト"}
+      File.open(csv_path, "w"){|f| f.puts "test_logaling,テストろがりん"}
     end
 
     context 'when .logaling exists' do
       before do
+        command.options = base_options.merge("no-pager" => true)
         @stdout = capture(:stdout) {command.show}
       end
 
       it 'should show translation list' do
-        @stdout.should include "spec"
-        @stdout.should include "spec-test"
-        @stdout.should include "spec-test-test"
-        @stdout.should_not include "test_logaling"
-      end
-    end
-
-    context 'with arguments glossary' do
-      before do
-        command.options = base_options.merge("glossary" => "spec", "source-language" => "ja", "target-language" => "en")
-        @stdout = capture(:stdout) {command.show}
-      end
-
-      it 'should show translation list' do
-        @stdout.should include "test_logaling"
-        @stdout.should_not include "spec-test-test"
+        @stdout.should include "スペックてすと"
+        @stdout.should_not include "テストろがりん"
       end
     end
 
@@ -460,9 +442,14 @@ describe Logaling::Command do
   end
 
   describe '#list' do
+    before do
+      command.new('spec', 'en', 'ja')
+      command.add('spec logaling', 'すぺっくろがりん')
+    end
+
     context 'when some glossaries are registered' do
       before do
-        command.new('spec', 'en', 'ja')
+        command.options = base_options.merge("no-pager" => true)
         @stdout = capture(:stdout) {command.list}
       end
 
@@ -473,8 +460,8 @@ describe Logaling::Command do
 
     context 'when a glossary is unregistered' do
       before do
-        command.new('spec', 'en', 'ja')
         repository.unregister('spec')
+        command.options = base_options.merge("no-pager" => true)
         @stdout = capture(:stdout) {command.list}
       end
 
@@ -485,7 +472,7 @@ describe Logaling::Command do
   end
 
   after do
-    FileUtils.remove_entry_secure(Logaling::Command::LOGALING_CONFIG, true)
-    FileUtils.remove_entry_secure(File.join(LOGALING_HOME, 'projects', 'spec'), true)
+    FileUtils.remove_entry_secure(logaling_config, true)
+    FileUtils.remove_entry_secure(File.join(logaling_home, 'projects', 'spec'), true)
   end
 end

data/spec/logaling/glossary_spec.rb

@@ -21,12 +21,13 @@ require "fileutils"
 module Logaling
   describe Glossary do
     let(:project) { "spec" }
-    let(:glossary) { Glossary.new(project, 'en', 'ja') }
-    let(:glossary_path) { Glossary.build_path(project, 'en', 'ja') }
-    let(:repository) { Logaling::Repository.new(LOGALING_HOME) }
+    let(:logaling_home) { @logaling_home }
+    let(:glossary) { Glossary.new(project, 'en', 'ja', logaling_home) }
+    let(:glossary_path) { glossary.source_path }
+    let(:repository) { Logaling::Repository.new(logaling_home) }
 
     before do
-      FileUtils.remove_entry_secure(File.join(LOGALING_HOME, 'projects', 'spec'), true)
+      FileUtils.remove_entry_secure(File.join(logaling_home, 'projects', 'spec'), true)
       FileUtils.mkdir_p(File.dirname(glossary_path))
     end
 
@@ -100,7 +101,7 @@ module Logaling
           glossary.add("delete_logaling", "てすと2", "備考")
           glossary.delete("delete_logaling", "てすと1")
           repository.index
-          @result = repository.lookup("delete_logaling", "en", "ja", project)
+          @result = repository.lookup("delete_logaling", glossary)
         end
 
         it 'should delete the bilingual pair' do
@@ -137,7 +138,7 @@ module Logaling
             glossary.add("user_logaling", "ユーザ", "備考")
             glossary.delete_all("user_logaling")
             repository.index
-            @result = repository.lookup("user_logaling", "en", "ja", project)
+            @result = repository.lookup("user_logaling", glossary)
           end
 
           it 'should delete the term' do
@@ -152,8 +153,7 @@ module Logaling
             glossary.add("delete_logaling", "てすと1", "備考")
             glossary.add("delete_logaling", "てすと2", "備考")
             glossary.delete_all("delete_logaling", true)
-            repository.index
-            @result = repository.lookup("delete_logaling", "en", "ja", project)
+            @result = Logaling::Glossary.load_glossary_yml(glossary_path)
           end
 
           it {
@@ -161,15 +161,17 @@ module Logaling
           }
 
           it "should delete terms when force option is true" do
-            @result.any?{|term| term[:source_term] == "delete_logaling" && term[:target_term] == "てすと1"}.should be_false
-            @result.any?{|term| term[:source_term] == "delete_logaling" && term[:target_term] == "てすと2"}.should be_false
+            @result.any?{|term| term == {"source_term"=>"delete_logaling", "target_term"=>"てすと1", "note"=>"備考"}}.should be_false
+            @result.any?{|term| term == {"source_term"=>"delete_logaling", "target_term"=>"てすと2", "note"=>"備考"}}.should be_false
+            @result.any?{|term| term == {"source_term"=>"user_logaling", "target_term"=>"ユーザ1", "note"=>"備考"}}.should be_true
+            @result.any?{|term| term == {"source_term"=>"user_logaling", "target_term"=>"ユーザ2", "note"=>"備考"}}.should be_true
           end
         end
       end
     end
 
     after do
-      FileUtils.remove_entry_secure(File.join(LOGALING_HOME, 'projects', 'spec'), true)
+      FileUtils.remove_entry_secure(File.join(logaling_home, 'projects', 'spec'), true)
     end
   end
 end