lib/hyla/commands/watch.rb in hyla-1.0.2 vs lib/hyla/commands/watch.rb in hyla-1.0.3

@@ -1,87 +1,37 @@
 module Hyla
   module Commands
     class Watch < Command
 
-      DEFAULT_OPTIONS = {
-          :watch_dir => '.',
-          :watch_ext => %w(ad adoc asc asciidoc txt index),
-          :run_on_start => false,
-          :backend => 'html5',
-          :eruby => 'erb',
-          :doctype => 'article',
-          :compact => false,
-          :attributes => {},
-          :always_build_all => false,
-          :to_dir => '.',
-          :to_file => '',
-          :safe => :unsafe,
-          :header_footer => true
-      }
-
       WS_OPTIONS = {
           :base_url => '/modules'
       }
 
       def initialize
       end
 
-      def init(watchers = [], options = {})
-        watchers = [] if !watchers
-        merged_opts = DEFAULT_OPTIONS.clone
-
-        if options.has_key? :watch_dir
-          merged_opts[:watch_dir] = options.delete :watch_dir
-          # set output to input if input is specified, but not output
-          unless options.has_key? :to_dir
-            merged_opts[:to_dir] = merged_opts[:watch_dir]
-          end
-        end
-
-        merged_opts.merge! options
-
-        # house cleaning
-        merged_opts[:watch_dir] = '.' if merged_opts[:watch_dir].to_s.empty?
-        merged_opts.delete(:to_dir) if (merged_opts[:to_dir] == '.' || merged_opts[:to_dir].to_s.empty?)
-
-        if merged_opts[:watch_dir] == '.'
-          input_re = ''
-        else
-          merged_opts[:watch_dir].chomp!('/') while merged_opts[:watch_dir].end_with?('/')
-          merged_opts[:watch_dir] << '/'
-          input_re = Regexp.escape merged_opts[:watch_dir]
-        end
-
-        watch_re = %r{^#{input_re}.+\.(?:#{merged_opts[:watch_ext] * '|'})$}
-        watchers << ::Guard::Watcher.new(watch_re)
-        merged_opts[:attributes] = {} unless merged_opts[:attributes]
-        # set a flag to indicate running environment
-        merged_opts[:attributes]['guard'] = ''
-      end
-
       def self.start_livereload
         @reload = Hyla::Commands::Reload.new
-        Thread.new { @reload.process(WS_OPTIONS) }
+        @t = Thread.new { @reload.process(WS_OPTIONS) }
       end
 
       def self.process(args, options = {})
 
         # Start LiveReload
         self.start_livereload
 
-        @opts = DEFAULT_OPTIONS.clone
+        @opts = options
+        @opts_bk = @opts
 
         if options.has_key? :destination
           @opts[:to_dir] = File.expand_path options[:destination]
         end
 
         if options.has_key? :source
           @opts[:watch_dir] = File.expand_path options[:source]
         end
 
-        @received_opts = options
-
         #
         # Guard Listen Callback
         # Detect files modified, deleted or added
         #
         callback = Proc.new do |modified, added, removed|
@@ -101,21 +51,21 @@
             end
 
           end
         end # callback
 
-        Hyla.logger.info ">> ... Starting"
-        Hyla.logger.info ">> Hyla has started to watch files in this output dir :  #{@opts[:watch_dir]}"
-        Hyla.logger.info ">> Results of Asciidoctor generation will be available here : #{@opts[:to_dir]}"
+        Hyla.logger.info ">> ... Starting\n"
+        Hyla.logger.info ">> Hyla has started to watch files in this dir : #{@opts[:watch_dir]}"
+        Hyla.logger.info ">> Results of rendering will be available here : #{@opts[:to_dir]}"
 
         # TODO : Investigate issue with Thread pool is not running (Celluloid::Error)
         # when using a more recent version of guard listen
         listener = Listen.to!(@opts[:watch_dir], &callback)
 
         trap(:INT) {
           Hyla.logger.info "Interrupt intercepted"
-          Thread.kill
+          Thread.kill(@t)
         }
       end
 
       # listen
 
@@ -130,18 +80,15 @@
           Hyla.logger.info ">> File to be processed : #{file_to_process}"
           Hyla.logger.info ">> Extension of the file : #{@ext_name}"
 
           # Generate File name
           # Rename xxx.adoc, xxx.asciidoc, xxx.ad, xxx.index to xxx.html
-          to_file = file_to_process.to_s.gsub(/.adoc|.ad|.asciidoc|.index/, '.html')
+          to_file = file_to_process.to_s.gsub(/.adoc$|.ad$|.asciidoc$|.index$/, '.html')
           @opts[:to_file] = to_file
 
-          # TODO Check why asciidoctor populates new attributes and removes to_dir
-          # TODO when it is called a second time
-          # Workaround - reset list, add again :out_dir
-          @opts[:attributes] = {}
-          @opts[:to_dir] = @received_opts[:destination]
+          # Use destination from original config
+          @opts[:to_dir] = @opts_bk[:destination]
 
           # Calculate Asciidoc to_dir relative to the dir of the file to be processed
           # and create dir in watched dir
           rel_dir = substract_watch_dir(dir_file, @opts[:watch_dir])
           if !rel_dir.empty?
@@ -160,10 +107,9 @@
           Asciidoctor.render_file(f, @opts)
 
           # Refresh browser connected using LiveReload
           path = []
           path.push(calc_dir)
-          # TODO
           @reload.reload_browser(path)
         end
       end
 
       def self.substract_watch_dir(file_dir, watched_dir)