Merge pull request #21 from DannyBen/patch

Add ability to --index --and-quit

README.md

@@ -86,6 +86,7 @@ bind: '0.0.0.0'
 autoh1: true
 highlighter: true
 line_numbers: true
+index: false
 ```
 
 

lib/madness/command_line.rb

@@ -5,14 +5,9 @@ class CommandLine
     include Singleton
     include Colsole
 
-    # Without any argument, we run the server in the current directory.
-    # Otherwise, we will set some options before executing.
+    # Launch the server
     def execute(argv=[])
-      if argv.empty?
-        launch_server
-      else
-        launch_server_with_options argv
-      end
+      launch_server_with_options argv
     end
 
     private
@@ -24,11 +19,10 @@ def launch_server_with_options(argv)
       begin
         args = Docopt::docopt(doc, argv: argv, version: VERSION)
         set_config args
-        if args['--index']
-          build_index
-        else
-          launch_server
-        end
+
+        build_index if config.index
+        launch_server unless args['--and-quit']
+
       rescue Docopt::Exit => e
         puts e.message
       end
@@ -42,7 +36,7 @@ def launch_server
         STDERR.puts "Invalid path (#{config.path})" 
         return
       end
-      
+
       show_status
       Server.prepare
       Server.run!
@@ -57,14 +51,15 @@ def set_config(args)
       config.autoh1       = false  if args['--no-auto-h1']
       config.highlighter  = false  if args['--no-syntax']
       config.line_numbers = false  if args['--no-line-numbers']
+      config.index        = true   if args['--index']
     end
 
     # Say hello to everybody when the server starts, showing the known 
     # config.
     def show_status
       say_status :start, 'the madness'
       say_status :listen, "#{config.bind}:#{config.port}", :txtblu
-      say_status :path, config.path, :txtblu
+      say_status :path, File.realpath(config.path), :txtblu
       say_status :use, config.filename if config.file_exist?
       say "-" * 40
     end

lib/madness/docopt.txt

@@ -29,8 +29,12 @@ Options:
   --index
     Build or rebuild the index for the search page.
 
+  --and-quit
+    Quit after building the index (applicable only with --index).
+
 Examples:
   madness
   madness docs
   madness docs --no-auto-h1 -p 4567
+  madness --index --and-quit
 

lib/madness/settings.rb

@@ -10,7 +10,7 @@ class Settings
     include Singleton
 
     attr_accessor :port, :bind, :path, :autoh1, 
-      :highlighter, :line_numbers
+      :highlighter, :line_numbers, :index
 
     def initialize
       reset
@@ -41,6 +41,7 @@ def set_defaults
       self.autoh1 = true
       self.highlighter = true
       self.line_numbers = true
+      self.index = false
     end
 
     def load_from_file

spec/fixtures/.madness.yml

@@ -5,4 +5,5 @@ port: '1337'
 bind: '4.3.2.1'
 autoh1: false
 highlighter: false
-line_numbers: false
+line_numbers: false
+index: true

spec/madness/command_line_spec.rb

@@ -50,9 +50,18 @@
     end
 
     context "with --index" do
-      it "calls the index builder" do
+      it "calls the index builder and starts the server" do
+        expect(Server).to receive :run!
         expect_any_instance_of(Search).to receive :build_index
         command = %w[--index]
+        expect {cli.execute command}.to output(/done.*indexing.*start.*the madness/m).to_stdout
+      end
+    end
+
+    context "with --index --and-quit" do
+      it "calls the index builder" do
+        expect_any_instance_of(Search).to receive :build_index
+        command = %w[--index --and-quit]
         expect {cli.execute command}.to output(/done.*indexing/).to_stdout
       end
     end

spec/madness/settings_spec.rb

@@ -24,6 +24,7 @@
       expect(config.autoh1).to be false
       expect(config.highlighter).to be false
       expect(config.line_numbers).to be false
+      expect(config.index).to be true
     end
   end