null+****@clear*****
null+****@clear*****
Thu Feb 16 16:54:55 JST 2012
SHIMADA Koji 2012-02-16 16:54:55 +0900 (Thu, 16 Feb 2012)
New Revision: a2086ec0522888bca35d01a6a68aa3e17b3caafd
Merged 68987aa: Merge pull request #44 from logaling/remove-dependency-on-logaling-home
Log:
Reduce dependency on LOGALING_HOME
Modified files:
lib/logaling/command/application.rb
lib/logaling/glossary.rb
Modified: lib/logaling/command/application.rb (+4 -3)
===================================================================
--- lib/logaling/command/application.rb 2012-02-16 16:51:29 +0900 (90ade55)
+++ lib/logaling/command/application.rb 2012-02-16 16:54:55 +0900 (4ed243d)
@@ -28,7 +28,8 @@ module Logaling::Command
def initialize(*args)
super
- @repository = Logaling::Repository.new(LOGALING_HOME)
+ @logaling_home = options["logaling-home"] ? options["logaling-home"] : LOGALING_HOME
+ @repository = Logaling::Repository.new(@logaling_home)
project_config_path = File.join(find_dotfile, 'config')
@config = Logaling::Config.load_config_and_merge_options(project_config_path, @repository.config_path, options)
rescue Logaling::CommandFailed
@@ -115,7 +116,7 @@ module Logaling::Command
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") : File.join(find_dotfile, "config")
+ config_path = options["global"] ? File.join(@logaling_home, "config") : File.join(find_dotfile, "config")
FileUtils.touch(config_path) unless File.exist?(config_path)
Logaling::Config.add(config_path, key, value)
say "Successfully set config."
@@ -258,7 +259,7 @@ module Logaling::Command
"target-language" => "input target-language code '-T <target-language code>'"
}
@config.check_required_option(required_options)
- @glossary = Logaling::Glossary.new(@config.glossary, @config.source_language, @config.target_language)
+ @glossary = Logaling::Glossary.new(@config.glossary, @config.source_language, @config.target_language, @logaling_home)
end
end
Modified: lib/logaling/glossary.rb (+4 -4)
===================================================================
--- lib/logaling/glossary.rb 2012-02-16 16:51:29 +0900 (ee5f4f7)
+++ lib/logaling/glossary.rb 2012-02-16 16:54:55 +0900 (997a50c)
@@ -61,14 +61,14 @@ module Logaling
glossary
end
- def build_path(glossary, source_language, target_language)
+ def build_path(glossary, source_language, target_language, logaling_home=LOGALING_HOME)
fname = [glossary, source_language, target_language].join(".")
- File.join(LOGALING_HOME, "projects", glossary, "glossary", "#{fname}.yml")
+ File.join(logaling_home, "projects", glossary, "glossary", "#{fname}.yml")
end
end
- def initialize(glossary, source_language, target_language)
- @path = Glossary.build_path(glossary, source_language, target_language)
+ def initialize(glossary, source_language, target_language, logaling_home=LOGALING_HOME)
+ @path = Glossary.build_path(glossary, source_language, target_language, logaling_home)
@glossary = glossary
@source_language = source_language
@target_language = target_language