lib/daddy/itamae.rb in daddy-0.5.11 vs lib/daddy/itamae.rb in daddy-0.5.12
- old
+ new
@@ -1,44 +1,10 @@
-require 'itamae/resource/remote_file'
-
-module Itamae
- module Resource
- class Template
-
- def find_source_file_with_daddy_convention
- begin
- ret = find_source_file_without_daddy_convention
- rescue SourceNotFoundError => e
- if attributes.source == :auto
- ret = find_source_file_in_templates
- else
- raise e
- end
- end
-
- ret
- end
-
- def find_source_file_in_templates
- itamae_dir = ::File.expand_path('../../../itamae', __FILE__)
- path = ::File.join(itamae_dir, source_file_dir, "#{attributes.path}.erb")
- if ::File.exist?(path)
- path
- else
- raise SourceNotFoundError, "source file is not found (searched in daddy path: #{path})"
- end
- end
-
- alias_method :find_source_file_without_daddy_convention, :find_source_file
- alias_method :find_source_file, :find_source_file_with_daddy_convention
- end
- end
+Dir[File.join(File.dirname(__FILE__), 'itamae', 'ext', '*.rb')].each do |f|
+ require f
end
-require 'i18n'
-I18n.available_locales = [:en, :ja]
-I18n.default_locale = ENV['LANG'].start_with?('ja_') ? :ja : :en
-I18n.load_path += Dir.glob(File.expand_path('../../../itamae/locale/*.yml', __FILE__))
+require_relative 'itamae/config'
+require_relative 'itamae/i18n'
-Dir[File.join(File.dirname(__FILE__), 'itamae', '*.rb')].each do |f|
+Dir[File.join(File.dirname(__FILE__), 'itamae', 'env', '*.rb')].each do |f|
require f
end