lib/lurker/cli.rb in lurker-0.6.12 vs lib/lurker/cli.rb in lurker-1.0.0

@@ -16,11 +16,11 @@
     include Thor::Actions
 
     attr_accessor :content
 
     def self.templates_root
-      options[:template].present? ? Pathname.new(options[:templates]).expand_path : Lurker::BUNDLED_TEMPLATES_PATH
+      Lurker::BUNDLED_TEMPLATES_PATH
     end
 
     def self.assets_root
       options[:assets].present? ? Pathname.new(options[:assets]).expand_path : Lurker::BUNDLED_ASSETS_PATH
     end
@@ -104,11 +104,14 @@
         say_status :using, path
       end
 
       def setup_rendering_engine!
         I18n.config.enforce_available_locales = true
-        Lurker::RenderingController.prepend_view_path templates_root
+        Lurker::RenderingController.prepend_view_path Lurker::Cli.templates_root
+        if options[:templates].present?
+          Lurker::RenderingController.prepend_view_path Pathname.new(options[:templates]).expand_path
+        end
         Lurker::RenderingController.config.assets_dir = assets_root
       end
 
       def prepare_assets!
         directory assets_root, '.', exclude_pattern: /application\.(js|css)$/
@@ -157,11 +160,10 @@
 
       def html_options
         @html_options ||= {
             static_html: true,
             url_base_path: url_base_path.prepend('/'),
-            template_directory: templates_root,
             assets_directory: assets_root,
             assets: assets,
             html_directory: output_path,
             footer: footer,
             lurker: gem_info
@@ -193,13 +195,9 @@
       @assets ||= {}
     end
 
     def assets_root
       Lurker::Cli.assets_root
-    end
-
-    def templates_root
-      Lurker::Cli.templates_root
     end
 
     def asset_logical_path(path)
       path = Pathname.new(path) unless path.is_a? Pathname
       path.sub %r{-[0-9a-f]{40}\.}, '.'