null+****@clear*****
null+****@clear*****
Thu Feb 16 16:51:29 JST 2012
SHIMADA Koji 2012-02-16 16:51:29 +0900 (Thu, 16 Feb 2012)
New Revision: 8c8749a7477b59f39df057623e6dd7804d183f10
Log:
Refer LOGALING_HOME once
Modified files:
spec/logaling/command_spec.rb
spec/logaling/glossary_spec.rb
spec/logaling/repository_spec.rb
Modified: spec/logaling/command_spec.rb (+18 -17)
===================================================================
--- spec/logaling/command_spec.rb 2012-02-15 13:29:04 +0900 (51c023d)
+++ spec/logaling/command_spec.rb 2012-02-16 16:51:29 +0900 (65500ad)
@@ -18,20 +18,21 @@
require File.join(File.dirname(__FILE__), "..", "spec_helper")
describe Logaling::Command::Application do
+ let(:logaling_home) { LOGALING_HOME }
let(:base_options) { {"glossary"=>"spec", "source-language"=>"en", "target-language"=>"ja"} }
let(:command) { Logaling::Command::Application.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) }
+ 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
+ @project_counts = Dir[File.join(logaling_home, "projects", "*")].size
end
context 'when .logaling already exists' do
@@ -57,7 +58,7 @@ describe Logaling::Command::Application do
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
+ Dir[File.join(logaling_home, "projects", "*")].size.should == @project_counts + 1
end
end
@@ -73,7 +74,7 @@ describe Logaling::Command::Application do
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
+ Dir[File.join(logaling_home, "projects", "*")].size.should == @project_counts
end
end
end
@@ -82,7 +83,7 @@ describe Logaling::Command::Application do
describe '#register' do
before do
sleep(1)
- @project_counts = Dir[File.join(LOGALING_HOME, "projects", "*")].size
+ @project_counts = Dir[File.join(logaling_home, "projects", "*")].size
end
context "when can not find .logaling" do
@@ -92,7 +93,7 @@ describe Logaling::Command::Application do
end
it 'register nothing' do
- Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts
+ Dir[File.join(logaling_home, "projects", "*")].size.should == @project_counts
end
it "print message \"Try 'loga new' first.\"" do
@@ -108,7 +109,7 @@ describe Logaling::Command::Application do
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
+ Dir[File.join(logaling_home, "projects", "*")].size.should == @project_counts + 1
end
after do
@@ -119,7 +120,7 @@ describe Logaling::Command::Application do
describe '#unregister' do
before do
- @project_counts = Dir[File.join(LOGALING_HOME, "projects", "*")].size
+ @project_counts = Dir[File.join(logaling_home, "projects", "*")].size
end
context "when can not find .logaling" do
@@ -144,7 +145,7 @@ describe Logaling::Command::Application 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 == @project_counts
end
end
end
@@ -159,7 +160,7 @@ describe Logaling::Command::Application do
it 'unregister .logaling' do
File.exist?(target_project_path).should be_false
- Dir[File.join(LOGALING_HOME, "projects", "*")].size.should == @project_counts
+ Dir[File.join(logaling_home, "projects", "*")].size.should == @project_counts
end
end
@@ -179,7 +180,7 @@ describe Logaling::Command::Application do
describe '#config' do
let(:project_config) { File.join(Logaling::Command::LOGALING_CONFIG, 'config') }
- let(:global_config) { File.join(LOGALING_HOME, 'config') }
+ let(:global_config) { File.join(logaling_home, 'config') }
subject { File.read(project_config) }
@@ -214,7 +215,7 @@ describe Logaling::Command::Application 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
@@ -260,7 +261,7 @@ describe Logaling::Command::Application do
end
context 'project config does not have TARGET-LANGUAGE' do
- 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"} }
before do
# create global config file
@@ -396,7 +397,7 @@ describe Logaling::Command::Application do
context "and called with '--force=true'" do
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)
command.options = base_options.merge("force" => true)
command.new('spec', 'en', 'ja')
command.add('term', '用語1', '備考')
@@ -475,6 +476,6 @@ describe Logaling::Command::Application do
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(File.join(logaling_home, 'projects', 'spec'), true)
end
end
Modified: spec/logaling/glossary_spec.rb (+4 -3)
===================================================================
--- spec/logaling/glossary_spec.rb 2012-02-15 13:29:04 +0900 (1d6a8b2)
+++ spec/logaling/glossary_spec.rb 2012-02-16 16:51:29 +0900 (83675da)
@@ -21,12 +21,13 @@ require "fileutils"
module Logaling
describe Glossary do
let(:project) { "spec" }
+ let(:logaling_home) { LOGALING_HOME }
let(:glossary) { Glossary.new(project, 'en', 'ja') }
let(:glossary_path) { Glossary.build_path(project, 'en', 'ja') }
- let(:repository) { Logaling::Repository.new(LOGALING_HOME) }
+ 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
@@ -170,7 +171,7 @@ module Logaling
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
Modified: spec/logaling/repository_spec.rb (+5 -4)
===================================================================
--- spec/logaling/repository_spec.rb 2012-02-15 13:29:04 +0900 (fd1a113)
+++ spec/logaling/repository_spec.rb 2012-02-16 16:51:29 +0900 (4c04eb8)
@@ -21,13 +21,14 @@ require "fileutils"
module Logaling
describe Repository do
let(:project) { "spec" }
+ let(:logaling_home) { LOGALING_HOME }
let(:glossary) { Glossary.new(project, 'en', 'ja') }
let(:glossary_path) { Glossary.build_path(project, 'en', 'ja') }
- let(:repository) { Logaling::Repository.new(LOGALING_HOME) }
- let(:db_home) { File.join(LOGALING_HOME, "db") }
+ let(:repository) { Logaling::Repository.new(logaling_home) }
+ let(:db_home) { File.join(logaling_home, "db") }
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
@@ -129,7 +130,7 @@ module Logaling
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